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

3023 Commits

Author SHA1 Message Date
Parker Moore aa86651650
Add absolute_url and relative_url filters. 2016-09-22 14:16:00 -07:00
Ashwin Maroli 99fc60e28c update template to include theme files 2016-09-21 06:29:34 +05:30
jekyllbot 3a7cbadd82 Merge pull request #5375 from Nicop06/underscore_highlight 
Merge pull request 5375
 2016-09-20 17:05:49 -07:00
jekyllbot ee84a95a38 Merge pull request #5376 from jonblatho/master 
Merge pull request 5376
 2016-09-20 17:04:57 -07:00
jekyllbot cfe61771e0 Merge pull request #5380 from ethomson/coderay_deprecation 
Merge pull request 5380
 2016-09-20 16:39:33 -07:00
jekyllbot 504411e476 Merge pull request #5237 from ashmaroli/bundle2new 
Merge pull request 5237
 2016-09-20 15:32:25 -07:00
Parker Moore 279f1516d2
Merge branch 'master' into themes-asset-folder 
* master:
  Update history to reflect merge of #5381 [ci skip]
  Update history to reflect merge of #5383 [ci skip]
  run features on windows
  Appease Rubocop
  Update history to reflect merge of #5372 [ci skip]
  Add missing period to sentence in first paragraph.
 2016-09-20 13:13:01 -07:00
Parker Moore 7309ecf8e1
Theme: for various path helpers, use strings. Symbols confuse people. 2016-09-19 13:47:51 -07:00
Pat Hawks 3bfdc00d14
Appease Rubocop 2016-09-19 13:15:02 -05:00
Jonathan Thornton f2bfc832a0 Marking filename with backticks as suggested 2016-09-19 12:08:20 -05:00
Edward Thomson 054b23f69a Only complain about `coderay` if it is actually in the config 
Don't complain about the deprecated `kramdown.coderay` key when
`highlighter == "coderay"`, since that could have been set with the
legitimate `syntax_highlighter: coderay` setting.  Instead, complain
only if the `kramdown.coderay` configuration setting is actually
present.
 2016-09-19 11:38:05 -05:00
Nicolas Porcel 0b94cf3fa1 Allow underscore in highlighter language 2016-09-19 13:10:29 +02:00
Jonathan Thornton 1a11536a2c Clarify documentation in README 
This change is subtle, but may prove greatly useful to Jekyll newbies
 2016-09-18 17:38:28 -05:00
Parker Moore 74baeb889a
ThemeAssetsReader: fix tests so everything passes. 2016-09-18 15:04:15 -04:00
Parker Moore 87b9cfe2b5
ThemeBuilder: add 'assets' to list of scaffold directories 2016-09-16 14:57:58 -07:00
Parker Moore 13aec48137
Add ThemeAssetsReader which reads assets from a theme 
If the theme includes the 'assets' directory, it will be walked and items will be added to the site based
on the normal rules of Jekyll: if there is YAML front matter, it will be added as a (convertible) Page,
otherwise it will be added as a StaticFile.
 2016-09-16 14:41:36 -07:00
Parker Moore b8f17b9034
Exclude node_modules by default 
If no 'exclude' directive is specified, exclude node_modules by default.

https://twitter.com/mxstbr/status/761856359579185153
 2016-09-16 13:09:10 -07:00
Frank Taillandier 59b61c3f9f Exclude vendor by default 2016-09-16 07:56:37 +02:00
jekyllbot 4888b84b44 Merge pull request #5199 from jeffkole/adds-linking-to-all-files 
Merge pull request 5199
 2016-09-13 07:11:50 -07:00
Ashwin Maroli 566b42b8b3 add `bundle install` to `jekyll new` 
- automatically run `bundle install` from within the newly generated blog
   directory by default.
 - add a new switch to skip this default behaviour.
 2016-09-13 08:43:13 +05:30
jekyllbot 3e0363be4a Merge pull request #5326 from ashmaroli/gitignore-gem 
Merge pull request 5326
 2016-09-09 13:53:28 -07:00
jekyllbot a70abbeab5 Merge pull request #5337 from jekyll/fix-convertible-5308 
Merge pull request 5337
 2016-09-08 11:27:35 -07:00
