Commit Graph

2365 Commits

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