Commit Graph

983 Commits

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