Commit Graph

2456 Commits

Author SHA1 Message Date
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