Commit Graph

2683 Commits

Author SHA1 Message Date
jekyllbot cfeb54d4be Merge pull request #5022 from ayastreb/collection
Merge pull request 5022
2016-07-15 19:39:42 -07:00
jekyllbot ed98597d49 Merge pull request #5106 from ayastreb/after_init_hook
Merge pull request 5106
2016-07-15 19:24:02 -07:00
jekyllbot eb88aa330c Merge pull request #5060 from stomar/stringify-overrides
Merge pull request 5060
2016-07-15 17:26:14 -07:00
jekyllbot 3ae7d0c319 Merge pull request #5101 from crispgm/dev_to_integer_filter
Merge pull request 5101
2016-07-15 09:58:08 -07:00
Anatoliy Yastreb b9f232e5bf rubocop: fix methods naming and indentation 2016-07-15 10:59:44 +03:00
Anatoliy Yastreb b88f0a21d6 hooks: move after_init hook call at the end of Site.initialize 2016-07-15 10:31:02 +03:00
jekyllbot 4dee1f6aa7 Merge pull request #5053 from stevecheckoway/strict-liquid
Merge pull request 5053
2016-07-14 19:55:08 -07:00
David Zhang 20b3758edb Add to_integer filter
Add to_integer filter

Fix test_filter: parenthesize the method

Fix offense: seperate every 3 digits with _

rubocop:disable Metrics/ModuleLength

More descriptive exception

Fix fmt error

Remove if stmt for integer input

Remove rescue for to_i

Remove error message assert
2016-07-15 08:38:36 +08:00
Parker Moore f417cf8a0f Merge pull request #5042 from jekyll/fix-more-theme-things
Fix more theme things
2016-07-14 17:14:41 -07:00
Florian Thomas 99663a9199
object needs to respond to select instead of being an enumerable 2016-07-14 13:11:09 -05:00
Marko Locher 73223f3a5a Fix Rubocop warnings 2016-07-14 12:15:00 +02:00
Marko Locher 0e8f204011 Fix #3926 post_url helper with sub-directories
Instead of matching the the value provided to `post_url` against
the basename, test against the relative path.

Updated the regexp to match both
  * _posts/category
  * category/_posts
2016-07-14 11:53:58 +02:00
Anatoliy Yastreb 695b5396fd rubocop: fix code style 2016-07-14 09:23:05 +03:00
jekyllbot 1f366730f8 Merge pull request #5069 from Crunch09/issue-2834
Merge pull request 5069
2016-07-12 19:50:32 -07:00
jekyllbot 146d0f301d Merge pull request #5067 from jekyll/excerpt-drop-previous-doc
Merge pull request 5067
2016-07-11 11:20:22 -07:00
Florian Thomas cc82d44222
check if relative URL contains a colon
fixes #2834
2016-07-08 20:33:47 +02:00
Marcus Stollsteimer 1c0f21230d Stringify configuration overrides before first use
This makes sure that overrides for Jekyll.configuration
all have string keys before their first use, particularly
also the "config" and "skip_config_files" options.
2016-07-08 15:47:26 +02:00
Parker Moore e3214c23a3
Add missing elements to Excerpt which delegate to its Document 2016-07-07 13:37:09 -07:00
Anatoliy Yastreb ba08e17204 Extract tag name to class method 2016-07-07 14:41:57 +03:00
Anatoliy Yastreb 3aead1d4a9 Imitate fetch method instead of creating real Hash object 2016-07-06 11:20:37 +03:00
Anatoliy Yastreb 72d49490d2 Add fetch method to Drops 2016-07-05 21:22:24 +03:00
Stephen Checkoway dcc8960806 Enable strict (or lax) liquid parsing.
Insert

liquid:
  error_mode: strict # or lax or warn

in _config.yml to change the error mode.
2016-07-04 10:16:11 -05:00
Parker Moore 0599f114d6
Only add a CODE_OF_CONDUCT.md file if specified. 2016-06-29 15:14:26 -07:00
Parker Moore 4b7109d273
Themes won't have executables. 2016-06-29 14:15:02 -07:00
Parker Moore 5a1a7e1056
Remove the plugin_theme metadata field. Not useful. 2016-06-29 14:13:09 -07:00
Parker Moore a7d25ed963
Fix rubocop offenses on master. 2016-06-28 22:08:06 -07:00
jekyllbot 549371fd4e Merge pull request #5030 from ayastreb/document-stylefix
Merge pull request 5030
2016-06-27 09:48:46 -07:00
Anatoliy Yastreb 8154eb40aa rubocop: separate deprecator error messages 2016-06-26 16:43:56 +02:00
jekyllbot cdee574782 Merge pull request #5031 from ayastreb/convertible-stylefix
Merge pull request 5031
2016-06-25 14:47:29 -07:00
Anatoliy Yastreb 3ccc91430f rubocop: fix code style 2016-06-25 15:22:36 +03:00
Anatoliy Yastreb 2bbad7cb43 rubocop: fix code style 2016-06-25 15:11:50 +03:00
Anatoliy Yastreb b156aa912a rubocop: fix code style 2016-06-25 14:56:12 +03:00
jekyllbot 205acb0916 Merge pull request #5024 from ayastreb/configuration
Merge pull request 5024
2016-06-23 18:48:25 -07:00
jekyllbot d093c76d35 Merge pull request #5025 from ayastreb/regenerator
Merge pull request 5025
2016-06-23 09:32:13 -07:00
Parker Moore 9278eb8fce
utils: check that the object is a hash when merging default_proc
Follow-up to #5026.
2016-06-22 12:15:07 -07:00
Anatoliy Yastreb 0b169f7739 rubocop: refactor modified? method 2016-06-22 14:15:13 +03:00
Anatoliy Yastreb 08b883b268 rubocop: fix code style 2016-06-20 16:03:42 +03:00
Anatoliy Yastreb d13112dbdc rubocop: fix code style 2016-06-19 18:22:59 +03:00
Anatoliy Yastreb 14e857029a rubocop: fix code style 2016-06-19 15:48:23 +03:00
jekyllbot 5c03e1da3f Merge pull request #5019 from ayastreb/static_file
Merge pull request 5019
2016-06-17 19:42:28 -07:00
jekyllbot 7ee99bcd38 Merge pull request #4922 from jekyll/jekyll-new-use-theme
Merge pull request 4922
2016-06-16 17:31:53 -07:00
Anatoliy Yastreb 0f74db4131 rubocop: move mtimes cache hash to class variable 2016-06-16 23:12:01 +03:00
Anatoliy Yastreb 7a933893db rubocop: fix code style 2016-06-16 13:14:50 +03:00
Parker Moore c70ca8ac97
Whoops, forgot the _layouts templates. 2016-06-15 16:04:57 -07:00
Parker Moore 765a23468e
Give the user a layout scaffolding. 2016-06-15 15:59:31 -07:00
Parker Moore 1dbcf97bef
Fix rubocop offense. 2016-06-15 12:50:54 -07:00
Parker Moore ddf833505c
Fix offense. 2016-06-15 10:33:30 -07:00
jekyllbot 713fbb6652 Merge pull request #5009 from nasht00/master
Merge pull request 5009
2016-06-15 10:04:37 -07:00
jekyllbot fb1a459ddd Merge pull request #4917 from pathawks/pr/normalize_whitespace
Merge pull request 4917
2016-06-14 14:03:05 -07:00
Parker Moore e85e89bbff
Ensure the minima theme is shipped with a new site. 2016-06-14 11:54:01 -07:00
Parker Moore 73f70e9071
Add .bundle to gitignore for the theme 2016-06-14 11:51:26 -07:00
Parker Moore e72bfdab21
theme template: link to the example post instead of just quoting it. 2016-06-14 11:51:01 -07:00
Parker Moore ce1c148898
Rename the jekyll_pessimistic_version theme template method to be more descriptive 2016-06-14 11:46:10 -07:00
Parker Moore ad94182b49
Add .gitignore to theme template. 2016-06-14 11:43:12 -07:00
jekyllbot 9f1f70267f Merge pull request #4993 from ayastreb/filters
Merge pull request 4993
2016-06-14 11:23:58 -07:00
Nathan Hazout 3fe9e92c4f Prevent reset of page to fix #4414 2016-06-14 13:07:26 +03:00
Parker Moore e6dc78b22f
Run Site#generate for 'jekyll doctor' to catch plugin issues. 2016-06-13 13:08:48 -07:00
Anatoliy Yastreb 5f2bb5d0aa rubocop: fix code style 2016-06-07 20:13:43 +03:00
jekyllbot 7197028cd5 Merge pull request #4973 from ayastreb/site
Merge pull request 4973
2016-06-06 08:03:36 -07:00
DirtyF f41bd1bab7
Rubocop cleanup 2016-06-06 16:30:09 +02:00
Parker Moore f5a8000baa
Fix regexp literal issues on master. 2016-06-03 22:10:15 -07:00
Parker Moore 8917fa8282
Merge branch 'master' into percent_r
* master: (22 commits)
  Update history to reflect merge of #4980 [ci skip]
  werdz
  Use jekyll-mentions and restructure
  Add post about GSoC project.
  Update history to reflect merge of #4976 [ci skip]
  Amend WEBrick default headers documentation
  Update history to reflect merge of #4966 [ci skip]
  .rubocop.yml - remove lib/jekyll.rb
  lib/jekyll.rb - fix offenses reported by rubocop method set_timezone is ignored using rubocop:disable Style/AccessorMethodName
  Update history to reflect merge of #4977 [ci skip]
  Update history to reflect merge of #4962 [ci skip]
  Update history to reflect merge of #4959 [ci skip]
  Fixed typo
  Changed github-gem to github-pages
  Included installation instructions
  Installation instructions for github-pages gem
  Added link to windows doc page
  Fix inaccurate HTTP response header field name
  Minor tweak to fix missing apostrophne
  Feedback for flubbed regex and prefer File's directory check
  ...
