rubocop-sequel 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1426529648e896758505cc0f580c8a9dfd04eaaadf041e01fe8a38f1452fc549
-  data.tar.gz: 8105c3044c2536f0f57fc79346ecf2349036b5d918fa7312f1d35e55ffc41bc0
+  metadata.gz: c8a199639fb0c16e569564f9648764d8fb8aaf33bbee5def7a66d210cc85d649
+  data.tar.gz: 593503731a786d54e7fafbde51fd1972ce2d20713549c9d440d62a899c2e7ee0
 SHA512:
-  metadata.gz: 3eb093802d46566d8a0e0e4920af488673448bbd1ae9e8dab89b4dd2aedd11494f2222bfd4ae1fcaff01104b848d50510fef518daa0b947e741f85d009a04d33
-  data.tar.gz: 5570ee0d798a47808cacb9a162db33a141c0055147dbedbb88fba614ecc9b14ce6c50bd66f9911f01136515f5d94ed4634cbdb76355a68d628755426b8d4c3d4
+  metadata.gz: b55fa4dd717d9f52c7df265cff1e69971fc383dd2ee5851badeab905824910735e5f911061dbec719f66a44cf4f2b3a4774e5d068e3bd305e05261c051886b78
+  data.tar.gz: eb87589c3d20befa8af7bdff1c9c46143b351d7a38e43c32b3b3ce195bdb538e8fefc7b9f97635aad7d9511dd3e276c382349792c8519aa3d6e9e462d6ee3791

data/.rubocop.yml

@@ -7,7 +7,8 @@ AllCops:
 # Offense count: 1
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 31
+  Exclude:
+    - spec/**/*
 
 # Offense count: 1
 # Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.

data/lib/rubocop-sequel.rb

@@ -4,5 +4,6 @@ require 'rubocop'
 
 require 'rubocop/cop/sequel/column_default'
 require 'rubocop/cop/sequel/concurrent_index'
+require 'rubocop/cop/sequel/json_column'
 require 'rubocop/cop/sequel/migration_name'
 require 'rubocop/cop/sequel/save_changes'

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

@@ -7,12 +7,12 @@ module RuboCop
       class ColumnDefault < Cop
         MSG = "Don't create new column with default values"
 
-        def_node_matcher :add_column_default, <<-MATCHER
+        def_node_matcher :add_column_default?, <<-MATCHER
           (send _ :add_column ... (hash (pair (sym :default) _)))
         MATCHER
 
         def on_send(node)
-          return unless add_column_default(node)
+          return unless add_column_default?(node)
           add_offense(node, location: :selector, message: MSG)
         end
       end

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

@@ -7,12 +7,12 @@ module RuboCop
       class ConcurrentIndex < Cop
         MSG = 'Prefer creating or dropping new index concurrently'
 
-        def_node_matcher :indexes, <<-MATCHER
+        def_node_matcher :indexes?, <<-MATCHER
           (send _ {:add_index :drop_index} $...)
         MATCHER
 
         def on_send(node)
-          indexes(node) do |args|
+          indexes?(node) do |args|
             if offensive?(args)
               add_offense(node, location: :selector, message: MSG)
             end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module RuboCop
+  module Cop
+    module Sequel
+      # JSONColumn looks for non-JSONB columns.
+      class JSONColumn < Cop
+        MSG = 'Use JSONB rather than JSON or hstore'
+
+        def_node_matcher :json_or_hstore?, <<-MATCHER
+          (send _ :add_column ... (sym {:json :hstore}))
+        MATCHER
+
+        def_node_matcher :column_type?, <<-MATCHER
+          (send _ {:json :hstore} ...)
+        MATCHER
+
+        def_node_matcher :column_method?, <<-MATCHER
+          (send _ :column ... (sym {:json :hstore}))
+        MATCHER
+
+        def on_send(node)
+          return unless json_or_hstore?(node)
+          add_offense(node, location: :selector, message: MSG)
+        end
+
+        def on_block(node)
+          return unless node.send_node.method_name == :create_table
+          node.each_node(:send) do |method|
+            next unless column_method?(method) || column_type?(method)
+            add_offense(method, location: :selector, message: MSG)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -8,12 +8,12 @@ module RuboCop
         MSG = 'Use `Sequel::Model#save_changes` instead of '\
           '`Sequel::Model#save`.'
 
-        def_node_matcher :model_save, <<-MATCHER
+        def_node_matcher :model_save?, <<-MATCHER
           (send _ :save)
         MATCHER
 
         def on_send(node)
-          return unless model_save(node)
+          return unless model_save?(node)
           add_offense(node, location: :selector, message: MSG)
         end
 

data/rubocop-sequel.gemspec

@@ -13,14 +13,14 @@ 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.0.5'
+  gem.version       = '0.0.6'
 
-  gem.add_runtime_dependency 'rubocop', '~> 0.52', '>= 0.52'
+  gem.add_runtime_dependency 'rubocop', '~> 0.55', '>= 0.55'
 
-  gem.add_development_dependency 'rake', '~> 12.0.0', '>= 12.0.0'
-  gem.add_development_dependency 'rspec', '~> 3.5', '>= 3.5.0'
-  gem.add_development_dependency 'rubocop-rspec', '~> 1.22.0', '>= 1.22.0'
+  gem.add_development_dependency 'rake', '~> 12.3.0', '>= 12.0.0'
+  gem.add_development_dependency 'rspec', '~> 3.7', '>= 3.7.0'
+  gem.add_development_dependency 'rubocop-rspec', '~> 1.25.0', '>= 1.25.0'
   gem.add_development_dependency 'sequel', '~> 4.49', '>= 4.49.0'
-  gem.add_development_dependency 'simplecov', '~> 0.12'
+  gem.add_development_dependency 'simplecov', '~> 0.16'
   gem.add_development_dependency 'sqlite3', '~> 1.3', '>= 1.3.12'
 end

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

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe RuboCop::Cop::Sequel::JSONColumn do
+  subject(:cop) { described_class.new }
+
+  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)
+    end
+
+    it 'registers an offense when using hstore type' do
+      inspect_source('add_column(:products, :type, :hstore)')
+      expect(cop.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
+    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)
+    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)
+    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
+    end
+
+    it 'does not register an offense when using jsonb' do
+      inspect_source('create_table(:products) { jsonb :type }')
+      expect(cop.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
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-sequel
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Timothée Peignier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -16,27 +16,27 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.55'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.55'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.55'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.52'
+        version: '0.55'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 12.3.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.0.0
@@ -46,7 +46,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 12.3.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.0.0
@@ -56,40 +56,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.5.0
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.25.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.25.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.25.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.22.0
+        version: 1.25.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -116,14 +116,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -161,13 +161,14 @@ files:
 - lib/rubocop-sequel.rb
 - lib/rubocop/cop/sequel/column_default.rb
 - 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/save_changes.rb
 - lib/rubocop/sequel.rb
 - rubocop-sequel.gemspec
-- rubocop.yml
 - spec/rubocop/cop/sequel/column_default_spec.rb
 - 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/save_changes_spec.rb
 - spec/spec_helper.rb
@@ -198,6 +199,7 @@ summary: A plugin for the RuboCop code style & linting tool.
 test_files:
 - spec/rubocop/cop/sequel/column_default_spec.rb
 - 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/save_changes_spec.rb
 - spec/spec_helper.rb

data/rubocop.yml

@@ -1,3 +0,0 @@
-inherit_from: .rubocop_todo.yml
-AllCops:
-  TargetRubyVersion: 2.3