Commit Graph

1102 Commits

Author SHA1 Message Date
Pat Hawks 6ef2bcb29a Rubocop: test/test_filters.rb 2016-05-25 21:59:11 -05: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 aff1430608
Fix tests for document drop JSONification based on master updates. /cc #4914 2016-05-25 16:04:16 -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 cf810a88fa Merge pull request #4942 from pathawks/fp/configuration-from-permalink-fix
Merge pull request 4942
2016-05-25 15:42:05 -07:00
Parker Moore f8c708ffec Fix test to simply ensure next is an object in jsonify 2016-05-24 19:08:50 -05: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
Pat Hawks cc0c5ea19e Rubocop fixes 2016-05-24 19:01:35 -05:00
Parker Moore 7641971d7e Fix tests for plugins in configuration. 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 ad59b6e62a Remove merge conflicts I forgot to fix. 2016-05-24 18:49:02 -05:00
Parker Moore 37b93f10dd Add missing 'end' to test/helper.rb 2016-05-24 18:47:15 -05:00
Parker Moore 59346eb228 Remove call to #backwards_compatibilize in Configuration.from 2016-05-24 18:47:15 -05:00
Parker Moore 4e06f07ad4 Add tests for Configuration#add_default_collections 2016-05-24 18:47:14 -05:00
Parker Moore dbcbf809ff Refactor some tests to prevent manipulation of Jekyll::Config::DEFAULTS 2016-05-24 18:47:04 -05:00
Parker Moore c69ca4c11e Test#build_configs shouldn't overwrite default collections 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 3896f6d5d8 Use require_relative 2016-05-24 17:32:33 -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
Brint O'Hearn 6db5272528 Splitting args onto own lines in test/test_static_file.rb
For functions where the character limit was exceeded
and line wrapping was needed, this commit just splits
each arg into it's own line.
2016-05-20 21:24:34 -05:00
Brint O'Hearn 8f07affe2a Rubocop fixes for test/test_related_posts.rb 2016-05-20 21:23:29 -05:00
Brint O'Hearn a9f110b861 Rubocop fixes for test/test_sass.rb 2016-05-20 21:23:29 -05:00
Brint O'Hearn 16c1146b4f Rubocop fixes for test/test_static_file.rb 2016-05-20 21:23:29 -05:00
Brint O'Hearn 1380836a4b Rubocop fixes for test/test_theme.rb 2016-05-20 21:23:29 -05:00
Brint O'Hearn 013e2f159d Rubocop fixes for test/test_url.rb 2016-05-20 21:23:29 -05:00
Pat Hawks f7714add15 Add normalize_whitepace filter 2016-05-19 19:59:22 -07:00
Brint O'Hearn ce9a8cb0f2 Moving url to local var for better readability 2016-05-16 20:42:59 -05:00
Brint O'Hearn df585aa5c6 Moving expected output into variable to make asserts more readable 2016-05-16 20:13:50 -05:00
Brint O'Hearn b006810f17 Moving .with down one line 4x times 2016-05-16 19:59:13 -05:00
Brint O'Hearn 98eef8af95 Aligning hashes per 2caff75 2016-05-16 19:48:04 -05:00
Brint O'Hearn 211c16003e test/test_exerpt.rb variable assignment cleanup 2016-05-16 19:39:43 -05:00
Brint O'Hearn bc16d13d79 Shortening messages to keep things down to one line where possible 2016-05-16 19:31:43 -05:00
Brint O'Hearn 6ef54393c2 Rubocop fixes for test/test_redcarpet.rb 2016-05-16 19:26:53 -05:00
Brint O'Hearn de5d773a6a Rubocop fixes for test/test_rdiscount.rb 2016-05-16 19:26:53 -05:00
Brint O'Hearn df7992c626 Rubocop fixes for test/test_plugin_manager.rb 2016-05-16 19:26:53 -05:00
Brint O'Hearn df01b6825e Rubocop fixes for test/test_path_sanitization.rb 2016-05-16 19:26:53 -05:00
Brint O'Hearn c76b458dd5 Rubocop fixes for test/test_new_command.rb 2016-05-16 19:26:53 -05:00
Brint O'Hearn ad98883843 Rubocop fixes for test/test_log_adapter.rb 2016-05-16 19:26:53 -05:00
Brint O'Hearn 5a1a8c9c82 Rubocop fixes for test/test_liquid_extensions.rb 2016-05-16 19:26:53 -05:00
Brint O'Hearn 271a8aebfb Rubocop fixes for test/test_layout_reader.rb 2016-05-16 19:26:53 -05:00
Brint O'Hearn 0635bbba06 Rubocop fixes for test/test_generated_site.rb 2016-05-16 19:26:53 -05:00
Brint O'Hearn 555b2fbe72 Rubocop fixes for test/test_front_matter_defaults.rb 2016-05-16 19:26:53 -05:00
Brint O'Hearn c8cae38da6 Rubocop fixes for test/test_excerpt.rb 2016-05-16 19:26:53 -05:00
Brint O'Hearn cfe6cf7ca1 Rubocop fixes for test/test_doctor_command.rb 2016-05-16 19:26:53 -05:00
Brint O'Hearn 454a1e415c Rubocop fixes for test/test_convertible.rb 2016-05-16 19:26:53 -05:00
Brint O'Hearn 5034cc377a Rubocop fixes for test/simplecov_custom_profile.rb 2016-05-16 19:26:53 -05:00
Brint O'Hearn aad587ca2f Rubocop fixes for test/helper.rb 2016-05-16 19:26:53 -05:00
Brint O'Hearn 146d49dc8f Rubocop test cleanups for #4885
This commit cleans up rubocop violations for the following files:

test/test_ansi.rb
test/test_cleaner.rb
test/test_coffeescript.rb
test/test_collections.rb
test/test_command.rb
test/test_commands_serve.rb
2016-05-16 19:26:53 -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
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 d5dd423bfd
Add cucumber specs. 2016-04-21 16:09:23 -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
Parker Moore 655ffd45be Use source_dir instead of my own computer's path 2016-04-21 11:26:33 -07:00
Parker Moore 40e3a04704
test_document: scopes are based on relative_path 2016-04-18 13:56:02 -07: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 6ee728efcb Merge pull request #4537 from Crunch09/fix-warnings
Merge pull request 4537
2016-03-31 18:37:32 -07:00
Jussi Kinnula 4effe25cc1 Fix slugify test 2016-03-29 10:11:47 +03:00
Jussi Kinnula 487631e935 Add tests for ascii slugify mode 2016-03-29 09:07:30 +03:00
Jordon Bedwell f80321ecac Update Rake.
Update Rake and disable verbosity when running the specs because we have some
deprecated usage (for now -- however, see: jekyll/jekyll#4719) and because
Rouge, and Liquid throw out thousands (probably hyperbolic) of warnigns when the
specs are being ran.  We need upstream to fix their problems while we fix ours
or we'll all have a bad day, not that we aren't already.
2016-03-27 22:22:35 -05:00
Pierre Fenoll 9347e90a67 Use EntryFilter throughout & update tests 2016-03-26 16:40:19 +01:00
Pierre Fenoll 4aadfe9fd7 Add test that filters out symlink pointing outside site source 2016-03-26 14:16:43 +01:00
Parker Moore 33255e3ac3
IncludeTag: implement multiple load paths 2016-03-25 17:44:29 -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 6aae64c985 Update test_theme.rb 2016-03-25 15:22:29 -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
Ben Balter 0f90fe67d2 but who will test the testers? 2016-03-25 15:00:42 -04:00
Ben Balter 4a70382d5b test that themes register with sass 2016-03-25 14:48:44 -04: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
Jeff Kolesky 54fcc97725 Checks for link file extension in tests 2016-03-24 08:54:31 -07:00
Shinn Kondo c27c669796 Fix test teardown for cleaner. 2016-03-23 20:37:13 -05: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
Shinn Kondo 01d48320fd Merge remote-tracking branch 'upstream/master' 2016-03-23 19:33:22 -05:00
Parker Moore da35e134f1
Add test for creation of Gemfile by 'jekyll new' 2016-03-23 17:24:38 -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
Tom Fejfar 007b7d45dc
Ensure Rouge closes its div/figure properly after highlighting ends.
Fixes #4474
2016-03-23 14:04:11 -07:00
Pat Hawks aeecbd741f
Add test to inspect strings 2016-03-21 15:45:29 -07:00
jekyllbot 848b1358a1 Merge pull request #4491 from jekyll/ignore-tilde
Merge pull request 4491
2016-03-20 15:34:35 -07: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 97efa0f0ce Clean up Tags::PostUrl a bit 2016-03-15 16:06:25 -07:00
Saleem Rashid 64e4984ff5 theme: fix invalid theme test, really 2016-03-11 20:59:54 +00:00
Saleem Rashid 7b63c8d201 theme: fix invalid theme test 2016-03-11 20:45:22 +00:00
Ben Balter 0a04932020 remove assets dir from theme fixture 2016-03-11 14:46:05 -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 9e0ed00a59 Merge pull request #4555 from timwis/patch-1
Merge pull request 4555
2016-03-08 16:25:15 -08:00
Ben Balter c86fba6fb3 use /assets for theme assets, not _assets 2016-03-06 15:42:08 -05:00
Ben Balter 8b880cb993 add theme tests 2016-03-05 13:35:52 -05:00
timwis e130a0841f add test to ensure where doesn't match substrings 2016-03-03 15:56:54 -05: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
Parker Moore de8f67c4a2 Fix link issues in the site found by HTML Proofer. 2016-03-01 19:43:22 -08:00
jekyllbot f274179d9b Merge pull request #4618 from spudowiar/fix-test-state-leakage
Merge pull request 4618
2016-03-01 11:59:07 -08:00
Saleem Rashid b0c730d278 kramdown: fix state leakage (#4617) in test
fixes #4250
2016-03-01 18:41:04 +00: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 ac704b9763 Merge pull request #4545 from jekyll/allow-no-extensions-coll-docs
Merge pull request 4545
2016-02-29 15:50:29 -08:00
Tony Garnock-Jones fa1eb68941 Fix for issue #4582, plus simple test 2016-02-26 11:06:03 -05:00
timwis 3fbca47b1a add test for group_by size property 2016-02-25 10:41:23 -05:00
timwis f5f8548eb8 add tests for where arrays 2016-02-25 10:24:47 -05: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
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
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
jekyllbot 00d753612c Merge pull request #4404 from jekyll/bom-it
Merge pull request 4404
2016-01-28 17:20:33 -08:00
Alfred Xing 5fc48ffcb9 Suppress stdout in liquid profiling test
The test was spewing out some whitespace
2016-01-27 14:06:48 -08:00
Parker Moore b1868983c7 Add test for Page#dir in :date/nil modes 2016-01-27 08:44:59 -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 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
rebornix 1298ba6908 Fix #4188: Extract title from filename successfully when dateless. 2016-01-22 09:09:30 -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 a351a70b03 test: Slight refactor to doublecheck destination. 2016-01-18 14:08:53 -08:00
Parker Moore 275d56a0fe test: use {assert,refute}_exist everywhere 2016-01-18 13:45:36 -08:00
Parker Moore 2de5bacb41 pages' permalink' extnames must be respected
This reverts a bit of the work @willnorris had made to support
extensionless permalinks. Using the ‘permalink’ front matter will no
longer work as it must allow non-html extensions to be written.
2016-01-18 13:45:17 -08:00
Parker Moore 5cf5ce979f test: add assert_exist and refute_exist 2016-01-18 13:42:03 -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 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
Jordon Bedwell ea9cac5214 Add a nasty hack to reduce persistence until RSpec. 2016-01-15 14:15:28 -06: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
Pedro Euko 156e093b5c Ensure no errors when there is no permalink 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
Pat Hawks ba017ebb97
Remove old Fixme note 2016-01-11 22:32:04 -08:00
Jordon Bedwell 55423e344e Add CodeClimate to the testing stuff. 2016-01-10 11:18:46 -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
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 b6c283a4ae wip: allow custom extensions 2016-01-04 17:42:06 -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 5bf596b239 utils/drops: update Drop to support Utils.deep_merge_hashes
Fixes #4287
2015-12-27 08:06:37 -05:00
Pat Hawks 69a6323599 Utils.deep_merge_hashes failing test 2015-12-27 07:48:45 -05:00
Pat Hawks a47ce7b655
Wrap Arguments in () when used in a setter 2015-12-26 12:48:20 -08:00
Parker Moore d070a77716 url: fix issue with bad URL escaping when using Drop 2015-12-24 15:07:20 -05:00
Parker Moore cd2688ab66 test_excerpt & _page: use Drop instead of Hash to mock payload 2015-12-22 22:37:48 -05:00
Parker Moore 645a2cc664 test/test_doctor_command.rb: fix test for Doctor.urls_only_differ_by_case 2015-12-14 20:59:52 -08:00
Nick Quaranto 115926fd54 Change TestDoctorCommand to JekyllUnitTest since Test constant doesn't necessarily exist 2015-12-14 21:58:36 -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 4f21458b34 Merge pull request #4184 from ducktyper/allow-quoted-dates
Merge pull request 4184
2015-12-11 14:02:55 -08:00
Parker Moore c6255d5f28 Merge pull request #4223 from jekyll/pull/sample-filter
Merge pull request 4223
2015-12-04 14:12:18 -08:00
Jordon Bedwell 8efbdc01ff Fix #3791/#3478
* Add support for SSL through command line switches.
* Add suppport for file/index.html > file.html > directory.
* Add support for custom-headers through configuration.
* Modernize and split up the serve.
* Add a few basic tests.
2015-12-04 14:07:07 -06:00
Parker Moore 2e91d094e5 filters#sample: n == 1, return item; n > 1, return array 2015-12-04 10:25:13 -08:00
Jordon Bedwell 28c568386d Merge pull request #4220 from jekyll/pull/enable-codeclimate-platform
Fix: #4219: Add CodeClimate Platform.
2015-12-04 12:08:00 -06:00
Jordon Bedwell b6de905ee4 Fix: #4219: Add CodeClimate Platform. 2015-12-04 11:42:52 -06:00
Parker Moore 86195655d7 filters: allow sample(n) instead of just sample(1) 2015-12-04 09:40:57 -08:00
Parker Moore 96bc62c666 Add 'sample' Liquid filter
Equivalent to Array#sample functionality
2015-12-04 09:33:33 -08:00
Parker Moore 6cbd06ea85 Merge pull request #4109 from jekyll/cleanup-kramdown-converter
Merge pull request 4109
2015-12-04 09:21:22 -08:00
Jordon Bedwell 3432fd2c2d Modernize Kramdown for Markdown converter. 2015-12-04 08:09:08 -06:00
Parker Moore b90f8e048a Merge pull request #4150 from ducktyper/master
Merge pull request 4150
2015-11-30 19:57:01 -08:00
Ducksan Cho e60e5f3532 Allow quoted date in front matter defaults 2015-11-25 23:18:33 +13:00
Parker Moore ac1b2b88d4 Merge pull request #4160 from jekyll/fix-html-htm-xhtml-pages
Merge pull request 4160
2015-11-24 16:19:46 -08:00
Tim Cuthbertson a7730914df rename `@options` in HighlightBlock (clash with Liquid::Block). fixes #4173 2015-11-24 20:24:44 +11:00
ducksan cho e9f8b4df74 Add Windows support to Utils.safe_glob 2015-11-19 17:15:51 +13:00
Jordon Bedwell 90865d5fc1 Fix #4082: Allow users to use .htm and .xhtml (XHTML5.) 2015-11-18 16:02:03 -06:00
Ducksan Cho a168edae45 Add Utils.safe_glob method
which works the same way as Dir.glob but seperating the input
into two parts ('dir' + '/' + 'pattern') to make sure
the first part('dir') does not act as a pattern.
2015-11-19 00:46:46 +13:00
rebornix 6a98ab2a15 Make `:title` cased for backwards compability and add `:slug` for uncased usage. 2015-11-18 10:43:13 +08:00
Parker Moore db6103bdee Document: only superdirectories of the collection are categories 2015-11-04 15:18:02 +07:00
Paul Robert Lloyd 9d1641f163 Fix #3371 - kramdown:syntax_highlighter should automatically take value of highlighter 2015-10-31 23:58:49 +00:00
XhmikosR 3b55bd1a51 Trim trailing whitespace.
[ci skip]
2015-10-30 21:57:14 +02:00
Jordon Bedwell 71f4383d18 Fix #4075: Make sure that .jekyll-metadata is not generated when not needed. 2015-10-29 15:44:38 -05:00
Jordon Bedwell dfae4669e4 AUTOMATIC: Whitespace stripped. 2015-10-29 15:43:55 -05:00
Jordon Bedwell e5f26b5a36 Fix test warnings when doing rake {test,spec} or script/test 2015-10-29 15:18:19 -05:00
Florian Thomas cf71c563ab Handle empty config files
SafeYAML.load_file returns `false` when processing empty files so we
convert this into an empty hash for further processing.

fixes #4030
2015-10-28 22:31:42 +01:00
Alfred Xing 2a040fd527 Rename incremental regeneration flag
Rename from `full_rebuild` to disable, to `incremental` to enable
2015-10-26 14:20:44 -07:00
Alfred Xing d9b12bc090 Disable incremental regeneration by default in Jekyll 3.0
Disable the feature as it's still not 100% working 100% of the time. Feature
can be re-enabled by specifying `full_rebuild: false` in the configuration
2015-10-26 13:37:47 -07:00
Parker Moore b89f943bf2 collections: posts as collection 2015-10-26 00:29:14 -07:00
Jordon Bedwell 84089f9ebe Merge pull request #4033 from jekyll/ignore-more-bundler-directories
Ignore `.bundle` when generating test coverage
2015-10-16 06:10:35 -05:00
Matt Rogers ff504a39ba Ignore `.bundle` when generating test coverage
Fix the code coverage reporting when using `.bundle` to store my gems in
by having SimpleCov ignore that directory. Use of `.bundle` to store my
gems consolidates things since since that directory also holds the
bundler config file. It also keeps a `vendor` directory out of the
project tree for non-Rails projects.  Simplecov was not ignoring that
directory though, which meant that the code coverage numbers I were
seeing locally were wrong (and very frightening). With this change, all
is right with the world once again. 😃
2015-10-15 20:59:34 -05:00
Kevin Locke bb9462f12f Whole-post excerpts should match the post content
When a post does not contain an excerpt_separator, meaning the excerpt
includes the entire post, the excerpt should contain exactly the post
content.

This is desirable both from a correctness standpoint, that the excerpt
should not introduce any new content, and more practically to allow fast
and easy detection of whole-post excerpts in Liquid templates using
`post.excerpt == post.content`.  A common use-case is deciding whether
to render "Read More" links on a page containing post excerpts.

This commit does exactly that.  It avoids adding additional newlines to
the excerpt content when the excerpt includes the whole post and adds
tests to ensure that this behavior is correct and preserved going
forward.

Signed-off-by: Kevin Locke <kevin@kevinlocke.name>
2015-10-01 13:58:00 -07:00
Parker Moore 4169075dd1 filters: `where` should compare stringified versions of input & comparator
Non-string input was being missed as a result of poor comparison.
Converting inputs to strings ensure numerical and boolean values are
properly compared.

Fixes #3911.
2015-08-25 23:00:58 -07:00
Fabio Niephaus 2812341c37 Merge branch 'master' of https://github.com/jekyll/jekyll into _includes
Conflicts:
	bin/jekyll
2015-08-09 16:22:33 +01:00
Fabio Niephaus ac56e9dd16 Make _includes directory configurable; closes #2684
and rename `plugins`, `layouts` and `data_source` directories for consistency
2015-08-09 16:20:58 +01:00
Veres Lajos d652f6e337 typofix in test/test_regenerator.rb 2015-08-08 21:28:36 +01:00
Robert Papp 371ca58e69 Fixes #3776 by changing to the correct name for whitelisting. 2015-08-05 00:20:14 +02:00
Shinnosuke Kondo e0b8539670 Added a new case for test_clearner
where a directory is not in keep_files, but its path contains a string in keep_files.
2015-07-13 17:47:42 -05:00
Mike Bland 250b6ebb7e Adapt StaticFile for collections, config defaults
This enables files such as images and PDFs to show up in the same relative
output directory as other HTML and Markdown documents in the same collection.

It also enables static files to be hidden using defaults from _config.yml in
the same way that other documents in the same collection and directories may
be hidden using `published: false`.
2015-06-29 19:58:27 -04:00
Parker Moore 8b44a7bb42 Merge pull request #3762 from fw42/liquid_profiler
Merge pull request 3762
2015-06-16 10:21:33 -07:00
Jordon Bedwell 137efdc9f4 Fix: #3738; Move code wrapper from div to figure. 2015-06-10 15:20:44 -05:00
Rafael Picanço e84a7aadee fixing typo on line 31
- front matter
2015-06-08 13:24:53 -03:00
Florian Weingarten 7bc9e1aae6 Add byte counter 2015-06-07 16:49:22 +00:00
Florian Weingarten 1e9163fdf4 Liquid profiler 2015-06-07 16:38:05 +00:00
Jordon Bedwell e9215ec047 Merge pull request #3732 from jekyll/fix-frontmatter-defaults
Fix it so that 'blog.html' matches 'blog.html'
2015-06-06 06:30:43 -05:00
Alfred Xing bba7870f8b Merge pull request #3717 from alfredxing/regenerator-handle-deleted-files
Merge pull request 3717
2015-05-31 11:10:42 -07:00
Jordon Bedwell 14ed5cc954 Fix it so that 'blog.html' matches 'blog.html' 2015-05-25 02:07:21 -05:00
Alfred Xing a2ee820609 Regenerator: handle deleted/renamed/moved dependencies
Should fix #3716
2015-05-19 22:47:58 -07:00
Florian Weingarten 87400f2155 regression test for corrupted marshal file 2015-05-19 20:00:50 +00:00
Florian Weingarten 3474481043 Marshal metadata 2015-05-18 14:02:43 +00:00
Jordon Bedwell f054bae503 Add support for JRuby, it was easier than assumed. 2015-05-15 07:10:22 -05:00