schema_plus_pg_indexes 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c7a0890c1692f1bccb36a22dd4c68c81385e2fa
-  data.tar.gz: 6aefdddf74cca2fd8f72120b2098b674a69ae97d
+  metadata.gz: ab9e97841907e541e956b5913588e9da67ac61a3
+  data.tar.gz: 24f847eed723f93c188de98e38bdf32380a1b681
 SHA512:
-  metadata.gz: b4418c479638217697120b8278121e7342da4eb4595c2af12807631f9ea5c60bed98645aeb02fe83973865a707159c10d2c3dbf38702642eeb06bab5eb4968bf
-  data.tar.gz: fb4644fab3314297ad7ed94487006156630009d395cde790057a00c3818f942193a638de7dd4d53caf0cb77705d6d60367bb4a5b69f7a3aa9b73b583be6ab4ee
+  metadata.gz: 7b37d277f416c7bbbcafe1228cf0e96d8d7cc11f10d3e880076c587eef9a2d0d9e159091ed7d69f372bea5cc752d86e01796ea7019eabbc67c16ea27413c0f42
+  data.tar.gz: c162ca9beb5865f541193730ba48d1bb28566c8a874cbc45fe851b60ee4521d6e3f7c1488e9f7b0a6898669b8fc1fa88cb8ad04d223d4fd46ed13d97a77a5448

data/.gitignore

@@ -1,6 +1,7 @@
 /coverage
 /tmp
 /pkg
+/Gemfile.local
 
 *.lock
 *.log

data/README.md

@@ -31,12 +31,12 @@ gem "schema_plus_pg_indexes"
 
 schema_plus_pg_indexes is tested on
 
-[//]: # SCHEMA_DEV: MATRIX - begin
-[//]: # These lines are auto-generated by schema_dev based on schema_dev.yml
+<!-- SCHEMA_DEV: MATRIX - begin -->
+<!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
 * ruby **1.9.3** with rails **4.2**, using **postgresql**
 * ruby **2.1.5** with rails **4.2**, using **postgresql**
 
-[//]: # SCHEMA_DEV: MATRIX - end
+<!-- SCHEMA_DEV: MATRIX - end -->
 
 
 ## History

data/lib/schema_plus_pg_indexes.rb

@@ -2,7 +2,6 @@ require 'schema_monkey'
 require 'schema_plus_indexes'
 
 require_relative 'schema_plus_pg_indexes/active_record/connection_adapters/index_definition'
-require_relative 'schema_plus_pg_indexes/middleware/migration'
 require_relative 'schema_plus_pg_indexes/middleware/postgresql/dumper'
 require_relative 'schema_plus_pg_indexes/middleware/postgresql/migration'
 require_relative 'schema_plus_pg_indexes/middleware/postgresql/query'

data/lib/schema_plus_pg_indexes/active_record/connection_adapters/index_definition.rb

@@ -23,8 +23,8 @@ module SchemaPlusPgIndexes
         end
 
         def kind
-          ActiveSupport::Deprecation.warn "ActiveRecord IndexDefinition#kind is deprecated, used #using instead"
-          using
+          ActiveSupport::Deprecation.warn "ActiveRecord IndexDefinition#kind is deprecated, used #using.to_s instead"
+          using.to_s
         end
 
         def initialize_with_schema_plus_pg_indexes(*args)

data/lib/schema_plus_pg_indexes/middleware/postgresql/migration.rb

@@ -3,9 +3,22 @@ module SchemaPlusPgIndexes
     module Postgresql
       module Migration
         def self.insert
+          SchemaMonkey::Middleware::Migration::Index.prepend DeprecateArgs
           SchemaMonkey::Middleware::Migration::IndexComponentsSql.append DefineExtensions
         end
 
+        class DeprecateArgs < SchemaMonkey::Middleware::Base
+          def call(env)
+            {:conditions => :where, :kind => :using}.each do |deprecated, proper|
+              if env.options[deprecated]
+                ActiveSupport::Deprecation.warn "ActiveRecord index option #{deprecated.inspect} is deprecated, use #{proper.inspect} instead"
+                env.options[proper] = env.options.delete(deprecated)
+              end
+            end
+            continue env
+          end
+        end
+
         class DefineExtensions < SchemaMonkey::Middleware::Base
           # SchemaPlusPgIndexes provides the following extra options for PostgreSQL
           # indexes:

data/lib/schema_plus_pg_indexes/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlusPgIndexes
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/schema_plus_pg_indexes.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0.0"
-  spec.add_development_dependency "schema_dev", "~> 2.0"
+  spec.add_development_dependency "schema_dev", "~> 2.0", ">= 2.0.3"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-gem-profile"
 end

data/spec/deprecation_spec.rb

@@ -43,7 +43,7 @@ describe 'Deprecations' do
       index = User.indexes.first
       expect(ActiveSupport::Deprecation).to receive(:warn).with(/kind.*using/)
       expect(index.using).to eq using # sanity check
-      expect(index.kind).to eq index.using
+      expect(index.kind).to eq using.to_s
     end
   end
 

data/spec/schema_dumper_spec.rb

@@ -116,14 +116,6 @@ describe "Schema dump" do
         expect(dump_posts).to match(/body.*index:.*using: :hash/)
       end
     end
-
-    it "should not include index order for non-ordered index types" do
-      with_index Post, :user_id, :using => :hash do
-        expect(dump_posts).to match(/user_id.*index:.*using: :hash/)
-        expect(dump_posts).not_to match(%r{order})
-      end
-    end
-
   end
 
   protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_pg_indexes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ronen barzel
@@ -101,6 +101,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -108,6 +111,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.3
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +160,6 @@ files:
 - gemfiles/rails-4.2/Gemfile.postgresql
 - lib/schema_plus_pg_indexes.rb
 - lib/schema_plus_pg_indexes/active_record/connection_adapters/index_definition.rb
-- lib/schema_plus_pg_indexes/middleware/migration.rb
 - lib/schema_plus_pg_indexes/middleware/postgresql/dumper.rb
 - lib/schema_plus_pg_indexes/middleware/postgresql/migration.rb
 - lib/schema_plus_pg_indexes/middleware/postgresql/query.rb

data/lib/schema_plus_pg_indexes/middleware/migration.rb

@@ -1,23 +0,0 @@
-module SchemaPlusPgIndexes
-  module Middleware
-    module Migration
-
-      def self.insert
-        SchemaMonkey::Middleware::Migration::Index.prepend DeprecateArgs
-      end
-
-      class DeprecateArgs < SchemaMonkey::Middleware::Base
-        def call(env)
-          {:conditions => :where, :kind => :using}.each do |deprecated, proper|
-            if env.options[deprecated]
-              ActiveSupport::Deprecation.warn "ActiveRecord index option #{deprecated.inspect} is deprecated, use #{proper.inspect} instead"
-              env.options[proper] = env.options.delete(deprecated)
-            end
-          end
-          continue env
-        end
-      end
-
-    end
-  end
-end