Commit Graph

1930 Commits

Author SHA1 Message Date
Parker Moore
f908051aa4 mime.types: remove extraneous hyphen before comment 2015-04-14 17:15:08 -07:00
Parker Moore
ab83f0bf2e Merge pull request #3649 from schneems/schneems/utf8-myhomework
Merge pull request 3649
2015-04-14 16:51:21 -07:00
schneems
701617cb0e Fix header for RSS feeds with UTF8 characters.
```
$ curl http://localhost:4000/feed.xml -I
HTTP/1.1 200 OK
Etag: 64af8c-2356-552805aa
Content-Type: text/xml; charset=utf-8
Content-Length: 9046
Last-Modified: Fri, 10 Apr 2015 17:17:30 GMT
Server: WEBrick/1.3.1 (Ruby/2.2.1/2015-02-26)
Date: Fri, 10 Apr 2015 17:17:34 GMT
Connection: Keep-Alive
```

Originally contributed to https://github.com/fitztrev/jekyll-utf8/pull/3
2015-04-14 18:21:25 -04:00
Parker Moore
0072865512 Merge pull request #3629 from justinweiss/lsi_search_on_posts
Merge pull request 3629
2015-04-14 13:13:24 -07:00
Parker Moore
ff3edbc16b static files mtime liquid should return a Time obj 2015-04-14 11:52:25 -07:00
Alfred Xing
5a60adb6bd Maruku deprecation error message 2015-04-14 10:58:47 -07:00
Alfred Xing
ae039663b9 Remove Maruku and references to it 2015-04-14 10:58:47 -07:00
Parker Moore
c76c4e478b Convertible#read_yaml should return self.data.
Broken in 4b108df3ab.
2015-04-11 15:42:58 -04:00
Parker Moore
4b108df3ab convertible: abort with an error if Page/Post#data isn't a hash.
when the default_proc was being assigned, it failed if it wasn't a Hash. We
expect data to be a Hash everywhere, so let's freak out if it isn't after
reading and applying the fallback.

Fixes #3643.
2015-04-10 17:07:14 -04:00
Parker Moore
bf98004843 Merge pull request #3608 from nickburlett/patch/incremental-build
Merge pull request 3608
2015-04-10 16:51:56 -04:00
Parker Moore
eeb13872e3 Merge branch 'delftswa2014-remove-unused-method'
* delftswa2014-remove-unused-method:
  static_file: extract extname in initializer and save as variable. #3632
  removed unused method StaticFile::extname
2015-04-10 16:31:26 -04:00
Parker Moore
f14af82da5 static_file: extract extname in initializer and save as variable. #3632 2015-04-10 16:31:19 -04:00
Nicolas Hoizey
76416e50e8 Add WOFF2 font format 2015-04-10 00:13:02 +02:00
Martijn den Hoedt
f0cac685de removed unused method StaticFile::extname 2015-04-01 12:57:49 +02:00
Justin Weiss
fa435fae94 Use Jekyll::Posts for both LSI indexing and lookup.
When looking for related posts, Jekyll was indexing `Jekyll::Post`
objects, but finding related posts based on `Jekyll::Post#content`. This
caused two problems:

1. Ruby 2.2 will warn on == if <=> throws an exception (and future Ruby
versions will surface that exception). Because `String`s can't be
compared with `Jekyll::Post`s, this warning was appearing all the time
while searching for related posts.

2. LSI won't return a post itself when searching for related posts. But
LSI could never tell that we were searching on a post, since Jekyll
passed post content, not a post object. With this fix, we can remove the
`- [post]` from `Jekyll::RelatedPosts#find_related`.

This is a more accurate fix for #3484.
2015-03-29 23:43:55 -07:00
Jordon Bedwell
f75346c799 Merge pull request #3614 from nickburlett/patch/incremental-build-dest-missing
Incremental build if destination file missing
2015-03-28 19:26:01 -05:00
Nicholas Burlett
1f8157022a Clean up destination modified check
Clean up the destination modified check in `source_modified_or_dest_missing?` to be easier to read. Note that it can now return `nil` instead of `false` for an unmodified `source_path` and a `nil` `dest_path`, but in a discussion on 706007ead9 we decided that was okay.
2015-03-25 08:51:58 -07:00
Martijn den Hoedt
d98047ef74 Removed the word 'Jekyll' a few times from the comments 2015-03-25 08:49:05 +01:00
Nicholas Burlett
8f4194eea5 Clean up regeneration missing-destination checks
Use easier-to-follow checks for missing-destinations in the regenerator.
2015-03-24 21:21:37 -07:00
Parker Moore
e7d0b6c5a5 Merge pull request #3545 from delftswa2014/site_extract_readers
Merge pull request 3545
2015-03-23 19:53:07 -07:00
Nicholas Burlett
d4b8f0d9dd Process metadata for all dependencies
When adding a dependency, also add the dependency to the metadata hash.

