outrigger 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 613f64ef0cb57dc2e0d9db82cbaf36875d83e29e
-  data.tar.gz: e1c6fe5ce0efb7eec9b771fb8ea74355dc69791b
+  metadata.gz: 71510d6681f003b4789cf0d0a01ee95c30906fcf
+  data.tar.gz: a17a22273ad13306a31f5b00d9ce8c49017328ee
 SHA512:
-  metadata.gz: 9a38cc82481cd060301eac7de9cbce6ff7c8195918c257d7d59af6338815855851110fe5c97405a15fcbe2f2461df90316a50048053069a65e21ac5865a44ee4
-  data.tar.gz: 14eefd72465206a5f803e52c5f0c6397139211a298ca5e916cfc60af80b89fd9728e061b8ea2c44b8fc2788e8dc3f9d1ccfdcb73dd3f3a10c731265337a0fead
+  metadata.gz: b438bb3bb8a44fe6aa4ad55144a464a18b3ec7cb6829449069ac5f5120a2ec49462af7b0943ed79fbd931b285e529ca84ad5e3e38be2cccc47620a83ad8f64d5
+  data.tar.gz: 8fd3fcc001452e8dd981a86dddccdb1a66fc5755821fee215c976b0d9bc8a0313b0670445f3e3f827a677170adf0974f22cd37c4675aa12b36c4f1c2752a182b

data/lib/outrigger.rb

@@ -3,7 +3,7 @@ require 'active_record' unless defined? ActiveRecord
 require 'outrigger/taggable'
 require 'outrigger/taggable_proxy'
 
-require 'outrigger/railtie' if defined? Rails
+require 'outrigger/railtie' if defined? Rails::Railtie
 
 module Outrigger
   def self.filter(*tags)

data/lib/outrigger/cops/migration/tagged.rb

@@ -3,16 +3,26 @@ module RuboCop
     module Migration
       class Tagged < Cop
         def on_class(node)
-          _name, superclass, body = *node
-          return unless body && superclass == s(:const, s(:const, nil, :ActiveRecord), :Migration)
+          _name, _superclass, body = *node
+          return unless body && migration_class?(node)
           check(node, body)
         end
 
         private
 
-        def s(name, *args)
-          Parser::AST::Node.new(name, args)
-        end
+        def_node_matcher :migration_class?, <<~PATTERN
+          {
+            (class
+              (const nil _)
+              (const
+                (const nil :ActiveRecord) :Migration) ...)
+            (class
+              (const nil _)
+              (send
+                (const
+                  (const nil :ActiveRecord) :Migration) :[] _) ...)
+          }
+        PATTERN
 
         def check(klass, node)
           tag = tag_node(node)

data/lib/outrigger/railtie.rb

@@ -1,6 +1,3 @@
-require 'rails'
-require 'rake'
-
 module Outrigger
   class Railtie < Rails::Railtie
     railtie_name :taggable_migrations

data/lib/outrigger/version.rb

@@ -1,3 +1,3 @@
 module Outrigger
-  VERSION = '1.2.1'.freeze
+  VERSION = '1.2.2'.freeze
 end

data/spec/outrigger/cops/migration/tagged_spec.rb

