salsify_rubocop 0.48.1 → 0.52.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1168006be538d22e3437ab541c048e7b6d16502e
-  data.tar.gz: 1f27eaee901f052080f61c69d6fe10f00e6908e9
+SHA256:
+  metadata.gz: 711fd8590c32360212eb79475aed75fa3c9005be72bd22c2a65c4499ed0a9eb5
+  data.tar.gz: 8dedaaccd58cdffb7943dbbcf32e6454bcb77d99a95f2428066ebcdb8008ea32
 SHA512:
-  metadata.gz: b0c8afbcf2b7ff19fa513446155e97bc27182d75244e2652ab52f557123d1539cd160720d659452fded8b9836f5d4eed9945d7f50cab7f79263a5d335dcdcf00
-  data.tar.gz: be74e32b09f5499e75f2bdad040966f7166fb1bbcd00198f25e852596c0a54217e2fc06c880962f4cbff006d46737848322de87b90f516ec1e702297a81b32a6
+  metadata.gz: c471766fc309ae3115177dce42b057c5fa18a6bffd1f0f47dc88b5b4cdb906d8ecac815873d4c6a9f6a204cfa898585db3588cff32b71d1340b7ac8714169c78
+  data.tar.gz: 1ef6635f33167b36b2e0b72995939a9e31f0c97dba606290eac0c76c0eb195a599a6870b3226d9551a98d87a7d5a43252ca1fd14b8571747fcf640092d743629

data/.travis.yml

@@ -1,8 +1,9 @@
 language: ruby
 rvm:
-  - 2.4.0
-  - 2.3.3
-  - 2.2.6
+  - 2.5.0
+  - 2.4.3
+  - 2.3.6
+  - 2.2.9
 before_install:
   # Workaround for https://github.com/sickill/rainbow/issues/48
   - gem update --system

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # salsify_rubocop
 
+## v0.52.1
+- Update to `rubocop` v0.52.1 and `rubocop-rspec` v1.21.0.
+
 ## v0.48.1
 - Add `Salsify/RailsApplicationMailer` cop.
 

data/conf/rubocop.yml

@@ -34,3 +34,6 @@ RSpec/MultipleExpectations:
 
 RSpec/NestedGroups:
   Enabled: false
+
+RSpec/ContextWording:
+  Enabled: false

data/conf/rubocop_without_rspec.yml

@@ -22,7 +22,7 @@ Performance/RedundantMerge:
 Style/Alias:
   EnforcedStyle: prefer_alias_method
 
-Style/AlignHash:
+Layout/AlignHash:
   Enabled: false
 
 Style/Documentation:
@@ -39,19 +39,19 @@ Style/EachForSimpleLoop:
 Style/EachWithObject:
   Enabled: false
 
-Style/EmptyLines:
+Layout/EmptyLines:
   Enabled: false
 
-Style/EmptyLinesAroundBlockBody:
+Layout/EmptyLinesAroundBlockBody:
   Enabled: false
 
-Style/EmptyLinesAroundClassBody:
+Layout/EmptyLinesAroundClassBody:
   Enabled: false
 
-Style/EmptyLinesAroundModuleBody:
+Layout/EmptyLinesAroundModuleBody:
   Enabled: false
 
-Style/EmptyLinesAroundMethodBody:
+Layout/EmptyLinesAroundMethodBody:
   Enabled: false
 
 Style/EmptyLiteral:
@@ -62,7 +62,7 @@ Style/EmptyMethod:
 
 # The Exclude list is not additive. Projects that exclude file names will
 # need to re-add Appraisals.
-Style/FileName:
+Naming/FileName:
   Exclude:
     - 'Appraisals'
 
@@ -73,7 +73,7 @@ Style/GuardClause:
   Enabled: false
 
 # does not make sense to enable this without AlignHash
-Style/IndentHash:
+Layout/IndentHash:
   Enabled: false
 
 Style/Lambda:
@@ -85,13 +85,13 @@ Style/ModuleFunction:
 Style/MultilineBlockChain:
   Enabled: false
 
-Style/MultilineMethodCallIndentation:
+Layout/MultilineMethodCallIndentation:
   Enabled: false
 
