Commit Graph

1770 Commits

Author SHA1 Message Date
Will Norris 669c803912 always include file extension on destination files
This ensures that destination files for HTML posts, pages and
collections always include the proper file extension (as defined by
output_ext) regardless of permalink structure.  This allows for URLs
that contain no extension or trailing slash to still result in proper
destination files with .html extensions.

Because this change relies so heavily on output_ext accurately
identifying the extension of the destination file, this change also
removes the feature test that tested support for permalinks with a .htm
extension.  In order to support alternate file extensions, a future
patch or plugin will need to modify the output_ext value, at which point
everything else should work as expected.
2015-03-02 21:20:54 -08:00
Joop Aué 7a31029c79 Removed deprecation inconsistency
Replaced occasions where the logger was used to report deprecations.
Deprecator is now used instead.

Signed-off-by: Joop Aué <joopaue@gmail.com>
2015-03-02 21:54:05 +01:00
Martin Jorn Rogalla 92a9582733 Corrected error message as suggested by @parkr.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 11:16:08 +01:00
Martin Jorn Rogalla 78af3c5018 Improved clarity of sort nil input error message.
Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 09:51:59 +01:00
Martin Jorn Rogalla 0565308ce6 Added test to check on nil input for sort filter.
- Added a test to check if the sort filter will raise the correct
   exception on given nil input.
 - Improved error message and used "nil" consistently.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-03-01 09:40:32 +01:00
Martin Jorn Rogalla 531d0fb261 Sort will now raise error on nil object array input.
Sort will now throw an error when a nil object array is given as input.
See issue #3491 for more information.

Signed-off-by: Martin Jorn Rogalla <martin@martinrogalla.com>
2015-02-26 22:12:06 +01:00
Parker Moore 3f3b203992 Use end_with? instead of regexp for adding index.html 2015-02-25 11:59:27 -08:00
ChaYoung You 7db9397a9d
Remove trailing whitespace 2015-02-22 20:27:15 +09:00
Parker Moore 52c4ce2a5a Finish of moving the unit tests over to Minitest 2015-02-21 00:31:07 -08:00
Will Norris 6e89c1c02b write .jekyll-metadata even on full_rebuild
For a full rebuild, we certainly don't want to *read* from
.jeykll-metadata, but we should still write it.  Otherwise, a subsequent
incremental build would have to do a full rebuild again since there is
no metadata file to start from.
2015-02-14 22:43:43 -08:00
Will Norris 58dc1f77e9 add draft? method to identify if Post is a draft 2015-02-14 00:01:27 -08:00
Parker Moore c6d5a913f1 Site#read_data_file: read CSV's with proper file encoding
Fixes #3451.
2015-02-13 19:39:15 -08:00
Ryan Tomayko 491cce7a99 Avoid requiring webrick at boot time
This is a bit uglier but allows deferring loading webrick until the
serve command is invoked as opposed to when it's required.
2015-02-12 22:16:12 -05:00
Ryan Tomayko e99a9e5821 Custom WEBrick FileHandler for stripping .html extension
This first performs the normal static file check at the exact
location. If no file is found, attempt the check again with an
".html" suffix.

See the following for base class search_file implementation:

https://github.com/ruby/ruby/blob/4607f95/lib/webrick/httpservlet/filehandler.rb#L363-L383
2015-02-12 21:58:35 -05:00
Mark Tareshawty f933164a2a use SCREAMING_SNAKE_CASE and remove --destination from --source options 2015-02-10 15:02:49 -05:00
Mark Tareshawty c96abf7e82 added -s and -d 2015-02-10 11:08:22 -05:00
Parker Moore bf149a0b97 highlight: fix problem with linenos and rouge.
Found by @EdMcBane in https://github.com/jekyll/jekyll/pull/3435

The strange regexp we were doing to replace the <pre><code></pre></code>
bits in the Pygments output were wreaking havoc on Rouge output
because Rouge uses <pre>'s to wrap line numbers.

