salsify_rubocop 0.47.2 → 0.48.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01ddf57339e753b601e0bbbefda0a87141ee09c5
-  data.tar.gz: 964f0c25cd592a0ca6a9949f3a4c05fa3d4630f3
+  metadata.gz: 5e07cf5240f0567f82de5841b7918aced03bbcd1
+  data.tar.gz: 5cf9381c581f64eabf2c9bd1fe5d1dfd08c2e191
 SHA512:
-  metadata.gz: 4b5a9ed9d733e36708b4a75d14c6c82121f18eeb71fb16b542d9a8c1719a0a0580f61df67c5b793e240ab515ac4963f9adc3a90511d21e3ac3f737afb330cbec
-  data.tar.gz: bc07f258e1f8fc671f8f0ed2e763dc072a35bbfc300821e2585d9ee7ab631dd606af31e9dc823de9de4468651708eb2b49b087fabd9ba9828f542d45a6ada720
+  metadata.gz: f1f8d75e6ae82ce709e174d327b0008520182f7f9af9ac5d79c1e2fa6df9604c1eeca592ad83502e658ffcffde33d47c77c531f8129c98dbda5e3bb6863f35f0
+  data.tar.gz: 0c093a80290aedf6bee8ba31858b32744b440f7d52d6b4487e0b2734a9ec0f3aeb6414dbdeb6fdc27a23052545e5f5b4fc2bb2d909d72f8cf6c770742b53f67a

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # salsify_rubocop
 
+## v0.48.0
+- Add `Salsify/RspecDotNotSelfDot` cop.
+- Add `Salsify/RailsApplicationSerializer` cop.
+- Update to `rubocop` v0.48.1 and `rubocop-rspec` v1.15.0.
+- Disable cops: `Lint/AmbiguousBlockAssociation`, `Style/PercentLiteralDelimiters`,
+  and `Style/SymbolArray`.
+
 ## v0.47.2
 - Fix issue for `Salsify/Style` with nested access as the target for
   conditional assignment.

data/conf/rubocop_rails50.yml

@@ -1,6 +1,9 @@
 inherit_from:
   - ../conf/rubocop_rails.yml
 
+AllCops:
+  TargetRailsVersion: 5.0
+
 Rails/HttpPositionalArguments:
   Enabled: true
 

data/conf/rubocop_without_rspec.yml

@@ -9,6 +9,10 @@ AllCops:
     - 'tmp/**/*'
     - 'vendor/**/*'
 
+# This cop has poor handling for the common case of a lambda arg in a DSL
+Lint/AmbiguousBlockAssociation:
+  Enabled: false
+
 Lint/AmbiguousOperator:
   Enabled: false
 
@@ -56,6 +60,12 @@ Style/EmptyLiteral:
 Style/EmptyMethod:
   Enabled: false
 
+# The Exclude list is not additive. Projects that exclude file names will
+# need to re-add Appraisals.
+Style/FileName:
+  Exclude:
+    - 'Appraisals'
+
 Style/FrozenStringLiteralComment:
   Enabled: false
 
@@ -92,6 +102,10 @@ Style/NumericLiteralPrefix:
 Style/NumericPredicate:
   Enabled: false
 
+# This cop is unstable.
+Style/PercentLiteralDelimiters:
+  Enabled: false
+
 Style/Proc:
   Enabled: false
 
@@ -120,6 +134,10 @@ Style/StringLiterals:
   Exclude:
     - 'spec/**/*'
 
+# We don't require %i() for an array of symbols.
+Style/SymbolArray:
+  Enabled: false
+
 Style/VariableNumber:
   Enabled: false
 

data/config/default.yml

@@ -1,3 +1,7 @@
+Salsify/RailsApplicationSerializer:
+  Description: 'Serializers must subclass ApplicationSerializer.'
+  Enabled: false
+
 Salsify/RailsApplicationRecord:
   Description: 'Models must subclass ApplicationRecord.'
   Enabled: false
@@ -12,6 +16,12 @@ Salsify/RspecDocString:
   Include:
     - 'spec/**/*'
 
+Salsify/RspecDotNotSelfDot:
+  Description: 'Enforce ".<class method>" instead of "self.<class method>" for example group description.'
+  Enabled: true
+  Include:
+    - 'spec/**/*'
+
 Salsify/RspecStringLiterals:
   Description: 'Enforce consistent quote style for non-doc strings in RSpec tests.'
   Enabled: true