-Style/MultilineOperationIndentation:
+Layout/MultilineOperationIndentation:
   Enabled: false
 
-Style/MultilineBlockLayout:
+Layout/MultilineBlockLayout:
   Enabled: false
 
 # This cop complains about values like 05.
@@ -126,7 +126,7 @@ Style/SingleLineBlockParams:
 
 # This cop doesn't work properly if you a have a block with
 # arguments split across multiple lines
-Style/SpaceAroundBlockParameters:
+Layout/SpaceAroundBlockParameters:
   Enabled: false
 
 Style/StringLiterals:
@@ -138,7 +138,7 @@ Style/StringLiterals:
 Style/SymbolArray:
   Enabled: false
 
-Style/VariableNumber:
+Naming/VariableNumber:
   Enabled: false
 
 Metrics/AbcSize:

data/lib/rubocop/cop/salsify/rails_application_mailer.rb

@@ -1,11 +1,7 @@
-# encoding: utf-8
-
-require 'rubocop'
-
 module RuboCop
   module Cop
     module Salsify
-      # Check that mailers subclass ApplicationMailer with Rails 5.0
+      # Check that mailers subclass ApplicationMailer with Rails 5.0.
       #
       # @example
       #
@@ -19,34 +15,19 @@ module RuboCop
       #    ...
       #  end
       class RailsApplicationMailer < Cop
+        extend TargetRailsVersion
 
