rubocop-sequel 0.1.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a6bd53027cc6d6df7b1d67153a46c9ac5325509b
-  data.tar.gz: 32b4aa5476643d2c82d4c5495b77ba5cd3fcab02
+SHA256:
+  metadata.gz: dc0c293a2da37b5ef89b4b0e7d6a6639c4edcc99b5f5a476adeaba27924baf84
+  data.tar.gz: 37d04d0e24b6aabc08a97ec6d713bfa00db61e755eb1d6a6254cf09d305149c8
 SHA512:
-  metadata.gz: 75952359885f37ceafdc126f9df5b102f3f64d06ed761308085a6fe3498d68382a28bdfef00a6658c14af589f98900a70076fce221d425eb8167b3f2de1d8ed0
-  data.tar.gz: 2016916ef31f9459cc2ad51b4180534563d7c38f901a72e060db218716ddbad3ef9dfc2e35970333bb1877f7ea2d6f6e69018df4c5af37f5ce2de2bd188e5031
+  metadata.gz: 26fdd03e129d3636db9f348a7825c608eeefd7d5d1d715cdce4413120446ee93fda09afe5cb192e6074c02f33e03a5f8a7f87891e4ddb961e07ecc104fe44817
+  data.tar.gz: b55b4773c476338c93699771bf9066aedb261a2c8bb259177ec0b6b9b436475ac3243d476697d3edebd93474fe821f609e6a34548b1e5b4720cb4f84c3ac36c8

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "bundler"
+    directory: /
+    schedule:
+      interval: "weekly"

data/.github/workflows/actions.yml

@@ -1,5 +1,5 @@
 name: CI
-on: push
+on: [push, pull_request]
 
 jobs:
   main:
@@ -8,10 +8,10 @@ jobs:
     strategy:
       matrix:
         ruby:
-          - 2.4
           - 2.5
           - 2.6
           - 2.7
+          - 3.0
     steps:
       - uses: actions/checkout@v2
 

data/.rubocop.yml

@@ -2,7 +2,8 @@ require:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 2.4
+  TargetRubyVersion: 2.5
+  NewCops: enable
 
 # Offense count: 1
 # Configuration parameters: CountComments, ExcludedMethods.

data/lib/rubocop-sequel.rb

@@ -7,3 +7,4 @@ require 'rubocop/cop/sequel/concurrent_index'
 require 'rubocop/cop/sequel/json_column'
 require 'rubocop/cop/sequel/migration_name'
 require 'rubocop/cop/sequel/save_changes'
+require 'rubocop/cop/sequel/partial_constraint'

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

@@ -4,8 +4,9 @@ module RuboCop
   module Cop
     module Sequel
       # ColumnDefault looks for column creation with a default value.
-      class ColumnDefault < Cop
+      class ColumnDefault < Base
         MSG = "Don't create new column with default values"
+        RESTRICT_ON_SEND = %i[add_column].freeze
 
         def_node_matcher :add_column_default?, <<-MATCHER
           (send _ :add_column ... (hash (pair (sym :default) _)))
@@ -14,7 +15,7 @@ module RuboCop
         def on_send(node)
           return unless add_column_default?(node)
 
-          add_offense(node, location: :selector, message: MSG)
+          add_offense(node.loc.selector, message: MSG)
         end
       end
     end

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

@@ -4,8 +4,9 @@ module RuboCop
   module Cop
     module Sequel
       # ConcurrentIndex looks for non-concurrent index creation.
-      class ConcurrentIndex < Cop
+      class ConcurrentIndex < Base
         MSG = 'Prefer creating or dropping new index concurrently'
+        RESTRICT_ON_SEND = %i[add_index drop_index].freeze
 
         def_node_matcher :indexes?, <<-MATCHER
           (send _ {:add_index :drop_index} $...)
@@ -13,7 +14,7 @@ module RuboCop
 
         def on_send(node)
           indexes?(node) do |args|
-            add_offense(node, location: :selector, message: MSG) if offensive?(args)
+            add_offense(node.loc.selector, message: MSG) if offensive?(args)
           end
         end
 

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

@@ -4,8 +4,9 @@ module RuboCop
   module Cop
     module Sequel
       # JSONColumn looks for non-JSONB columns.