@@ -0,0 +1,142 @@
+require 'spec_helper'
+require 'outrigger/cops/migration/tagged'
+
+RSpec.describe RuboCop::Cop::Migration::Tagged do # rubocop:disable Metrics/BlockLength
+  let(:config_hash) do
+    {
+      'Migration/Tagged' => {
+        'AllowedTags' => %w[predeploy deploy],
+        'Enabled' => true
+      }
+    }
+  end
+
+  let(:config) { RuboCop::Config.new(config_hash) }
+
+  let(:migration_class) do
+    <<-RUBY
+    class Test < ActiveRecord::Migration
+      tag :predeploy
+      def change
+      end
+    end
+    RUBY
+  end
+
+  let(:migration_class_42) do
+    <<-RUBY
+    class Test < ActiveRecord::Migration[4.2]
+      tag :predeploy
+      def change
+      end
+    end
+    RUBY
+  end
+
+  subject(:cop) { described_class.new(config) }
+
+  shared_examples_for 'valid migrations' do
+    it 'passes valid unversioned migration' do
+      inspect_source(migration_class)
+      expect(cop.offenses.empty?).to be(true)
+    end
+
+    it 'passes valid versioned migration' do
+      inspect_source(migration_class_42)
+      expect(cop.offenses.empty?).to be(true)
+    end
+  end
+
+  context 'valid config' do # rubocop:disable Metrics/BlockLength
+    include_examples 'valid migrations'
+
+    context 'missing tags' do # rubocop:disable Metrics/BlockLength
+      let(:migration_class) do
+        <<-RUBY
+        class Test < ActiveRecord::Migration
+          def change
+          end
+        end
+        RUBY
+      end
+
+      let(:migration_class_42) do
+        <<-RUBY
+        class Test < ActiveRecord::Migration[4.2]
+          def change
+          end
+        end
+        RUBY
+      end
+
+      it 'finds missing tag in unversioned migration' do
+        inspect_source(migration_class)
+        expect(cop.offenses.empty?).to be(false)
+        expect(cop.offenses.first.message).to match(/All migrations require a tag from/)
+      end
+
+      it 'finds missing tag in versioned migration' do
+        inspect_source(migration_class_42)
+        expect(cop.offenses.empty?).to be(false)
+        expect(cop.offenses.first.message).to match(/All migrations require a tag from/)
+      end
+    end
+
+    context 'invalid tag' do # rubocop:disable Metrics/BlockLength
+      let(:migration_class) do
+        <<-RUBY
+        class Test < ActiveRecord::Migration
+          tag :foobar
+          def change
+          end
+        end
+        RUBY
+      end
+
+      let(:migration_class_42) do
+        <<-RUBY
+        class Test < ActiveRecord::Migration[4.2]
+          tag :foobar
+          def change
+          end
+        end
+        RUBY
+      end
+
+      it 'fails on invalid tag in unversioned migration' do
+        inspect_source(migration_class)
+        expect(cop.offenses.empty?).to be(false)
+        expect(cop.offenses.first.message).to match(/Tags may only be one of/)
+      end
+
+      it 'fails on invalid tag in versioned migration' do
+        inspect_source(migration_class_42)
+        expect(cop.offenses.empty?).to be(false)
+        expect(cop.offenses.first.message).to match(/Tags may only be one of/)
+      end
+    end
+  end
+
+  context 'invalid config' do
+    let(:config_hash) do
+      {
+        'Migration/Tagged' => {
+          'AllowedTags' => [],
+          'Enabled' => true
+        }
+      }
+    end
+
+    it 'fails on missing tags in configuration on unversioned migration' do
+      inspect_source(migration_class)
+      expect(cop.offenses.empty?).to be(false)
+      expect(cop.offenses.first.message).to match(/No allowed tags have been defined/)
+    end
+
+    it 'fails on missing tags in configuration on versioned migration' do
+      inspect_source(migration_class_42)
+      expect(cop.offenses.empty?).to be(false)
+      expect(cop.offenses.first.message).to match(/No allowed tags have been defined/)
+    end
+  end
+end

data/spec/outrigger/railtie_spec.rb

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe Outrigger::Railtie do
+  let(:subject) { Outrigger::Railtie }
+
+  it 'provides a railtie_name' do
+    expect(subject.railtie_name).to eq 'taggable_migrations'
+  end
+end

data/spec/spec_helper.rb

@@ -4,9 +4,13 @@ SimpleCov.start do
   add_filter 'spec'
   track_files 'lib/**/*.rb'
 end
-SimpleCov.minimum_coverage(30) # TODO: add better coverage
+SimpleCov.minimum_coverage(75)
 
 require 'bundler/setup'
+require 'rails/railtie'
+require 'rubocop'
+require 'rubocop/rspec/support'
+
 require 'outrigger'
 
 RSpec.configure do |config|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: outrigger
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Drew Bowman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-16 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,6 +44,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.15'
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +138,9 @@ files:
 - spec/gemfiles/rails-4.2.gemfile.lock
 - spec/gemfiles/rails-5.0.gemfile
 - spec/gemfiles/rails-5.0.gemfile.lock
+- spec/outrigger/cops/migration/tagged_spec.rb
 - spec/outrigger/outrigger_spec.rb
+- spec/outrigger/railtie_spec.rb
 - spec/outrigger/taggable_proxy_spec.rb
 - spec/outrigger/taggable_spec.rb
 - spec/spec_helper.rb
@@ -151,7 +173,9 @@ test_files:
 - spec/gemfiles/rails-4.2.gemfile.lock
 - spec/gemfiles/rails-5.0.gemfile
 - spec/gemfiles/rails-5.0.gemfile.lock
+- spec/outrigger/cops/migration/tagged_spec.rb
 - spec/outrigger/outrigger_spec.rb
+- spec/outrigger/railtie_spec.rb
 - spec/outrigger/taggable_proxy_spec.rb
 - spec/outrigger/taggable_spec.rb
 - spec/spec_helper.rb