2016-06-03 22:09:15 -07:00
Praveen Kumar 712e77abd2 lib/jekyll.rb - fix offenses reported by rubocop
method set_timezone is ignored using rubocop:disable Style/AccessorMethodName
2016-06-03 09:45:15 +05:30
Parker Moore f5a0db9dcc
Rubocop: use %r for all regular expressions. 2016-06-02 17:08:21 -07:00
jekyllbot 986eda335c Merge pull request #4959 from derekgottlieb/rubocop-theme-and-url
Merge pull request 4959
2016-06-02 17:08:04 -07:00
jekyllbot 6a07254cbf Merge pull request #4953 from Crunch09/issue-4850
Merge pull request 4953
2016-06-02 16:59:51 -07:00
jekyllbot dc4b91b0c8 Merge pull request #4974 from ayastreb/frontmatter_defaults
Merge pull request 4974
2016-06-02 12:06:55 -07:00
Anatoliy Yastreb e7677bdf51 rubocop: revert has_precedence method rename 2016-06-02 21:25:50 +03:00
Anatoliy Yastreb 597e8ee5d5 rubocop: fix code style 2016-06-02 16:12:16 +03:00
Anatoliy Yastreb 06cff8f781 rubocop: fix code style 2016-06-01 18:20:35 +03:00
Derek Gottlieb db6050768d Feedback for flubbed regex and prefer File's directory check 2016-05-28 19:23:23 -05:00
Derek Gottlieb 03f7bc1a8c lib/jekyll/url.rb passing rubocop 2016-05-28 17:15:33 -05:00
Pat Hawks 714c99b418 Convert input to string before markdownify or smartify 2016-05-28 15:19:15 -05:00
Derek Gottlieb b5cec7d335 lib/jekyll/theme.rb passing rubocop 2016-05-28 13:51:13 -05:00
Florian Thomas f8c038566c `Serve.process` should receive same config as `Build.process`
fixes #4850
2016-05-27 11:46:04 +02:00
Parker Moore 35b3c91b64
Merge branch 'pathawks-readers'
* pathawks-readers:
  I will chain blocks if I want to chain blocks.
  Rubocop: Readers
  Rubocop: lib/jekyll/readers/static_file_reader.rb
  Rubocop: lib/jekyll/readers/post_reader.rb
  Rubocop: lib/jekyll/readers/page_reader.rb
  Rubocop: lib/jekyll/readers/layout_reader.rb
  Rubocop: lib/jekyll/reader.rb
2016-05-26 16:10:21 -07:00
Parker Moore 3a3405fe51
I will chain blocks if I want to chain blocks. 2016-05-26 16:09:56 -07:00
Parker Moore 5e46a02d71
Merge branch 'ayastreb-tags'
* ayastreb-tags:
  rubocop: fix code style
  rubocop: fix spacing in code style
  rubocop: fix code style
  rubocop: fix include tag code style
  rubocop: fix post URL tag code style
  rubocop: fix link tag code style
  rubocop: fix highlight tag code style
2016-05-26 16:05:35 -07:00
jekyllbot 8a5148f589 Merge pull request #4948 from pathawks/drops
Merge pull request 4948
2016-05-26 16:03:52 -07:00
jekyllbot 8d0a4be5e0 Merge pull request #4931 from pathawks/converters
Merge pull request 4931
2016-05-26 10:28:21 -07:00
jekyllbot 40c6702a0d Merge pull request #4933 from pathawks/liquid
Merge pull request 4933
2016-05-26 10:21:38 -07:00
Pat Hawks 30eebaf5e0 Rubocop: lib/jekyll/drops/site_drop.rb 2016-05-26 12:04:28 -05:00
jekyllbot 87acab9a86 Merge pull request #4950 from pathawks/rubocop/entry_filter
Merge pull request 4950
2016-05-26 08:25:55 -07:00
Anatoliy Yastreb 001cbf2c07 rubocop: fix code style 2016-05-26 12:17:31 +03:00
Pat Hawks ae71db4693 Rubocop: lib/jekyll/stevenson.rb 2016-05-26 01:04:12 -05:00
Pat Hawks d855ec03ba Rubocop: lib/jekyll/converters/markdown/redcarpet_parser.rb 2016-05-26 00:53:38 -05:00
Pat Hawks 0880dc097f Rubocop: lib/jekyll/converters/markdown/kramdown_parser.rb 2016-05-26 00:53:26 -05:00
Pat Hawks 38eb326b7f Rubocop: lib/jekyll/converters/markdown.rb 2016-05-26 00:53:15 -05:00
Pat Hawks d58c986b2b Rubocop: lib/jekyll/entry_filter.rb 2016-05-26 00:45:54 -05:00
Pat Hawks 382be191ae Rubocop: lib/jekyll/readers/static_file_reader.rb 2016-05-26 00:10:43 -05:00
Pat Hawks 0696e6c169 Rubocop: lib/jekyll/readers/post_reader.rb 2016-05-26 00:10:31 -05:00
Pat Hawks 615a9ee9ac Rubocop: lib/jekyll/readers/page_reader.rb 2016-05-26 00:10:20 -05:00
Pat Hawks e85690a61f Rubocop: lib/jekyll/readers/layout_reader.rb 2016-05-26 00:10:09 -05:00
Pat Hawks 795bcdef68 Rubocop: lib/jekyll/reader.rb 2016-05-26 00:09:46 -05:00
Pat Hawks 4c35d15a3b Rubocop: lib/jekyll/liquid_renderer/table.rb 2016-05-26 00:07:52 -05:00
Pat Hawks 3e42e6d461 Rubocop: lib/jekyll/liquid_renderer.rb 2016-05-26 00:07:43 -05:00
Parker Moore 746e360c63
Delimeters, delimeters, delimeters. 2016-05-25 18:03:25 -07:00
Parker Moore 34d172007b
Merge branch 'pathawks-rubocop/misc'
* pathawks-rubocop/misc:
  Fix Page#relative_path so that it consistently does NOT have the prepending slash (previously inconsistent)
  Rubocop cleanup for lib/jekyll/layout.rb
  Rubocop cleanup for lib/jekyll/plugin_manager.rb
  Rubocop cleanup for lib/jekyll/page.rb