-      class JSONColumn < Cop
+      class JSONColumn < Base
         MSG = 'Use JSONB rather than JSON or hstore'
+        RESTRICT_ON_SEND = %i[add_column].freeze
 
         def_node_matcher :json_or_hstore?, <<-MATCHER
           (send _ :add_column ... (sym {:json :hstore}))
@@ -22,7 +23,7 @@ module RuboCop
         def on_send(node)
           return unless json_or_hstore?(node)
 
-          add_offense(node, location: :selector, message: MSG)
+          add_offense(node.loc.selector, message: MSG)
         end
 
         def on_block(node)
@@ -31,7 +32,7 @@ module RuboCop
           node.each_node(:send) do |method|
             next unless column_method?(method) || column_type?(method)
 
-            add_offense(method, location: :selector, message: MSG)
+            add_offense(method.loc.selector, message: MSG)
           end
         end
       end

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

@@ -4,19 +4,19 @@ module RuboCop
   module Cop
     module Sequel
       # MigrationName looks for migration files named with a default name.
-      class MigrationName < Cop
+      class MigrationName < Base
         include RangeHelp
 
         MSG = 'Migration files should not use default name.'
 
-        def investigate(processed_source)
+        def on_new_investigation
           file_path = processed_source.buffer.name
           return if config.file_to_include?(file_path)
 
           return unless filename_bad?(file_path)
 
           location = source_range(processed_source.buffer, 1, 0)
-          add_offense(nil, location: location)
+          add_offense(location)
         end
 
         private

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

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Sequel
+      # PartialConstraint looks for missed usage of partial indexes.
+      class PartialConstraint < Base
+        MSG = "Constraint can't be partial, use where argument with index"
+        RESTRICT_ON_SEND = %i[add_unique_constraint].freeze
+
+        def_node_matcher :add_partial_constraint?, <<-MATCHER
+          (send _ :add_unique_constraint ... (hash (pair (sym :where) _)))
+        MATCHER
+
+        def on_send(node)
+          return unless add_partial_constraint?(node)
+
+          add_offense(node.loc.selector, message: MSG)
+        end
+      end
+    end
+  end
+end

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

@@ -4,9 +4,12 @@ module RuboCop
   module Cop
     module Sequel
       # SaveChanges promotes the use of save_changes.
-      class SaveChanges < Cop
+      class SaveChanges < Base
+        extend AutoCorrector
+
         MSG = 'Use `Sequel::Model#save_changes` instead of '\
-          '`Sequel::Model#save`.'
+              '`Sequel::Model#save`.'
+        RESTRICT_ON_SEND = %i[save].freeze
 
         def_node_matcher :model_save?, <<-MATCHER
           (send _ :save)
@@ -15,11 +18,11 @@ module RuboCop
         def on_send(node)
           return unless model_save?(node)
 
-          add_offense(node, location: :selector, message: MSG)
-        end
+          range = node.loc.selector
 
-        def autocorrect(node)
-          ->(corrector) { corrector.replace(node.loc.selector, 'save_changes') }
+          add_offense(range, message: MSG) do |corrector|
+            corrector.replace(range, 'save_changes')
+          end
         end
       end
     end

data/rubocop-sequel.gemspec

@@ -13,16 +13,17 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = 'rubocop-sequel'
   gem.require_paths = ['lib']
-  gem.version       = '0.1.0'
+  gem.version       = '0.3.3'
 
-  gem.required_ruby_version = '~> 2.4'
+  gem.required_ruby_version = '>= 2.5'
 
   gem.add_runtime_dependency 'rubocop', '~> 1.0'
 
-  gem.add_development_dependency 'rake', '~> 12.3.0'
+  gem.add_development_dependency 'rake', '~> 13.0.6'
   gem.add_development_dependency 'rspec', '~> 3.7'
+  gem.add_development_dependency 'rubocop-rake', '~> 0.6.0'
   gem.add_development_dependency 'rubocop-rspec', '~> 2.0'
-  gem.add_development_dependency 'sequel', '~> 4.49'
+  gem.add_development_dependency 'sequel', '~> 5.47'
   gem.add_development_dependency 'simplecov', '~> 0.16'
   gem.add_development_dependency 'sqlite3', '~> 1.3', '>= 1.3.12'
 end

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

