Commit Graph

1758 Commits

Author SHA1 Message Date
Malo Skrylevo 54d0bf47e8 Added per post excerpt_separator functionality, so you are able to
specify :excerpt_separator (as well as just :excerpt) key direct inside
the post YAML, to make an excerpt based on the value in the post. Tests
were also added.
2015-01-08 15:18:06 +03:00
Parker Moore 502fd94f2c Merge pull request #3172 from alfredxing/docs-output-overrides 2015-01-05 23:19:12 -08:00
Alfred Xing c58ac78a5e Expose Publisher in Site 2015-01-05 16:13:04 -08:00
Alfred Xing 7655b533c9 Allow documents to set `published` in front matter 2015-01-05 16:11:02 -08:00
Parker Moore a098dc80cd Merge pull request #3234 from jekyll/ruby-2-2 2014-12-29 20:49:04 -05:00
Parker Moore 7cd5847826 Merge pull request #3244 from jekyll/store-messages 2014-12-29 20:48:23 -05:00
Parker Moore 7bcf8d689e Always call Time#localtime to translate to TZ'd time. 2014-12-29 20:12:35 -05:00
nitoyon 5e10958faa Unescape Document output path
Document#destination wasn't unescaped properly.

For example, when we have a document named '_langs/c#.md',
we expect its url to be '/langs/c#.html',
but it was actually '/langs/c%23.html'.

