Commit Graph

1041 Commits

Author SHA1 Message Date
jekyllbot 0f3ce73516 Merge pull request #4860 from pathawks/pr/where_exp
Merge pull request 4860
2016-07-25 12:16:55 -07:00
Anatoliy Yastreb 9176924eab filters: raise error if no input given to date filters 2016-07-24 01:37:35 +03:00
XhmikosR dbc0349909 tests: Typo fixes. 2016-07-18 21:20:47 +03:00
jekyllbot eb88aa330c Merge pull request #5060 from stomar/stringify-overrides
Merge pull request 5060
2016-07-15 17:26:14 -07:00
jekyllbot 3ae7d0c319 Merge pull request #5101 from crispgm/dev_to_integer_filter
Merge pull request 5101
2016-07-15 09:58:08 -07:00
David Zhang 20b3758edb Add to_integer filter
Add to_integer filter

Fix test_filter: parenthesize the method

Fix offense: seperate every 3 digits with _

rubocop:disable Metrics/ModuleLength

More descriptive exception

Fix fmt error

Remove if stmt for integer input

Remove rescue for to_i

Remove error message assert
2016-07-15 08:38:36 +08:00
Florian Thomas 99663a9199
object needs to respond to select instead of being an enumerable 2016-07-14 13:11:09 -05:00
Pat Hawks 2b57795c7f
Failing test: where_exp filter should filter posts 2016-07-14 13:08:25 -05:00
Marko Locher 73223f3a5a Fix Rubocop warnings 2016-07-14 12:15:00 +02:00
Marko Locher 49e97ef9b0 Add test case for deprecated post comparison
Checks that `post_url` works for nested posts even if the path isn't specified. Also checks that a deprecation message is shown in the build log.
2016-07-14 11:53:58 +02:00
jekyllbot 1f366730f8 Merge pull request #5069 from Crunch09/issue-2834
Merge pull request 5069
2016-07-12 19:50:32 -07:00
jekyllbot 146d0f301d Merge pull request #5067 from jekyll/excerpt-drop-previous-doc
Merge pull request 5067
2016-07-11 11:20:22 -07:00
Florian Thomas cc82d44222
check if relative URL contains a colon
fixes #2834
2016-07-08 20:33:47 +02:00
Marcus Stollsteimer ba8573c420 Change baseurl to example.com for some test cases 2016-07-08 15:48:14 +02:00
Marcus Stollsteimer 1c0f21230d Stringify configuration overrides before first use
This makes sure that overrides for Jekyll.configuration
all have string keys before their first use, particularly
also the "config" and "skip_config_files" options.
2016-07-08 15:47:26 +02:00
Parker Moore c46f219d3c
Commit failing test for lack of certain excerpt drop properties. 2016-07-07 13:34:10 -07:00
Marcus Stollsteimer d4c87e3655 Remove useless statement from test 2016-07-07 15:30:59 +02:00
Anatoliy Yastreb 3aead1d4a9 Imitate fetch method instead of creating real Hash object 2016-07-06 11:20:37 +03:00
Anatoliy Yastreb 72d49490d2 Add fetch method to Drops 2016-07-05 21:22:24 +03:00
Parker Moore b772329c60
Merge branch 'master' into remove-jruby-and-ruby-head
* master: (41 commits)
  Fix rubocop offenses on master.
  script/fmt: print Rubocop version
  Update history to reflect merge of #5030 [ci skip]
  rubocop: separate deprecator error messages
  Update history to reflect merge of #5031 [ci skip]
  Update history to reflect merge of #5032 [ci skip]
  rubocop: fix code style
  rubocop: fix code style
  rubocop: fix code style
  Update history to reflect merge of #5024 [ci skip]
  Update history to reflect merge of #5025 [ci skip]
  utils: check that the object is a hash when merging default_proc
  Update history to reflect merge of #5026 [ci skip]
  rubocop: refactor modified? method
  Add a benchmark for capture vs. assign in Liquid. [ci skip]
  Update history to reflect merge of #5027 [ci skip]
  Add generator-jekyllized to third party plugins
  rubocop: fix code style
  rubocop: fix code style
  rubocop: fix code style
  ...
2016-06-29 00:52:58 -07:00
Parker Moore a7d25ed963
Fix rubocop offenses on master. 2016-06-28 22:08:06 -07:00
Parker Moore 6f3c01ca87
Fix for jruby 2016-06-28 18:30:02 -07:00
Parker Moore 2ef70fd348
Some weird stuff with Colorator on my machine & jruby. 2016-06-28 14:39:06 -07:00
Parker Moore 12c1ada0e5
test: skip openssl test for jruby 2016-06-28 12:43:15 -07:00
jekyllbot fb1a459ddd Merge pull request #4917 from pathawks/pr/normalize_whitespace
Merge pull request 4917
2016-06-14 14:03:05 -07:00
Parker Moore f5a0db9dcc
Rubocop: use %r for all regular expressions. 2016-06-02 17:08:21 -07:00
jekyllbot 6a07254cbf Merge pull request #4953 from Crunch09/issue-4850
Merge pull request 4953
2016-06-02 16:59:51 -07:00
Pat Hawks 5dfaa66d48 Failing test: markdownify a number 2016-05-28 15:18:37 -05:00
Florian Thomas f8c038566c `Serve.process` should receive same config as `Build.process`
fixes #4850
2016-05-27 11:46:04 +02:00
Pat Hawks fbff506faa Rubocop: test/test_site.rb 2016-05-26 00:00:08 -05:00
Pat Hawks 5a23b130ce Rubocop: test/test_utils.rb 2016-05-25 22:01:10 -05:00
Pat Hawks 8fbeb52314 Rubocop: test/test_tags.rb 2016-05-25 22:00:58 -05:00
Pat Hawks 98262b73d5 Rubocop: test/test_regenerator.rb 2016-05-25 22:00:29 -05:00
Pat Hawks 474fc0a9a8 Rubocop: test/test_page.rb 2016-05-25 22:00:15 -05:00
Pat Hawks 7537b01e74 Rubocop: test/test_liquid_renderer.rb 2016-05-25 22:00:05 -05:00
Pat Hawks 23646549c4 Rubocop: test/test_kramdown.rb 2016-05-25 21:59:54 -05:00
Pat Hawks c00c761e1d Rubocop: test/test_entry_filter.rb 2016-05-25 21:59:43 -05:00
Pat Hawks 5291bd0498 Rubocop: test/test_document.rb 2016-05-25 21:59:33 -05:00
Pat Hawks fd75f0f7b1 Rubocop: test/test_configuration.rb 2016-05-25 21:59:23 -05:00
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