@@ -6,12 +6,12 @@ describe RuboCop::Cop::Sequel::ColumnDefault do
   subject(:cop) { described_class.new }
 
   it 'registers an offense when setting a default' do
-    inspect_source('add_column(:products, :type, :text, default: "cop")')
-    expect(cop.offenses.size).to eq(1)
+    offenses = inspect_source('add_column(:products, :type, :text, default: "cop")')
+    expect(offenses.size).to eq(1)
   end
 
   it 'does not register an offense when not setting a default' do
-    inspect_source('add_column(:products, :type, :text)')
-    expect(cop.offenses).to be_empty
+    offenses = inspect_source('add_column(:products, :type, :text)')
+    expect(offenses).to be_empty
   end
 end

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

@@ -7,35 +7,35 @@ describe RuboCop::Cop::Sequel::ConcurrentIndex do
 
   context 'without the concurrent option' do
     it 'registers an offense without options' do
-      inspect_source(<<~SOURCE)
+      offenses = inspect_source(<<~SOURCE)
         add_index(:products, :name)
         drop_index(:products, :name)
       SOURCE
-      expect(cop.offenses.size).to eq(2)
+      expect(offenses.size).to eq(2)
     end
 
     it 'registers an offense with other options' do
-      inspect_source(<<~SOURCE)
+      offenses = inspect_source(<<~SOURCE)
         add_index(:products, :name, unique: true)
         drop_index(:products, :name, unique: true)
       SOURCE
-      expect(cop.offenses.size).to eq(2)
+      expect(offenses.size).to eq(2)
     end
 
     it 'registers an offense with composite index' do
-      inspect_source(<<~SOURCE)
+      offenses = inspect_source(<<~SOURCE)
         add_index(:products, [:name, :price], unique: true)
         drop_index(:products, [:name, :price])
       SOURCE
-      expect(cop.offenses.size).to eq(2)
+      expect(offenses.size).to eq(2)
     end
   end
 
   it 'does not register an offense when using concurrent option' do
-    inspect_source(<<~SOURCE)
+    offenses = inspect_source(<<~SOURCE)
       add_index(:products, :name, unique: true, concurrently: true)
       drop_index(:products, :name, concurrently: true)
     SOURCE
-    expect(cop.offenses).to be_empty
+    expect(offenses).to be_empty
   end
 end

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

@@ -7,45 +7,45 @@ describe RuboCop::Cop::Sequel::JSONColumn do
 
   context 'with add_column' do
     it 'registers an offense when using json type' do
-      inspect_source('add_column(:products, :type, :json)')
-      expect(cop.offenses.size).to eq(1)
+      offenses = inspect_source('add_column(:products, :type, :json)')
+      expect(offenses.size).to eq(1)
     end
 
     it 'registers an offense when using hstore type' do
-      inspect_source('add_column(:products, :type, :hstore)')
-      expect(cop.offenses.size).to eq(1)
+      offenses = inspect_source('add_column(:products, :type, :hstore)')
+      expect(offenses.size).to eq(1)
     end
 
     it 'does not register an offense when using jsonb' do
-      inspect_source('add_column(:products, :type, :jsonb)')
-      expect(cop.offenses).to be_empty
+      offenses = inspect_source('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
-      inspect_source('create_table(:products) { json :type, default: {} }')
-      expect(cop.offenses.size).to eq(1)
+      offenses = inspect_source('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
-      inspect_source('create_table(:products) { column :type, :hstore }')
-      expect(cop.offenses.size).to eq(1)
+      offenses = inspect_source('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
-      inspect_source('create_table(:products) { column :type, :jsonb }')
-      expect(cop.offenses).to be_empty
+      offenses = inspect_source('create_table(:products) { column :type, :jsonb }')
+      expect(offenses).to be_empty
     end
 
     it 'does not register an offense when using jsonb' do
-      inspect_source('create_table(:products) { jsonb :type }')
-      expect(cop.offenses).to be_empty
+      offenses = inspect_source('create_table(:products) { jsonb :type }')
+      expect(offenses).to be_empty
     end
 
     it 'does not register an offense when using a simple type' do
-      inspect_source('create_table(:products) { integer :type, default: 0 }')
-      expect(cop.offenses).to be_empty
+      offenses = inspect_source('create_table(:products) { integer :type, default: 0 }')
+      expect(offenses).to be_empty
     end
   end
 end

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

@@ -17,13 +17,13 @@ describe RuboCop::Cop::Sequel::MigrationName, :config do
     let(:cop_config) { {} }
 
     it 'registers an offense when using the default name' do
-      inspect_source('', 'new_migration.rb')
-      expect(cop.offenses.size).to eq(1)
+      offenses = inspect_source('', 'new_migration.rb')
+      expect(offenses.size).to eq(1)
     end
 
     it 'does not register an offense when using a specific name' do
-      inspect_source('', 'add_index.rb')
-      expect(cop.offenses).to be_empty
+      offenses = inspect_source('', 'add_index.rb')
+      expect(offenses).to be_empty
     end
   end
 
@@ -31,13 +31,13 @@ describe RuboCop::Cop::Sequel::MigrationName, :config do
     let(:cop_config) { { 'DefaultName' => 'add_migration' } }
 
     it 'registers an offense when using the default name' do
-      inspect_source('', 'add_migration.rb')
-      expect(cop.offenses.size).to eq(1)
+      offenses = inspect_source('', 'add_migration.rb')
+      expect(offenses.size).to eq(1)
     end
 
     it 'does not register an offense when using a specific name' do
-      inspect_source('', 'add_index.rb')
-      expect(cop.offenses).to be_empty
+      offenses = inspect_source('', 'add_index.rb')
+      expect(offenses).to be_empty
     end
   end
 end

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

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Sequel::PartialConstraint do
+  subject(:cop) { described_class.new }
+
+  it 'registers an offense when using where for constraint' do
+    offenses = inspect_source(<<~RUBY)
+      add_unique_constraint %i[col_1 col_2], where: "state != 'deleted'"
+    RUBY
+
+    expect(offenses.size).to eq(1)
+  end
+end

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

@@ -6,13 +6,13 @@ describe RuboCop::Cop::Sequel::SaveChanges do
   subject(:cop) { described_class.new }
 
   it 'registers an offense when using save' do
-    inspect_source('favorite.save')
-    expect(cop.offenses.size).to eq(1)
+    offenses = inspect_source('favorite.save')
+    expect(offenses.size).to eq(1)
   end
 
   it 'does not register an offense when using save_changes' do
-    inspect_source('favorite.save_changes')
-    expect(cop.offenses).to be_empty
+    offenses = inspect_source('favorite.save_changes')
+    expect(offenses).to be_empty
   end
 
   it 'auto-corrects by using save_changes' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-sequel
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Timothée Peignier
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-23 00:00:00.000000000 Z
+date: 2021-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.49'
+        version: '5.47'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.49'
+        version: '5.47'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -121,6 +135,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/actions.yml"
 - ".gitignore"
 - ".rspec"
@@ -133,6 +148,7 @@ files:
 - lib/rubocop/cop/sequel/concurrent_index.rb
 - lib/rubocop/cop/sequel/json_column.rb
 - lib/rubocop/cop/sequel/migration_name.rb
+- lib/rubocop/cop/sequel/partial_constraint.rb
 - lib/rubocop/cop/sequel/save_changes.rb
 - lib/rubocop/sequel.rb
 - rubocop-sequel.gemspec
@@ -140,6 +156,7 @@ files:
 - spec/rubocop/cop/sequel/concurrent_index_spec.rb
 - spec/rubocop/cop/sequel/json_column_spec.rb
 - spec/rubocop/cop/sequel/migration_name_spec.rb
+- spec/rubocop/cop/sequel/partial_constraint_spec.rb
 - spec/rubocop/cop/sequel/save_changes_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/rubocop-hq/rubocop-sequel
@@ -152,17 +169,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.6.11
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: A Sequel plugin for RuboCop
@@ -171,5 +187,6 @@ test_files:
 - spec/rubocop/cop/sequel/concurrent_index_spec.rb
 - spec/rubocop/cop/sequel/json_column_spec.rb
 - spec/rubocop/cop/sequel/migration_name_spec.rb
+- spec/rubocop/cop/sequel/partial_constraint_spec.rb
 - spec/rubocop/cop/sequel/save_changes_spec.rb
 - spec/spec_helper.rb