schema_plus_pg_indexes 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef5750ecbe4c6463189603e306f2acfd9339753f
-  data.tar.gz: aa49a2061f4600f9652f4cf238c605db35d6c153
+  metadata.gz: d010d734ff72f02495576fa113afcfa6382f78fb
+  data.tar.gz: ea0f894d22af03ff5f74dd7b567d2d53360e7761
 SHA512:
-  metadata.gz: 64722adf53223e3ade5a1169bf70873bccd90d1ececd0a3d705f8770aa79f6fac2b9c7171966edc56883e31c580c972a59855b3f34001219ea9f337a9376bf22
-  data.tar.gz: 8a59bb3f09a07c8ad2036b3fe7ac1b72cc2fb6adcb287ffb33ee5c0969351d10e3935e9c65f21580d678270168e055475307b371dd68e43b55ab8f15fb644aa6
+  metadata.gz: 8817842bf9b32af012479c19ddb7e872dceacc99ce20a9382469854d145c30e2fe6a81ec30fee987dbc3f4957f92011a2fa719bdb04c9962f387d6c16da2f16a
+  data.tar.gz: af6ade8cfd3eaaee33202b8ab361fdd18fbcafcf9d6b3263c3efbe45c82cd7a8e20b7994b242dc39eed20e82825c67079a507f7cd34bde919057f1fcec2d627f

data/README.md

@@ -61,6 +61,7 @@ schema_plus_pg_indexes is tested on
 
 ## History
 
