salsify_rubocop 0.52.1 → 0.52.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 711fd8590c32360212eb79475aed75fa3c9005be72bd22c2a65c4499ed0a9eb5
-  data.tar.gz: 8dedaaccd58cdffb7943dbbcf32e6454bcb77d99a95f2428066ebcdb8008ea32
+SHA1:
+  metadata.gz: fe137e6b63dff943d47b4dffb004f798b024d6f6
+  data.tar.gz: f1c9ba164a84db16c846a24a7e77e0deafb0c190
 SHA512:
-  metadata.gz: c471766fc309ae3115177dce42b057c5fa18a6bffd1f0f47dc88b5b4cdb906d8ecac815873d4c6a9f6a204cfa898585db3588cff32b71d1340b7ac8714169c78
-  data.tar.gz: 1ef6635f33167b36b2e0b72995939a9e31f0c97dba606290eac0c76c0eb195a599a6870b3226d9551a98d87a7d5a43252ca1fd14b8571747fcf640092d743629
+  metadata.gz: 61d30cf5598f2475fd00ab2766e7a64ad715a43b9ce16840e9dfa93c85bd379bf3e411383e458df224a8f0afbc3f6bbc5cb95767e0dd7642556ae447b2401662
+  data.tar.gz: b1ea791fcc890e69fd2980956674b86182d187e6d8b8d80639bdbd87c93a17808c8fb4601908ac23993cfba0a13da2f46002007fa9d4c2f49eb2764f36037c8b

data/.rubocop.yml

@@ -1,6 +1,9 @@
 inherit_from:
   - conf/rubocop.yml
 
+AllCops:
+  TargetRubyVersion: 2.3
+
 Metrics/LineLength:
   Exclude:
     - '*.gemspec'

data/.travis.yml

@@ -1,12 +1,8 @@
 language: ruby
 rvm:
-  - 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
+  - 2.5.1
+  - 2.4.4
+  - 2.3.7
 script:
   - bundle exec rubocop
   - bundle exec rspec

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # salsify_rubocop
 
+## v0.52.1.1
+- Fix `Salsify/StyleDig` false positive in assignments (see [#20](https://github.com/salsify/salsify_rubocop/issues/20)). 
+
 ## v0.52.1
 - Update to `rubocop` v0.52.1 and `rubocop-rspec` v1.21.0.
 

data/README.md

@@ -1,7 +1,6 @@
 # salsify_rubocop
 
-This gem provides shared configuration for RuboCop for Salsify applications
-and gems.
+This gem provides shared configuration for RuboCop for Salsify applications/gems and some experimental cops.
 
 [RuboCop](https://github.com/bbatsov/rubocop) is a static code analyzer that 
 can enforce style conventions as well as identify common problems.

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

@@ -24,16 +24,15 @@ module RuboCop
         MSG = 'Use `dig` for nested access.'.freeze
 
         def_node_matcher :nested_access_match, <<-PATTERN
-          (send (send (send _receiver !:[]) :[] _) :[] _)
+          (send (send (send _receiver !:[]) :[] !{irange erange}) :[] !{irange erange})
         PATTERN
 
         def on_send(node)
-          if nested_access_match(node) && !conditional_assignment?(node)
-            match_node = node
-            # walk to outermost access node
-            match_node = match_node.parent while access_node?(match_node.parent)
-            add_offense(match_node)
-          end
+          return unless nested_access_match(node) && !assignment?(node)
+          match_node = node
+          # walk to outermost access node
+          match_node = match_node.parent while access_node?(match_node.parent)
+          add_offense(match_node, location: :expression, message: MSG)
         end
 
         def autocorrect(node)
@@ -55,12 +54,16 @@ module RuboCop
 
         private
 
-        def conditional_assignment?(node)
-          node.parent && node.parent.or_asgn_type? && (node.parent.children.first == node)
+        def assignment?(node)
+          node.parent&.assignment? && (node.parent.children.first == node)
         end
 
         def access_node?(node)
-          node && node.send_type? && node.method_name == :[]
+          node&.send_type? && node.method_name == :[] && !range?(node.first_argument)
+        end
+
+        def range?(node)
+          node.irange_type? || node.erange_type?
         end
       end
     end

data/lib/salsify_rubocop/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salsify_rubocop
 version: !ruby/object:Gem::Version
-  version: 0.52.1
+  version: 0.52.1.1
 platform: ruby
 authors:
 - Salsify, Inc
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Shared shared RuboCop configuration