Commit Graph

6257 Commits

Author SHA1 Message Date
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 fa31fcb3bf Update history.md to reflect the merger of #3418 [ci skip] 2015-03-04 05:22:29 -06: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
Will Norris 5e9b7343bf Update history to reflect merge of #3490 [ci skip] 2015-03-03 10:54:13 -08:00
Will Norris 5d1a24e291 Merge pull request #3490 from willnorris/ext
always include file extension on destination files
2015-03-03 10:53:08 -08: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
Alfred Xing 8917ef011c Update history to reflect merge of #3535 [ci skip] 2015-03-02 15:05:37 -08:00
Alfred Xing 27a02e163b Merge pull request #3535 from delftswa2014/deprecation-inconsistency
Removed deprecation inconsistency
2015-03-02 15:04:21 -08:00
Joop Aué 7a31029c79 Removed deprecation inconsistency
Replaced occasions where the logger was used to report deprecations.
Deprecator is now used instead.

Signed-off-by: Joop Aué <joopaue@gmail.com>
2015-03-02 21:54:05 +01:00
Parker Moore 48bf711ec7 Update history to reflect merge of #3531 [ci skip] 2015-03-02 09:40:05 -08:00
Parker Moore b3371119fd Merge pull request #3531 from jekyll/liquid-c-upgrade
Upgrade liquid-c to 3.x
2015-03-02 09:39:32 -08:00
Will Norris dae5d30096 Update history to reflect merge of #3532 [ci skip] 2015-03-01 18:18:17 -08:00
Will Norris bc2b87ca92 Merge pull request #3532 from willnorris/ordinal_docs
document 'ordinal' built-in permalink style
2015-03-01 18:15:46 -08:00
Will Norris f251848283 document 'ordinal' built-in permalink style
ordinal was actually added back in April 2013 in ea753130
2015-03-01 17:27:56 -08:00
Parker Moore 2b1b7b977b Upgrade liquid-c to 3.x 2015-03-01 16:07:33 -08:00
Parker Moore c2b613d05e Update history to reflect merge of #3469 [ci skip] 2015-03-01 16:05:53 -08:00
Parker Moore 5ee4e6d9c9 Merge pull request #3469 from jedd-ahyoung/Frontmatter-date-documentation
docs: Add frontmatter date formatting information
2015-03-01 16:05:23 -08:00
Martin Jorn Rogalla 92a9582733 Corrected error message as suggested by @parkr.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 11:16:08 +01:00
Martin Jorn Rogalla 78af3c5018 Improved clarity of sort nil input error message.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 09:51:59 +01:00
Martin Jorn Rogalla 0565308ce6 Added test to check on nil input for sort filter.
- Added a test to check if the sort filter will raise the correct
   exception on given nil input.
 - Improved error message and used "nil" consistently.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 09:40:32 +01:00
Parker Moore 9437bd4669 Update history to reflect merge of #3529 [ci skip] 2015-03-01 00:37:44 -08:00
Parker Moore 9b962dc565 Merge branch 'fabianrbz-remove_adapters_deprecation_warning'
* fabianrbz-remove_adapters_deprecation_warning:
  Add minitest/profile to profile 10 slowest tests
  Move simplecov_custom_profile to test/ & gate with TRAVIS env
  Remove unused groups from simplecov's profile
  Removes the following deprecation warning: 'method adapters is deprecated. use profiles instead'
2015-03-01 00:36:48 -08:00
Parker Moore f1edf9e692 Add minitest/profile to profile 10 slowest tests 2015-03-01 00:36:40 -08:00
Parker Moore fbe52bca85 Move simplecov_custom_profile to test/ & gate with TRAVIS env 2015-03-01 00:36:20 -08:00
Matt Rogers 60f0977a50 Update history to reflect merge of #3528 [ci skip] 2015-02-28 21:44:31 -06:00
Matt Rogers 7d6d29b4ca Merge pull request #3528 from willnorris/textile 2015-02-28 21:44:29 -06:00
Parker Moore 6b09d1818d Update history to reflect merge of #3516 [ci skip] 2015-02-28 18:56:13 -08:00
Parker Moore 50a4b2824b Merge pull request #3516 from jekyll/end-with
Use String#end_with?("/") instead of regexp
2015-02-28 18:55:53 -08:00
Parker Moore 6c073ec476 Remove reference to jekyll-textile-converter. 2015-02-28 17:29:39 -08:00
Parker Moore 8e87e9ebec Update history to reflect merge of #3530 [ci skip] 2015-02-28 17:28:43 -08:00
Parker Moore e777c9b213 Merge pull request #3530 from delftswa2014/picturetag-link-fix
Replaced link caught by htmlproofer.
2015-02-28 17:27:53 -08:00
Martin Jorn Rogalla d79c0fc4dd Replaced a picture element link with @parkr's suggestion.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-02-28 15:10:05 +01:00
Will Norris dae77e9a63 switch remaining textile test files to markdown
Textile support was removed from jekyll core in #3319, and most of the
tests switched to markdown at that time.  This changes the remaining
tests to use markdown as well.  The vast majority of the test cases were
testing things in the file name or front matter, so it doesn't really
matter what markup format they use.  The one test that was claiming to
test that textile was transformed had actually been moved to markdown as
well, just not renamed.

Fixes #3507
2015-02-27 18:29:52 -08:00
Fabian Rodriguez e4b1382bfd Remove unused groups from simplecov's profile 2015-02-27 23:09:33 -02:00
Fabian Rodriguez cd7b3f54f1 Removes the following deprecation warning:
'method adapters is deprecated. use profiles instead'

This warning was showing up because the project was using
the gem 'simplecov-gem-adapter' which uses the old syntax.

* Remove the gem dependency
* Add a profile with the same setup that the gem has
2015-02-27 23:01:48 -02:00
Jordon Bedwell a25f2d7dd6 Ask people to use talk.jekyllrb.com for non bugs. 2015-02-27 15:33:08 -06:00
Parker Moore ed953e6e1f Update history to reflect merge of #3523 [ci skip] 2015-02-27 13:07:12 -08:00
Parker Moore 5a84d1960e Merge pull request #3523 from alfredxing/introducing-jekyll-talk
Add blog post introducing Jekyll Talk
2015-02-27 13:05:54 -08:00
Alfred Xing e56f2414ae Add blog post introducing Jekyll Talk 2015-02-26 21:23:21 -08:00
Martin Jorn Rogalla 531d0fb261 Sort will now raise error on nil object array input.
Sort will now throw an error when a nil object array is given as input.
See issue #3491 for more information.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-02-26 22:12:06 +01:00
Parker Moore 14fa3287b7 Update history to reflect merge of #3518 [ci skip] 2015-02-25 16:16:16 -08:00
Parker Moore 8997212222 Merge branch 'alfredxing-add-talk-to-help'
* alfredxing-add-talk-to-help:
  Add Jekyll Talk to Help page on site
2015-02-25 16:11:43 -08:00