We now unecape URL at Document#destination like Post#destination and
Page#destination.
2014-12-29 22:38:50 +09:00
Parker Moore 7fc47bfc43 Initialize @messages at instantiation time. 2014-12-29 01:14:16 -05:00
Parker Moore b2146e8659 Store log messages in an array of messages. 2014-12-29 01:14:16 -05:00
Parker Moore 612eb737a5 Merge pull request #3047 from karouf/slugify-non-latin 2014-12-29 00:31:34 -05:00
Parker Moore 004f923644 Revert "Revert "Make permalink parsing consistent with pages"" 2014-12-29 00:30:42 -05:00
Parker Moore e39dfa3f0b Merge pull request #2908 from alfredxing/document-path 2014-12-29 00:26:35 -05:00
Parker Moore be23e18555 Say 'since 2.0' 2014-12-28 23:54:03 -05:00
Parker Moore aa4beda868 Merge pull request #3240 from jekyll/snake_case 2014-12-28 23:36:08 -05:00
Parker Moore c576d23908 Use External instead of Deprecator for requiring gracefully 2014-12-28 14:37:49 -05:00
Parker Moore ac41312c5d Separate jekyll-docs out into a separate gem & bless it 2014-12-28 14:37:02 -05:00
Parker Moore 0c0aea3ad7 Improve Site#getConverterImpl and call it Site#find_converter_instance 2014-12-28 14:12:09 -05:00
Parker Moore b6641be8ef Call it site_payload instead of payload. 2014-12-26 22:40:18 -05:00
Parker Moore 2f8248a6f1 Only call #site_payload once for all collection work. 2014-12-26 22:24:18 -05:00
Parker Moore 0eb2796a66 Sort static files just once.
Ref: #2075.
2014-12-26 22:23:45 -05:00
Parker Moore d35af9c1f3 Read 'enable_coderay' in the Kramdown parser 2014-12-26 22:16:57 -05:00
Parker Moore f6bff6fb61 Have a deprecation fallback for 'use_coderay' 2014-12-26 22:16:47 -05:00
Parker Moore a103898980 Set 'use_coderay' to 'enable_coderay' 2014-12-26 22:16:33 -05:00
Parker Moore cb2eea0e41 Release 💎 2.5.3 2014-12-22 09:16:40 -05:00
Parker Moore 8284714d8a Release 💎 2.5.3 2014-12-22 09:15:57 -05:00
Parker Moore 7227ad4ebb Merge pull request #3116 from alfredxing/incremental 2014-12-22 08:57:50 -05:00
Aidan Feldman 383a0d0aa7 modify as_liquid to use case statement 2014-12-09 07:42:14 -05:00
Alfred Xing 43a28aed96 Fix indentation 2014-12-05 19:38:43 -08:00
Alfred Xing 5d9662f80f Always regenerate asset files 2014-12-05 19:07:18 -08:00
Alfred Xing 52f0b36558 Add incremental rebuild info to build command output 2014-12-04 20:09:49 -08:00
Alexander Köplinger 6055f112fb Incorporate code review feedback 2014-11-30 14:52:16 +01:00
Alexander Köplinger a0da18e4f8 Incorporate code review feedback 2014-11-30 14:30:22 +01:00
Alexander Köplinger 98405edf61 Add a Jekyll doctor warning for URLs that only differ by case
Those URLs are problematic on case-insensitive file systems because one of the URLs is overwritten by the other.
Fixes #3035
2014-11-29 15:14:44 +01:00
Alfred Xing d0e12d69bc Last few revisions 2014-11-28 14:05:40 -08:00
Alfred Xing b6d81c58df Perform less expensive operation first 2014-11-27 10:00:29 -08:00
Aidan Feldman 4776b27ff3 reduce nesting of #as_liquid 2014-11-27 04:20:05 -06:00
Aidan Feldman 87d08ec827 refactor #as_liquid 2014-11-27 04:16:29 -06:00
Alfred Xing 02f281eef3 Add unit and cucumber tests 2014-11-26 21:15:53 -08:00
Alfred Xing 8a257aca6b Implement more suggestions 2014-11-26 20:15:42 -08:00
Aidan Feldman 0662d31bf6 fix jsonify filter when used with boolean values 2014-11-26 02:40:41 -06:00
Brandon Bradley e546eb3e9f force markdown regexp to match the full extension 2014-11-24 20:08:31 -06:00
Alfred Xing dc30114605 Use site.in_source_dir 2014-11-23 16:16:19 -08:00
Alfred Xing 2a5cf11ee2 Add --no-metadata option 2014-11-23 15:38:00 -08:00
Parker Moore 5b77d02e3b Merge pull request #3141 from jekyll/bundle-require-is-borking-pygments
Fix Bundler-integration Plugin Manager
2014-11-23 14:18:06 -08:00
Parker Moore c2b24e82e5 Refactor the case statement in highlighter for better readability. [ci skip] 2014-11-23 14:17:21 -08:00
Parker Moore 10030ae8cd Put that Bundle.require statement back. 2014-11-23 14:13:47 -08:00
Alfred Xing 75c5c16297 Handle path overrides 2014-11-23 14:06:29 -08:00
Parker Moore ef53e677a4 Better tests for plugin manager. 2014-11-23 13:14:51 -08:00
Alfred Xing 4acf343fea Add clean command 2014-11-23 12:51:19 -08:00
Parker Moore b1bba1945a Prepare for a v2.5.2 release. 2014-11-22 15:37:07 -08:00
Parker Moore d17b80bf2a Keep track of the required gems. 2014-11-22 12:38:36 -08:00
Alfred Xing ac03af3229 Implement @mattr-'s suggestions 2014-11-21 22:12:21 -08:00
Alfred Xing fe6bfc6f1b Fix failing tests 2014-11-21 22:12:21 -08:00
Alfred Xing d438362971 Add regenerate front-matter variable 2014-11-21 22:12:21 -08:00
Alfred Xing 842470b0c4 Refinements 2014-11-21 22:12:21 -08:00
Alfred Xing 11917645f2 Incremental regeneration 2014-11-21 22:12:20 -08:00
David Williamson d7e3d4df8f Add support for collections documents to have YAML front matter ending in dots. 2014-11-20 14:38:17 -06:00
Parker Moore 60202782ea Only try bundler if the Gemfile is there. 2014-11-16 21:21:50 -08:00
Parker Moore 32b14d6402 First, setup Bundler. Then, require it.
Per a conversation in
https://github.com/bundler/bundler/issues/3252#issuecomment-63208769
2014-11-16 21:18:23 -08:00
Parker Moore 687b9cdf19 Merge pull request #3058 from alfredxing/fix-post-url-equality 2014-11-16 20:19:37 -08:00
Alfred Xing d4c15efff9 Cache name matching regex 2014-11-11 17:35:09 -08:00
Alfred Xing 06750b8502 Print error message in renderer 2014-11-10 11:45:56 -08:00
Alfred Xing 84cef2202d Remove duplicate 'Conversion error:' message 2014-11-10 09:12:51 -08:00
Alfred Xing eaa132c65b Fall back to old method with deprecation warning 2014-11-09 11:55:47 -08:00
Parker Moore 22d11bef2d Prepare a 💎 v2.5.1 release. 2014-11-08 22:29:47 -08:00
Parker Moore e11fb4d427 Merge pull request #3067 from jekyll/specify-log-level 2014-11-06 12:05:07 -08:00
Parker Moore 5b54f78875 Allow users to specify the log level via JEKYLL_LOG_LEVEL. 2014-11-06 12:03:07 -08:00
Parker Moore 989c70fe4a In the case that a Gemfile does not exist, ensure Jekyll doesn't fail. 2014-11-06 10:48:09 -08:00
Parker Moore a0afa19e9a Release 💎 v2.5.0 2014-11-05 22:07:23 -08:00
Parker Moore 13bb7360c0 Merge pull request #2865 from jekyll/some-kind-of-bundler-thingy 2014-11-05 22:01:37 -08:00
Parker Moore 5a350788e7 Test JEKYLL_NO_BUNDLER_REQUIRE. 2014-11-05 21:04:34 -08:00
Sean Collins 5a288e7de4 Add 'b' and 's' aliases for build and serve, respectively 2014-11-05 23:13:08 -05:00
Parker Moore 8ee1b2a1fd Finish up the plugin manager
And so it shall be.
2014-11-05 19:29:54 -08:00
Parker Moore b0a7f9c8c9 Require plugins from Gemfile :jekyll_plugins group. 2014-11-05 18:50:38 -08:00
Parker Moore 34de676713 Require gems in :jekyll_plugins group in a Gemfile in unsafe mode.
Replaces #1658. /cc @imathis
2014-11-05 18:39:54 -08:00
Parker Moore 9a15a09028 Add {{ | jsonify }} support for hashes. 2014-11-05 11:37:34 -08:00
Alfred Xing 50d0fc3c85 Match post.name instead of slugs and dates 2014-11-04 16:13:04 -08:00
Parker Moore 90cddade53 Commit the paths one by one to Jekyll.sanitized_path with the proper initial base.
Prevents errors like these:

[39/78] TestPost#test_: A Post processing posts should not be writable outside of destination. /Users/parker/jekyll/jekyll/test/dest
/Users/parker/jekyll/jekyll/test/dest/Users/parker/jekyll/baddie.html
 = 0.01 s
  1) Failure:
TestPost#test_: A Post processing posts should not be writable outside of destination.  [/Users/parker/jekyll/jekyll/test/test_post.rb:152]:
Failed assertion, no message given.
2014-11-03 22:27:55 -08:00
Parker Moore 2ee8d690c4 More conversion of Jekyll.sanitized_path ~> site.in_(source|dest)_dir 2014-11-03 22:16:48 -08:00
Parker Moore ca40c771d0 Only allow CWD _layouts outside of safe mode. 2014-11-03 22:16:48 -08:00
Parker Moore 68e9c84a18 Flatten paths sent into `#in_dest_dir` 2014-11-03 22:16:48 -08:00
Parker Moore f7b1782294 Fix post.rb permalink stuff in light of merge of #2925. 2014-11-03 22:16:48 -08:00
Parker Moore 656e772388 Cache the related posts most_recent_posts
/cc @mattr- is this safe to do, you think? it only happens at render
time...
2014-11-03 22:16:47 -08:00
Parker Moore 817f6cb658 Fix problem where entries weren't stripped of their trailing slashes. 2014-11-03 22:16:47 -08:00
Parker Moore 179b5ab193 Use site.in_source_dir as @mastahyeti suggested 2014-11-03 22:16:47 -08:00
Parker Moore b4a2788626 Just swallow it if there is no content for the excerpt to parse. 2014-11-03 22:16:47 -08:00
Parker Moore 3762878381 Correctly access the StaticFile's site variable. 2014-11-03 22:16:47 -08:00
Parker Moore 9cbc24fce5 More safety. 🔒 2014-11-03 22:16:47 -08:00
Parker Moore 461e16f8bc More tests are passing. Hooray. 2014-11-03 22:15:40 -08:00
Parker Moore 0bc88975c8 More removal of File.join 2014-11-03 22:15:40 -08:00
Parker Moore 98182aab4a Use site.in_source_dir in Collection. 2014-11-03 22:15:40 -08:00
Parker Moore 3a3be7e5a7 Add Site#in_dest_dir 2014-11-03 22:15:40 -08:00
Parker Moore 7e1cc4b684 Add Site#in_source_dir 2014-11-03 22:15:40 -08:00
Parker Moore 0f2a3a606b Append the site to Jekyll.sites upon creation 2014-11-03 22:15:40 -08:00
Parker Moore 314dce62cf Make Site.source and Site.dest "immutable" 2014-11-03 22:15:40 -08:00
Parker Moore ccd1941378 Merge pull request #3053 from alfredxing/fix-serve-host 2014-11-03 12:09:34 -08:00
Alfred Xing a16dfef840 Use 127.0.0.1 as host instead of 0.0.0.0 2014-11-02 15:31:23 -08:00
Veres Lajos e1f7139b9c typo fixes 2014-11-02 23:00:09 +00:00
Renaud Martinet f9e249ae20 Generalize Utils#slugify for any scripts
It replaces any non alphanumeric glyphs by an hyphen.
2014-10-31 15:56:03 +01:00
Parker Moore 8dcf7a6680 Merge pull request #3031 from alfredxing/frontmatter-permalinks 2014-10-29 15:13:12 -07:00
Alfred Xing 02e53fb6ff Implement @parkr's suggestions 2014-10-27 22:59:15 -07:00
Parker Moore 3fb1356593 The jsonify filter should deep-convert to Liquid when given an Array.
Fixes https://github.com/github/choosealicense.com/issues/225
2014-10-27 15:58:42 -07:00
Alfred Xing cd9d38c5ea Remove duplicate code 2014-10-26 21:38:19 -07:00
Alfred Xing 0fe1d0686a Allow placeholders in permalinks 2014-10-26 18:23:58 -07:00
Parker Moore ae01b1d5df 😦 2014-10-22 02:16:50 -07:00
Parker Moore 5cb0aee251 Have to go back on all these... 2014-10-22 02:10:21 -07:00
Parker Moore 2eb318a929 Replace costly Hash#fetch with arity=2 with arity=1 + block. 2014-10-22 01:43:46 -07:00
Parker Moore 0511ece2f5 Use String#<< instead of String#+=
I just couldn’t believe this but look:

~/jekyll/jekyll#master$ ruby benchmark/string-concat
Calculating -------------------------------------
                  +=      6367 i/100ms
                  <<    128697 i/100ms
-------------------------------------------------
                  +=     1704.3 (±0.6%) i/s -      12734 in   7.472170s
                  <<  4381212.4 (±6.3%) i/s -   21878490 in   5.014899s

WOW.
2014-10-22 00:58:20 -07:00
Parker Moore 1395d5686b Optimize more URL#sanitize_url 2014-10-22 00:57:53 -07:00
Parker Moore 3227c4ecea Use #tr instead of #gsub 2014-10-22 00:57:25 -07:00
Parker Moore b9c4fc93d7 Use flat_map instead of map.flatten 2014-10-22 00:57:06 -07:00
Parker Moore 9cc3085dd0 Turn on FancyIndexing. 2014-10-20 21:23:30 -07:00
Parker Moore 5b37ad57cc If `--verbose` is given, debug the sh*t out of that. 2014-10-20 21:23:22 -07:00
Parker Moore 3dedcbf894 Sort webrick_options 2014-10-20 21:23:00 -07:00
Parker Moore 7fd9f102c0 Merge pull request #2997 from jekyll/utils-slugify 2014-10-20 20:11:04 -07:00
Parker Moore 5ed4638400 Merge pull request #2986 from tamagokun/where_filters_enumerable 2014-10-20 20:09:21 -07:00
Glauco Custódio 68c0e8f847 Hash#each_key instead of Hash#keys.each. Faster code. 2014-10-20 10:10:29 -02:00
Parker Moore 078b2785e4 Revert "Make permalink parsing consistent with pages" 2014-10-18 12:07:44 -07:00
Parker Moore 9f5835871b Utils.slugify: Don't create new objects when gsubbing 2014-10-12 16:18:40 -07:00
Parker Moore b564214535 Pass the context on to IncludeRelativeTag#page_path 2014-10-12 15:16:38 -07:00
Parker Moore 626706c8c5 Cache the `@includes_dir` in each instance so the method isn't called all the time 2014-10-12 15:11:28 -07:00
Parker Moore 4942b2947b Only compile the Converter#matches regexp when asked for 2014-10-12 14:31:49 -07:00
Parker Moore fbe98df488 Cache variables that won't change through the life of an object 2014-10-12 14:06:17 -07:00
Parker Moore 44c9f81921 Cache the extname regexp in Converters::Markdown and Textile 2014-10-12 14:06:16 -07:00
nitoyon 46e76bde3f Add mode parameter to slugify Liquid filter 2014-10-12 02:44:58 +09:00
Mike Kruk f6ea8b4d50 Allow Enumerables to be used with "where" filter. 2014-10-08 16:19:55 -04:00
Parker Moore 94a1330d61 Revert "Allow Enumerables to be used with "where" filter" 2014-10-08 12:47:17 -07:00
Mike Kruk 1db62cca9e allow Enumerables to be used with "where" filter
Enumerable module responds to `select` so this shouldn't be a problem here. Typical use case would be an object from a plugin being passed through a where filter.
2014-10-07 23:05:23 -04:00
feivel 0701fa7b16 Update outdated comment
incorrect as of 6 Aug 2014.
2014-09-26 19:49:58 -04:00
Alfred Xing 3a96d01e4a Make permalink parsing consistent with pages
Require permalink to end in a slash to write an index file.
Addresses #2920.
2014-09-24 22:08:25 -07:00
Parker Moore bd0eebdb05 Merge pull request #2925 from pathawks/htm-extension 2014-09-24 17:08:02 -07:00
Parker Moore e6f89074d4 Rouge's Redcarpet plugin now has a different API
See for more:
- 18ec938e9c
- https://github.com/jneen/rouge/issues/182
2014-09-22 23:03:49 -07:00
Pat Hawks fdf58c5ce2 Allow per post permalinks to end in `.htm`
Fixes #2920
2014-09-14 11:58:16 -07:00
Alfred Xing c3ec158f2d Keep backwards compatibility
Re-add `relative_path` Liquid variable too keep compatibility
2014-09-11 18:25:21 -07:00
Alfred Xing 6c0e791236 Use relative path for `path` Liquid variable in Documents 2014-09-10 21:04:40 -07:00
Parker Moore e72f8cf5b1 Release 💎 2.4.0 2014-09-09 22:24:09 -07:00
Parker Moore 196a56e3ec Add push, pop, shift, and unshift Liquid filters.
Fixes #2892.
2014-09-09 21:29:23 -07:00
Garen Torikian deb4e0d24a Set tag name as ivar
This lets us use just one syntax_example method for both classes.
2014-09-08 14:27:51 -07:00
Garen Torikian 0675f2a423 Update include_relative tests
This verifies you can’t go “up” in the include
2014-09-07 21:23:45 -07:00
Parker Moore 6644c77d23 Merge pull request #2870 from gjtorikian/support-relative-include 2014-09-07 13:05:38 -07:00
Garen Torikian a569799ffc Sanitize the resolved includes path 2014-09-07 12:18:54 -07:00
Garen Torikian 3668437c96 Rename method to `resolved_includes_dir` 2014-09-07 12:18:35 -07:00
Garen Torikian 4da07bb2c3 Add tests around nasty include attempts 2014-09-07 12:00:37 -07:00
Garen Torikian 0e4549013d Define methods for shared vars between include & include_relative 2014-09-07 11:21:40 -07:00
Chris Frederick 394eab4a3a Add the slugify Liquid filter 2014-09-07 16:48:57 +09:00
Garen Torikian 9f558d1cec Rename tag to `include_relative` 2014-09-06 21:48:15 -07:00
Garen Torikian 787bb582da Trash the subclass 2014-09-06 21:48:00 -07:00
Parker Moore 58a76911bb Merge pull request #2864 from kansaichris/add-title-to-collection-urls 2014-09-05 10:04:38 -07:00
Garen Torikian aa97f1025d Support a new `relative_include` tag 2014-09-03 15:43:51 -07:00
Chris Frederick 4adc35aaf3 Revise Utils#slugify with inspiration from Rails 2014-09-02 14:32:14 +09:00
Chris Frederick 702b39dec5 Replace the 'name' parameter with 'string' 2014-09-02 13:34:44 +09:00
Chris Frederick 3ca1245027 Move Document#sluggify to Utils#slugify 2014-09-02 13:29:28 +09:00
Shu Uesugi cfd17b2e7d Add inspect filter 2014-09-01 14:51:09 -07:00
Chris Frederick 05d65f0341 Rename 'slug' to 'sluggify' and clean up code 2014-09-01 16:25:42 +09:00
Chris Frederick a5e51cfdbe Properly handle titles with trailing punctuation 2014-09-01 13:25:38 +09:00
Chris Frederick cca9c50c26 Add 'title' to url_placeholders 2014-09-01 12:53:31 +09:00
Chris Frederick bcb6798838 Pass the filename as an argument to Document#slug 2014-09-01 12:45:41 +09:00
Parker Moore 081e34a5ab Merge pull request #2858 from jekyll/auto-enable-watch 2014-08-31 00:05:42 -07:00
Parker Moore b5dbc36975 Use Jekyll.sanitized_path when adding static files to Collections.
h/t @benbalter https://github.com/jekyll/jekyll/pull/2737#discussion_r16713423
Not sure if the previous code can be exploited, but being super safe is never a bad thing.
2014-08-30 23:09:47 -07:00
Parker Moore 6cee2a87cc Auto-enable watch on 'serve'.
Addresses @kneath's and @chibicode's comments in #2695.
2014-08-30 22:52:41 -07:00
Parker Moore eea5921856 Fix test for Liquid rendering in Sass. 2014-08-30 21:54:50 -07:00
Parker Moore 190ab7f6b8 Merge pull request #2830 from kansaichris/render-liquid-in-coffeescript 2014-08-28 19:35:44 -07:00
Faruk AYDIN d395183ee2 refactored where filter comment 2014-08-28 22:46:53 +03:00
Chris Frederick 79992fc3c8 Fix inaccurate comments 2014-08-26 17:17:13 +09:00
Chris Frederick 71b10e2d4a Make render_with_liquid? true for CoffeeScript 2014-08-26 17:14:33 +09:00
Parker Moore 56cd73eb35 Merge pull request #2799 from kansaichris/add-title-to-collection-permalinks 2014-08-25 23:15:23 -07:00
Chris Frederick a72706ace6 Add Document#slug 2014-08-26 11:46:01 +09:00
Chris Frederick cc4a0d1704 Change :title to :name 2014-08-26 11:26:19 +09:00
Ruslan Korolev d9da7cbd76 add class << self idiom to new command 2014-08-25 10:59:58 +04:00
Chris Frederick e8b00fb6f2 Add the 'title' variable to collection permalinks 2014-08-23 14:50:55 +09:00
Kamil Dziemianowicz 3b7091aab7 Find variables in _config.yaml by searching with relative file path. 2014-08-20 00:07:51 +02:00
James Smith cccfda7de8 hashrockets in CSV loading 2014-08-17 08:34:38 +01:00
James Smith 866935dadf map with proc for CSV loading 2014-08-16 20:26:29 +01:00
James Smith 687176e22c Autoload csv files from data directory 2014-08-16 14:54:14 +01:00
Parker Moore 4d8e335da1 The mighty classifier --- reborn!!!!!
Use classifier-reborn v2.0 in place of classifier 1.3.
Code at https://github.com/jekyll/classifier-reborn
2014-08-13 00:29:40 -04:00
Parker Moore 9738ea452f Merge pull request #2723 from jekyll/release-2-3-0 2014-08-13 00:04:15 -04:00
Kevin 566d3718b0 added sassify and scssify filters fot converting sass and scss strings to css 2014-08-12 21:24:04 -06:00
Parker Moore 10cc45fc45 Add StaticFile#destination_rel_dir 2014-08-12 18:07:13 -04:00
Parker Moore 530e049d2d Read in static files info `collection.files` as `StaticFile`s. 2014-08-12 15:59:45 -04:00
Parker Moore f16a5cbae1 Add Utils.has_yaml_header? so we can check the front matter existence in one place 2014-08-12 15:58:02 -04:00
Parker Moore 7b1763a124 Release 💎 v2.3.0 2014-08-12 14:39:21 -04:00
Parker Moore eabde41267 Merge pull request #2733 from jekyll/sass-in-liquid 2014-08-12 14:36:15 -04:00
Parker Moore 707278f099 Use the proper extname getter. 2014-08-12 14:11:27 -04:00
Parker Moore ba63a2c6d1 Merge pull request #2731 from jekyll/doc-to_s 2014-08-12 13:47:32 -04:00
Parker Moore 8ff9074ce5 Allow Sass files to be rendered, but never place them in layouts.
Fixes #2573.
2014-08-12 13:38:53 -04:00
Parker Moore db34c48927 Just like for Convertible, place the un-layouted content in document.content. 2014-08-12 12:52:38 -04:00
Parker Moore 2fd155615f Forgot a question mark == broken tests. 2014-08-12 12:22:48 -04:00
Parker Moore e36d433100 FrontmatterDefaults#update_deprecated_types deals with a set, not a scope 2014-08-12 12:22:39 -04:00
Parker Moore 9c090c862f Ask about 'Draft' before asking about 'Post'
`Draft`s are a subclass of `Post` so `draft.is_a?(Post)` will return
`true`, thus making all `Draft`s `Post`s, which is not desired. If
asking about `Draft` first, then we avoid this problem.