To be consistent, the output from render_* should *not* include
the wrapping <div> and <pre> tags. It should just be what was
inside. We can then wrap it in our own custom tags without using
any regular expressions, as God intended. Death to regular
expressions and HTML manipulation!
2015-02-09 21:42:52 -08:00
Parker Moore c625b94bc0 Merge pull request #3401 from jekyll/fix-code-cleanup 2015-02-09 16:26:19 -08:00
Parker Moore 571800c8ad Use 3 places to the right of the decimal place instead of 2. 2015-02-07 23:57:07 -08:00
eksperimental d795113e94 Update build.rb
parenthesis added to round
2015-02-07 23:57:07 -08:00
eksperimental dbc8530068 Show only two decimals in time to generate pages
no need to display 10 decimals.
it feels up my screen with useless numbers! ;-p
2015-02-07 23:57:07 -08:00
Mark Tareshawty 120d3e07ca added flags from docs 2015-02-06 13:27:23 -05:00
eksperimental 5e541b5eb0 fix quote 2015-02-05 16:48:59 +07:00
Parker Moore d24ea66933 The highlight tip should only clip the newlines before and after the *entire* block, not in between.
Ref: https://github.com/jneen/rouge/issues/230
2015-02-01 22:37:10 -08:00
Jordon Bedwell 9ba9c47cd6 Fixes #3339 Add `pkill -f jekyll` to ways to kill.
This shows people how to kill Jekyll without knowing the PID using `pkill` (you could also do `kill -9 $(pgrep -f jekyll)` but that is just the long way around doing `pkill -f` so it shouldn't be shown in the Jekyll logger but can be documented here for people.
2015-02-01 06:45:52 -06:00
Parker Moore 3318c38eec Merge pull request #3391 from jekyll/enspeeden-include 2015-01-31 15:41:34 -08:00
Parker Moore a87cda4b12 Add configuration fallback for paginate, and fix tests. 2015-01-31 13:53:17 -08:00
Parker Moore 65d43ef398 Move previous runtime dependencies to development dependencies. 2015-01-31 13:53:17 -08:00
Parker Moore 057b8cae7f Use `rouge` as the default syntax highlighter. 2015-01-31 13:52:50 -08:00
Parker Moore 336bb44750 Use #require_with_graceful_fail in Highlight tag. 2015-01-31 13:52:26 -08:00
Parker Moore 18e0d2fe75 Make the {% include %} tag a teensy bit faster. 2015-01-31 12:59:25 -08:00
Parker Moore aceb5b5d53 Merge branch 'jekyll-gjtorikian-patch-1'
* jekyll-gjtorikian-patch-1:
  Use the source_dir() helper
  Add test for new extracted method
  Factor out a `read_data_file` call to keep things clean
2015-01-31 00:12:33 -08:00
Parker Moore 0c624eb11b The :title URL placeholder for collections should be the filename slug.
This mimicks posts most closely. It can be overridden by the
YAML front matter.

Undoes some of #2864.
2015-01-30 01:53:11 -08:00
Garen Torikian e1e60499b1 Factor out a `read_data_file` call to keep things clean 2015-01-29 12:41:19 -08:00
kaatt ff646738fc Shows time after initial generation 2015-01-30 01:32:00 +05:30
Alfred Xing 31b03e9b86 Merge pull request #3325 from imathis/generate-url 2015-01-24 11:21:51 -08:00
Parker Moore 317e2f460e Release 💎 v3.0.0.beta1 2015-01-24 09:55:46 -08:00
Alfred Xing 58e231ce40 Rename Regenerator#write to Regenerator#write_metadata 2015-01-19 16:29:50 -08:00
Alfred Xing fe5f0d124c Move all regenerate? checking to Regenerator 2015-01-18 11:05:06 -08:00
Brandon Mathis 589919d58a Strip slashes on nil url tokens 2015-01-18 08:31:14 -06:00
Parker Moore c378f741a8 Merge pull request #3319 from jekyll/split-off-textile 2015-01-17 17:08:15 -08:00
Parker Moore cbe5f8e4dd Merge pull request #3321 from jekyll/performance-upgrades 2015-01-17 16:55:51 -08:00
Parker Moore c1da91cf5c Start removing mentions of Textile. 2015-01-17 16:51:28 -08:00
Parker Moore 877cba9811 Remove direct baked-in support for Textile. 2015-01-17 16:51:28 -08:00
Pascal Borreli d28fb07bb9 Fixed typo [ci skip] 2015-01-18 00:45:28 +00:00
Parker Moore aaf0ba15cc Use frozen regular expressions for Utils#slugify 2015-01-17 16:25:33 -08:00
Parker Moore ef2d558874 Markdown#matches should avoid regexp 2015-01-17 16:25:10 -08:00
Parker Moore 10659e1eef Merge branch 'nitoyon-slugify-new-param'
* nitoyon-slugify-new-param:
  Remove superfluous Sass declarations.
  Move the slugify options out to their own section so as to fix the formatting.
  Document the mode parameter of slugify Liquid filter
  Add tests for mode parameters of slugify Liquid filter
  Add mode parameter to slugify Liquid filter

Conflicts:
	lib/jekyll/utils.rb

        ---> Hadn't added UTF-8 support in nitoyon's PR.
2015-01-17 16:06:10 -08:00
Parker Moore b2099ac763 Merge branch 'davidized-collection_yaml_dots'
* davidized-collection_yaml_dots:
  Move YAML Front Matter regexp into a constant.
  Add support for collections documents to have YAML front matter ending in dots.

Conflicts:
	test/test_collections.rb
2015-01-17 15:24:33 -08:00
Parker Moore c7d92c4e6d Move YAML Front Matter regexp into a constant. 2015-01-17 15:23:33 -08:00
Parker Moore 6d9b4c2aba Merge pull request #2774 from dziemian007/formatter_variables_by_relative_path 2015-01-17 15:16:50 -08:00
Parker Moore a312115a5a Merge pull request #3014 from jekyll/revert-3013-revert-2921-post-dest 2015-01-17 15:13:17 -08:00
Parker Moore 84cfc1ceff Merge branch 'majioa-devel'
* majioa-devel:
  Ensure Post#excerpt_separator always returns a string.
  get procedure for default excerpt separator for both cases site and page was moved to the post's specific method :excerpt_separator.
  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-17 15:01:20 -08:00
Parker Moore 18f3d76603 Ensure Post#excerpt_separator always returns a string. 2015-01-17 14:59:44 -08:00
Parker Moore ba2e1390ad Merge pull request #2571 from yous/patch-mixed-case-category 2015-01-17 14:55:30 -08:00
Matt Rogers ce78ea7818 Merge pull request #3220 from inukshuk/patch-1 2015-01-13 19:02:41 -06:00
Ryan Burnette 80465efff7 Require date in filters.rb 2015-01-13 13:51:47 -05:00
Ryan Burnette 936c737a32 Address #3298 2015-01-13 02:21:28 -05:00
Sylvester Keil 60921132c6 Preserve original mtime when copying static files 2015-01-12 13:00:35 +01:00
Parker Moore 4cbd814546 Add support for Windows line feeds too. 2015-01-09 23:55:47 -08:00
Malo Skrylevo a0f2b5f944 get procedure for default excerpt separator for both cases site and page was
moved to the post's specific method :excerpt_separator.
2015-01-10 04:05:16 +03:00
Kevin Ushey b92274b101 only strip newlines when rendering highlight blocks (#3265) 2015-01-09 00:07:11 -08:00
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