Addresses part 1 of #3591. Prior to this fix, the regnerator only paid attention the mtime of the first dependency it checked, so for posts/pages with N multiple dependencies (i.e., every layout file used to render them), it continues to regenerate the post/page approximately N times, at which point it's seen all of the dependencies.
2015-03-22 13:33:12 -07:00
Parker Moore
e91527058a Merge pull request #3592 from nickburlett/patch/incremental-build
Merge pull request 3592
2015-03-21 19:29:45 -07:00
Nicholas Burlett
706007ead9 Incrementally regenerate missing destination file
Addresses the third point of #3591, in which the incremental regenerator doesn't notice that destination files have gone missing.
2015-03-21 19:25:02 -07:00
Martin Jorn Rogalla
63a1ec8949 Made corrections as suggested by @mattr-.
- Corrected TomDoc, added variables and fixed typos.
 - deprecated_rel_permalink -> relative_permalinks_are_deprecated.
 - Grouped calls together in @reader.read.
 - Removed dynamic and static reader subdirectories.
 - Removed unnecessary move of limit_posts.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-20 12:41:19 +01:00
Martin Rogalla
324748a5a6 Added corrections as suggested by @parkr.
- Replaced occurrences of #array += with concat
   operations.(performance)
 - Corrected alignment.
 - Removed rebase artifact.

Signed-off-by: Martin Rogalla <martin@martinrogalla.com>
2015-03-19 14:56:46 +01:00
Nicholas Burlett
15ebf929e1 Use the new clear_cache method
Instead of assigning `@cache = {}`, clear the cache using `clear_cache`
2015-03-18 22:30:31 -07:00
Nicholas Burlett
adce349d7a Clear the regenerator cache every time we process
To address part of #3591, clear the regenerator's cache every time the
site is processed. This ensures that the regenerator doesn't incorrectly
believe a file hasn't changed based on stale information.
2015-03-18 10:27:40 -07:00
Jordon Bedwell
e268ee0f33 Whoops, forgot the pre in the beta tag. 2015-03-18 05:25:36 -05:00
Parker Moore
eb2fc89776 Correct the semantics of checking for jekyll-paginate 2015-03-16 15:48:50 -07:00
Parker Moore
bb57c80478 Perform jekyll-paginate deprecation warning correctly.
Fixes #3393
2015-03-16 14:54:31 -07:00
Martin Jorn Rogalla
b178358cf9 Merge branch 'master' into site_extract_readers
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-06 17:28:45 +01:00
Martin Jorn Rogalla
00cdcbc184 Separated some more readers from the main reader.rb file.
- Draft Reader
 - Collection Reader
 - Page Reader
 - Post Reader
 - Static File Reader

Fixed references and ran tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-06 17:20:25 +01:00
Martin Jorn Rogalla
bebd80342e Extracted draft, post reader into external classes.
Organized the draft, post and layout reader into the *readers* classes.
Fixed all references and ran tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-06 12:39:50 +01:00
Parker Moore
6d9258bcdc Release 💎 v3.0.0.beta2 2015-03-05 13:40:10 -08:00
Matt Rogers
02e98f238e Merge pull request #3520 from delftswa2014/sort-null 2015-03-05 14:35:40 -06:00
Martin Jorn Rogalla
4b8e3cfdbd Moved the in_(source/dest)_dir back to site.rb.
After carefully looking at these two methods, as of right now they do not
belong in the reader, as they should also be used by the writer. Thus the
decision was made to move them back into the class containing the source
and dest fields, site.rb.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-05 13:34:46 +01:00
ChaYoung You
7806f9ed52 Replace File.exists? with File.exist?
`File.exists?` is deprecated method. See
http://ruby-doc.org//core-2.2.0/File.html#exists-3F-method.
2015-03-05 18:21:52 +09:00
ChaYoung You
489da6784a Remove duplicated range from regex
`/\w/` is equivalent to `[a-zA-Z0-9_]`. See
http://ruby-doc.org/core-2.2.0/doc/regexp_rdoc.html#label-Character+Classes.
2015-03-05 18:19:32 +09:00
Parker Moore
e229e3285f Merge pull request #3537 from kleinfreund/patch-2
Removing unused code from post layout
2015-03-04 18:32:57 -08:00
Will Norris
f6f2626828 Merge pull request #3538 from willnorris/permalink
Improved permalinks for pages and collections
2015-03-04 15:18:43 -08:00
Parker Moore
ced9146c11 Merge pull request #3544 from delftswa2014/micro_refactor_url
Refactored url.rb to be compliant with Ruby Style Guide.
2015-03-04 15:13:35 -08:00
Martin Jorn Rogalla
ca7375a51b Corrected quote-usage. Replaced [-1].eql with end_with.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 22:31:19 +01:00
Martin Jorn Rogalla
9e1cb96a7e Added site reference for encoding configuration.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 22:23:47 +01:00
Martin Jorn Rogalla
7114380da7 Added and improved documentation, fixed long method name.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 21:37:25 +01:00
Martin Jorn Rogalla
1b796354fb Added documentation, made method private and fixed quotes.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 21:10:26 +01:00
Martin Jorn Rogalla
f252a82afc Made the Reader responsible for the actual Reading.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 21:00:45 +01:00
Martin Jorn Rogalla
2f88a0c0a1 Extracted read_collections from site.rb into reader.rb
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:55:53 +01:00
Martin Jorn Rogalla
2857350df1 Extracted read_directories from site.rb into reader.rb
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com
2015-03-04 20:51:26 +01:00
Martin Jorn Rogalla
9bcad08e3a Extracted limit_posts from site.rb into reader.rb
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com
2015-03-04 20:35:02 +01:00
Martin Jorn Rogalla
a4adeb446b Extracted read_posts from site.rb into reader.rb
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-04 20:22:37 +01:00