-        MSG = 'Mailers must subclass ApplicationMailer'.freeze
-        APPLICATION_MAILER = 'ApplicationMailer'.freeze
-        ACTIVE_MAILER_BASE_PATTERN = '(const (const nil :ActionMailer) :Base)'.freeze
-
-        def_node_matcher :mailer_class_definition, <<-PATTERN
-        (class (const _ !:ApplicationMailer) #{ACTIVE_MAILER_BASE_PATTERN} ...)
-        PATTERN
-
-        def_node_matcher :class_new_definition, <<-PATTERN
-        [!^(casgn nil :ApplicationMailer ...) (send (const nil :Class) :new #{ACTIVE_MAILER_BASE_PATTERN})]
-        PATTERN
+        minimum_target_rails_version 5.0
 
-        def on_class(node)
-          mailer_class_definition(node) do
-            add_offense(node.children[1], :expression, MSG)
-          end
-        end
+        MSG = 'Mailers should subclass `ApplicationMailer`.'.freeze
+        SUPERCLASS = 'ApplicationMailer'.freeze
+        BASE_PATTERN = '(const (const nil? :ActionMailer) :Base)'.freeze
 
-        def on_send(node)
-          class_new_definition(node) do
-            add_offense(node.children.last, :expression, MSG)
-          end
-        end
+        include RuboCop::Cop::EnforceSuperclass
 
         def autocorrect(node)
           lambda do |corrector|
-            corrector.replace(node.source_range, APPLICATION_MAILER)
+            corrector.replace(node.source_range, self.class::SUPERCLASS)
           end
         end
       end

data/lib/rubocop/cop/salsify/rails_application_serializer.rb

@@ -1,40 +1,33 @@
-# encoding: utf-8
-
-require 'rubocop'
-
 module RuboCop
   module Cop
     module Salsify
-      # Check that serializers subclass ApplicationSerializer
+      # Check that serializers subclass ApplicationSerializer with Rails 5.0.
+      #
+      # @example
+      #
+      #  # good
+      #  class Tesla < ApplicationSerializer
+      #    ...
+      #  end
+      #
+      #  # bad
+      #  class Yugo < ActiveModel::Serializer
+      #    ...
+      #  end
       class RailsApplicationSerializer < Cop
+        extend TargetRailsVersion
 
-        MSG = 'Serializers must subclass ApplicationSerializer'.freeze
-        APPLICATION_SERIALIZER = 'ApplicationSerializer'.freeze
-        ACTIVE_MODEL_SERIALIZER_PATTERN = '(const (const nil :ActiveModel) :Serializer)'.freeze
-
-        def_node_matcher :serializer_class_definition, <<-PATTERN
-          (class (const _ !:ApplicationSerializer) #{ACTIVE_MODEL_SERIALIZER_PATTERN} ...)
-        PATTERN
-
-        def_node_matcher :class_new_definition, <<-PATTERN
-          [!^(casgn nil :ApplicationSerializer ...) (send (const nil :Class) :new #{ACTIVE_MODEL_SERIALIZER_PATTERN})]
-        PATTERN
+        minimum_target_rails_version 5.0
 
-        def on_class(node)
-          serializer_class_definition(node) do
-            add_offense(node.children[1], :expression, MSG)
-          end
-        end
+        MSG = 'Serializers should subclass `ApplicationSerializer`.'.freeze
+        SUPERCLASS = 'ApplicationSerializer'.freeze
+        BASE_PATTERN = '(const (const nil? :ActiveModel) :Serializer)'.freeze
 
-        def on_send(node)
-          class_new_definition(node) do
-            add_offense(node.children.last, :expression, MSG)
-          end
-        end
+        include RuboCop::Cop::EnforceSuperclass
 
         def autocorrect(node)
           lambda do |corrector|
-            corrector.replace(node.source_range, APPLICATION_SERIALIZER)
+            corrector.replace(node.source_range, self.class::SUPERCLASS)
           end
         end
       end

data/lib/rubocop/cop/salsify/rspec_doc_string.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module RuboCop
   module Cop
     module Salsify
@@ -44,14 +42,18 @@ module RuboCop
           check_quotes(args.first)
         end
 
+        def autocorrect(node)
+          StringLiteralCorrector.correct(node, style)
+        end
+
         private
 
         def check_quotes(doc_node)
           if wrong_quotes?(doc_node)
             if style == :single_quotes
-              add_offense(doc_node, :expression, SINGLE_QUOTE_MSG)
+              add_offense(doc_node, message: SINGLE_QUOTE_MSG)
             else
-              add_offense(doc_node, :expression, DOUBLE_QUOTE_MSG)
+              add_offense(doc_node, message: DOUBLE_QUOTE_MSG)
             end
           end
         end
@@ -65,17 +67,6 @@ module RuboCop
             src !~ /^" | \\ | \#/x
           end
         end
-
-        def autocorrect(node)
-          lambda do |corrector|
-            str = node.str_content
-            if style == :single_quotes
-              corrector.replace(node.source_range, to_string_literal(str))
-            else
-              corrector.replace(node.source_range, str.inspect)
-            end
-          end
-        end
       end
     end
   end

data/lib/rubocop/cop/salsify/rspec_dot_not_self_dot.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module RuboCop
   module Cop
     module Salsify
@@ -28,7 +26,7 @@ module RuboCop
 
         def on_send(node)
           example_group_match(node) do |doc|
-            add_offense(doc, :expression, MSG) if SELF_DOT_REGEXP =~ doc.source
+            add_offense(doc) if SELF_DOT_REGEXP =~ doc.source
           end
         end
 

data/lib/rubocop/cop/salsify/rspec_string_literals.rb

@@ -1,5 +1,3 @@
-# encoding: utf-8
-
 module RuboCop
   module Cop
     module Salsify
@@ -22,9 +20,13 @@ module RuboCop
         DOUBLE_QUOTE_MSG = 'Prefer double-quoted strings unless you need ' \
           'single quotes to avoid extra backslashes for escaping.'.freeze
 
+        def autocorrect(node)
+          StringLiteralCorrector.correct(node, style)
+        end
+
         private
 
-        def message(*)
+        def message(_node)
           style == :single_quotes ? SINGLE_QUOTE_MSG : DOUBLE_QUOTE_MSG
         end
 

data/lib/rubocop/cop/salsify/style_dig.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# This may be added in the near future to rubocop, see https://github.com/bbatsov/rubocop/issues/5332
 
 module RuboCop
   module Cop
@@ -32,16 +32,16 @@ module RuboCop
             match_node = node
             # walk to outermost access node
             match_node = match_node.parent while access_node?(match_node.parent)
-            add_offense(match_node, :expression, MSG)
+            add_offense(match_node)
           end
         end
 
         def autocorrect(node)
           access_node = node
-          source_args = [access_node.method_args.first.source]
+          source_args = [access_node.first_argument.source]
           while access_node?(access_node.children.first)
             access_node = access_node.children.first
-            source_args << access_node.method_args.first.source
+            source_args << access_node.first_argument.source
           end
           root_node = access_node.children.first
 

data/lib/salsify_rubocop.rb

@@ -15,7 +15,6 @@ RuboCop::ConfigLoader.instance_variable_set(:@default_configuration, config)
 # cops
 require 'rubocop/cop/salsify/rails_application_mailer'
 require 'rubocop/cop/salsify/rails_application_serializer'
-require 'rubocop/cop/salsify/rails_application_record'
 require 'rubocop/cop/salsify/rspec_doc_string'
 require 'rubocop/cop/salsify/rspec_dot_not_self_dot'
 require 'rubocop/cop/salsify/rspec_string_literals'

data/lib/salsify_rubocop/version.rb

@@ -1,3 +1,3 @@
 module SalsifyRubocop
-  VERSION = '0.48.1'.freeze
+  VERSION = '0.52.1'.freeze
 end

data/salsify_rubocop.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'salsify_rubocop/version'
@@ -34,6 +32,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
 
-  spec.add_runtime_dependency 'rubocop', '~> 0.48.1'
-  spec.add_runtime_dependency 'rubocop-rspec', '~> 1.15.0'
+  spec.add_runtime_dependency 'rubocop', '~> 0.52.1'
+  spec.add_runtime_dependency 'rubocop-rspec', '~> 1.21.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salsify_rubocop
 version: !ruby/object:Gem::Version
-  version: 0.48.1
+  version: 0.52.1
 platform: ruby
 authors:
 - Salsify, Inc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: 0.52.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.48.1
+        version: 0.52.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.21.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.15.0
+        version: 1.21.0
 description: Shared shared RuboCop configuration
 email:
 - engineering@salsify.com
@@ -104,7 +104,6 @@ files:
 - conf/rubocop_without_rspec.yml
 - config/default.yml
 - lib/rubocop/cop/salsify/rails_application_mailer.rb
-- lib/rubocop/cop/salsify/rails_application_record.rb
 - lib/rubocop/cop/salsify/rails_application_serializer.rb
 - lib/rubocop/cop/salsify/rspec_doc_string.rb
 - lib/rubocop/cop/salsify/rspec_dot_not_self_dot.rb
@@ -135,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Shared shared RuboCop configuration

data/lib/rubocop/cop/salsify/rails_application_record.rb

@@ -1,55 +0,0 @@
-# encoding: utf-8
-
-require 'rubocop'
-
-module RuboCop
-  module Cop
-    module Salsify
-      # Check that models subclass ApplicationRecord with Rails 5.0
-      #
-      # @example
-      #
-      #  # good
-      #  class Tesla < ApplicationRecord
-      #    ...
-      #  end
-      #
-      #  # bad
-      #  class Yugo < ActiveRecord::Base
-      #    ...
-      #  end
-      class RailsApplicationRecord < Cop
-
-        MSG = 'Models must subclass ApplicationRecord'.freeze
-        APPLICATION_RECORD = 'ApplicationRecord'.freeze
-        ACTIVE_RECORD_BASE_PATTERN = '(const (const nil :ActiveRecord) :Base)'.freeze
-
-        def_node_matcher :model_class_definition, <<-PATTERN
-        (class (const _ !:ApplicationRecord) #{ACTIVE_RECORD_BASE_PATTERN} ...)
-        PATTERN
-
-        def_node_matcher :class_new_definition, <<-PATTERN
-        [!^(casgn nil :ApplicationRecord ...) (send (const nil :Class) :new #{ACTIVE_RECORD_BASE_PATTERN})]
-        PATTERN
-
-        def on_class(node)
-          model_class_definition(node) do
-            add_offense(node.children[1], :expression, MSG)
-          end
-        end
-
-        def on_send(node)
-          class_new_definition(node) do
-            add_offense(node.children.last, :expression, MSG)
-          end
-        end
-
-        def autocorrect(node)
-          lambda do |corrector|
-            corrector.replace(node.source_range, APPLICATION_RECORD)
-          end
-        end
-      end
-    end
-  end
-end