@@ -19,8 +29,8 @@ Salsify/RspecStringLiterals:
   SupportedStyles:
     - single_quotes
     - double_quotes
-#  Include:
-#    - 'spec/**/*'
+  Include:
+    - 'spec/**/*'
 
 Salsify/StyleDig:
   Description: 'Recommend `dig` for deeply nested access.'

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

@@ -1,5 +1,7 @@
 # encoding: utf-8
+
 require 'rubocop'
+
 module RuboCop
   module Cop
     module Salsify

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

@@ -0,0 +1,43 @@
+# encoding: utf-8
+
+require 'rubocop'
+
+module RuboCop
+  module Cop
+    module Salsify
+      # Check that serializers subclass ApplicationSerializer
+      class RailsApplicationSerializer < Cop
+
+        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
+
+        def on_class(node)
+          serializer_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_SERIALIZER)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -60,7 +60,7 @@ module RuboCop
           src = node.source
           return false if src.start_with?('%', '?')
           if style == :single_quotes
-            src !~ /^'/ && !double_quotes_acceptable?(node.str_content)
+            src !~ /^'/ && !needs_escaping?(node.str_content)
           else
             src !~ /^" | \\ | \#/x
           end

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

@@ -0,0 +1,45 @@
+# encoding: utf-8
+
+module RuboCop
+  module Cop
+    module Salsify
+      # Use ".<class method>" instead of "self.<class method>" in RSpec example
+      # group descriptions.
+      #
+      # @example
+      #
+      #   # good
+      #   describe ".does_stuff" do
+      #     ...
+      #   end
+      #
+      #   # bad
+      #   describe "self.does_stuff" do
+      #     ...
+      #   end
+      class RspecDotNotSelfDot < Cop
+
+        SELF_DOT_REGEXP = /["']self\./
+        MSG = 'Use ".<class method>" instead of "self.<class method>" for example group description.'.freeze
+
+        def_node_matcher :example_group_match, <<-PATTERN
+          (send _ #{RuboCop::RSpec::Language::ExampleGroups::ALL.node_pattern_union} $_ ...)
+        PATTERN
+
+        def on_send(node)
+          example_group_match(node) do |doc|
+            add_offense(doc, :expression, MSG) if SELF_DOT_REGEXP =~ doc.source
+          end
+        end
+
+        def autocorrect(node)
+          lambda do |corrector|
+            corrector.remove(Parser::Source::Range.new(node.source_range.source_buffer,
+                                                       node.source_range.begin_pos + 1,
+                                                       node.source_range.begin_pos + 5))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/salsify_rubocop/version.rb

@@ -1,3 +1,3 @@
 module SalsifyRubocop
-  VERSION = '0.47.2'.freeze
+  VERSION = '0.48.0'.freeze
 end

data/lib/salsify_rubocop.rb

@@ -13,7 +13,9 @@ config = RuboCop::ConfigLoader.merge_with_default(config, path)
 RuboCop::ConfigLoader.instance_variable_set(:@default_configuration, config)
 
 # cops
+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'
 require 'rubocop/cop/salsify/style_dig'

data/salsify_rubocop.gemspec

@@ -1,4 +1,5 @@
 # coding: utf-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'salsify_rubocop/version'
@@ -33,6 +34,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.47.1'
-  spec.add_runtime_dependency 'rubocop-rspec', '~> 1.10.0'
+  spec.add_runtime_dependency 'rubocop', '~> 0.48.1'
+  spec.add_runtime_dependency 'rubocop-rspec', '~> 1.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salsify_rubocop
 version: !ruby/object:Gem::Version
-  version: 0.47.2
+  version: 0.48.0
 platform: ruby
 authors:
 - Salsify, Inc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.1
+        version: 0.48.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.47.1
+        version: 0.48.1
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.10.0
+        version: 1.15.0
 description: Shared shared RuboCop configuration
 email:
 - engineering@salsify.com
@@ -104,7 +104,9 @@ files:
 - conf/rubocop_without_rspec.yml
 - config/default.yml
 - 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
 - lib/rubocop/cop/salsify/rspec_string_literals.rb
 - lib/rubocop/cop/salsify/style_dig.rb
 - lib/rubocop/rspec/language/each_selector.rb
@@ -132,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Shared shared RuboCop configuration