2016-05-25 17:57:52 -07:00
Parker Moore 4fbbeddae2
Fix Page#relative_path so that it consistently does NOT have the prepending slash (previously inconsistent)
Fixes for #4946
2016-05-25 17:57:09 -07:00
Parker Moore 6f1e1d80cd
Rubocop: drop changes from v3.1 forward-ports 2016-05-25 16:10:11 -07:00
Parker Moore e56e58e498
Merge branch 'master' into pathawks-fp/jsonify-drops
* master: (38 commits)
  Mention where it came from. [ci skip]
  Update history to reflect merge of #4944 [ci skip]
  Update history to reflect merge of #4943 [ci skip]
  Mention where it came from. [ci skip]
  Update history to reflect merge of #4942 [ci skip]
  Update history to reflect merge of #4941
  External: remove &block arg, use block_given?
  Update history to reflect merge of #4936 [ci skip]
  lib/jekyll.rb: require document_drop to ease our pain
  Sort the results of the require_all glob.
  Rubocop fixes
  Reset {{ layout }} between each render & merge layout data properly
  Add failing test for layout data inheritance bug (#4433)
  Add failing test for layout bug (#4897)
  Fix tests for plugins in configuration.
  Define Drop#each so we can use the new frozen/duping behavior
  Don't default 'include' and 'exclude' to an empty array
  Fix some minor things in the tests
  Freeze configuration defaults & duplicate in deep_merge_hashes if need be.
  Remove merge conflicts I forgot to fix.
  ...
2016-05-25 15:55:47 -07:00
jekyllbot dc5fd15f71 Merge pull request #4944 from pathawks/fp/sort-includes
Merge pull request 4944
2016-05-25 15:46:50 -07:00
jekyllbot 0ca45a48e5 Merge pull request #4943 from pathawks/fp/fix-layout-var-overflow
Merge pull request 4943
2016-05-25 15:44:23 -07:00
jekyllbot cf810a88fa Merge pull request #4942 from pathawks/fp/configuration-from-permalink-fix
Merge pull request 4942
2016-05-25 15:42:05 -07:00
Anatoliy Yastreb 2caf8e0621 rubocop: fix spacing in code style 2016-05-25 21:48:21 +03:00
Anatoliy Yastreb 5c036cf3c4 rubocop: fix code style 2016-05-25 20:24:19 +03:00
Parker Moore 10543e7c46
Merge branch 'pathawks-fp/ExcerptDrop'
* pathawks-fp/ExcerptDrop:
  Rubocop fixes
  excerpt drop should give access to document's layout
  look up the content methods for drops in a smarter way
  Use require_relative
  Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid
2016-05-25 09:31:27 -07:00
Brint O'Hearn de39107c76 Rubocop cleanup for lib/jekyll/layout.rb 2016-05-25 11:28:46 -05:00
Brint O'Hearn 65e78b3280 Rubocop cleanup for lib/jekyll/plugin_manager.rb 2016-05-25 11:27:43 -05:00
Brint O'Hearn 3a04093e51 Rubocop cleanup for lib/jekyll/page.rb 2016-05-25 11:27:29 -05:00
Parker Moore 733c56a65e
External: remove &block arg, use block_given?
Addresses my comment in https://github.com/jekyll/jekyll/pull/4936#discussion_r64598949
2016-05-25 08:55:12 -07:00
Anatoliy Yastreb 2ca80920dc rubocop: fix include tag code style 2016-05-25 13:15:04 +03:00
Parker Moore 17d8c96a63 Add ability to render drops as JSON
Previously you could do, e.g. {{ site | jsonify }}, but with the introduction of Liquid Drops, this didn't work anymore.
This PR adds the ability to render drops as JSON. You can safely run drop.to_json and it should Do the Right Thing.
2016-05-24 19:08:46 -05:00
Parker Moore ad7bd84098 lib/jekyll.rb: require document_drop to ease our pain 2016-05-24 19:03:32 -05:00
Parker Moore 1a05483a63 Sort the results of the require_all glob.
Filesystems behave differently when performing glob listings.

In my environment, they are listed alphabetically. On my Mac, when asking for a list of files in a directory, those files are returned as a nicely sorted list. Alphabetized, like you'd want them to be. Like you'd expect them to be.

In some environments, quite different from my own, the return of a similar operation is quite random. Perhaps q comes before a, or e before d; the filesystem will choose its order of the day and you, the fare user, tired and weary from work, must bare the brunt of this.

And so, with this commit, I do hereby request that the noble makers of Dir[] provide for us, the downtrodden and ravaged users, some consistency. As a user of Ruby, I shouldn't have to know or consider the behaviour of an individual filesystem here; it should function the same for all filesystems.

Truly yours,
Parker
2016-05-24 19:03:32 -05:00
Parker Moore db7cd6f612 Reset {{ layout }} between each render & merge layout data properly 2016-05-24 18:57:54 -05:00
Parker Moore 7641971d7e Fix tests for plugins in configuration. 2016-05-24 18:49:06 -05:00
Parker Moore 48274244e3 Define Drop#each so we can use the new frozen/duping behavior 2016-05-24 18:49:06 -05:00
Parker Moore d5c3785d29 Don't default 'include' and 'exclude' to an empty array 2016-05-24 18:49:06 -05:00
Parker Moore de5970ae55 Fix some minor things in the tests 2016-05-24 18:49:05 -05:00
Parker Moore d84844c223 Freeze configuration defaults & duplicate in deep_merge_hashes if need be. 2016-05-24 18:49:05 -05:00
Parker Moore 59346eb228 Remove call to #backwards_compatibilize in Configuration.from 2016-05-24 18:47:15 -05:00
Parker Moore 8af77643c5 Site#site_payload: sort collections by label 2016-05-24 18:47:15 -05:00
Parker Moore f52a0e7200 Configuration#add_default_collections: fix bug where DEFAULTS['collections'] is modified 2016-05-24 18:47:15 -05:00
Parker Moore d01f7943de Add Configuration.from & use in Jekyll.configuration.
This process streamlines the creation of new configurations. Creating a new
site will choke if not all the correct options are given.
Configuration.from will ensure the overrides have all string keys and
ensures all the common issues & defaults are in place so a Site can be
created.

A common use:

    config = Configuration.from({ 'permalink' => '/:title/' }) # etc
    site = Jekyll::Site.new(config)
2016-05-24 18:47:15 -05:00
Parker Moore fab092fcec Remove use of Marshal in runtime code. 2016-05-24 18:47:15 -05:00
Parker Moore 6eaa8e90f8 Don't read a config file if the filename is empty. 2016-05-24 18:47:14 -05:00
Parker Moore 04d4473119 Use Marshal to duplicate configuration defaults to prevent manipulation 2016-05-24 18:47:14 -05:00
Parker Moore f2263a11b7 Only write collections.posts.permalink if permalink is set. 2016-05-24 18:40:19 -05:00
Pat Hawks 48f16974ce Rubocop fixes 2016-05-24 18:27:37 -05:00
Parker Moore 7d3f8ac75d excerpt drop should give access to document's layout 2016-05-24 17:35:03 -05:00
Parker Moore c0910f2bc5 look up the content methods for drops in a smarter way 2016-05-24 17:34:49 -05:00
Parker Moore b019234007 Add ExcerptDrop and remove excerpt's ability to refer to itself in Liquid 2016-05-24 17:30:03 -05:00
Anatoliy Yastreb 80a65d161f rubocop: fix post URL tag code style 2016-05-24 17:23:25 +03:00
Anatoliy Yastreb 0d11511914 rubocop: fix link tag code style 2016-05-24 17:13:54 +03:00
Anatoliy Yastreb 41a8b10780 rubocop: fix highlight tag code style 2016-05-24 17:03:06 +03:00
Pat Hawks a8d27e5788 Rubocop: Low hanging fruit 2016-05-23 22:10:49 -05:00
Brint O'Hearn dbda462c2f Adding double quotes & freeze back to version after rebase 2016-05-20 21:51:16 -05:00
Brint O'Hearn d743c80357 Rubocop fixes for lib/jekyll/utils/ansi.rb 2016-05-20 21:24:34 -05:00
Parker Moore 51c4152919
Release a beta. 2016-05-20 19:19:21 -07:00
Parker Moore 8ac5b03006
Cleaning up site template & theme updates. 2016-05-20 19:15:46 -07:00
jekyllbot ee2c41ad6a Merge pull request #4848 from jekyll/new-theme-command
Merge pull request 4848
2016-05-19 22:13:05 -07:00
Parker Moore f3a29677f9
Fix rubocop issues. 2016-05-19 21:34:30 -07:00
Pat Hawks f7714add15 Add normalize_whitepace filter 2016-05-19 19:59:22 -07:00
Parker Moore 12deccc513
Only spec.summary is needed... 2016-05-19 14:39:55 -07:00
Parker Moore 20110571ef
Add a Rakefile to do releases as well as adding an example website. 2016-05-19 14:36:01 -07:00
Parker Moore 3885057e9e
Fix rubocop offense. 2016-05-19 13:16:32 -07:00
Parker Moore 1d81d2087e
Add info about 3.1.6 to master. 2016-05-19 12:54:04 -07:00
Parker Moore 5949b4a5bb
Add release information for v3.1.5 2016-05-18 21:38:53 -07:00
Parker Moore eb14b88175
Port forward the release information for v3.1.4 2016-05-18 17:16:52 -07:00
Parker Moore 2caff755c4
Set Style/AlignHash EnforcedHashRocketStyle to 'table' 2016-05-16 16:24:01 -07:00
jekyllbot fb860fc1b7 Merge pull request #4888 from TheLucasMoore/Commands
Merge pull request 4888
2016-05-16 16:04:40 -07:00
Parker Moore 473d85b580
Add CoC and README for theme; make standard with Rubocop 2016-05-16 11:06:47 -07:00
Parker Moore e3df910533
Add more template files and add a ThemeBuilder which can create the site 2016-05-16 10:53:55 -07:00
Parker Moore 3611ae99d9
WIP: Add 'jekyll new-theme' command 2016-05-16 10:53:55 -07:00
TheLucasMoore b64b6aa526 Refactor if/else for new.rb process method 2016-05-13 15:10:59 -05:00
TheLucasMoore 465e7dd8b0 Added Exceptions and Passing ABC Metric 2016-05-13 13:46:42 -05:00
Derek Gottlieb 83f8df49ab Fixing rubocop offenses in lib/jekyll/cleaner.rb 2016-05-13 12:34:11 -05:00
TheLucasMoore 451881efcf ABC Condition Size too high 2016-05-12 20:21:19 -05:00
TheLucasMoore 894d1fe21e Tests Passing. Three RuboCop revisions remain 2016-05-12 19:42:04 -05:00
TheLucasMoore 26d0a8db77 Passing RuboCop for commands 2016-05-12 19:11:58 -05:00
TheLucasMoore 6f89fd5f3f clean.rb passing rubocop 2016-05-12 16:58:17 -05:00
Parker Moore 1ae4f513d8
Add 'ruby' to pre-filled Gemfile for 'jekyll new'
Fixes #4839
2016-05-12 12:19:46 -05:00
Jordon Bedwell 3751b47c50
Cleanup EntryFilter and make it far more robust.
* Allow users to filter directories by ending their path with "/"
* Allow users to filter with a Regexp, some scenariors can really require it.
* Use Pathutil#in_path? for Symlink verification, it real/expand.

This also requires some downstream work in "jekyll-watch" which at this time is
not very robust, it doesn't recognize the difference either, and should probably
start doing so (what I mean is detecting "/" and using the full path.)
2016-05-10 20:01:02 -05:00
Jordon Bedwell 44cf61d241
Fix #4856: Don't rescue LoadError or bundler load errors for Bundler.
When it comes to bundler it's smart enough to know what to require, and in casees it's not, it's smart enough to accept :require.  In most cases when bundler has a LoadError (or otherwise) it's because there is a problem inside of the Gem itself and when this happens, Jekyll will happily let that error slip when it shouldn't, resulting in a badly placed error that is actually wrong. This corrects that so errors can surface properly.
2016-04-29 06:37:57 -05:00
Parker Moore d74f8d6dd9
Fix spacing on the msg in Configuration#renamed_key 2016-04-28 17:55:15 -07:00
jekyllbot 1d788203df Merge pull request #4710 from fenollp/safe-symlinks
Merge pull request 4710
2016-04-21 17:38:00 -07:00
jekyllbot 298d56aab2 Merge pull request #4808 from jekyll/fix-collection-defaults-
Merge pull request 4808
2016-04-21 17:20:02 -07:00
Parker Moore 57ccbe08ea
Ensure symlinks work as expected (and secured). 2016-04-21 16:32:52 -07:00
Parker Moore 49a3f543f3
Theme: configure sass at initialize time so we don't forget 2016-04-21 16:11:09 -07:00
Parker Moore 3b2d68d333
LayoutReader: read proper item from theme class 2016-04-21 16:10:43 -07:00
Parker Moore 2b73696d03
Set @path and @base_dir on the Layout per whether it's in the theme 2016-04-21 16:10:19 -07:00
Parker Moore 42cc2445a5
Merge branch 'master' into themes
* master: (58 commits)
  Update history to reflect merge of #4792 [ci skip]
  Update history to reflect merge of #4793 [ci skip]
  Update history to reflect merge of #4804 [ci skip]
  Update history to reflect merge of #4754 [ci skip]
  Update history to reflect merge of #4813 [ci skip]
  Added missing single quote on rsync client side command
  Add v3.0.4 and v3.1.3 to the history.
  Fixed typo
  Add jekyll-autoprefixer plugin
  Explicitly require Filters rather than implicitly.
  Update history to reflect merge of #4786 [ci skip]
  Update history to reflect merge of #4789 [ci skip]
  updates example domain in config template
  Globalize Jekyll's Filters.
  Update JRuby to 9.0.5.0; Drop the double digit test.
  Update Rack-Jekyll Heroku deployment blog post url
  convertible: use Document::YAML_FRONT_MATTER_REGEXP to parse transformable files
  Update history to reflect merge of #4734 [ci skip]
  Update history to reflect merge of #4478 [ci skip]
  Fix rubocop warning.
  ...
2016-04-21 11:43:35 -07:00
jekyllbot 341407ef2a Merge pull request #4792 from jekyll/feature/globalize-filters
Merge pull request 4792
2016-04-20 14:06:10 -07:00
jekyllbot 46b2ab8e88 Merge pull request #4793 from sl4m/change-example-domain-url
Merge pull request 4793
2016-04-20 14:03:36 -07:00
Parker Moore 87825e1e14
Document#read: frontmatter.all should get relative_path not URL 2016-04-18 13:55:57 -07:00
Jordon Bedwell 27366f2e30
Explicitly require Filters rather than implicitly. 2016-04-15 12:02:25 -05:00
skim b122148acf updates example domain in config template 2016-04-15 09:29:39 +01:00
Jordon Bedwell 1e74c7a547
Globalize Jekyll's Filters.
As it stands Jekyll does not globalize it's filters.  So anybody wishing to go
into Jekyll's context to process their own Liquid (say in a plugin) may be taken
aback when they find out that Jekyll's filters are not available.
See: jekyll/jekyll-assets#252.
2016-04-14 20:36:22 -05:00
Parker Moore f210cafdf2
convertible: use Document::YAML_FRONT_MATTER_REGEXP to parse transformable files 2016-04-13 23:22:05 -04:00
Thomas Wood e470cae6da Fix rubocop warning. 2016-04-12 19:11:59 +01:00
Thomas Wood 1ef7653fed Fix minor code style recommendations and typos. 2016-04-12 18:59:56 +01:00
Thomas Wood 66c4ff8800 Add a where_exp filter for filtering by expression
This commit introduces a where_exp filter, which can be used as follows:
  `{{ array | where_exp: "item", "item == 10" }}`
  `{{ array | where_exp: "item", "item.field > 10" }}`
  `{{ site.posts | where_exp: "post", "post contains 'field'" }}`
  `{{ site.posts | where_exp: "post", "post.array contains 'giraffes'" }}`

This permits a variety of use cases, such as reported in: jekyll#4467,
jekyll#4385, jekyll#2787.
2016-04-12 18:52:58 +01:00
Jordon Bedwell 1efb1d7a58 Fix #4689: Use SSLEnable instead of EnableSSL and make URL HTTPS. 2016-04-12 02:59:48 -05:00
jekyllbot 41c3dd4cde Merge pull request #4741 from jekyll/sortable-doc-drop
Merge pull request 4741
2016-04-06 17:14:28 -07:00
jekyllbot a224491d20 Merge pull request #4717 from jekyll/cleanup-launch-browser
Merge pull request 4717
2016-03-31 18:40:15 -07:00
jekyllbot 6ee728efcb Merge pull request #4537 from Crunch09/fix-warnings
Merge pull request 4537
2016-03-31 18:37:32 -07:00
Parker Moore 4b471fe9fb
DocumentDrop: add `#<=>` which sorts by date (falling back to path) 2016-03-31 13:41:59 -07:00
Jussi Kinnula 4c65772c44 One final "urlsafe" replaced with "ascii" 2016-03-29 10:01:08 +03:00
Jussi Kinnula 764a2c1b39 Change urlsafe to ascii also when actually slugifying 2016-03-29 09:46:42 +03:00
Jussi Kinnula e823ac5180 Rename urlsafe to ascii, and document it (on utils.rb) 2016-03-29 09:07:12 +03:00
Jordon Bedwell 06ab708edf Don't blindly assume the last-system.
As it was we assumed that any system that wasn't Windows or OS X must be Linux
but the reality of that can be very unlikely. BSD is popular in some places and
it's not Linux and this would cause an error there.  If we do not know the
launcher for a platform we should ship an error and have the user file
a bug if they feel it necessary and skip the launch otherwise.
2016-03-27 21:41:23 -05:00
Pierre Fenoll 9347e90a67 Use EntryFilter throughout & update tests 2016-03-26 16:40:19 +01:00
Pierre Fenoll bbd2a2b7f1 Rename EntryFilter#bad_symlink? to EntryFilter#symlink_outside_site_source? 2016-03-26 13:12:08 +01:00
Parker Moore 33255e3ac3
IncludeTag: implement multiple load paths 2016-03-25 17:44:29 -07:00
Parker Moore 0920d2b48a
LayoutReader#read: read in Theme layouts if they aren't already registered 2016-03-25 17:06:26 -07:00
Parker Moore a30068bf3f
Merge remote-tracking branch 'origin/master' into themes
* origin/master: (65 commits)
  Update history to reflect merge of #4703 [ci skip]
  Update history to reflect merge of #4712 [ci skip]
  Highlight the test code
  Update history to reflect merge of #4640 [ci skip]
  readded "env=prod"-condition
  Update history to reflect merge of #3849 [ci skip]
  Update history to reflect merge of #4624 [ci skip]
  Update history to reflect merge of #4704 [ci skip]
  Update history to reflect merge of #4706 [ci skip]
  Checks for link file extension in tests
  Updating assets documentation
  Fix test teardown for cleaner.
  Update history to reflect merge of #4542 [ci skip]
  Add explanation of site variables in the example _config.yml
  Use double quotes in the gemfile
  Add test for creation of Gemfile by 'jekyll new'
  Add comment about github-pages
  Update history to reflect merge of #4533 [ci skip]
  Ensure Rouge closes its div/figure properly after highlighting ends.
  Add Site#config= which can be used to set the config
  ...
2016-03-25 16:30:25 -07:00
Parker Moore a1a4b3937a
Add Layout#relative_path so the layout can tell us what its path is for error messages 2016-03-25 16:29:37 -07:00
jekyllbot afa89d68f8 Merge pull request #4703 from jekyll/after_init_hook
Merge pull request 4703
2016-03-25 16:27:38 -07:00
Florian Thomas d213981a24 Fix warnings
This removes the following warnings:

- /lib/jekyll/configuration.rb:151: warning: instance variable @default_config_file not initialized
- /lib/jekyll/converter.rb:12: warning: instance variable @highlighter_prefix not initialized
- /lib/jekyll/converter.rb:24: warning: instance variable @highlighter_suffix not initialized
- /lib/jekyll/converters/markdown.rb:9: warning: instance variable @setup not initialized
- /lib/jekyll/converters/markdown/kramdown_parser.rb:60: warning: instance variable @highlighter not initialized
- /lib/jekyll/frontmatter_defaults.rb:97: warning: shadowing outer local variable - path
- /lib/jekyll/plugin.rb:66: warning: instance variable @safe not initialized
- /lib/jekyll/regenerator.rb:147: warning: instance variable @disabled not initialized
- /test/test_convertible.rb:40: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_filters.rb:154: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_new_command.rb:84: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_site.rb:234: warning: assigned but unused variable - site
- /test/test_site.rb:240: warning: assigned but unused variable - site
- /test/test_site.rb:522: warning: assigned but unused variable - source
- /test/test_tags.rb:153: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:425: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:449: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:496: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:496: warning: instance variable @result not initialized
- /test/test_tags.rb:511: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:773: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_tags.rb:773: warning: instance variable @result not initialized
- /test/test_tags.rb:788: warning: ambiguous first argument; put parentheses or a space even after `/' operator
- /test/test_url.rb:66: warning: shadowing outer local variable - doc
- /lib/jekyll/url.rb:119:in `escape_path': warning: URI.escape is obsolete
2016-03-25 22:03:17 +01:00
jekyllbot 1ab0ed3664 Merge pull request #4640 from surrim/symlink_static_files
Merge pull request 4640
2016-03-25 12:19:17 -07:00
Ben Balter bdaa0c3b5b register sass path 2016-03-25 14:46:00 -04:00
surrim 9be387ef6f readded "env=prod"-condition 2016-03-25 19:42:53 +01:00
Pierre Fenoll f60d3a8dbc Allow symlinks iff they point to stuff inside site.source 2016-03-25 15:14:04 +01:00
jekyllbot 7a4817e55a Merge pull request #3849 from shinkondo/master
Merge pull request 3849
2016-03-24 13:54:03 -07:00
jekyllbot da4a664290 Merge pull request #4624 from jeffkole/feature/add-collection-url-tag
Merge pull request 4624
2016-03-24 12:50:05 -07:00
jekyllbot 59d1a122c6 Merge pull request #4704 from jekyll/parkr-patch-1
Merge pull request 4704
2016-03-24 12:40:49 -07:00
jekyllbot 87d0f03f5c Merge pull request #4542 from jekyll/jekyll-new-with-gemfile
Merge pull request 4542
2016-03-23 17:49:46 -07:00
Parker Moore 7695ba6eb4 Add explanation of site variables in the example _config.yml 2016-03-23 17:44:11 -07:00
Shinn Kondo 01d48320fd Merge remote-tracking branch 'upstream/master' 2016-03-23 19:33:22 -05:00
Parker Moore 22d9312eaf Use double quotes in the gemfile 2016-03-23 17:25:19 -07:00
Parker Moore 09f9f193d8 Add comment about github-pages 2016-03-23 17:15:35 -07:00
jekyllbot 4ce50e3936 Merge pull request #4533 from hgoodman/feature/show-dir-listing
Merge pull request 4533
2016-03-23 17:01:16 -07:00
Parker Moore 9b60df8883
Add Site#config= which can be used to set the config 2016-03-23 13:14:30 -07:00
Parker Moore 84b7d9b3ac
Add Hook for :site :after_init 2016-03-23 13:14:08 -07:00
Pat Hawks b06af5a44f
Use encode for xml_escape filter 2016-03-21 11:07:46 -07:00
jekyllbot 848b1358a1 Merge pull request #4491 from jekyll/ignore-tilde
Merge pull request 4491
2016-03-20 15:34:35 -07:00
Jussi Kinnula c0dec091a2 Add urlsafe to accepted slugify modes 2016-03-18 17:14:54 +02:00
Jussi Kinnula 36dc8c2169 Add urlsafe method for slugify 2016-03-18 11:13:06 +02:00
Jeff Kolesky 4b32bd2b13 Updates code styling per PR 2016-03-17 14:26:13 -07:00
Jeff Kolesky f79f9d60a9 Changes `collection_url` tag to `link` tag 2016-03-17 14:01:04 -07:00
Parker Moore 4883a24363 PostComparer#post_date use the provided date instead of re-parsing the whole name. 2016-03-15 16:08:32 -07:00
Parker Moore 97efa0f0ce Clean up Tags::PostUrl a bit 2016-03-15 16:06:25 -07:00
Ben Balter 285aa54445 remove even more asset support 2016-03-11 16:18:11 -05:00
Ben Balter e3c71ea407 Merge branch 'master' into themes 2016-03-11 14:44:44 -05:00
Ben Balter 92168954d2 remove asset support 2016-03-11 14:41:26 -05:00
jekyllbot 2ea3bc53d3 Merge pull request #4653 from mlinksva/patch-2
Merge pull request 4653
2016-03-11 13:35:22 -06:00
Mike Linksvayer 4948b5a3b3 change smartify doc from copy/paste of mardownify doc 2016-03-11 11:09:03 -08:00
surrim 64d5e3dfd3 removed "env=prod"-condition 2016-03-11 19:26:16 +01:00
Parker Moore 79f8210fff 'jekyll clean': also remove .sass-cache 2016-03-11 10:04:36 -08:00
surrim 52eb60e171 use copy_entry only in safe mode 2016-03-11 18:45:40 +01:00
jekyllbot 9e0ed00a59 Merge pull request #4555 from timwis/patch-1
Merge pull request 4555
2016-03-08 16:25:15 -08:00
Matt Rogers 9520d9bbf9 Merge pull request #4636 from HugoGiraudel/patch-4 2016-03-08 16:04:02 -06:00
Ben Balter eb341514a7 use def_delegator 2016-03-08 11:55:16 -05:00
Ben Balter e8617cf7cd better theme-not-found handling 2016-03-08 11:53:29 -05:00
Zack Spencer 13912482ad Adding a debug log statment for skipped future posts.
For https://github.com/jekyll/jekyll/issues/4507
2016-03-07 22:10:10 +00:00
Ben Balter c86fba6fb3 use /assets for theme assets, not _assets 2016-03-06 15:42:08 -05:00
surrim 46bdaa49dc using FileUtils.copy_entry instead of FileUtils.cp to allow symlinks 2016-03-05 23:31:16 +01:00
Ben Balter 8b880cb993 add theme tests 2016-03-05 13:35:52 -05:00
Ben Balter ada7c4f441 revert layout reader 2016-03-05 13:05:57 -05:00
Ben Balter 47416169c3 add sass path 2016-03-05 13:05:11 -05:00
Ben Balter 8bfb9e51f3 Merge branch 'master' into themes 2016-03-05 13:04:15 -05:00
Jordon Bedwell 37cc45239d Merge pull request #4635 from HugoGiraudel/patch-3
Added role="banner" to <header>
2016-03-05 02:22:10 -06:00
Hugo Giraudel 664206608d Removed unnecessary nesting from _base.scss 2016-03-04 17:40:19 +01:00
Hugo Giraudel 90e83e0636 Changed main <div> to <main> and added aria-label="Content" 2016-03-04 17:33:44 +01:00
Hugo Giraudel 09b9db259c Added role="banner" to <header> 2016-03-04 17:32:21 +01:00
Hugo Giraudel ff91463c43 Added a default lang attribute 2016-03-04 17:03:26 +01:00
Jeff Kolesky b80a0cb5ce Adds collection_tag
This tag mirrors the post_tag functionality but for collections instead of just
posts.
2016-03-02 14:56:30 -08:00
Jeff Kolesky 67904e849d Ensures related_posts are only set for a post
Prior to this change, the related posts for the most recently rendered post
stayed set on the `site` object. This could result in pages that showed related
posts even when the page represented an entire collection of posts, such as on
an index page.  This change restores the functionality from Jekyll V2.
2016-03-01 12:05:49 -08:00
Parker Moore 14e9ec2bbb Doctor: correctly set key name so --config works
Fixes #4598
2016-02-29 16:17:49 -08:00