+* v0.1.10 - Upgrade to schmea_plus_core 1.0
 * v0.1.9 - Bug fix: multiple expression indexes (#8)
 * v0.1.8 - Bug fix: expression with operator class (#7)
 * v0.1.7 - Bug fix: mix of columns & expressions (#5)

data/gemfiles/activerecord-4.2/Gemfile.base

@@ -1,3 +1,3 @@
 eval File.read File.expand_path('../../Gemfile.base', __FILE__)
 
-gem "activerecord", "~> 4.2.0"
+gem "activerecord", "~> 4.2.6"

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

@@ -11,13 +11,13 @@ module SchemaPlusPgIndexes
 
             env.table.indexes.each do |index_dump|
               index_def = index_defs.find(&its.name == index_dump.name)
-              index_dump.add_option "case_sensitive: false" unless index_def.case_sensitive?
-              index_dump.add_option "expression: #{index_def.expression.inspect}" if index_def.expression and index_def.case_sensitive?
+              index_dump.options[:case_sensitive] = false unless index_def.case_sensitive?
+              index_dump.options[:expression] = index_def.expression if index_def.expression and index_def.case_sensitive?
               unless index_def.operator_classes.blank?
                 if index_def.columns.uniq.length <= 1 && index_def.operator_classes.values.uniq.length == 1
-                  index_dump.add_option "operator_class: #{index_def.operator_classes.values.first.inspect}"
+                  index_dump.options[:operator_class] = index_def.operator_classes.values.first
                 else
-                  index_dump.add_option "operator_class: {" + index_def.operator_classes.map{|column, val| "#{column.inspect}=>#{val.inspect}"}.join(", ") + "}"
+                  index_dump.options[:operator_class] = index_def.operator_classes
                 end
               end
             end
@@ -31,7 +31,7 @@ module SchemaPlusPgIndexes
             index_defs = Dumper.get_index_definitions(env, env.table)
 
             env.table.indexes.select(&its.columns.blank?).each do |index|
-              env.table.statements << "t.index name: #{index.name.inspect}, #{index.options}"
+              env.table.statements << "t.index #{{name: index.name}.merge(index.options).to_s.sub(/^{(.*)}$/, '\1')}"
               env.table.indexes.delete(index)
             end
           end

data/lib/schema_plus_pg_indexes/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlusPgIndexes
-  VERSION = "0.1.9"
+  VERSION = "0.1.10"
 end

data/schema_plus_pg_indexes.gemspec

@@ -19,11 +19,12 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activerecord", "~> 4.2"
   spec.add_dependency "schema_plus_indexes", "~> 0.1", ">= 0.1.3"
+  spec.add_dependency "schema_plus_core", "~> 1.0"
 
   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", "~> 3.5"
+  spec.add_development_dependency "schema_dev", "~> 3.6"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-gem-profile"
 end

data/spec/schema_dumper_spec.rb

@@ -48,20 +48,20 @@ describe "Schema dump" do
 
     it "should define case insensitive index" do
       with_index Post, [:body, :string_no_default], :case_sensitive => false do
-        expect(dump_posts).to match(/"body".*index: {.*with:.*string_no_default.*case_sensitive: false/)
+        expect(dump_posts).to match(/"body".*:index=>{.*:with=>.*string_no_default.*:case_sensitive=>false/)
       end
     end
 
     it "should define index with type cast" do
       with_index Post, [:integer_col], :name => "index_with_type_cast", :expression => "LOWER(integer_col::text)" do
-        expect(dump_posts).to include(%q{t.index name: "index_with_type_cast", expression: "lower((integer_col)::text)"})
+        expect(dump_posts).to include(%q{t.index :name=>"index_with_type_cast", :expression=>"lower((integer_col)::text)"})
       end
     end
 
 
     it "should define case insensitive index with mixed ids and strings" do
       with_index Post, [:user_id, :str_short, :short_id, :body], :case_sensitive => false do
-        expect(dump_posts).to match(/user_id.*index: {.* with: \["str_short", "short_id", "body"\], case_sensitive: false}/)
+        expect(dump_posts).to match(/user_id.*:index=>{.* :with=>\["str_short", "short_id", "body"\], :case_sensitive=>false}/)
       end
     end
 
@@ -69,77 +69,77 @@ describe "Schema dump" do
       col_name = "#{col_type}_col"
       it "should define case insensitive index that includes an #{col_type}" do
         with_index Post, [:user_id, :str_short, col_name, :body], :case_sensitive => false do
-          expect(dump_posts).to match(/user_id.*index: {.* with: \["str_short", "#{col_name}", "body"\], case_sensitive: false}/)
+          expect(dump_posts).to match(/user_id.*:index=>{.* :with=>\["str_short", "#{col_name}", "body"\], :case_sensitive=>false}/)
         end
       end
     end
 
     it "should define where" do
       with_index Post, :user_id, :name => "posts_user_id_index", :where => "user_id IS NOT NULL" do
-        expect(dump_posts).to match(/user_id.*index: {.*where: "\(user_id IS NOT NULL\)"}/)
+        expect(dump_posts).to match(/user_id.*:index=>{.*:where=>"\(user_id IS NOT NULL\)"}/)
       end
     end
 
     it "should define expression" do
       with_index Post, :name => "posts_freaky_index", :expression => "USING hash (least(id, user_id))" do
-        expect(dump_posts).to include(%q{t.index name: "posts_freaky_index", using: :hash, expression: "LEAST(id, user_id)"})
+        expect(dump_posts).to include(%q{t.index :name=>"posts_freaky_index", :using=>:hash, :expression=>"LEAST(id, user_id)"})
       end
     end
 
     it "should define multi-column with expression" do
       with_index Post, :body, :expression => "(least(id, user_id))" do
-        expect(dump_posts).to match(/body.*index.*expression: "LEAST\(id, user_id\)"/)
+        expect(dump_posts).to match(/body.*index.*:expression=>"LEAST\(id, user_id\)"/)
       end
     end
 
 
     it "should define operator_class" do
       with_index Post, :body, :operator_class => 'text_pattern_ops' do
-        expect(dump_posts).to match(/body.*index:.*operator_class: "text_pattern_ops"/)
+        expect(dump_posts).to match(/body.*:index=>.*:operator_class=>"text_pattern_ops"/)
       end
     end
 
     it "should define expression with operator_class" do
       with_index Post, :name => "expr_with_opclass", :expression => "upper(str_short || string_no_default)", :operator_class => 'text_pattern_ops' do
-        expect(dump_posts).to include(%q{t.index name: "expr_with_opclass", expression: "upper(((str_short)::text || (string_no_default)::text))", operator_class: "text_pattern_ops"})
+        expect(dump_posts).to include(%q{t.index :name=>"expr_with_opclass", :expression=>"upper(((str_short)::text || (string_no_default)::text))", :operator_class=>"text_pattern_ops"})
       end
     end
 
 
     it "should define multi-column operator classes " do
       with_index Post, [:body, :string_no_default], :operator_class => {body: 'text_pattern_ops', string_no_default: 'varchar_pattern_ops' } do
-        expect(dump_posts).to match(/body.*index:.*operator_class: {"body"=>"text_pattern_ops", "string_no_default"=>"varchar_pattern_ops"}/)
+        expect(dump_posts).to match(/body.*:index=>.*:operator_class=>{"body"=>"text_pattern_ops", "string_no_default"=>"varchar_pattern_ops"}/)
       end
     end
     
     it "should define multi-column operator classes even if one column has no operator" do
       with_index Post, [:body, :string_no_default], :operator_class => {string_no_default: 'varchar_pattern_ops'} do
-        expect(dump_posts).to match(/body.*index:.*operator_class: {"string_no_default"=>"varchar_pattern_ops"}/)
+        expect(dump_posts).to match(/body.*:index=>.*:operator_class=>{"string_no_default"=>"varchar_pattern_ops"}/)
       end
     end
 
     it 'should dump proper operator_class with case_sensitive => false' do
       with_index Post, :body, :operator_class => 'text_pattern_ops', :case_sensitive => false do
-        expect(dump_posts).to match(/body.*index:.*name: "index_posts_on_body", case_sensitive: false, operator_class: "text_pattern_ops"/)
+        expect(dump_posts).to match(/body.*:index=>.*:name=>"index_posts_on_body", :case_sensitive=>false, :operator_class=>"text_pattern_ops"/)
       end
     end
 
     it "should dump unique: true with expression (Issue #142)" do
       with_index Post, :name => "posts_user_body_index", :unique => true, :expression => "BTRIM(LOWER(body))" do
-        expect(dump_posts).to include(%q{t.index name: "posts_user_body_index", unique: true, expression: "btrim(lower(body))"})
+        expect(dump_posts).to include(%q{t.index :name=>"posts_user_body_index", :unique=>true, :expression=>"btrim(lower(body))"})
       end
     end
 
 
     it "should not define :case_sensitive => false with non-trivial expression" do
       with_index Post, :name => "posts_user_body_index", :expression => "BTRIM(LOWER(body))" do
-        expect(dump_posts).to include(%q{t.index name: "posts_user_body_index", expression: "btrim(lower(body))"})
+        expect(dump_posts).to include(%q{t.index :name=>"posts_user_body_index", :expression=>"btrim(lower(body))"})
       end
     end
 
     it "should define using" do
       with_index Post, :name => "posts_body_index", :expression => "USING hash (body)" do
-        expect(dump_posts).to match(/body.*index:.*using: :hash/)
+        expect(dump_posts).to match(/body.*:index=>.*:using=>:hash/)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_pg_indexes
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,6 +44,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.3
+- !ruby/object:Gem::Dependency
+  name: schema_plus_core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +106,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement