rubocop-rails_deprecation 0.3.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d83f59fd0e86b57e1f9007ddcd710071091255333a97c4d58da168769f62b882
-  data.tar.gz: 83824a404a65eb8d6d05d4946d1747823dab4d70fdcc5cd5a589e09c8cfdb67a
+  metadata.gz: 8cd931c5484f2340724c62e6027b6b9cb42fb5a66556a73a8b9776510f5bef53
+  data.tar.gz: 6aa4dcb475684c260b069c098dfab8fe9f59ec644ba4f0a883b2a63105cd21e0
 SHA512:
-  metadata.gz: 8dddc57f6cc13086ff9b84d400156726fa06bd3c5468298cdf324088bad93e18c83f275bd17a01628a58f7ec06cfbd95f85bbebfd51a987c9ed426b3f839beba
-  data.tar.gz: e5599be38bde11643bb4fe83edbf9a3722fee7e6139a8368acb3ee545dc58711b6784b63b3989f0412f7ecc9164150f7b61bb6fdc90092aa5c0a8341e43d84b5
+  metadata.gz: 0b221fc6c392b527f86c59eac7841781fe3c9fe94815451596c3b2134f01709accb3fae86befc3c92fd53fe2b3df106718fe2d8b435a737bfc4f06d328b6d9eb
+  data.tar.gz: 954e9a81b8c16d01ea55412123c9a8b72254379c01331ebd4309b9dd0e6e9c9a937a44ec3e6bf0417cbf5ca9dfc36456c710a689e52fd7fe63af4e4121d6990f

data/CHANGELOG.md

@@ -2,7 +2,25 @@
 
 ## Unreleased
 
-## 0.3.0
+## 0.6.0 - 2022-04-10
+
+### Added
+
+- Add RailsDeprecation/WhereNot cop.
+
+## 0.5.0 - 2022-04-10
+
+### Changed
+
+- Rename Deprecation/ToFormattedS with RailsDeprecation/ToFormattedS.
+
+## 0.4.0 - 2022-03-14
+
+### Added
+
+- Support csend on RailsDeprecation/ToFormattedS.
+
+## 0.3.0 - 2022-03-14
 
 ### Changed
 
@@ -15,7 +33,7 @@
 
 - Make #to_fs the default replacement for #to_s(:format).
 
-## 0.1.0
+## 0.1.0 - 2022-02-23
 
 ### Added
 

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    rubocop-rails_deprecation (0.3.0)
-      rubocop
+    rubocop-rails_deprecation (0.6.0)
+      rubocop (>= 1.27)
 
 GEM
   remote: https://rubygems.org/
@@ -29,13 +29,13 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.25.1)
+    rubocop (1.27.0)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.16.0)

data/config/default.yml

@@ -1,4 +1,4 @@
-Deprecation/ToFormattedS:
+RailsDeprecation/ToFormattedS:
   Description: Use `to_fs(...)` instead of `to_s(...)`.
   Enabled: true
   VersionAdded: '0.1'

data/lib/rubocop/cop/rails_deprecation/base.rb

@@ -2,12 +2,22 @@
 
 module RuboCop
   module Cop
-    module Deprecation
+    module RailsDeprecation
       class Base < ::RuboCop::Cop::Base
+        DEFAULT_MAXIMUM_TARGET_RAILS_VERSION = ::Float::INFINITY
+
         DEFAULT_MINIMUM_TARGET_RAILS_VERSION = 5.0
 
         class << self
-          attr_writer :minimum_target_rails_version
+          attr_writer(
+            :maximum_target_rails_version,
+            :minimum_target_rails_version
+          )
+
+          # @return [Float]
+          def maximum_target_rails_version
+            @maximum_target_rails_version ||= DEFAULT_MAXIMUM_TARGET_RAILS_VERSION
+          end
 
           # @return [Float]
           def minimum_target_rails_version
@@ -18,7 +28,7 @@ module RuboCop
           # @param [Float] version
           # @return [Boolean]
           def support_target_rails_version?(version)
-            minimum_target_rails_version <= version
+            (minimum_target_rails_version..maximum_target_rails_version).include?(version)
           end
         end
       end

data/lib/rubocop/cop/rails_deprecation/to_formatted_s.rb

@@ -2,7 +2,7 @@
 
 module RuboCop
   module Cop
-    module Deprecation
+    module RailsDeprecation
       # This cop identifies passing a format to `#to_s`.
       #
       # @safety
@@ -30,7 +30,7 @@ module RuboCop
         MSG = 'Use `to_fs(...)` instead of `to_s(...)`.'
 
         def_node_matcher :to_s_with_any_argument?, <<~PATTERN
-          (send _ :to_s _ ...)
+          ({csend | send} _ :to_s _ ...)
         PATTERN
 
         def on_send(node)
@@ -43,6 +43,7 @@ module RuboCop
             )
           end
         end
+        alias on_csend on_send
       end
     end
   end

data/lib/rubocop/cop/rails_deprecation/where_not.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module RailsDeprecation
+      # This cop identifies passing Hash with multiple elements to `where.not`.
+      #
+      # @example
+      #
+      #   # bad
+      #   where.not(key1: value1, key2: value2)
+      #
+      #   # good
+      #   where.not(key1: value1).where.not(key2: value2)
+      #
+      #   # good
+      #   where.not(key1: value1)
+      #
+      class WhereNot < Base
+        extend AutoCorrector
+
+        self.maximum_target_rails_version = 6.0
+
+        MSG = 'Use `where.not(key1: value1).where.not(key2: value2)` instead of `where.not(key1: value1, key2: value2)`.'
+
+        def_node_matcher :where_not_with_multiple_elements_hash?, <<~PATTERN
+          (send
+            (send _ :where) :not
+            ({ hash | kwargs }
+              (pair _ _)
+              (pair _ _)+))
+        PATTERN
+
+        def on_send(node)
+          return unless where_not_with_multiple_elements_hash?(node)
+
+          add_offense(node) do |corrector|
+            pairs = node.children[2].children
+            last_end_pos = pairs[0].location.expression.end_pos
+            pairs[1..].each do |pair|
+              corrector.remove(pair.location.expression.with(begin_pos: last_end_pos))
+              last_end_pos = pair.location.expression.end_pos
+              corrector.insert_after(node.location.expression, ".where.not(#{pair.source})")
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/rails_deprecation_cops.rb

@@ -2,3 +2,4 @@
 
 require_relative 'rails_deprecation/base'
 require_relative 'rails_deprecation/to_formatted_s'
+require_relative 'rails_deprecation/where_not'

data/lib/rubocop/rails_deprecation/inject.rb

@@ -3,7 +3,7 @@
 # The original code is from https://github.com/rubocop/rubocop-rspec/blob/main/lib/rubocop/rspec/inject.rb
 # See https://github.com/rubocop/rubocop-rspec/blob/main/MIT-LICENSE.md
 module RuboCop
-  module Deprecation
+  module RailsDeprecation
     # Because RuboCop doesn't yet support plugins, we have to monkey patch in a
     # bit of our configuration.
     module Inject

data/lib/rubocop/rails_deprecation/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module RuboCop
-  module Deprecation
-    VERSION = '0.3.0'
+  module RailsDeprecation
+    VERSION = '0.6.0'
   end
 end

data/lib/rubocop/rails_deprecation.rb

@@ -3,7 +3,7 @@
 require_relative 'rails_deprecation/version'
 
 module RuboCop
-  module Deprecation
+  module RailsDeprecation
     class Error < StandardError; end
     # Your code goes here...
     PROJECT_ROOT   = Pathname.new(__dir__).parent.parent.expand_path.freeze

data/lib/rubocop-rails_deprecation.rb

@@ -6,6 +6,6 @@ require_relative 'rubocop/rails_deprecation'
 require_relative 'rubocop/rails_deprecation/version'
 require_relative 'rubocop/rails_deprecation/inject'
 
-RuboCop::Deprecation::Inject.defaults!
+RuboCop::RailsDeprecation::Inject.defaults!
 
 require_relative 'rubocop/cop/rails_deprecation_cops'

data/rubocop-rails_deprecation.gemspec

@@ -4,7 +4,7 @@ require_relative 'lib/rubocop/rails_deprecation/version'
 
 Gem::Specification.new do |spec|
   spec.name = 'rubocop-rails_deprecation'
-  spec.version = RuboCop::Deprecation::VERSION
+  spec.version = RuboCop::RailsDeprecation::VERSION
   spec.authors = ['Ryo Nakamura']
   spec.email = ['r7kamura@gmail.com']
 
@@ -29,5 +29,5 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'rubocop'
+  spec.add_runtime_dependency 'rubocop', '>= 1.27'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rails_deprecation
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.27'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.27'
 description: 
 email:
 - r7kamura@gmail.com
@@ -44,6 +44,7 @@ files:
 - lib/rubocop-rails_deprecation.rb
 - lib/rubocop/cop/rails_deprecation/base.rb
 - lib/rubocop/cop/rails_deprecation/to_formatted_s.rb
+- lib/rubocop/cop/rails_deprecation/where_not.rb
 - lib/rubocop/cop/rails_deprecation_cops.rb
 - lib/rubocop/rails_deprecation.rb
 - lib/rubocop/rails_deprecation/inject.rb