Fixes #2726
2014-08-12 11:52:16 -04:00
Parker Moore 60c29561f2 Use plural 'type' in front matter defaults for pages/posts/drafts
Fixes #2657
2014-08-12 11:50:02 -04:00
Parker Moore d57c4f1c01 Document#to_s should produce just the content of the document.
Fixes #2655
2014-08-12 11:25:28 -04:00
Parker Moore 1dcf241677 Merge pull request #2722 from jekyll/don-t-concat-extnames 2014-08-12 11:19:53 -04:00
Parker Moore 1666bbc52e Call #to_liquid before calling #to_json in jsonify filter. 2014-08-11 20:16:42 -04:00
Parker Moore fd2d7df9b7 Don't concat extnames in output for multiple converters 2014-08-10 20:32:29 -04:00
Parker Moore 6f8b8816f5 Merge pull request #2704 from jekyll/mult-converters 2014-08-10 20:29:37 -04:00
Parker Moore 47b38cf9ee Merge pull request #2716 from jekyll/reform-watch 2014-08-10 20:28:38 -04:00
Parker Moore 11373acb15 Merge pull request #2720 from jekyll/read-in-utf8 2014-08-10 16:45:11 -04:00
Parker Moore 9b3ccee3dd Pass in options to File.open in Document. 2014-08-10 16:23:33 -04:00
Parker Moore 68fb130fd0 Add magic comments for UTF-8 2014-08-10 16:16:48 -04:00
Parker Moore 45a347c022 Read in every Document's content as UTF-8 2014-08-10 16:16:41 -04:00
Parker Moore 69cc414c1b Don't need to capture the group. 2014-08-10 15:44:36 -04:00
Parker Moore 3264766762 Use case-insensitive checking for the file extensions when loading config files. 2014-08-10 14:37:41 -04:00
Parker Moore c7c1eddd47 It's called Jekyll::Watcher 2014-08-10 14:33:11 -04:00
Parker Moore a2dfd6eddc Refactor based on jekyll-watch clean-up.
https://github.com/jekyll/jekyll-watch/pull/5
2014-08-09 00:13:18 -04:00
ChaYoung You c8d1c3d264
Remove duplicated mixed case categories 2014-08-07 11:27:42 +09:00
ChaYoung You 3768d90278
Use category in downcase only for URL (Resolves #1739) 2014-08-07 11:27:41 +09:00
Parker Moore 939c67222a Check to make sure the command is valid. 2014-08-06 21:28:21 -04:00
Parker Moore 23515acc31 Slim down help command. 2014-08-06 21:20:39 -04:00
Parker Moore a0f449d613 Add 'jekyll help' command.
Ref: #2695
2014-08-06 21:17:44 -04:00
Bret Comnes d0ac4915cb Reverts 18c033dc5c
The merge that is reverted assigned categories to posts
based on the subfolders in the _posts directory and 
was merged under the understanding that it was fixing a bug.

Subfolders in the _posts directory should not assign 
metadata information to posts at this point in time and 
was not a bug.
2014-08-06 14:20:03 -07:00
Parker Moore d004bc4ea5 Allow Convertibles to be converted by >= 1 converters. 2014-08-06 16:20:24 -04:00
Parker Moore 229cedfc50 Reorganize and update default configuration settings. #2456. 2014-08-06 16:01:47 -04:00
Parker Moore cb671acd0c Merge pull request #2682 from alfredxing/date-parser-util 2014-08-06 15:30:02 -04:00
Parker Moore 21b6a01980 Merge pull request #2693 from ivantsepp/2142_partial_liquid_output_tag_in_include_tag 2014-08-06 15:28:07 -04:00
Parker Moore 5eacc9e831 Merge pull request #2696 from jekyll/jekyll-autogeneration-disabled 2014-08-06 15:27:16 -04:00
Parker Moore a27313b1d0 Use helper method #deprecation_message in Deprecator.no_subcommand. 2014-08-05 16:43:38 -04:00
Parker Moore 9fd872e7b8 Notify the user when auto-regeneration is disabled. 2014-08-05 15:55:43 -04:00
Martin Seeler 13425266eb Fixed Typo in error message 2014-08-05 15:37:09 +02:00
Ivan Tse 0594adb8fd Allow VARIABLE_SYNTAX to collect partial variables 2014-08-05 01:04:36 -04:00
Alfred Xing 4cfbdb07bb Show input in error message
Show date input in error message to make it easier for user
to find infringing date/file
2014-08-02 11:51:04 -07:00
Parker Moore 81807cb5af Merge pull request #2615 from alfredxing/collections-static-files 2014-08-02 14:44:45 -04:00
Alfred Xing d5322a73bf Move instances of `Time.parse` into a Utils method 2014-08-02 09:38:50 -07:00
Alfred Xing 5fdf637c6a Cache information about document YAML header existence 2014-08-01 22:03:29 -07:00
Alfred Xing 989d5d357b Use `relative_path` in error message instead of `path` 2014-08-01 21:00:17 -07:00
Alfred Xing f8c19df79a Add friendly error message for invalid dates
Catch the `ArgumentError` when parsing dates from the YAML front
matter
2014-08-01 21:00:17 -07:00
Parker Moore 4ca3fe5137 Merge pull request #2664 from alfredxing/replace-deprecated-methods 2014-08-01 23:27:58 -04:00
Parker Moore 503e54779a Merge pull request #2673 from lucianosousa/patch-1 2014-08-01 23:27:13 -04:00
Alfred Xing 274c6d3667 Allow static files in collections
Allow Documents to be static files so static files can exist in collections
2014-08-01 13:24:27 -07:00
Luciano Sousa 33cd956e4e improving strftime call
set non padded config to avoid parse string type twice
2014-08-01 00:02:41 -03:00
Alfred Xing 6d62dbbafc Replace deprecated Ruby methods
Replace `Hash#has_key?` and `File.exists?` with `Hash#key?`
and `File.exist?`
2014-07-31 12:50:20 -07:00
Alfred Xing 9437a7abcd Don't require the `scope` key in front matter defaults
Set defaults for `scope` in front matter defaults as per #2656
2014-07-31 11:17:35 -07:00
Parker Moore dc894e41af Prep for v2.2.0 release. 2014-07-29 19:02:51 -04:00
Parker Moore 3cb2e74b5c Add further testing for Highlight#sanitized_opts 2014-07-29 16:30:44 -04:00
Parker Moore a4c9925e99 Whitelist three Pygments options.
- startinline
- hl_lines
- linenos
2014-07-29 14:20:49 -04:00
Parker Moore 592afc270e Merge pull request #2620 from alfredxing/warn-on-layout-nonexistent 2014-07-29 00:11:41 -04:00
Alfred Xing 2785d702e2 Remove 'none' as a valid layout 2014-07-28 18:35:47 -07:00
Sylvain UTARD 592630d48c Do not forget to downcase the categories here as well 2014-07-27 00:29:31 +02:00
Sylvain UTARD 16dbe54560 When using subdirs to reflect categories, the underlying `categories` attribute was not set 2014-07-24 18:59:26 +02:00
Florian Weingarten 2eb57279fe Remove unnecessary Jekyll::Tags::IncludeTag#blank? method 2014-07-22 21:06:43 +00:00
Alfred Xing 7586538432 Use `is_a?` instead of `class` 2014-07-21 09:23:21 -07:00
Alfred Xing 4bd5614f4c Exclude excerpts from layout checks 2014-07-20 12:57:40 -07:00
Alfred Xing c8e0fcfcdf Fix up errors in CI build 2014-07-20 12:56:54 -07:00
Alfred Xing 7fa30c0dec Add path of file requesting nonexistent layout 2014-07-20 12:17:04 -07:00
Alfred Xing a0d679439f Move layout validity logic to separate method 2014-07-20 10:01:09 -07:00
Alfred Xing 072ddb799f Do the same for documents 2014-07-20 09:18:35 -07:00
Alfred Xing ac744a6313 Give a build warning if a layout does not exist
Throw a warning if a non-"none" layout is specified but the corresponding
layout file does not exist.
2014-07-20 09:17:19 -07:00
Alfred Xing 475e08bba3 Replace all RubyForge links with new residences 2014-07-16 13:43:09 -07:00
Parker Moore c7cc36abdb Put errors/exceptions into Jekyll::Errors module 2014-07-12 13:47:59 -07:00
Parker Moore a97ae67552 Gracefully require 2014-07-12 13:46:49 -07:00
Parker Moore 685cdbe124 Release Jekyll v2.1.1 2014-07-10 09:40:36 -07:00
Alfred Xing 28131624b8 Don't use old `@url` variable
Fix for #2557
2014-07-07 10:54:19 -07:00
Parker Moore a66d96ce0a Use Jekyll.sanitized_path more. 2014-07-01 18:29:15 -04:00
Parker Moore 8882f4dd14 Merge pull request #2554 from alfredxing/fix-build-tomdoc 2014-06-28 21:37:25 -04:00
Alfred Xing bb9517b73f Fill in a bit of missing TomDoc
Fill in a piece of missing doc for the `build` function in `commands/build.rb`
2014-06-28 17:48:19 -07:00
Parker Moore 08d0ff0922 Bump version in gem. 2014-06-28 17:41:29 -04:00
Parker Moore e332197660 Be quiet very quickly. Fixes #2520. 2014-06-28 17:19:40 -04:00
Parker Moore 5f7a3f2b69 Filter out directories from entries in the collection 2014-06-28 16:51:30 -04:00
Parker Moore 02676572dd Allow dots in collection labels. 2014-06-28 16:51:19 -04:00
Parker Moore 12b47cc037 Spike out jekyll <cmd> --watch into a separate gem. 2014-06-27 16:41:10 -04:00
Parker Moore 6a7386e6ba Merge pull request #2432 from jekyll/docs-4-ci 2014-06-27 16:39:19 -04:00
Parker Moore bd4a8c1ce2 Fixes, fixes. 2014-06-27 15:32:16 -04:00
Parker Moore d16f62cb38 Ensure exclude and include arrays are arrays of strings.
Fixes #2542.
2014-06-25 16:56:27 -04:00
Parker Moore cedbdf43ca Merge pull request #2532 from alexmedearis/hl_lines 2014-06-25 16:14:14 -04:00
Parker Moore 20180923cf Merge pull request #2490 from penibelst/deep-defaults 2014-06-24 23:04:38 -04:00
Parker Moore 6e104c3ed0 Ensure the post categories are unique (only one). Ref: #2527 #2531
h/t @Nicholas-Perry
https://github.com/jekyll/jekyll/issues/2527#issuecomment-47041756
2014-06-24 19:15:02 -04:00
Anatol Broder edbc273829 Use Utils.deep_merge_hashes 2014-06-24 20:24:26 +02:00
Anatol Broder 5f807e7421 Merge deep 2014-06-24 20:20:15 +02:00
Parker Moore dc074fcc50 Merge pull request #2477 from jekyll/serve-skip-initial-build 2014-06-23 19:06:10 -04:00
Parker Moore d359c63018 Merge pull request #2493 from jekyll/fix-sort 2014-06-23 19:02:54 -04:00
Parker Moore e75dcc18f1 Merge pull request #2511 from denilsonsa/patch-1 2014-06-23 19:01:31 -04:00
Parker Moore b0e51e2cba Merge pull request #2524 from jekyll/all-html-files 2014-06-23 18:59:57 -04:00
Parker Moore e58c1ee306 Merge pull request #2531 from jekyll/merge-post-categories 2014-06-23 18:58:51 -04:00
Simon Sarris 74f0f27d18 Before copying file, explicitly remove the old one
On Windows, FileUtils.cp(path, dest_path) will fail with a Permission
Denied if the dest_path already exists and is read-only. People have
complained about this since at least 2008.

This lets `jekyll build` work without error in Windows when one or more
read-only files exist.

This change will accommodate users of Team Foundation, which uses the
read-only flag for for source control status. (dumb, I know, but but a
real problem)
2014-06-19 18:25:00 -04:00
Parker Moore 5846cc7b70 No private methods in LogAdapter. 2014-06-19 17:11:04 -04:00
Alex Medearis b202b508f2 handles line numbers with more than 1 digit 2014-06-18 17:48:50 -07:00
Alex Medearis 674b540c6f unit tests 2014-06-18 17:27:27 -07:00
Alex Medearis 8b860d3f0e Fixes highlight.rb to correctly parse list values 2014-06-18 17:08:50 -07:00
Parker Moore 99cc12cc0a Merge file system categories with categories from YAML.
Fixes #2527
2014-06-18 18:10:07 -04:00
Parker Moore a78b5c2f8d Include files with a url which ends in / in the site.html_pages list
https://github.com/jekyll/jekyll-sitemap/issues/27
2014-06-17 15:18:41 -04:00
Denilson Figueiredo de Sá cc734930c6 Making `highlight` behave more like redcarpet
See issue 2510 for details.
2014-06-13 03:31:38 -03:00
Parker Moore d59b2c3ef6 Merge pull request #2419 from jens-na/collection-defaults 2014-06-12 20:38:21 -04:00
Parker Moore 50b04cdf92 Use `raise` instead of logging & aborting 2014-06-08 19:33:45 -04:00
Parker Moore ccee1b6a55 Try item#to_liquid before looking at the data 2014-06-08 19:33:37 -04:00
Parker Moore ccf97a62f1 Merge pull request #2459 from ivantsepp/watch_ignore_files 2014-06-06 23:11:44 -04:00
Ivan Tse 6684a8f914 Refactor logic into Command class. Add tests. 2014-06-04 14:23:40 -04:00
Parker Moore b126159360 Skip initial build of site on serve with flag.
Adds --skip-initial-build flag to jekyll-serve, which serves the destination
immediately rather than waiting for the site to be built.

Fixes #1252.
2014-06-03 13:30:14 -04:00
Bud Parr 441ac3742c remove extra space 2014-06-02 15:05:03 -04:00
Bud Parr 90bc9314f1 change label to collection
To make it clear the label is of the document's collection
2014-06-02 14:32:52 -04:00
Bud Parr 00ab79b7cf add collection.label to Document#to_liquid 2014-06-01 21:45:23 -04:00
Jens Nazarenus 497c10897f Passes the url to FrontmatterDefaults.all instead of full path 2014-06-01 22:21:31 +02:00
Jens Nazarenus c8786b7b28 Adds default front-matter support for collecitons 2014-06-01 22:21:31 +02:00
Parker Moore 879abc0949 Externalize the {% gist %} tag as the jekyll-gist gem. 2014-06-01 13:18:00 -04:00
Parker Moore 83fb1fd0f6 Merge pull request #2444 from createdbypete/configurable-logger 2014-05-30 18:16:47 -04:00
Parker Moore 6849d6a5e5 If rouge isn't there, say so.
In the previous version, it would say 'redcarpet' wasn't installed,
due to the rescue LoadError block on line 93. This change will tell
the user that, in fact, rouge isn't installed and that this is the
cause of the error, not that redcarpet isn't installed.

Fixes #2464.
https://github.com/jekyll/jekyll/issues/2464
2014-05-30 17:59:47 -04:00
Parker Moore e9ac432e0f Merge pull request #2458 from karouf/cleaner-empty-dirs 2014-05-30 11:35:35 -04:00
Renaud Martinet a324eafac4 Using implicit returns to conform to coding style 2014-05-30 08:46:31 +02:00
Ivan Tse c4434f27af Get relative paths of directories to ignore
Use `Pathname#realpath` to get absolute paths so that
`Pathname#relative_path_from` will not raise an exception. Also add the
config files to this list.
2014-05-28 01:16:34 -04:00
Ivan Tse 6ba077cf37 Remove `Command.globs` method
It is no longer being used.
2014-05-28 01:15:07 -04:00
Renaud Martinet 72c410363c Keep parents of directories in keep_files
Closes #1297
2014-05-27 21:11:17 +02:00