Ashwin Maroli 8813173ba7 set empty url in config file by default 2016-09-08 15:47:28 +05:30
Parker Moore c1e6f1fb94
Fix rubocop errors & add one more test for slugify 'ascii' mode (#4680) 2016-09-07 17:50:14 -07:00
Parker Moore 9164973a6c
Merge branch 'jussikinnula-master' 
* jussikinnula-master:
  Fix slugify test
  One final "urlsafe" replaced with "ascii"
  Change urlsafe to ascii also when actually slugifying
  Add tests for ascii slugify mode
  Rename urlsafe to ascii, and document it (on utils.rb)
  Add urlsafe to accepted slugify modes
  Add urlsafe method for slugify
 2016-09-07 16:50:32 -07:00
jekyllbot dddafccb36 Merge pull request #5235 from jekyll/update-windows-detection-to-check-proc-version 
Merge pull request 5235
 2016-09-07 16:34:37 -07:00
Parker Moore 3840a38081
Convertible: set self.output in #render_all_layouts and #do_layout 2016-09-07 15:59:43 -07:00
Ashwin Maroli b47db14f86 add future gems to gitignore 2016-09-05 15:14:59 +05:30
Eloy Espinaco 9b09d8a8e8 Add support for indented link references on excerpt 
Excerpt link reference extraction is missing all the indented references
at the bottom of the page. Markdown specify that those can be indented up
to three spaces.
 2016-09-02 17:21:10 -03:00
jekyllbot 2f167aeea7 Merge pull request #5308 from jekyll/rubocop-convertible 
Merge pull request 5308
 2016-09-01 17:18:50 -07:00
Parker Moore 4af0f0262e
Remove layouts named param from Renderer#initialize 2016-09-01 13:26:14 -07:00
jekyllbot 6a34966f20 Merge pull request #5189 from jekyll/skip-theme-if-not-string 
Merge pull request 5189
 2016-08-30 14:54:47 -07:00
Parker Moore a78426f20d
Convertible#read_yaml: disable Metrics/AbcSize check 2016-08-30 14:39:49 -07:00
Parker Moore 9ddc12bad8
Convertible: ensure layouts the argument and payload the argument are set properly in the renderer 2016-08-30 14:39:20 -07:00
Parker Moore ac6bbc1906
Renderer#invalid_layout? should check if document is an excerpt 2016-08-30 14:14:52 -07:00
Parker Moore 8014c54ee0
Convertible#converters: sort the converters 2016-08-30 14:14:33 -07:00
Parker Moore 73e79f0049
Proxy Convertible#converters to Renderer#run 2016-08-30 14:14:22 -07:00
Parker Moore 8496e2e8b6
Proxy Convertible#render_liquid to Renderer 2016-08-30 14:14:12 -07:00
Parker Moore d0f57b61d4
Proxy Convertible#transform to Renderer 2016-08-30 14:14:03 -07:00
Parker Moore 741102bd40
Proxy Convertible#converters to Renderer 2016-08-30 14:13:26 -07:00
Parker Moore b781b9967d
Proxy Convertible#render_all_layouts to Renderer.place_in_layouts 2016-08-30 14:04:57 -07:00
jekyllbot 6b121d2d85 Merge pull request #5045 from ayastreb/document-rubocop-fix 
Merge pull request 5045
 2016-08-30 13:34:55 -07:00
Parker Moore 2b15b0b325
Site#configure_theme: don't do anything if theme config is unset; TEST 2016-08-30 12:17:24 -07:00
Parker Moore 4420c3b2af
Make Site#configure_theme more understandable 2016-08-30 11:58:21 -07:00
Frank Taillandier a9da814f17
add basename and name variables for static files 2016-08-27 11:22:24 +02:00
Heng, K. (Stephen) 7892c5e1f3 Fix issue #5276, where path strips root destination dir if filename matches 2016-08-25 18:35:09 +08:00
Anatoliy Yastreb 2183d9d6b4 Implement respond_to_missing? in Document 2016-08-25 12:13:34 +02:00
Anatoliy Yastreb 158e02623a rubocop: reduce code complexity 2016-08-25 11:22:40 +02:00
David Zhang 9c33754f4f Exclude Gemfile in _config.yml template 2016-08-25 14:54:59 +08:00
Frank Taillandier 326332a5d5
Rename filename to name 2016-08-21 21:32:26 +02:00
Frank Taillandier 87c00b2756
Get static filename 2016-08-20 17:42:05 +02:00
Heng, K. (Stephen) 596f5d1af3 Proposed fix for #5192 
Strip drive name only when necessary.
 2016-08-18 12:02:00 +08:00
Ashwin Maroli a9f92278d3 colorize interpolated text in Jekyll.logger.info 2016-08-16 22:50:54 +05:30
Jordon Bedwell f1f8319566
Fix #5233: Increase our ability to detect Windows. 
This increases our ability to detect Windows, and to detect Windows+Bash.  It also adds a message to Windows for users who try to "--watch", also noting to to them to check out the Windows ticket so eventually somebody pings us if this issue is fixed. /cc @TAGraves
 2016-08-16 03:46:03 -05:00
Parker Moore b937757dce
Site#configure_theme: warn in case the 'theme' config is not a string 2016-08-07 12:03:50 -07:00
Stephen Checkoway 6167c09569 Run hooks in priority order. 
Low priority hooks are being run before higher priority hooks. This is easy to
demonstrate with the following plugin:

    1.upto(10).each do |n|
      Jekyll::Hooks.register :site, :after_reset, priority: Jekyll::Hooks::PRIORITY_MAP[:low] do
        puts "Low #{n}"
      end
      Jekyll::Hooks.register :site, :after_reset, priority: Jekyll::Hooks::PRIORITY_MAP[:normal] do
        puts "Normal #{n}"
      end
      Jekyll::Hooks.register :site, :after_reset, priority: Jekyll::Hooks::PRIORITY_MAP[:high] do
        puts "High #{n}"
      end
    end

Sorting by the negative of the priority and then by the order the hook was
added does the right thing.
 2016-08-06 20:56:34 -05:00
Jeff Kolesky e0ce4a00f8 Fixes `link` tag to work with static files 2016-08-04 20:03:01 -07:00
Jeff Kolesky 82d6657ae8 Adds ability to link to all files 
Fixes request made in #4624 and bug found in #5182
 2016-08-03 15:08:26 -07:00
Ben Balter 58cd8f3f4e use jekyll-feed for default site RSS feed 2016-08-03 12:10:44 -04:00
Parker Moore 2bd592077d
Site#configure_theme: do not set theme unless it's a string 
Some previous ad-hoc 'themes' used this configuration option to store a hash of values.
In that case, we should simply pretend we have no theme.
 2016-08-02 17:11:40 -07:00
Parker Moore 15dc18343c
Add release post for 3.2.1 & update History & version 2016-08-02 16:17:28 -07:00
jekyllbot 6e0119d5e1 Merge pull request #5164 from jekyll/fix-windows-error 
Merge pull request 5164
 2016-08-01 17:34:52 -07:00
jekyllbot 95e9774100 Merge pull request #5156 from jekyll/theme-source-fix 
Merge pull request 5156
 2016-08-01 17:27:02 -07:00
Parker Moore d4e18fc979
Layout: set relative_path without using Pathname 
Presently, on a Windows machine, you get an ArgumentError on Windows:

     Generating...
C:/Ruby23-x64/lib/ruby/2.3.0/pathname.rb:520:in `relative_path_from':
    different prefix: "/" and "C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/minima-1.0.1" (ArgumentError)
    from C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/jekyll-3.2.0/lib/jekyll/layout.rb:61:in `relative_path'
    from C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/jekyll-3.2.0/lib/jekyll/renderer.rb:161:in `place_in_layouts'
    from C:/Ruby23-x64/lib/ruby/gems/2.3.0/gems/jekyll-3.2.0/lib/jekyll/renderer.rb:71:in `run'

This doesn't affect filesystems which do not use drive names.
 2016-07-29 12:16:06 -07:00
jekyllbot 8e25b8bffb Merge pull request #5152 from jekyll/theme-dir-regex-fix 
Merge pull request 5152
 2016-07-28 14:02:10 -07:00
Ben Balter 909800839c Missing trailing | 2016-07-28 16:31:20 -04:00
Ben Balter 9220c5a634 Also include LICENSE and README 2016-07-28 15:43:45 -04:00
Ben Balter 8b69c6f0b5 resolve theme root before sanitizing 2016-07-28 15:12:31 -04:00
Ben Balter 2351ef6bbe dont double sanitize theme folder paths 2016-07-28 14:46:05 -04:00
Jordon Bedwell 54281530fb
Revert "Readability: lib/jekyll/static_file.rb." 
This reverts commit 26f1ea2487.
 2016-07-28 13:15:29 -05:00
Ben Balter 1bf47ec394 include theme directories in default gemspec 2016-07-28 10:21:30 -04:00
Jordon Bedwell 26f1ea2487
Readability: lib/jekyll/static_file.rb. 2016-07-27 23:59:50 -05:00
Parker Moore 07518d9540
Release 💎 3.2.0 2016-07-27 17:17:14 -07:00
Parker Moore 7e34be945a
Remove mention of rake preview for theme README. 2016-07-26 17:34:52 -07:00
Parker Moore a31766d329
ThemeBuilder: do not create example site & Rakefile 
They're unnecessary -- the theme _is_ a Jekyll site. Just use jekyll build.
 2016-07-26 17:32:18 -07:00
Parker Moore deab138f23
site template: update link to jglovier/jekyll-new to jekyll/minima 2016-07-26 15:37:26 -07:00
jekyllbot 41a99b300d Merge pull request #5137 from jekyll/pull/fixes-for-rubocop-0-42 
Merge pull request 5137
 2016-07-25 17:45:51 -07:00
Parker Moore 4b698747dc
Style fixes for Rubocop 0.42.0 
- var == 0 becomes var.zero?
- when defining method_missing, also define respond_to_missing?
 2016-07-25 12:46:43 -07:00
jekyllbot 6b0b6418dc Merge pull request #5135 from chrisfinazzo/baseurl-subcommand 
Merge pull request 5135
 2016-07-25 12:26:02 -07:00
jekyllbot 0f3ce73516 Merge pull request #4860 from pathawks/pr/where_exp 
Merge pull request 4860
 2016-07-25 12:16:55 -07:00
jekyllbot 57944c3da4 Merge pull request #5127 from ayastreb/date-filter-fix 
Merge pull request 5127
 2016-07-25 10:42:28 -07:00
jekyllbot 810e411bdf Merge pull request #5129 from stevecheckoway/display-liquid-warnings 
Merge pull request 5129
 2016-07-25 10:41:54 -07:00
chrisfinazzo ed3f745b77
Add baseurl subcommand, fixes #4919 2016-07-25 10:15:15 -04:00
Parker Moore 0e0e9f2081
Fix script/fmt error in site.rb. 2016-07-24 19:27:21 -07:00
Parker Moore 9f02ec6cf8
Release v3.2.0.pre.beta2 2016-07-24 16:43:28 -07:00
Stephen Checkoway 8d4ab9366e Show liquid warnings. 2016-07-24 13:04:28 -05:00
Anatoliy Yastreb 9176924eab filters: raise error if no input given to date filters 2016-07-24 01:37:35 +03:00
jekyllbot f8aea7b35c Merge pull request #5109 from mojavelinux/issue-4858 
Merge pull request 5109
 2016-07-21 11:43:38 -07:00
Dan Allen d590d7a738 resolves #4858 pass site instance to watch plugin 
- prevents the watch plugin from creating a new site instance
 2016-07-19 23:21:28 -06:00
XhmikosR 5ca080ac6f Whitespace cleanup. 2016-07-18 21:31:17 +03:00
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
jekyllbot c16a2f4d6a Merge pull request #4590 from tonyg/pr4582 
Merge pull request 4590
 2016-02-29 16:12:06 -08:00
jekyllbot cddea273a9 Merge pull request #4557 from timwis/patch-2 
Merge pull request 4557
 2016-02-29 16:08:11 -08:00
jekyllbot 9b889217fa Merge pull request #4611 from jekyll/draft-time-source-mtime 
Merge pull request 4611
 2016-02-29 16:00:52 -08:00
jekyllbot ac704b9763 Merge pull request #4545 from jekyll/allow-no-extensions-coll-docs 
Merge pull request 4545
 2016-02-29 15:50:29 -08:00
Parker Moore ae228705b2 Document#date: drafts which have no date should use source file mtime 2016-02-29 15:46:11 -08:00
Chayoung You dafb25cbfe Escape title and description 
Follows after #4307.
 2016-02-28 22:07:10 +09:00
Ben Balter 91b348966e add theme class 2016-02-26 14:25:29 -05:00
Tony Garnock-Jones fa1eb68941 Fix for issue #4582, plus simple test 2016-02-26 11:06:03 -05:00
timwis 6245ddb14d where filter uses array for everything 2016-02-25 10:18:03 -05:00
Tim Wisniewski 7542ab51b7 Add size property to group_by result 2016-02-20 20:30:38 -05:00
Tim Wisniewski 64ad293b89 add array support to where filter 2016-02-20 19:46:48 -05:00
Parker Moore 05d753f4e0 Release 💎 v3.1.2 2016-02-19 15:40:57 -08:00
Parker Moore d929242e2b Permalinks which end in a slash should always output HTML 
Duplicates #4493 for 3.1.1.

/cc @jekyll/core
 2016-02-19 15:02:13 -08:00
Parker Moore 3aa80b7d04 Allow collections to have documents that have no file extension 2016-02-19 13:40:17 -08:00
Parker Moore 551f8b751f `jekyll new` should create a Gemfile which is educational 2016-02-18 16:56:39 -08:00
Henry Goodman d387fd0baa Add show_dir_listing option for serve command 2016-02-17 20:54:57 -08:00
jekyllbot db9865ebb6 Merge pull request #4525 from atomicules/capitalize-in-titleize 
Merge pull request 4525
 2016-02-15 20:50:42 -08:00
atomicules e4aa45b03f Fix titleize_slug so already capitalized words are not dropped 
Previously `titleize` used `capitalize!` which has the side effect of
returning `nil` for anything already starting with a capital letter. This
commit changes it to just `capitalize`.

Example, before:

A file "2016-01-01-This-is-a-title-with-Capitals.markdown" would return "Is A
Title With" for `post.title`

Example, after:

A file "2016-01-01-This-is-a-title-with-Capitals.markdown" will return "This Is A
Title With Capitals" for `post.title`

Tests added for `titleize_slug` in test_utils.rb

Fix problem introduced in 67f842546e

References #4525
 2016-02-15 21:22:50 +00:00
lonnen e191109549 add consistency to the deprecation message 2016-02-09 23:46:45 -08:00
Parker Moore a040af37c0 Jekyll.sanitized_path: sanitizing a questionable path should handle tildes 2016-02-07 17:53:26 -08:00
Parker Moore 0e89a37eaf Revert "Jekyll.sanitized_path: sanitizing a questionable path should handle tildes" 
This reverts commit 246e65914f.
 2016-02-07 17:53:09 -08:00
Parker Moore 246e65914f Jekyll.sanitized_path: sanitizing a questionable path should handle tildes 2016-02-07 17:52:15 -08:00
Parker Moore 3373eb6525 EntryFilter#special?: ignore filenames which begin with '~' 2016-02-07 17:28:03 -08:00
Parker Moore 5058382d5a LiquidRenderer#parse: parse with line numbers. 2016-02-02 14:43:45 -08:00
Jordon Bedwell 65a1fc4120 Mispell Rouge intentionally. 2016-02-02 12:27:17 -06:00
Jordon Bedwell 4d805e29bc Fix #4427: Make our @config hash symbol accessible. 2016-01-30 09:48:37 -06:00
Parker Moore bfee5c5b59 Release 💎 v3.1.1 2016-01-28 20:36:51 -08:00
jekyllbot 00d753612c Merge pull request #4404 from jekyll/bom-it 
Merge pull request 4404
 2016-01-28 17:20:33 -08:00
Parker Moore 9daebe8dd2 Use improved Page#dir 2016-01-27 08:32:36 -08:00
Parker Moore aad54c9a87 Add Utils.merged_file_read_opts to unify reading & strip the BOM 2016-01-26 17:08:54 -08:00
Parker Moore 38b64faeb2 Page#dir: ensure it ends in a slash 2016-01-26 16:44:30 -08:00
Parker Moore d7ff4234f0 Renderer#output_ext: honor folders when looking for ext 
Previously, even if the document permalink was a folder, it would look for
an extension on that.  For example, if I have:

    permalink: "/new-version-jekyll-v3.0.0/"

the output_ext would be ".0".  Now, the output_ext honors the trailing
slash and will report based on the converters instead.
 2016-01-25 15:32:44 -08:00
Parker Moore 368f5b67a9 Release 💎 3.1.0 2016-01-24 13:13:15 -08:00
Parker Moore 4b827e1797 Release 💎 3.1.0.pre.rc3 2016-01-22 13:15:41 -08:00
jekyllbot ccb382679a Merge pull request #4195 from jekyll/pull/cleanup-document__post_read 
Merge pull request 4195
 2016-01-22 13:13:18 -08:00
jekyllbot 512c7fdb05 Merge pull request #4388 from jekyll/fix-page.class-access 
Merge pull request 4388
 2016-01-22 13:01:04 -08:00
Parker Moore 2b8de59717 remove merge conflict 2016-01-22 09:38:34 -08:00
Parker Moore afff4f0bec Merge remote-tracking branch 'origin/pull/cleanup-document__post_read' into pull/cleanup-document__post_read 
* origin/pull/cleanup-document__post_read:
  add Utils.strip_heredoc
  Fix #4191: Reduce Document#post_read complexity slightly.
  Fix #4188: Extract title from filename successfully when dateless.
 2016-01-22 09:37:58 -08:00
Parker Moore 5878acaaf1 Document#post_read: only overwrite slug & ext if they aren't set by YAML 2016-01-22 09:36:55 -08:00
Parker Moore 8204e479c3 add Utils.strip_heredoc 2016-01-22 09:11:56 -08:00
Jordon Bedwell 67f842546e Fix #4191: Reduce Document#post_read complexity slightly. 2016-01-22 09:11:56 -08:00
rebornix 1298ba6908 Fix #4188: Extract title from filename successfully when dateless. 2016-01-22 09:09:30 -08:00
Parker Moore cf51e32d0e Drop#[]: use self.class.invokable? instead of content_methods.include? for speed 2016-01-22 08:59:48 -08:00
Zshawn Syed 4ecdf6ce10 Remove extra OR condition since a missing hash key will return a nil anyway. Added a test to catch this nil condition since it was missing to begin with. Reduced line length in test_page.rb 2016-01-21 23:44:30 -06:00
Parker Moore 31ae61b419 Drop#[]: only use public_send for keys in the content_methods array 2016-01-21 18:20:35 -08:00
Parker Moore a72629908a Document: throw a useful error when an invalid date is given 2016-01-20 14:19:06 -08:00
Parker Moore 1ba23c32c6 add Utils.strip_heredoc 2016-01-20 11:46:18 -08:00
Pat Hawks 090cf5a50b
Disable auto-regeneration when running server detached 2016-01-19 23:12:59 -08:00
Jordon Bedwell f8e8672148 Fix #4191: Reduce Document#post_read complexity slightly. 2016-01-19 11:18:19 -08:00
rebornix d50656021f Fix #4188: Extract title from filename successfully when dateless. 2016-01-19 11:18:19 -08:00
Parker Moore 32fba4f01a Release 💎 v3.1.0.pre.rc2 2016-01-18 15:39:53 -08:00
Parker Moore e75d703806 Page#write? shouldn't freeze 'true' 2016-01-18 15:33:58 -08:00
Parker Moore 4de1873b56 Renderer: #output_ext should check to make sure the output extension of the permalink isn't empty 2016-01-18 14:09:14 -08:00
Parker Moore 2554281188 document#merge_data!: reformat 2016-01-18 13:41:49 -08:00
Parker Moore e5d8bdee8f Page: freeze true in write? 2016-01-18 12:47:48 -08:00
Parker Moore 66dc083ad0 Renderer: set paginator 2016-01-18 12:47:36 -08:00
Parker Moore 0a6f289ba5 page: write? should always be true 2016-01-18 11:53:16 -08:00
Parker Moore 7d81c00b29 Renderer: use Convertible's way of picking the last Converter's output extension 2016-01-18 11:41:47 -08:00
Parker Moore d343da61eb Page: pipe through Renderer instead of using Convertible 2016-01-18 11:41:05 -08:00
Parker Moore c678640553 Release 💎 v3.1.0.pre.rc1 2016-01-15 16:25:58 -08:00
jekyllbot 0daafd7bda Merge pull request #4361 from jekyll/pheuko-empty-permalink 
Merge pull request 4361
 2016-01-15 16:19:22 -08:00
Parker Moore 06fa14c11a Restructure data validation so that permalink check raises an error. 2016-01-15 16:11:08 -08:00
Parker Moore 89db3c6384 Convertible: separate data validation out of #read 2016-01-15 15:52:54 -08:00
Parker Moore 948dcf2714 Convertible: consolidate empty check into Convertible#read 2016-01-15 15:51:32 -08:00
Parker Moore 15a2dacd37 Merge pull request #4359 from jekyll/optimize-drop 
Fix deep_merge_hashes! handling of drops and hashes
 2016-01-15 15:19:18 -08:00
Parker Moore 0587a3bb57 Fix some debug logging. 
- excluded? should now only print when it is excluded
- requiring is now properly aligned
 2016-01-15 11:30:02 -08:00
Parker Moore 5d79c55b2c Fix deep_merge_hashes! handling of drops and hashes 2016-01-15 11:22:39 -08:00
Parker Moore 22931f42b8 Drop: require 'json' for #inspect call 2016-01-15 10:00:56 -08:00
Parker Moore 3e81331af1 Utils: don't require mime/types 2016-01-15 10:00:45 -08:00
Pedro Euko 5681742223 Check if permalink key was given 2016-01-15 14:40:59 -02:00
Pedro Euko f8a63157d7 Empty permalink now shows an error 2016-01-15 14:40:47 -02:00
Jordon Bedwell 70f741b86f Remove ObectSpace dumping and start using inherited, it's faster. 2016-01-10 14:08:53 -06:00
jekyllbot 735554007c Merge pull request #4314 from jekyll/allow-custom-php-extensions 
Merge pull request 4314
 2016-01-09 18:11:47 -08:00
Parker Moore bb4f5910c9 document: don't cache @output_ext 
Fixes race issue.
Will introduce perf issues, though...
 2016-01-09 18:04:13 -08:00
Pat Hawks ddf640e6bd
Test all the things 2016-01-08 17:10:36 -08:00
Pat Hawks acb2263f51
Add smartify filter 2016-01-07 02:36:24 -08:00
Parker Moore a1b39840bb Revert change to Collection#url_template which caused test breakage. 
Reverts dab53a697b
 2016-01-06 10:13:13 -08:00
Peter Suschlik b1a2115948 Fix spelling of GitHub in docs and history 
* Github -> GitHub
* GitHub pages -> GitHub Pages
 2016-01-06 17:21:09 +01:00
Parker Moore dc31264160 url: tiny optimization to #generate_url_from_drop 2016-01-04 18:18:28 -08:00
Parker Moore 9579924f8a drop: tiny optimization to .mutable to create fewer objects 2016-01-04 18:18:12 -08:00
Parker Moore dab53a697b collection: tiny optimization to #url_template 2016-01-04 18:17:51 -08:00
Parker Moore b6c283a4ae wip: allow custom extensions 2016-01-04 17:42:06 -08:00
Parker Moore f995d86673 Merge pull request #4254 from jekyll/shim-docs-import-with-nudge 
Merge pull request 4254
 2016-01-04 16:30:30 -08:00
Parker Moore f47612ee98 Merge pull request #4307 from fulldecent/patch-1 
Merge pull request 4307
 2016-01-04 16:25:41 -08:00
Parker Moore 4fe9eecf05 For blessed gems, shim their commands so users know how to use them. 2016-01-04 16:10:21 -08:00
Parker Moore cb5bc1093e utils: has_yaml_header? should accept files with extraneous spaces 
Occasionally, extra spaces at the end of the YAML front matter prologue are
saved to a file and it goes missing without telling the user why. This
should simply accept those changes without any detriment to the user,
allowing anyone to add as many spaces as they like to the end of their
front matter prologues.
 2016-01-04 14:09:30 -08:00
Parker Moore e097a15657 Merge pull request #4312 from jekyll/fix-layout-metadata 
Merge pull request 4312
 2016-01-04 13:05:00 -08:00
Parker Moore 95a3c54ddb drop: only check mutable if the key is a method 2016-01-04 12:41:40 -08:00
Parker Moore 06c45df8c3 Drop: hash syntax should use setter method for a property if it's defined 2016-01-04 12:38:41 -08:00
Parker Moore 735194ccaf Convertible/Page/Renderer: use payload hash accessor & setter syntax 2016-01-04 12:37:19 -08:00
Pat Hawks 060904d809
Rubocop: Style/TrailingWhitespace 
- Trailing whitespace detected
Rubocop: Style/EmptyLines
 - Extra blank line detected
Rubocop: Style/EmptyLinesAroundBlockBody
 - Extra empty line detected at block body beginning
 2016-01-04 12:16:36 -08:00
Pat Hawks ab3d906e04
Rubocop: Style/ParenthesesAroundCondition 
- Don't use parentheses around the condition of an if
 2016-01-04 12:14:00 -08:00
Pat Hawks cce848d3d8
Rubocop: Avoid single-line method definitions 2016-01-04 12:12:17 -08:00
Pat Hawks c1c8b6dbf7
Rubocop: Style/SpaceInsideHashLiteralBraces 2016-01-04 12:07:34 -08:00
Pat Hawks 04e635b10c
Rubocop: Style/SpaceInsideRangeLiteral 
- Space inside range literal
 2016-01-04 12:06:40 -08:00
Pat Hawks 6711234d5f
Rubocop: Style/BlockDelimiters 
- Avoid using {...} for multi-line blocks
 2016-01-04 12:05:54 -08:00
Pat Hawks 086e85ca9e
Rubocop: Style/PerlBackrefs 
- Avoid the use of Perl-style backrefs
 2016-01-04 12:01:23 -08:00
Pat Hawks be3666fcf0
Rubocop: Do not use unless with else 
- Rewrite these with the positive case first
 2016-01-04 11:51:14 -08:00
Pat Hawks ec83ef60b5
Rubocop: Lint/UselessAssignment 2016-01-04 11:49:54 -08:00
Pat Hawks 085a778b0a
Rubocop: Style/NestedTernaryOperator 
- Ternary operators must not be nested. Prefer if/else constructs instead.
 2016-01-04 11:46:25 -08:00
Pat Hawks 78e9f3389e
Rubocop: Style/IndentationWidth 2016-01-04 11:42:17 -08:00
Pat Hawks f9926edbc4
Rubocop: Style/TrivialAccessors 
- Use `attr_writer` to define trivial writer methods
 2016-01-04 11:39:14 -08:00
Pat Hawks af9ec6831d
Rubocop: Style/ElseAlignment 
- Align else with if
Rubocop: Lint/EndAlignment
 - Align end with if
 2016-01-04 11:23:06 -08:00
Pat Hawks f6fd9014ba
Rubocop: Style/CaseIndentation 
- Indent when as deep as case
 2016-01-04 11:15:37 -08:00
Pat Hawks 2c9a349f9a Rubocop: Style/Next 
- Use next to skip iteration
 2016-01-04 11:10:52 -08:00
Pat Hawks f221b925b4 Rubocop: Lint/StringConversionInInterpolation 
- Redundant use of Object#to_s in interpolation
 2016-01-04 11:08:31 -08:00
Pat Hawks 13c980c896 Rubocop: Style/TrailingComma 2016-01-04 11:08:31 -08:00
Pat Hawks 4c5d77a4b5 Rubocop: Style/EmptyLines 2016-01-04 11:08:18 -08:00
Pat Hawks fd8fdd87d3
Rubocop: Style/RegexpLiteral 2016-01-03 17:10:39 -08:00
Pat Hawks e3189e3828
Rubocop: Lint/UnusedMethodArgument 2016-01-03 17:07:39 -08:00
Pat Hawks 11f0aab4b1
Rubocop: Lint/UnusedBlockArgument 
- Unused block argument
 2016-01-03 16:24:13 -08:00
Pat Hawks 7ca4f7cd62
Rubocop: Style/Proc 
- Use proc instead of Proc.new
...and use lambda instead of proc
 2016-01-03 16:18:26 -08:00
Pat Hawks af5d51289f
Rubocop: Style/SymbolProc 
- Pass &:to_sym as an argument to map instead of a block
 - Pass &:capitalize as an argument to select instead of a block
 - Pass &:to_s as an argument to map instead of a block
 2016-01-03 16:02:32 -08:00
Pat Hawks 704ca6b8cc
Rubocop: Style/NegatedIf 
- Favor unless over if for negative conditions
 2016-01-03 15:59:12 -08:00
Pat Hawks 663a2d3279
Rubocop: Style/SpaceBeforeBlockBraces 
Rubocop: Style/SpaceInsideBlockBraces
 2016-01-03 15:58:02 -08:00
Pat Hawks a70d89a862
Rubocop: Style/SpaceAfterComma 
- Space missing after comma
 2016-01-03 15:56:44 -08:00
Pat Hawks cda226de45
Rubocop: Style/EmptyLinesAroundClassBody 
- Extra empty line detected at class body end
 2016-01-03 15:55:33 -08:00
Pat Hawks 2530a8cdfc
Rubocop: Style/HashSyntax 
- Use hash rockets syntax
 2016-01-03 15:49:22 -08:00
Pat Hawks d157a04c6d
Rubocop: Performance/StringReplacement 
- Use delete! instead of gsub!
 - Use tr instead of gsub
 2016-01-03 15:47:31 -08:00
Pat Hawks ff5f7b7120
Rubocop: Style/DeprecatedHashMethods 
- Hash#has_key? is deprecated in favor of Hash#key?
Add method `key?` to Drop
 2016-01-03 15:41:04 -08:00
Pat Hawks 98a19cdf2b
Rubocop: Style/PercentLiteralDelimiters 
- %w-literals should be delimited by ( and )
Rubocop: Style/WordArray
 - Use %w or %W for array of words
 2016-01-03 15:32:11 -08:00
Pat Hawks fb0457bf3d
Rubocop: Style/AndOr 
- Use && instead of and
 - Use || instead of or
 2016-01-03 15:30:26 -08:00
Pat Hawks 6550867051
Rubocop: Style/SpecialGlobalVars 
- Prefer $LOAD_PATH over $:
 2016-01-03 15:29:49 -08:00
Pat Hawks 8223ebd861
Use select and find instead of conditional loop 2016-01-03 15:24:18 -08:00
Pat Hawks 0eae36aec2
Rubocop: Style/LineEndConcatenation 
- Use \ instead of + or << to concatenate those strings
 2016-01-03 14:41:49 -08:00
Pat Hawks 44d2995277
Rubocop: Style/Semicolon 
- Do not use semicolons to terminate expressions
 2016-01-03 14:40:45 -08:00
Pat Hawks 31dd0ebed5
Rubocop: Style/EmptyLiteral 
- Use array literal [] instead of Array.new
 - Use hash literal {} instead of Hash.new
 2016-01-03 14:39:01 -08:00
William Entriken 22a0be3f7b Escape html from site.title and page.title 2016-01-03 16:10:38 -05:00
Jordon Bedwell f2f88dbd9f Move require "jekyll/drops/drop" to "jekyll.rb" 
Linux does not read files in alphanumeric order, this can lead to
Jekyll drops not working on Linux because the assumption here is that
the collection drop will be required first.
 2015-12-27 12:48:21 -06:00
Parker Moore 5034216637 Release 💎 3.1.0.pre.beta1 2015-12-27 08:32:08 -05:00
Parker Moore 7c4876d2eb Merge pull request #4289 from jekyll/fix-utils-deep-merge-drops 
Merge pull request 4289
 2015-12-27 08:27:25 -05:00
Parker Moore 1b73751abf Merge branch 'fixup-custom-markdown' 
* fixup-custom-markdown:
  markdown: minor style fixes
  Add support for underscores.
  Refactor: lib/jekyll/convertor/markdown.rb - tests: no additions/breaks.
 2015-12-27 08:24:16 -05:00
Parker Moore 8e887dcd8b markdown: minor style fixes 
ref: #3771
 2015-12-27 08:24:00 -05:00
Parker Moore 5bf596b239 utils/drops: update Drop to support Utils.deep_merge_hashes 
Fixes #4287
 2015-12-27 08:06:37 -05:00
Parker Moore d138558c1d drops: provide #to_h to allow for hash introspection 
Follow-up to #4277
 2015-12-26 14:25:29 -05:00
Parker Moore 3fa8af2a18 drops: create one base Drop class which can be set as mutable or not 2015-12-26 13:43:42 -05:00
Parker Moore 57613b31dd Slightly restructure rake helper files 
Ref #4282
 2015-12-26 12:53:30 -05:00
Parker Moore e3da5a3f9f Merge pull request #4282 from leethomas/refactor-rake-tasks 
Merge pull request 4282
 2015-12-26 12:47:30 -05:00
Parker Moore 1f298e0d9d url: move setter outside of if statement 
Addresses @envygeeks's comment:
d070a77716 (commitcomment-15164169)
 2015-12-26 12:32:21 -05:00
Parker Moore b70ea3ca5c immutable_drop/errors: consolidate errors & fix syntax for raising 
Addresses @envygeeks's comments:
bff1726a5a
 2015-12-26 12:27:07 -05:00
Parker Moore 1afbe9967d document: return nil if bad arg in #<=> 
Addresses @envygeek's comment:

233589e150 (commitcomment-15164178)
 2015-12-26 12:23:21 -05:00
leethomas b05b174b87 moved namespaced rake tasks to separate .rake files under lib/tasks 2015-12-25 22:50:23 -08:00
Parker Moore c63b51b661 document: revert comparison of Documents to old style & add nil check 
@envygeeks, this should address your comment: fcce0d5482 (commitcomment-15162261)
 2015-12-25 22:54:12 -05:00
Parker Moore debdb15171 Move 'forwardable' require to earlier in the program start up. 2015-12-25 22:45:51 -05:00
Parker Moore b2b634e767 drops: use def_delegator more liberally where acceptable 2015-12-24 15:07:48 -05:00
Parker Moore fcce0d5482 document: fix issue with bad comparison 2015-12-24 15:07:31 -05:00
Parker Moore d070a77716 url: fix issue with bad URL escaping when using Drop 2015-12-24 15:07:20 -05:00
Parker Moore bff1726a5a immutable_drop: use custom error for bad set 2015-12-24 15:06:32 -05:00
Parker Moore 233589e150 document: throw ArgumentError if compared to non-doc 2015-12-22 21:34:24 -05:00
Parker Moore 532bb9e9cb Further consolidation in the Drops. 2015-12-22 21:33:42 -05:00
Parker Moore 4935e85f7c CollectionDrop: to_s should work like Array#to_s 2015-12-21 23:41:36 -05:00
Parker Moore 03488b1cde DocumentDrop: use def_delegators instead of duplicating methods 2015-12-21 23:36:31 -05:00
Parker Moore ebe3c10604 Drops: fix accessing of site collections via site.COL_NAME 2015-12-21 23:33:33 -05:00
Parker Moore 82c3ee365f Initial work on using Liquid::Drops instead of Hashes. 
The properties of Liquid::Drops are only evaluated when they're asked for
and therefore save computation time. This prevents a lot of GC time cleaning
up objects that are not needed, because they're not created unless requested.
Additionally, this saves time for actual computation of those values because
they can be computed only if needed.

It's funny how much it helps when you only do what is needed. Far less overhead.
 2015-12-21 22:47:30 -05:00
Parker Moore fdcd761313 Merge branch 'akoeplinger-doctor-permalink-same-case-warning' 
* akoeplinger-doctor-permalink-same-case-warning:
  Added tests for new jekyll doctor warning
  Incorporate code review feedback
  Incorporate code review feedback
  Add a Jekyll doctor warning for URLs that only differ by case
 2015-12-13 12:26:07 -08:00
Parker Moore 92adfd0e46 Merge pull request #4052 from Crunch09/process-empty-config-files 
Merge pull request 4052
 2015-12-11 14:11:11 -08:00
Parker Moore b94800361b Collection: change missing_method message to be a bit clearer. 
Fixes #4234. Fixes #4199.
 2015-12-11 14:07:34 -08:00
Parker Moore 4f21458b34 Merge pull request #4184 from ducktyper/allow-quoted-dates 
Merge pull request 4184
 2015-12-11 14:02:55 -08:00
Parker Moore 11959ab2bc Merge pull request #4233 from RochesterinNYC/patch-1 
Merge pull request 4233
 2015-12-07 22:10:09 -08:00
James Wen 0e89e80426 Switch PluginManager to use require_with_graceful_fail 
* Add debug statement specifying current plugin to External#require_with_graceful_fail
 2015-12-07 20:46:07 -05:00