From 704937bc00b4472200196158c7a7f4ef43c18714 Mon Sep 17 00:00:00 2001 From: Dylan Thacker-Smith Date: Fri, 25 Sep 2015 19:34:44 -0400 Subject: [PATCH] Fix offenses from the new version of rubocop. --- .rubocop.yml | 4 +++- lib/liquid/extensions.rb | 14 +++++++------- lib/liquid/standardfilters.rb | 2 +- lib/liquid/tags/cycle.rb | 2 +- lib/liquid/tags/for.rb | 2 +- liquid.gemspec | 2 +- test/integration/tags/if_else_tag_test.rb | 4 ++-- test/unit/context_unit_test.rb | 4 ++-- 8 files changed, 18 insertions(+), 16 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 839fdff..e273808 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -118,6 +118,8 @@ Style/ClassVars: Style/PerlBackrefs: Enabled: false +Style/TrivialAccessors: + AllowPredicates: true + Style/WordArray: Enabled: false - diff --git a/lib/liquid/extensions.rb b/lib/liquid/extensions.rb index 24fc8e3..ccad59e 100644 --- a/lib/liquid/extensions.rb +++ b/lib/liquid/extensions.rb @@ -7,44 +7,44 @@ class String # :nodoc: end end -class Array # :nodoc: +class Array # :nodoc: def to_liquid self end end -class Hash # :nodoc: +class Hash # :nodoc: def to_liquid self end end -class Numeric # :nodoc: +class Numeric # :nodoc: def to_liquid self end end -class Time # :nodoc: +class Time # :nodoc: def to_liquid self end end -class DateTime < Date # :nodoc: +class DateTime < Date # :nodoc: def to_liquid self end end -class Date # :nodoc: +class Date # :nodoc: def to_liquid self end end class TrueClass - def to_liquid # :nodoc: + def to_liquid # :nodoc: self end end diff --git a/lib/liquid/standardfilters.rb b/lib/liquid/standardfilters.rb index dd60c14..53ec111 100644 --- a/lib/liquid/standardfilters.rb +++ b/lib/liquid/standardfilters.rb @@ -42,7 +42,7 @@ module Liquid end def url_encode(input) - CGI.escape(input) rescue input + CGI.escape(input) unless input.nil? end def slice(input, offset, length = nil) diff --git a/lib/liquid/tags/cycle.rb b/lib/liquid/tags/cycle.rb index 82ba9fb..345b988 100644 --- a/lib/liquid/tags/cycle.rb +++ b/lib/liquid/tags/cycle.rb @@ -37,7 +37,7 @@ module Liquid iteration = context.registers[:cycle][key] result = context.evaluate(@variables[iteration]) iteration += 1 - iteration = 0 if iteration >= @variables.size + iteration = 0 if iteration >= @variables.size context.registers[:cycle][key] = iteration result end diff --git a/lib/liquid/tags/for.rb b/lib/liquid/tags/for.rb index 53bf64f..ffb924f 100644 --- a/lib/liquid/tags/for.rb +++ b/lib/liquid/tags/for.rb @@ -152,7 +152,7 @@ module Liquid def strict_parse(markup) p = Parser.new(markup) @variable_name = p.consume(:id) - raise SyntaxError.new(options[:locale].t("errors.syntax.for_invalid_in".freeze)) unless p.id?('in'.freeze) + raise SyntaxError.new(options[:locale].t("errors.syntax.for_invalid_in".freeze)) unless p.id?('in'.freeze) collection_name = p.expression @name = "#{@variable_name}-#{collection_name}" @collection_name = Expression.parse(collection_name) diff --git a/liquid.gemspec b/liquid.gemspec index b8845ca..232906e 100644 --- a/liquid.gemspec +++ b/liquid.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |s| s.test_files = Dir.glob("{test}/**/*") s.files = Dir.glob("{lib}/**/*") + %w(MIT-LICENSE README.md) - s.extra_rdoc_files = ["History.md", "README.md"] + s.extra_rdoc_files = ["History.md", "README.md"] s.require_path = "lib" diff --git a/test/integration/tags/if_else_tag_test.rb b/test/integration/tags/if_else_tag_test.rb index c23e3ed..45a5d3a 100644 --- a/test/integration/tags/if_else_tag_test.rb +++ b/test/integration/tags/if_else_tag_test.rb @@ -29,10 +29,10 @@ class IfElseTagTest < Minitest::Test assert_template_result(' YES ', '{% if a or b %} YES {% endif %}', 'a' => true, 'b' => true) assert_template_result(' YES ', '{% if a or b %} YES {% endif %}', 'a' => true, 'b' => false) assert_template_result(' YES ', '{% if a or b %} YES {% endif %}', 'a' => false, 'b' => true) - assert_template_result('', '{% if a or b %} YES {% endif %}', 'a' => false, 'b' => false) + assert_template_result('', '{% if a or b %} YES {% endif %}', 'a' => false, 'b' => false) assert_template_result(' YES ', '{% if a or b or c %} YES {% endif %}', 'a' => false, 'b' => false, 'c' => true) - assert_template_result('', '{% if a or b or c %} YES {% endif %}', 'a' => false, 'b' => false, 'c' => false) + assert_template_result('', '{% if a or b or c %} YES {% endif %}', 'a' => false, 'b' => false, 'c' => false) end def test_if_or_with_operators diff --git a/test/unit/context_unit_test.rb b/test/unit/context_unit_test.rb index e4768f9..5655865 100644 --- a/test/unit/context_unit_test.rb +++ b/test/unit/context_unit_test.rb @@ -267,7 +267,7 @@ class ContextUnitTest < Minitest::Test def test_access_hashes_with_hash_notation @context['products'] = { 'count' => 5, 'tags' => ['deepsnow', 'freestyle'] } - @context['product'] = { 'variants' => [ { 'title' => 'draft151cm' }, { 'title' => 'element151cm' } ] } + @context['product'] = { 'variants' => [ { 'title' => 'draft151cm' }, { 'title' => 'element151cm' } ] } assert_equal 5, @context['products["count"]'] assert_equal 'deepsnow', @context['products["tags"][0]'] @@ -305,7 +305,7 @@ class ContextUnitTest < Minitest::Test end def test_first_can_appear_in_middle_of_callchain - @context['product'] = { 'variants' => [ { 'title' => 'draft151cm' }, { 'title' => 'element151cm' } ] } + @context['product'] = { 'variants' => [ { 'title' => 'draft151cm' }, { 'title' => 'element151cm' } ] } assert_equal 'draft151cm', @context['product.variants[0].title'] assert_equal 'element151cm', @context['product.variants[1].title']