diff --git a/.rubocop.yml b/.rubocop.yml index ef8c839..eba259f 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -30,7 +30,7 @@ Lint/UnusedBlockArgument: Enabled: false Lint/EndAlignment: - AlignWith: variable + EnforcedStyleAlignWith: variable Lint/UnusedMethodArgument: Enabled: false @@ -59,10 +59,10 @@ Style/BracesAroundHashParameters: Style/NumericLiterals: Enabled: false -Style/SpaceInsideBrackets: +Layout/SpaceInsideBrackets: Enabled: false -Style/SpaceBeforeBlockBraces: +Layout/SpaceBeforeBlockBraces: Enabled: false Style/Documentation: @@ -71,19 +71,19 @@ Style/Documentation: Style/ClassAndModuleChildren: Enabled: false -Style/TrailingComma: +Style/TrailingCommaInLiteral: Enabled: false -Style/IndentHash: +Layout/IndentHash: EnforcedStyle: consistent Style/FormatString: Enabled: false -Style/AlignParameters: +Layout/AlignParameters: EnforcedStyle: with_fixed_indentation -Style/MultilineOperationIndentation: +Layout/MultilineOperationIndentation: EnforcedStyle: indented Style/IfUnlessModifier: @@ -92,7 +92,7 @@ Style/IfUnlessModifier: Style/RaiseArgs: Enabled: false -Style/DeprecatedHashMethods: +Style/PreferredHashMethods: Enabled: false Style/RegexpLiteral: @@ -107,7 +107,7 @@ Performance/Count: Style/ConstantName: Enabled: false -Style/CaseIndentation: +Layout/CaseIndentation: Enabled: false Style/ClassVars: @@ -121,3 +121,7 @@ Style/TrivialAccessors: Style/WordArray: Enabled: false + +Naming/MethodName: + Exclude: + - 'example/server/liquid_servlet.rb' diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 02bb779..8860c19 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -1,72 +1,248 @@ -# This configuration was generated by `rubocop --auto-gen-config` -# on 2015-06-08 18:16:16 +0000 using RuboCop version 0.32.0. +# This configuration was generated by +# `rubocop --auto-gen-config` +# on 2017-11-22 11:35:55 -0500 using RuboCop version 0.49.1. # The point is for the user to remove these configuration records # one by one as the offenses are removed from the code base. # Note that changes in the inspected code, or installation of new # versions of RuboCop, may require this file to be generated again. +# Offense count: 3 +# Cop supports --auto-correct. +Layout/ClosingParenthesisIndentation: + Exclude: + - 'test/integration/error_handling_test.rb' + +# Offense count: 1 +# Cop supports --auto-correct. +Layout/EmptyLineAfterMagicComment: + Exclude: + - 'lib/liquid/version.rb' + +# Offense count: 1 +# Cop supports --auto-correct. +# Configuration parameters: AllowForAlignment, ForceEqualSignAlignment. +Layout/ExtraSpacing: + Exclude: + - 'test/integration/parsing_quirks_test.rb' + # Offense count: 5 -Lint/NestedMethodDefinition: - Enabled: false +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent +Layout/IndentHeredoc: + Exclude: + - 'test/integration/tags/for_tag_test.rb' + - 'test/integration/trim_mode_test.rb' -# Offense count: 53 +# Offense count: 6 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +# SupportedStyles: symmetrical, new_line, same_line +Layout/MultilineMethodCallBraceLayout: + Exclude: + - 'test/integration/error_handling_test.rb' + - 'test/unit/strainer_unit_test.rb' + +# Offense count: 2 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +# SupportedStyles: runtime_error, standard_error +Lint/InheritException: + Exclude: + - 'lib/liquid/interrupts.rb' + +# Offense count: 1 +Lint/ScriptPermission: + Exclude: + - 'test/test_helper.rb' + +# Offense count: 52 Metrics/AbcSize: - Max: 58 + Max: 56 -# Offense count: 12 +# Offense count: 13 Metrics/CyclomaticComplexity: - Max: 15 + Max: 12 -# Offense count: 553 -# Configuration parameters: AllowURI, URISchemes. +# Offense count: 620 +# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns. +# URISchemes: http, https Metrics/LineLength: Max: 294 -# Offense count: 77 +# Offense count: 102 # Configuration parameters: CountComments. Metrics/MethodLength: - Max: 46 + Max: 37 -# Offense count: 6 +# Offense count: 9 Metrics/PerceivedComplexity: - Max: 13 + Max: 11 -# Offense count: 1 -Style/AccessorMethodName: - Enabled: false +# Offense count: 10 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +# SupportedStyles: prefer_alias, prefer_alias_method +Style/Alias: + Exclude: + - 'lib/liquid/drop.rb' + - 'lib/liquid/i18n.rb' + - 'lib/liquid/profiler/hooks.rb' + - 'lib/liquid/standardfilters.rb' + - 'lib/liquid/tag.rb' + - 'lib/liquid/tags/include.rb' + - 'lib/liquid/variable.rb' # Offense count: 1 # Cop supports --auto-correct. -Style/ClosingParenthesisIndentation: - Enabled: false - -# Offense count: 3 -# Configuration parameters: MinBodyLength. -Style/GuardClause: - Enabled: false - -# Offense count: 4 -# Configuration parameters: EnforcedStyle, SupportedStyles. -Style/MethodName: - Enabled: false - -# Offense count: 1 -Style/MultilineBlockChain: - Enabled: false +# Configuration parameters: EnforcedStyle, SupportedStyles, SingleLineConditionsOnly, IncludeTernaryExpressions. +# SupportedStyles: assign_to_condition, assign_inside_condition +Style/ConditionalAssignment: + Exclude: + - 'lib/liquid/errors.rb' # Offense count: 2 -# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles. -Style/Next: - Enabled: false +# Cop supports --auto-correct. +Style/EmptyCaseCondition: + Exclude: + - 'lib/liquid/block_body.rb' + - 'lib/liquid/lexer.rb' -# Offense count: 7 +# Offense count: 5 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +# SupportedStyles: compact, expanded +Style/EmptyMethod: + Exclude: + - 'lib/liquid/tag.rb' + - 'lib/liquid/tags/comment.rb' + - 'lib/liquid/tags/include.rb' + - 'test/integration/tags/include_tag_test.rb' + - 'test/unit/context_unit_test.rb' + +# Offense count: 2 +# Configuration parameters: SupportedStyles. +# SupportedStyles: annotated, template +Style/FormatStringToken: + EnforcedStyle: template + +# Offense count: 14 +# Configuration parameters: MinBodyLength. +Style/GuardClause: + Exclude: + - 'lib/liquid/condition.rb' + - 'lib/liquid/lexer.rb' + - 'lib/liquid/strainer.rb' + - 'lib/liquid/tags/assign.rb' + - 'lib/liquid/tags/capture.rb' + - 'lib/liquid/tags/case.rb' + - 'lib/liquid/tags/for.rb' + - 'lib/liquid/tags/include.rb' + - 'lib/liquid/tags/raw.rb' + - 'lib/liquid/tags/table_row.rb' + - 'lib/liquid/variable.rb' + - 'test/unit/tokenizer_unit_test.rb' + +# Offense count: 4 +# Configuration parameters: SupportedStyles. +# SupportedStyles: snake_case, camelCase +Style/MethodName: + EnforcedStyle: snake_case + +# Offense count: 6 +# Cop supports --auto-correct. +Style/MutableConstant: + Exclude: + - 'lib/liquid/expression.rb' + - 'lib/liquid/lexer.rb' + - 'lib/liquid/standardfilters.rb' + - 'lib/liquid/tags/if.rb' + - 'lib/liquid/variable_lookup.rb' + - 'lib/liquid/version.rb' + +# Offense count: 1 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles. +# SupportedStyles: skip_modifier_ifs, always +Style/Next: + Exclude: + - 'lib/liquid/tags/for.rb' + +# Offense count: 4 +# Cop supports --auto-correct. +# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles. +# SupportedStyles: predicate, comparison +Style/NumericPredicate: + Exclude: + - 'spec/**/*' + - 'lib/liquid/context.rb' + - 'lib/liquid/forloop_drop.rb' + - 'lib/liquid/standardfilters.rb' + - 'lib/liquid/tablerowloop_drop.rb' + +# Offense count: 14 +# Cop supports --auto-correct. +# Configuration parameters: PreferredDelimiters. +Style/PercentLiteralDelimiters: + Exclude: + - 'lib/liquid/tags/if.rb' + - 'liquid.gemspec' + - 'test/integration/assign_test.rb' + - 'test/integration/standard_filter_test.rb' + +# Offense count: 2 +# Cop supports --auto-correct. +Style/RedundantParentheses: + Exclude: + - 'test/unit/condition_unit_test.rb' + +# Offense count: 1 +# Cop supports --auto-correct. +Style/RedundantSelf: + Exclude: + - 'lib/liquid/strainer.rb' + +# Offense count: 9 # Cop supports --auto-correct. # Configuration parameters: AllowAsExpressionSeparator. Style/Semicolon: - Enabled: false + Exclude: + - 'test/integration/error_handling_test.rb' + - 'test/integration/template_test.rb' + - 'test/unit/context_unit_test.rb' + +# Offense count: 7 +# Cop supports --auto-correct. +# Configuration parameters: MinSize, SupportedStyles. +# SupportedStyles: percent, brackets +Style/SymbolArray: + EnforcedStyle: brackets + +# Offense count: 2 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles, AllowSafeAssignment. +# SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex +Style/TernaryParentheses: + Exclude: + - 'lib/liquid/context.rb' + - 'lib/liquid/utils.rb' + +# Offense count: 4 +# Cop supports --auto-correct. +Style/UnneededInterpolation: + Exclude: + - 'lib/liquid/i18n.rb' + - 'test/integration/standard_filter_test.rb' + +# Offense count: 2 +# Cop supports --auto-correct. +Style/UnneededPercentQ: + Exclude: + - 'test/integration/error_handling_test.rb' # Offense count: 1 # Cop supports --auto-correct. # Configuration parameters: MaxLineLength. Style/WhileUntilModifier: - Enabled: false + Exclude: + - 'lib/liquid/tags/case.rb' diff --git a/Gemfile b/Gemfile index caa40ac..1a5b94b 100644 --- a/Gemfile +++ b/Gemfile @@ -9,7 +9,7 @@ group :benchmark, :test do end group :test do - gem 'rubocop', '0.34.2' + gem 'rubocop', '~> 0.49.0' platform :mri do gem 'liquid-c', github: 'Shopify/liquid-c', ref: 'bd53db95de3d44d631e7c5a267c3d934e66107dd' diff --git a/liquid.gemspec b/liquid.gemspec index 3affbed..e0e4ddb 100644 --- a/liquid.gemspec +++ b/liquid.gemspec @@ -1,4 +1,5 @@ # encoding: utf-8 + lib = File.expand_path('../lib/', __FILE__) $LOAD_PATH.unshift lib unless $LOAD_PATH.include?(lib) diff --git a/test/integration/tags/for_tag_test.rb b/test/integration/tags/for_tag_test.rb index d9d396f..cb7a822 100644 --- a/test/integration/tags/for_tag_test.rb +++ b/test/integration/tags/for_tag_test.rb @@ -159,7 +159,7 @@ HERE assert_template_result(expected, markup, assigns) end - def test_pause_resume_BIG_limit + def test_pause_resume_big_limit assigns = { 'array' => { 'items' => [1, 2, 3, 4, 5, 6, 7, 8, 9, 0] } } markup = <<-MKUP {%for i in array.items limit:3 %}{{i}}{%endfor%} @@ -178,7 +178,7 @@ HERE assert_template_result(expected, markup, assigns) end - def test_pause_resume_BIG_offset + def test_pause_resume_big_offset assigns = { 'array' => { 'items' => [1, 2, 3, 4, 5, 6, 7, 8, 9, 0] } } markup = '{%for i in array.items limit:3 %}{{i}}{%endfor%} next