schema_plus_pg_indexes 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2b5b828916853a511caa4f8b19f8a7e79fe8442
-  data.tar.gz: 5ff7110ccc48476917619787863700670b89c0f7
+  metadata.gz: a5edee49e9450968160894f728ed3ac793c60591
+  data.tar.gz: 57215e8659d5fa28aab3849965536b5f39c5d75c
 SHA512:
-  metadata.gz: bbab6a29c45ba788aaf81951efa439b3e9ce2f4de676db318393a1edf08fdeea3e3d3d0098cbe986e912ef6381f20e5850829235e3d097abc52522e7a1abbdd8
-  data.tar.gz: 9ab3c857047c7e6627e3d0888aef4c9b6060f63810e72c2994d05673eb659d52deeb243a98535e9f3861a8780af5a4663dd299b5f7fd53c3fe300299a5eab065
+  metadata.gz: 8189ce3e111371fc260735182c6079b432f94630df6f746f8d9cf1a46d9c6d2a73a62e3e11ebb31e2bc7f2c5a4e8eea1d067b8f3d75617c2ac3d88cef2c2486b
+  data.tar.gz: 72f51b3d84023ffd4caec75070af3d44cce5ed7c16924ba3002b7601864b6de899ac8be8663b219deb6a7886f9c31c3a64c417657d782308891c08ebc52df1d2

data/.travis.yml

@@ -5,7 +5,6 @@
 ---
 sudo: false
 rvm:
-- 1.9.3
 - 2.1.5
 gemfile:
 - gemfiles/activerecord-4.2/Gemfile.postgresql

data/README.md

@@ -22,18 +22,31 @@ Schema_plus_pg_indexes is part of the [SchemaPlus](https://github.com/SchemaPlus
 
 ## Installation
 
-In your application's Gemfile
+<!-- SCHEMA_DEV: TEMPLATE INSTALLATION - begin -->
+<!-- These lines are auto-inserted from a schema_dev template -->
+As usual:
 
 ```ruby
-gem "schema_plus_pg_indexes"
+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 **1.9.3** with activerecord **4.2**, using **postgresql**
 * ruby **2.1.5** with activerecord **4.2**, using **postgresql**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
@@ -66,8 +79,10 @@ the standard protocol: fork, feature branch, develop, push, and issue pull reque
 
 Some things to know about to help you develop and test:
 
-* **schema_dev**:  schema_plus_pg_indexes uses [schema_dev](https://github.com/SchemaPlus/schema_dev) to
-  facilitate running rspec tests on the matrix of ruby, rails, and database
+<!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_DEV - begin -->
+<!-- These lines are auto-inserted from a schema_dev template -->
+* **schema_dev**:  SchemaPlus::PgIndexes uses [schema_dev](https://github.com/SchemaPlus/schema_dev) to
+  facilitate running rspec tests on the matrix of ruby, activerecord, and database
   versions that the gem supports, both locally and on
   [travis-ci](http://travis-ci.org/SchemaPlus/schema_plus_pg_indexes)
 
@@ -76,15 +91,29 @@ Some things to know about to help you develop and test:
         $ schema_dev bundle install
         $ schema_dev rspec
 
-  You can also run on just one configuration at a time;  For info, see `schema_dev --help` or the
-  [schema_dev](https://github.com/SchemaPlus/schema_dev) README.
+  You can also run on just one configuration at a time;  For info, see `schema_dev --help` or the [schema_dev](https://github.com/SchemaPlus/schema_dev) README.
 
   The matrix of configurations is specified in `schema_dev.yml` in
   the project root.
 
-* **schema_monkey**: schema_plus_pg_indexes extends ActiveRecord using
-  [schema_monkey](https://github.com/SchemaPlus/schema_monkey)'s extension
-  API and protocols -- see its README for details.  If your contribution needs any additional monkey patching
-  that isn't already supported by
-  [schema_monkey](https://github.com/SchemaPlus/schema_monkey), please head
-  over there and submit a PR.
+
+<!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_DEV - end -->
+<!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_PLUS_CORE - begin -->
+<!-- These lines are auto-inserted from a schema_dev template -->
+* **schema_plus_core**: SchemaPlus::PgIndexes uses the SchemaPlus::Core API that
+  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_DEV: TEMPLATE USES SCHEMA_PLUS_CORE - end -->
+<!-- SCHEMA_DEV: TEMPLATE USES SCHEMA_MONKEY - begin -->
+<!-- These lines are auto-inserted from a schema_dev template -->
+* **schema_monkey**: SchemaPlus::PgIndexes is implemented as a
+  [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/gemfiles/Gemfile.base

@@ -1,8 +1,4 @@
 source 'https://rubygems.org'
 gemspec :path => File.expand_path('..', __FILE__)
 
-platform :ruby do
-    gem "byebug" if RUBY_VERSION > "2"
-end
-
 File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local

data/lib/schema_plus_pg_indexes.rb

@@ -2,9 +2,11 @@ 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/active_record/connection_adapters/postgresql_adapter'
 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'
+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)

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

@@ -6,10 +6,6 @@ module SchemaPlusPgIndexes
       # case sensitivity, expessions, and operator classes
       module IndexDefinition
 
-        def self.included(base)
-          base.alias_method_chain :initialize, :schema_plus_pg_indexes
-        end
-
         attr_accessor :expression
         attr_accessor :operator_classes
 
@@ -27,8 +23,8 @@ module SchemaPlusPgIndexes
           using.to_s
         end
 
-        def initialize_with_schema_plus_pg_indexes(*args)
-          initialize_without_schema_plus_pg_indexes(*args)
+        def initialize(*args)
+          super
           options = args.dup.extract_options!
           @expression = options[:expression]
           @operator_classes = options[:operator_classes] || {}
@@ -36,7 +32,7 @@ module SchemaPlusPgIndexes
         end
 
         def ==(other)
-          return false if not super(other) # can use super here because == is defined in SchemaPlusIndexes which was included before us
+          return false if not super other
           return false unless self.expression == other.expression
           return false unless !!self.case_sensitive? == !!other.case_sensitive?
           return false unless self.operator_classes == other.operator_classes

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

@@ -0,0 +1,17 @@
+module SchemaPlusPgIndexes
+  module ActiveRecord
+    module ConnectionAdapters
+      module PostgresqlAdapter
+        #
+        # SchemaPlusPgIndexes allows the column_names paramter
+        # to be left off
+        #
+        def add_index(*args)
+          options = args.extract_options!
+          table_name, column_names = args
+          super table_name, column_names, options
+        end
+      end
+    end
+  end
+end

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

@@ -2,10 +2,6 @@ module SchemaPlusPgIndexes
   module Middleware
     module Postgresql
       module Migration
-        def self.insert
-          SchemaMonkey::Middleware::Migration::Index.prepend DeprecateArgs
-          SchemaMonkey::Middleware::Migration::IndexComponentsSql.append DefineExtensions
-        end
 
         module Index
           # Deprecate args
@@ -19,77 +15,6 @@ module SchemaPlusPgIndexes
           end
         end
 
-        module IndexComponentsSql
-
-          # SchemaPlusPgIndexes provides the following extra options for PostgreSQL
-          # indexes:
-          # * +:expression+ - SQL expression to index.  column_name can be nil or ommitted, in which case :name must be provided
-          # * +:operator_class+ - an operator class name or a hash mapping column name to operator class name
-          # * +:case_sensitive - setting to +false+ is a shorthand for :expression => 'LOWER(column_name)'
-          #
-          # The <tt>:case_sensitive => false</tt> option ties in with Rails built-in support for case-insensitive searching:
-          #    validates_uniqueness_of :name, :case_sensitive => false
-          #
-          # Since since <tt>:case_sensitive => false</tt> is implemented by
-          # using <tt>:expression</tt>, this raises an ArgumentError if both
-          # are specified simultaneously.
-          #
-          def around(env)
-            options = env.options
-            column_names = env.column_names
-            table_name = env.table_name
-            connection = env.connection
-
-            if env.column_names.empty?
-              raise ArgumentError, "No columns and :expression missing from options - cannot create index" unless options[:expression]
-              raise ArgumentError, "No columns, and index name not given. Pass :name option" unless options[:name]
-            end
-
-            expression = options.delete(:expression)
-            operator_classes = options.delete(:operator_class)
-            case_insensitive = (options.delete(:case_sensitive) == false)
-
-            if expression
-              raise ArgumentError, "Cannot specify :case_sensitive => false with an expression.  Use LOWER(column_name)" if case_insensitive
-              expression.strip!
-              if m = expression.match(/^using\s+(?<using>\S+)\s*(?<rest>.*)/i)
-                options[:using] = m[:using]
-                expression = m[:rest]
-              end
-              if m = expression.match(/^(?<rest>.*)\s+where\s+(?<where>.*)/i)
-                options[:where] = m[:where]
-                expression = m[:rest]
-              end
-            end
-
-            yield env
-
-            if operator_classes and not operator_classes.is_a? Hash
-              operator_classes = Hash[column_names.map {|name| [name, operator_classes]}]
-            end
-
-            if expression
-              env.sql.columns = expression.sub(/ ^\( (.*) \) $/x, '\1')
-            elsif operator_classes or case_insensitive
-              option_strings = Hash[column_names.map {|name| [name, '']}]
-              (operator_classes||{}).stringify_keys.each do |column, opclass|
-                option_strings[column] += " #{opclass}" if opclass
-              end
-              option_strings = connection.send :add_index_sort_order, option_strings, column_names, options
-
-              if case_insensitive
-                caseable_columns = connection.columns(table_name).select { |col| [:string, :text].include?(col.type) }.map(&:name)
-                quoted_column_names = column_names.map do |col_name|
-                  (caseable_columns.include?(col_name.to_s) ? "LOWER(#{connection.quote_column_name(col_name)})" : connection.quote_column_name(col_name)) + option_strings[col_name]
-                end
-              else
-                quoted_column_names = column_names.map { |col_name| connection.quote_column_name(col_name) + option_strings[col_name] }
-              end
-
-              env.sql.columns = quoted_column_names.join(', ')
-            end
-          end
-        end
       end
     end
   end

data/lib/schema_plus_pg_indexes/middleware/postgresql/{query.rb → schema.rb}

@@ -1,7 +1,7 @@
 module SchemaPlusPgIndexes
   module Middleware
     module Postgresql
-      module Query
+      module Schema
         module Indexes
 
           def get_opclass_names(env, opclasses)

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

@@ -0,0 +1,80 @@
+module SchemaPlusPgIndexes
+  module Middleware
+    module Postgresql
+      module Sql
+
+        module IndexComponents
+
+          # SchemaPlusPgIndexes provides the following extra options for PostgreSQL
+          # indexes:
+          # * +:expression+ - SQL expression to index.  column_name can be nil or ommitted, in which case :name must be provided
+          # * +:operator_class+ - an operator class name or a hash mapping column name to operator class name
+          # * +:case_sensitive - setting to +false+ is a shorthand for :expression => 'LOWER(column_name)'
+          #
+          # The <tt>:case_sensitive => false</tt> option ties in with Rails built-in support for case-insensitive searching:
+          #    validates_uniqueness_of :name, :case_sensitive => false
+          #
+          # Since since <tt>:case_sensitive => false</tt> is implemented by
+          # using <tt>:expression</tt>, this raises an ArgumentError if both
+          # are specified simultaneously.
+          #
+          def around(env)
+            options = env.options
+            column_names = env.column_names
+            table_name = env.table_name
+            connection = env.connection
+
+            if env.column_names.empty?
+              raise ArgumentError, "No columns and :expression missing from options - cannot create index" unless options[:expression]
+              raise ArgumentError, "No columns, and index name not given. Pass :name option" unless options[:name]
+            end
+
+            expression = options.delete(:expression)
+            operator_classes = options.delete(:operator_class)
+            case_insensitive = (options.delete(:case_sensitive) == false)
+
+            if expression
+              raise ArgumentError, "Cannot specify :case_sensitive => false with an expression.  Use LOWER(column_name)" if case_insensitive
+              expression.strip!
+              if m = expression.match(/^using\s+(?<using>\S+)\s*(?<rest>.*)/i)
+                options[:using] = m[:using]
+                expression = m[:rest]
+              end
+              if m = expression.match(/^(?<rest>.*)\s+where\s+(?<where>.*)/i)
+                options[:where] = m[:where]
+                expression = m[:rest]
+              end
+            end
+
+            yield env
+
+            if operator_classes and not operator_classes.is_a? Hash
+              operator_classes = Hash[column_names.map {|name| [name, operator_classes]}]
+            end
+
+            if expression
+              env.sql.columns = expression.sub(/ ^\( (.*) \) $/x, '\1')
+            elsif operator_classes or case_insensitive
+              option_strings = Hash[column_names.map {|name| [name, '']}]
+              (operator_classes||{}).stringify_keys.each do |column, opclass|
+                option_strings[column] += " #{opclass}" if opclass
+              end
+              option_strings = connection.send :add_index_sort_order, option_strings, column_names, options
+
+              if case_insensitive
+                caseable_columns = connection.columns(table_name).select { |col| [:string, :text].include?(col.type) }.map(&:name)
+                quoted_column_names = column_names.map do |col_name|
+                  (caseable_columns.include?(col_name.to_s) ? "LOWER(#{connection.quote_column_name(col_name)})" : connection.quote_column_name(col_name)) + option_strings[col_name]
+                end
+              else
+                quoted_column_names = column_names.map { |col_name| connection.quote_column_name(col_name) + option_strings[col_name] }
+              end
+
+              env.sql.columns = quoted_column_names.join(', ')
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/schema_plus_pg_indexes/version.rb

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

data/schema_dev.yml

@@ -1,5 +1,4 @@
 ruby:
-    - 1.9.3
     - 2.1.5
 activerecord:
     - 4.2

data/schema_plus_pg_indexes.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_pg_indexes
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,39 +25,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: schema_monkey
+  name: schema_plus_indexes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-- !ruby/object:Gem::Dependency
-  name: schema_plus_indexes
-  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -106,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -160,9 +146,11 @@ files:
 - gemfiles/activerecord-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/active_record/connection_adapters/postgresql_adapter.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
+- lib/schema_plus_pg_indexes/middleware/postgresql/schema.rb
+- lib/schema_plus_pg_indexes/middleware/postgresql/sql.rb
 - lib/schema_plus_pg_indexes/version.rb
 - schema_dev.yml
 - schema_plus_pg_indexes.gemspec