dan
/
jekyll
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,649 Commits 2 Branches 2 Tags 21 MiB
Commit Graph

1914 Commits

Author SHA1 Message Date
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
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
Martin Jorn Rogalla 504c9a34ad Extracted `read_drafts` from site.rb into reader.rb 
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 20:19:39 +01:00
Martin Jorn Rogalla 29169aa858 Extracted `aggregate_post_info` from site.rb into reader.rb 
- Extracted
  - Updated References
  - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 20:16:31 +01:00
Martin Jorn Rogalla 67a2369854 Extracted `read_content` from site.rb into reader.rb 
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 20:11:27 +01:00
Martin Jorn Rogalla 537235c38b Extracted `read_data` from site.rb into reader.rb 
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 20:07:53 +01:00
Martin Jorn Rogalla 5b0e2a294d Extracted `read_data_to` from site.rb into reader.rb 
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 20:05:10 +01:00
Martin Jorn Rogalla e586105b46 Extracted `sanitize_filename` from site.rb into reader.rb 
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 20:01:27 +01:00
Martin Jorn Rogalla ddfecb0f53 Extracted `read_data_file` from site.rb into reader.rb 
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 19:55:54 +01:00
Martin Jorn Rogalla 6e06fd8734 Extracted `get_entries` from site.rb into reader.rb 
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 19:51:44 +01:00
Martin Jorn Rogalla 05bbcddb29 Extracted `filter_entries` from site.rb into reader.rb 
- Extracted
 - Updated References
 - Ran Tests

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 19:46:10 +01:00
Martin Jorn Rogalla c836ec613d Extracted `in_dest_dir` from site.rb into reader.rb 
- Extracted in_dest_dir from site.rb.
 - Updated References.
 - Ran Tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 19:21:24 +01:00
Martin Jorn Rogalla bb9d43dff5 Extracted `in_source_dir` from site.rb and into reader.rb. 
Extracted `in_source_dir` from site.rb into reader.rb.
Updated all the references and tests.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 19:16:03 +01:00
Will Norris 0d1586a5c4 Improved permalinks for pages and collections 
This updates the default permalink style for pages and collections to
match the site-wide 'permalink' setting.  If the permalink setting
contains a trailing slash, either explicitly or by being set to
':pretty', then pages and collections permalinks will contain trailing
slashes by default as well.  Similarly, if the permalink setting
contains a trailing ':output_ext', so will pages and collections.  If
the permalink setting contains neither a trailing slash or extension,
neither will pages or collections.

This impacts only the default permalink structure for pages and
collections.  Permalinks set in the frontmatter of an individual page
take precedence, as does the permalink setting for a specific
collection.

Fixes #2691
 2015-03-04 09:38:23 -08:00
Martin Jorn Rogalla 2ef9bae75a Refactored url.rb to compliant with Ruby Style Guide. 
- Single Quotes
 - Fixed Typo's in variable names.
 - Removed Redundant Escaping in Regular Expressions.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
 2015-03-04 14:16:55 +01:00
Jordon Bedwell d40b6d6ee0 Merge pull request #3418 from tarebyte/destination-and-source 
Added build --destination and --source flags
 2015-03-04 05:21:36 -06:00
Philipp Rudloff d56df7592c Removing unused code from post layout 
The post from the site template does not have `meta` in its front matter. 

Related to #3536.
 2015-03-03 09:52:23 +01:00
Will Norris 669c803912 always include file extension on destination files 
This ensures that destination files for HTML posts, pages and
collections always include the proper file extension (as defined by
output_ext) regardless of permalink structure.  This allows for URLs
that contain no extension or trailing slash to still result in proper
destination files with .html extensions.

Because this change relies so heavily on output_ext accurately
identifying the extension of the destination file, this change also
removes the feature test that tested support for permalinks with a .htm
extension.  In order to support alternate file extensions, a future
patch or plugin will need to modify the output_ext value, at which point
everything else should work as expected.
 2015-03-02 21:20:54 -08:00