schema_plus_pg_indexes 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5edee49e9450968160894f728ed3ac793c60591
-  data.tar.gz: 57215e8659d5fa28aab3849965536b5f39c5d75c
+  metadata.gz: b47ec75377fc42a755d49b02bdbf4129278a94f6
+  data.tar.gz: c803d64e0995541267e6484e68c99d4ee68bb036
 SHA512:
-  metadata.gz: 8189ce3e111371fc260735182c6079b432f94630df6f746f8d9cf1a46d9c6d2a73a62e3e11ebb31e2bc7f2c5a4e8eea1d067b8f3d75617c2ac3d88cef2c2486b
-  data.tar.gz: 72f51b3d84023ffd4caec75070af3d44cce5ed7c16924ba3002b7601864b6de899ac8be8663b219deb6a7886f9c31c3a64c417657d782308891c08ebc52df1d2
+  metadata.gz: 0ae836dd3706cbca4b4cccf18d073375c57c38539c35c1381a44c6f4aee7c1b3a8033e33d140b423985aba7730f12aaf27ffa23dacf4355b87fd8b4430ec1d0c
+  data.tar.gz: f744880251c090ba35b079bd7b5d6fc42a04474b80e4d9ed3134c90438fe96312ed234d9677618f196721605c1311cb3c78058eb835912375f707050bd2f4fdb

data/.travis.yml

@@ -10,7 +10,7 @@ gemfile:
 - gemfiles/activerecord-4.2/Gemfile.postgresql
 env: POSTGRESQL_DB_USER=postgres
 addons:
-  postgresql: '9.3'
+  postgresql: '9.4'
 before_script: bundle exec rake create_databases
 after_script: bundle exec rake drop_databases
 script: bundle exec rake travis

data/README.md

@@ -31,26 +31,8 @@ gem "schema_plus_pg_indexes"                # in a Gemfile
 gem.add_dependency "schema_plus_pg_indexes" # in a .gemspec
 ```
 
-To use with a rails app, also include
-
-```ruby
-gem "schema_monkey_rails"
-```
-
-which creates a Railtie to that will insert SchemaPlus::PgIndexes appropriately into the rails stack. To use with Padrino, see [schema_monkey_padrino](https://github.com/SchemaPlus/schema_monkey_padrino).
-
 <!-- SCHEMA_DEV: TEMPLATE INSTALLATION - end -->
 
-## Compatibility
-
-schema_plus_pg_indexes is tested on
-
-<!-- SCHEMA_DEV: MATRIX - begin -->
-<!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **2.1.5** with activerecord **4.2**, using **postgresql**
-
-<!-- SCHEMA_DEV: MATRIX - end -->
-
 ## Deprecations
 
 SchemaPlus 1.8.x provided some options and accessors that are now available
@@ -62,10 +44,21 @@ form:
   * `:conditions` => `:where`
   * `:kind` => `:using`
 
-* `IndexDefinition` deprecates accessors: 
+* `IndexDefinition` deprecates accessors:
   * `#conditions` in favor of `#where`
   * `#kind` in favor of `#using.to_s`
 
+
+## Compatibility
+
+schema_plus_pg_indexes is tested on
+
+<!-- SCHEMA_DEV: MATRIX - begin -->
+<!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
+* ruby **2.1.5** with activerecord **4.2**, using **postgresql**
+
+<!-- SCHEMA_DEV: MATRIX - end -->
+
 ## History
 
 ### v0.1.0
@@ -104,8 +97,8 @@ Some things to know about to help you develop and test:
   provides middleware callback stacks to make it easy to extend
   ActiveRecord's behavior.  If that API is missing something you need for
   your contribution, please head over to
-  [schema_plus_core](https://github/SchemaPlus/schema_plus_core) and open
-  an issue or pull request.  
+  [schema_plus_core](https://github.com/SchemaPlus/schema_plus_core) and open
+  an issue or pull request.
 
 <!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_PLUS_CORE - end -->
 <!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_MONKEY - begin -->
@@ -114,6 +107,5 @@ Some things to know about to help you develop and test:
   [schema_monkey](https://github.com/SchemaPlus/schema_monkey) client,
   using [schema_monkey](https://github.com/SchemaPlus/schema_monkey)'s
   convention-based protocols for extending ActiveRecord and using middleware stacks.
-  For more information see [schema_monkey](https://github.com/SchemaPlus/schema_monkey)'s README.
 
 <!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_MONKEY - end -->

data/lib/schema_plus_pg_indexes.rb

@@ -1,5 +1,4 @@
-require 'schema_monkey'
-require 'schema_plus_indexes'
+require 'schema_plus/indexes'
 
 require_relative 'schema_plus_pg_indexes/active_record/connection_adapters/index_definition'
 require_relative 'schema_plus_pg_indexes/active_record/connection_adapters/postgresql_adapter'
@@ -9,4 +8,4 @@ require_relative 'schema_plus_pg_indexes/middleware/postgresql/sql'
 require_relative 'schema_plus_pg_indexes/middleware/postgresql/schema'
 require_relative 'schema_plus_pg_indexes/version'
 
-SchemaMonkey.register(SchemaPlusPgIndexes)
+SchemaMonkey.register SchemaPlusPgIndexes

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

@@ -7,7 +7,7 @@ module SchemaPlusPgIndexes
 
           # Dump index extensions
           def after(env)
-            index_defs = Dumper.get_index_defiinitions(env, env.table)
+            index_defs = Dumper.get_index_definitions(env, env.table)
 
             env.table.indexes.each do |index_dump|
               index_def = index_defs.find(&its.name == index_dump.name)
@@ -31,7 +31,7 @@ module SchemaPlusPgIndexes
 
           # Move index definitions inline
           def after(env)
-            index_defs = Dumper.get_index_defiinitions(env, env.table)
+            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}"
@@ -40,7 +40,7 @@ module SchemaPlusPgIndexes
           end
         end
 
-        def self.get_index_defiinitions(env, table_dump)
+        def self.get_index_definitions(env, table_dump)
           env.dump.data.index_definitions ||= {}
           env.dump.data.index_definitions[table_dump.name] ||= env.connection.indexes(table_dump.name)
         end

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

@@ -53,7 +53,7 @@ module SchemaPlusPgIndexes
             end
 
             if expression
-              env.sql.columns = expression.sub(/ ^\( (.*) \) $/x, '\1')
+              env.sql.columns = expression
             elsif operator_classes or case_insensitive
               option_strings = Hash[column_names.map {|name| [name, '']}]
               (operator_classes||{}).stringify_keys.each do |column, opclass|

data/lib/schema_plus_pg_indexes/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlusPgIndexes
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/schema_plus_pg_indexes.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activerecord", "~> 4.2"
-  spec.add_dependency "schema_plus_indexes", "~> 0.1", ">= 0.1.2"
+  spec.add_dependency "schema_plus_indexes", "~> 0.1", ">= 0.1.3"
 
   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.1"
+  spec.add_development_dependency "schema_dev", "~> 3.5"
   spec.add_development_dependency "simplecov"
   spec.add_development_dependency "simplecov-gem-profile"
 end

data/spec/index_spec.rb

@@ -7,50 +7,46 @@ describe "index" do
 
   describe "add_index" do
 
-    before(:each) do
-      connection.tables.each do |table| connection.drop_table table, cascade: true end
-
-      define_schema do
-        create_table :users, :force => true do |t|
-          t.string :login
-          t.text :address
-          t.datetime :deleted_at
-        end
-
-        create_table :posts, :force => true do |t|
-          t.text :body
-          t.integer :user_id
-          t.integer :author_id
-        end
-
-      end
-      class User < ::ActiveRecord::Base ; end
-      class Post < ::ActiveRecord::Base ; end
-    end
-
+    class User < ::ActiveRecord::Base ; end
 
     after(:each) do
       migration.suppress_messages do
-        migration.remove_index(:users, :name => @index.name) if (@index ||= nil)
+        User.indexes.each do |index|
+          migration.remove_index :users, name: index.name, if_exists: true
+        end
+        User.reset_column_information
       end
     end
 
     context "extra features" do
 
+      before(:each) do
+        connection.tables.each do |table| connection.drop_table table, cascade: true end
+
+        define_schema do
+          create_table :users, :force => true do |t|
+            t.string :login
+            t.text :address
+            t.jsonb :json_col
+            t.datetime :deleted_at
+          end
+        end
+      end
+
       it "should assign expression, where and using" do
         add_index(:users, :expression => "USING hash (upper(login)) WHERE deleted_at IS NULL", :name => 'users_login_index')
-        @index = User.indexes.detect { |i| i.expression.present? }
-        expect(@index.expression).to eq("upper((login)::text)")
-        expect(@index.where).to eq("(deleted_at IS NULL)")
-        expect(@index.using).to       eq(:hash)
+        index = User.indexes.detect { |i| i.expression.present? }
+        expect(index.expression).to eq("upper((login)::text)")
+        expect(index.where).to eq("(deleted_at IS NULL)")
+        expect(index.using).to       eq(:hash)
       end
 
       it "should allow to specify expression, where and using separately" do
         add_index(:users, :using => "hash", :expression => "upper(login)", :where => "deleted_at IS NULL", :name => 'users_login_index')
-        @index = User.indexes.detect { |i| i.expression.present? }
-        expect(@index.expression).to eq("upper((login)::text)")
-        expect(@index.where).to eq("(deleted_at IS NULL)")
-        expect(@index.using).to eq(:hash)
+        index = User.indexes.detect { |i| i.expression.present? }
+        expect(index.expression).to eq("upper((login)::text)")
+        expect(index.where).to eq("(deleted_at IS NULL)")
+        expect(index.using).to eq(:hash)
       end
 
       it "should assign operator_class" do
@@ -65,8 +61,14 @@ describe "index" do
 
       it "should allow to specify actual expression only" do
         add_index(:users, :expression => "upper(login)", :name => 'users_login_index')
-        @index = User.indexes.detect { |i| i.name == 'users_login_index' }
-        expect(@index.expression).to eq("upper((login)::text)")
+        index = User.indexes.detect { |i| i.name == 'users_login_index' }
+        expect(index.expression).to eq("upper((login)::text)")
+      end
+
+      it "should create proper sql with jsonb expressions (schema_plus #212)" do
+        add_index :users, :name => "json_expression", :using => :gin, :expression => "(json_col -> 'field')"
+        index = User.indexes.detect(&its.name == "json_expression")
+        expect(index.expression).to eq("(json_col -> 'field'::text)")
       end
 
       it "should raise if no column given and expression is missing" do
@@ -98,7 +100,7 @@ describe "index" do
     protected
 
     def index_for(column_names)
-      @index = User.indexes.detect { |i| i.columns == Array(column_names).collect(&:to_s) }
+      User.indexes.detect { |i| i.columns == Array(column_names).collect(&:to_s) }
     end
 
   end

data/spec/schema_dumper_spec.rb

@@ -6,7 +6,7 @@ describe "Schema dump" do
   before(:all) do
     ActiveRecord::Migration.suppress_messages do
       ActiveRecord::Schema.define do
-        connection.tables.each do |table| drop_table table, :cascade => true end
+        connection.tables.each do |table| drop_table table, force: :cascade end
 
         create_table :users, :force => true do |t|
           t.string :login
@@ -98,6 +98,12 @@ describe "Schema dump" do
       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"/)
+      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))"})

data/spec/spec_helper.rb

@@ -23,7 +23,7 @@ def define_schema(&block)
   ActiveRecord::Migration.suppress_messages do
     ActiveRecord::Schema.define do
       connection.tables.each do |table|
-        drop_table table, :cascade => true
+        drop_table table, force: :cascade
       end
       instance_eval &block
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_pg_indexes
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-10 00:00:00.000000000 Z
+date: 2015-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -33,7 +33,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,7 +43,7 @@ dependencies:
         version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement