rubocop-sequel 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af5f93d560c9a6dcb0216440641d3b108a466f5f536d296f1602ab9e38cc9d9e
-  data.tar.gz: e76e3f9bc6f6a768d500955c88e94b2b05c70486e6978317542cbf7d808e6e5b
+  metadata.gz: 8264c5365683296b4ca9330ef776756e3c04ac55bb1ccdb9b2e76ea42d587e95
+  data.tar.gz: 53417ac0da345eba715ef2ce39a7ac60dbd93a0b6a2d174400ff3928bdb8814c
 SHA512:
-  metadata.gz: d7eb9f7f0c40b0ad3cf542fabd76d3ab506505e0d4f40cf831b6de91719186b57750e13036a600b303928cbc28ebf5d2dfec68802c692b9b3580b8943821ad2d
-  data.tar.gz: 5cd74af9570a31c507b45fe5258234e2204cb112bbb7fb051f5531d8e08ffcfd1bdeb93d8757d9c8e77d37babc16e7e6b3dee2c3729631c205ea1cf5ef8b1d07
+  metadata.gz: aa8a47c34b42c304ba81f83725298b2e7ed6ba5c5da8432c5869e10f22e728fe3009132e1d7a144492f95e509908cbd3378d055d1bb9ff164c58363794df9210
+  data.tar.gz: a664d80d57e0477053dd8aaf45dc052c306714e610c7f312e1f656b20f0a11d7f9e17394ec63a9bf61353214f10a3d97b0059d826f85ef01399777bfc4225ed0

data/.gitignore

@@ -1,3 +1,4 @@
 .tags
 *.gem
 Gemfile.lock
+.DS_Store

data/config/default.yml

@@ -16,8 +16,8 @@ Sequel/IrreversibleMigration:
     Warns against using certain methods inside a migration file's `change` block that would cause the migration to become irreversible.
   Reference: https://www.rubydoc.info/gems/rubocop-sequel/RuboCop/Cop/Sequel/IrreversibleMigration
   Enabled: true
-  VersionAdded: 0.3.4
-  VersionChanged: 0.3.4
+  VersionAdded: 0.3.5
+  VersionChanged: 0.3.6
 
 Sequel/JSONColumn:
   Description: >-

data/lib/rubocop/cop/sequel/concurrent_index.rb

@@ -5,6 +5,8 @@ module RuboCop
     module Sequel
       # ConcurrentIndex looks for non-concurrent index creation.
       class ConcurrentIndex < Base
+        include Helpers::Migration
+
         MSG = 'Specify `concurrently` option when creating or dropping an index.'
         RESTRICT_ON_SEND = %i[add_index drop_index].freeze
 
@@ -13,6 +15,8 @@ module RuboCop
         MATCHER
 
         def on_send(node)
+          return unless within_sequel_migration?(node)
+
           indexes?(node) do |args|
             add_offense(node.loc.selector, message: MSG) if offensive?(args)
           end

data/lib/rubocop/cop/sequel/helpers/migration.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Sequel
+      module Helpers
+        # Migration contains helper methods for detecting if a node is inside a `Sequel.migration` block
+        module Migration
+          extend NodePattern::Macros
+
+          def_node_matcher :sequel_migration_block?, <<~MATCHER
+            (block
+              (send
+                (const nil? :Sequel) :migration ...)
+              ...)
+          MATCHER
+
+          def within_sequel_migration?(node)
+            node.each_ancestor(:block).any? { |ancestor| sequel_migration_block?(ancestor) }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rubocop/cop/sequel/irreversible_migration.rb

@@ -5,6 +5,8 @@ module RuboCop
     module Sequel
       # IrreversibleMigration looks for methods inside a `change` block that cannot be reversed.
       class IrreversibleMigration < Base
+        include Helpers::Migration
+
         # https://sequel.jeremyevans.net/rdoc/files/doc/migration_rdoc.html#label-A+Basic+Migration
         VALID_CHANGE_METHODS = %i[
           create_table
@@ -26,11 +28,12 @@ module RuboCop
           set_column_allow_null
         ].freeze
 
-        MSG = 'Avoid using `%<name>s` inside a `change` block. Use `up` & `down` blocks instead.'
-        PRIMARY_KEY_MSG = 'Avoid using `add_primary_key` with an array argument inside a `change` block.'
+        MSG = 'Avoid using "%<name>s" inside a "change" block. Use "up" & "down" blocks instead.'
+        PRIMARY_KEY_MSG = 'Avoid using "add_primary_key" with an array argument inside a "change" block.'
 
         def on_block(node)
           return unless node.method_name == :change
+          return unless within_sequel_migration?(node)
 
           body = node.body
           return unless body

data/lib/rubocop/cop/sequel/json_column.rb

@@ -5,6 +5,8 @@ module RuboCop
     module Sequel
       # JSONColumn looks for non-JSONB columns.
       class JSONColumn < Base
+        include Helpers::Migration
+
         MSG = 'Use JSONB rather than JSON or hstore'
         RESTRICT_ON_SEND = %i[add_column].freeze
 
@@ -22,12 +24,14 @@ module RuboCop
 
         def on_send(node)
           return unless json_or_hstore?(node)
+          return unless within_sequel_migration?(node)
 
           add_offense(node.loc.selector, message: MSG)
         end
 
         def on_block(node)
           return unless node.send_node.method_name == :create_table
+          return unless within_sequel_migration?(node)
 
           node.each_node(:send) do |method|
             next unless column_method?(method) || column_type?(method)

data/lib/rubocop/cop/sequel/partial_constraint.rb

@@ -5,6 +5,8 @@ module RuboCop
     module Sequel
       # PartialConstraint looks for missed usage of partial indexes.
       class PartialConstraint < Base
+        include Helpers::Migration
+
         MSG = "Constraint can't be partial, use where argument with index"
         RESTRICT_ON_SEND = %i[add_unique_constraint].freeze
 
@@ -14,6 +16,7 @@ module RuboCop
 
         def on_send(node)
           return unless add_partial_constraint?(node)
+          return unless within_sequel_migration?(node)
 
           add_offense(node.loc.selector, message: MSG)
         end

data/lib/rubocop/sequel/version.rb

@@ -4,7 +4,7 @@ module RuboCop
   module Sequel
     # This module holds the RuboCop Sequel version information.
     module Version
-      STRING = '0.3.5'
+      STRING = '0.3.6'
     end
   end
 end

data/lib/rubocop-sequel.rb

@@ -7,6 +7,8 @@ require 'rubocop/sequel/inject'
 
 RuboCop::Sequel::Inject.defaults!
 
+require_relative 'rubocop/cop/sequel/helpers/migration'
+
 require 'rubocop/cop/sequel/concurrent_index'
 require 'rubocop/cop/sequel/irreversible_migration'
 require 'rubocop/cop/sequel/json_column'

data/rubocop-sequel.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.name          = 'rubocop-sequel'
   gem.require_paths = ['lib']
-  gem.version       = '0.3.5'
+  gem.version       = '0.3.6'
   gem.metadata['rubygems_mfa_required'] = 'true'
 
   gem.required_ruby_version = '>= 2.5'

data/spec/rubocop/cop/sequel/concurrent_index_spec.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 RSpec.describe RuboCop::Cop::Sequel::ConcurrentIndex do
+  include Spec::Helpers::Migration
+
   subject(:cop) { described_class.new }
 
   context 'without the concurrent option' do
     it 'registers an offense without options' do
-      offenses = inspect_source(<<~SOURCE)
+      offenses = inspect_source_within_migration(<<~SOURCE)
         add_index(:products, :name)
         drop_index(:products, :name)
       SOURCE
@@ -13,7 +15,7 @@ RSpec.describe RuboCop::Cop::Sequel::ConcurrentIndex do
     end
 
     it 'registers an offense with other options' do
-      offenses = inspect_source(<<~SOURCE)
+      offenses = inspect_source_within_migration(<<~SOURCE)
         add_index(:products, :name, unique: true)
         drop_index(:products, :name, unique: true)
       SOURCE
@@ -21,7 +23,7 @@ RSpec.describe RuboCop::Cop::Sequel::ConcurrentIndex do
     end
 
     it 'registers an offense with composite index' do
-      offenses = inspect_source(<<~SOURCE)
+      offenses = inspect_source_within_migration(<<~SOURCE)
         add_index(:products, [:name, :price], unique: true)
         drop_index(:products, [:name, :price])
       SOURCE
@@ -30,7 +32,7 @@ RSpec.describe RuboCop::Cop::Sequel::ConcurrentIndex do
   end
 
   it 'does not register an offense when using concurrent option' do
-    offenses = inspect_source(<<~SOURCE)
+    offenses = inspect_source_within_migration(<<~SOURCE)
       add_index(:products, :name, unique: true, concurrently: true)
       drop_index(:products, :name, concurrently: true)
     SOURCE

data/spec/rubocop/cop/sequel/helpers/migration.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Spec
+  module Helpers
+    module Migration
+      extend CopHelper
+
+      def inspect_source_within_migration(source, file = nil)
+        migration_wrapped_source = <<~SOURCE
+          Sequel.migration do
+            #{source}
+          end
+        SOURCE
+
+        inspect_source(migration_wrapped_source, file)
+      end
+    end
+  end
+end

data/spec/rubocop/cop/sequel/irreversible_migration_spec.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 RSpec.describe RuboCop::Cop::Sequel::IrreversibleMigration do
+  include Spec::Helpers::Migration
+
   subject(:cop) { described_class.new }
 
   context 'when inside a change block' do
@@ -28,12 +30,12 @@ RSpec.describe RuboCop::Cop::Sequel::IrreversibleMigration do
     end
 
     it 'registers an offense when there is an invalid method' do
-      offenses = inspect_source(invalid_source)
+      offenses = inspect_source_within_migration(invalid_source)
       expect(offenses.size).to eq(2)
     end
 
     it 'does not register an offense with valid methods' do
-      offenses = inspect_source(valid_source)
+      offenses = inspect_source_within_migration(valid_source)
       expect(offenses).to be_empty
     end
 
@@ -49,7 +51,7 @@ RSpec.describe RuboCop::Cop::Sequel::IrreversibleMigration do
       end
 
       it 'registers an offense' do
-        offenses = inspect_source(source)
+        offenses = inspect_source_within_migration(source)
         expect(offenses.size).to eq(1)
       end
     end
@@ -68,6 +70,19 @@ RSpec.describe RuboCop::Cop::Sequel::IrreversibleMigration do
       SOURCE
     end
 
+    it 'does not register an offense with any methods' do
+      offenses = inspect_source_within_migration(source)
+      expect(offenses).to be_empty
+    end
+  end
+
+  context 'when a change block is used outside of a Sequel migration' do
+    let(:source) do
+      <<~SOURCE
+        it { expect { subject }.to change { document_count(user_id) }.by(-1) }
+      SOURCE
+    end
+
     it 'does not register an offense with any methods' do
       offenses = inspect_source(source)
       expect(offenses).to be_empty

data/spec/rubocop/cop/sequel/json_column_spec.rb

@@ -1,48 +1,50 @@
 # frozen_string_literal: true
 
 RSpec.describe RuboCop::Cop::Sequel::JSONColumn do
+  include Spec::Helpers::Migration
+
   subject(:cop) { described_class.new }
 
   context 'with add_column' do
     it 'registers an offense when using json type' do
-      offenses = inspect_source('add_column(:products, :type, :json)')
+      offenses = inspect_source_within_migration('add_column(:products, :type, :json)')
       expect(offenses.size).to eq(1)
     end
 
     it 'registers an offense when using hstore type' do
-      offenses = inspect_source('add_column(:products, :type, :hstore)')
+      offenses = inspect_source_within_migration('add_column(:products, :type, :hstore)')
       expect(offenses.size).to eq(1)
     end
 
     it 'does not register an offense when using jsonb' do
-      offenses = inspect_source('add_column(:products, :type, :jsonb)')
+      offenses = inspect_source_within_migration('add_column(:products, :type, :jsonb)')
       expect(offenses).to be_empty
     end
   end
 
   context 'with create_table' do
     it 'registers an offense when using json as a method' do
-      offenses = inspect_source('create_table(:products) { json :type, default: {} }')
+      offenses = inspect_source_within_migration('create_table(:products) { json :type, default: {} }')
       expect(offenses.size).to eq(1)
     end
 
     it 'registers an offense when using the column method with hstore' do
-      offenses = inspect_source('create_table(:products) { column :type, :hstore }')
+      offenses = inspect_source_within_migration('create_table(:products) { column :type, :hstore }')
       expect(offenses.size).to eq(1)
     end
 
     it 'does not register an offense when using jsonb as column type`' do
-      offenses = inspect_source('create_table(:products) { column :type, :jsonb }')
+      offenses = inspect_source_within_migration('create_table(:products) { column :type, :jsonb }')
       expect(offenses).to be_empty
     end
 
     it 'does not register an offense when using jsonb' do
-      offenses = inspect_source('create_table(:products) { jsonb :type }')
+      offenses = inspect_source_within_migration('create_table(:products) { jsonb :type }')
       expect(offenses).to be_empty
     end
 
     it 'does not register an offense when using a simple type' do
-      offenses = inspect_source('create_table(:products) { integer :type, default: 0 }')
+      offenses = inspect_source_within_migration('create_table(:products) { integer :type, default: 0 }')
       expect(offenses).to be_empty
     end
   end

data/spec/rubocop/cop/sequel/partial_constraint_spec.rb

@@ -1,10 +1,12 @@
 # frozen_string_literal: true
 
 RSpec.describe RuboCop::Cop::Sequel::PartialConstraint do
+  include Spec::Helpers::Migration
+
   subject(:cop) { described_class.new }
 
   it 'registers an offense when using where for constraint' do
-    offenses = inspect_source(<<~RUBY)
+    offenses = inspect_source_within_migration(<<~RUBY)
       add_unique_constraint %i[col_1 col_2], where: "state != 'deleted'"
     RUBY
 

data/spec/spec_helper.rb

@@ -4,6 +4,8 @@ require 'rubocop'
 require 'rubocop/rspec/support'
 require 'rubocop-sequel'
 
+require_relative 'rubocop/cop/sequel/helpers/migration'
+
 RSpec.configure do |config|
   config.include RuboCop::RSpec::ExpectOffense
   config.disable_monkey_patching!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-sequel
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Timothée Peignier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-23 00:00:00.000000000 Z
+date: 2024-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -43,6 +43,7 @@ files:
 - config/obsoletion.yml
 - lib/rubocop-sequel.rb
 - lib/rubocop/cop/sequel/concurrent_index.rb
+- lib/rubocop/cop/sequel/helpers/migration.rb
 - lib/rubocop/cop/sequel/irreversible_migration.rb
 - lib/rubocop/cop/sequel/json_column.rb
 - lib/rubocop/cop/sequel/migration_name.rb
@@ -54,6 +55,7 @@ files:
 - rubocop-sequel.gemspec
 - spec/project_spec.rb
 - spec/rubocop/cop/sequel/concurrent_index_spec.rb
+- spec/rubocop/cop/sequel/helpers/migration.rb
 - spec/rubocop/cop/sequel/irreversible_migration_spec.rb
 - spec/rubocop/cop/sequel/json_column_spec.rb
 - spec/rubocop/cop/sequel/migration_name_spec.rb