Merge pull request #10 from charitywater/update-cop-for-new-rubocop-v…

…ersions

Update cop for new RuboCop versions

lib/charity_water/style/version.rb

@@ -1,5 +1,5 @@
 module CharityWater
   module Style
-    VERSION = '2.1.1'.freeze
+    VERSION = '2.2.0'.freeze
   end
 end

lib/private_attribute_accessors.rb

@@ -21,13 +21,14 @@ def private_block_attrs(body)
           return [] unless body
 
           private_nodes(body).select do |node|
-            %i(attr_reader attr_writer attr_accessor).include?(node.method_name)
+            node.send_type? && %i(attr_reader attr_writer attr_accessor).include?(node.method_name)
           end
         end
 
         def private_nodes(body)
-          index = body.child_nodes.index { |x| x.method_name == :private }
+          index = body.child_nodes.index { |x| x.send_type? && x.access_modifier? && x.method_name == :private }
           return [] unless index
+
           body.child_nodes[(index + 1)..-1]
         end
       end

spec/private_attribute_accessors_spec.rb

@@ -57,6 +57,25 @@ class SmallThing < Thing
               'Do not use private attribute accessors'])
   end
 
+  it 'can handle non-access modifier node types' do
+    inspect_source cop, <<-RUBY.strip_indent
+        class AwesomeController < RighteousController
+          def create
+            case variable_name
+            when 'something'
+              OtherClass::WorkerClass.perform_async argument
+            when 'something else'
+              OtherClass::WorkerClass.perform_async argument
+            end
+
+            head :ok
+          end
+        end
+    RUBY
+
+    expect(cop.offenses.size).to eq(0)
+  end
+
   it 'isn\'t offend by using any attr_* methods in public scope' do
     inspect_source cop, <<-RUBY.strip_indent
         class SmallThing < Thing