schema_plus_indexes 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3204552a60115feff109316363cec1ab9cc45e2
-  data.tar.gz: a1087216a0144af5c299bc0972fca2989c81c122
+  metadata.gz: 5f4aa8a0bb209b6aefdd7ae30e47ec26c594a6e3
+  data.tar.gz: 6deee591cfa43d5a6bb3a14f5a4048647b9c0a2f
 SHA512:
-  metadata.gz: 537929890d6ad08fd33f11a7f36c0b9413a93281e252258048e060eb71a05434f32d800f2887f13c044c0b2c3044fe684cb15e912fbfe00f6ce3706dc01611cc
-  data.tar.gz: f36b1a1c603c1ee61ffcb1ed80345eee92c7f177c953ee859da21feefcc2b5a892a08caeb40e3dcea4b5295aa84eca702b432a7ca757c2cfff2e377bf1e68f62
+  metadata.gz: 73655b914ee4ff00cdc004d605e843eaa9c88268073ae1658ed6b6df0153a8b3e969b48ecdd1595e0c66237afc1e58d10cb18e526de97850dc620627f24bf465
+  data.tar.gz: c8fe49bbd8130f7562ab10b4d3caff918e2d9efbd826f16ecec40789fb6d979c47a00824df0811d52756c414b171d0a43115a0d355d623f394860a2aaa776919

data/.travis.yml

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

data/Gemfile

@@ -1,3 +1,5 @@
 source "http://rubygems.org"
 
 gemspec
+
+File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local

data/README.md

@@ -5,7 +5,7 @@
 
 # schema_plus_indexes
 
-Schema_plus_index adds various convenient capabilities to `ActiveRecord`'s index handling:
+SchemaPlusIndexes adds various convenient capabilities to `ActiveRecord`'s index handling:
 
 * Adds shorthands to the `:index` option in migrations
 
@@ -45,18 +45,31 @@ schema_plus_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_indexes"
+gem "schema_plus_indexes"                # in a Gemfile
+gem.add_dependency "schema_plus_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::Indexes 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_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 **mysql2**, **sqlite3** or **postgresql**
 * ruby **2.1.5** with activerecord **4.2**, using **mysql2**, **sqlite3** or **postgresql**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
@@ -74,8 +87,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_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::Indexes 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_indexes)
 
@@ -84,15 +99,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_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::Indexes 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::Indexes 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_indexes.rb

@@ -1,4 +1,4 @@
-require 'schema_monkey'
+require 'schema_plus/core'
 
 require_relative 'schema_plus_indexes/active_record/base'
 require_relative 'schema_plus_indexes/active_record/connection_adapters/abstract_adapter'
@@ -6,6 +6,6 @@ require_relative 'schema_plus_indexes/active_record/connection_adapters/index_de
 require_relative 'schema_plus_indexes/middleware/dumper'
 require_relative 'schema_plus_indexes/middleware/migration'
 require_relative 'schema_plus_indexes/middleware/model'
-require_relative 'schema_plus_indexes/middleware/sqlite3'
+require_relative 'schema_plus_indexes/middleware/schema'
 
-SchemaMonkey.register(SchemaPlusIndexes)
+SchemaMonkey.register SchemaPlusIndexes

data/lib/schema_plus_indexes/active_record/base.rb

@@ -1,12 +1,7 @@
 module SchemaPlusIndexes
   module ActiveRecord
-
     module Base
-      def self.included(base) #:nodoc:
-        base.extend(ClassMethods)
-      end
-
-      module ClassMethods #:nodoc:
+      module ClassMethods
 
         public
 

data/lib/schema_plus_indexes/active_record/connection_adapters/abstract_adapter.rb

@@ -3,18 +3,14 @@ module SchemaPlusIndexes
     module ConnectionAdapters
       module AbstractAdapter
 
-        def self.included(base) #:nodoc:
-          base.alias_method_chain :remove_index, :schema_plus_indexes
-        end
-
         # Extends rails' remove_index to include this options:
         #   :if_exists
-        def remove_index_with_schema_plus_indexes(table_name, *args)
+        def remove_index(table_name, *args)
           options = args.extract_options!
           if_exists = options.delete(:if_exists)
           args << options if options.any?
           return if if_exists and not index_name_exists?(table_name, options[:name] || index_name(table_name, *args), false)
-          remove_index_without_schema_plus_indexes(table_name, *args)
+          super table_name, *args
         end
 
       end

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

@@ -6,17 +6,14 @@ module SchemaPlusIndexes
       # about partial indexes and case sensitivity (i.e. Postgresql
       # support).
       module IndexDefinition
-        def self.included(base)  #:nodoc:
-          base.alias_method_chain :initialize, :schema_plus_indexes
-        end
 
-        def initialize_with_schema_plus_indexes(*args) #:nodoc:
+        def initialize(*args) #:nodoc:
           # same args as add_index(table_name, column_names, options)
           if args.length == 3 and Hash === args.last
             table_name, column_names, options = args + [{}]
-            initialize_without_schema_plus_indexes(table_name, options[:name], options[:unique], column_names, options[:length], options[:orders], options[:where], options[:type], options[:using])
+            super table_name, options[:name], options[:unique], column_names, options[:length], options[:orders], options[:where], options[:type], options[:using]
           else # backwards compatibility
-            initialize_without_schema_plus_indexes(*args)
+            super
           end
           unless orders.blank?
             # fill out orders with :asc when undefined.  make sure hash ordering

data/lib/schema_plus_indexes/middleware/{sqlite3.rb → schema.rb}

@@ -1,7 +1,7 @@
 module SchemaPlusIndexes
   module Middleware
-    module Sqlite3
-      module Query
+    module Schema
+      module Sqlite3
         module Indexes
 
           def after(env)

data/lib/schema_plus_indexes/version.rb

@@ -1,3 +1,3 @@
 module SchemaPlusIndexes
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/schema_dev.yml

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

data/schema_plus_indexes.gemspec

@@ -3,27 +3,27 @@ lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'schema_plus_indexes/version'
 
-Gem::Specification.new do |spec|
-  spec.name          = "schema_plus_indexes"
-  spec.version       = SchemaPlusIndexes::VERSION
-  spec.authors       = ["ronen barzel"]
-  spec.email         = ["ronen@barzel.org"]
-  spec.summary       = %q{Adds shorthands and conveniences to ActiveRecord's handling of indexes}
-  spec.homepage      = "https://github.com/SchemaPlus/schema_plus_indexes"
-  spec.license       = "MIT"
+Gem::Specification.new do |gem|
+  gem.name          = "schema_plus_indexes"
+  gem.version       = SchemaPlusIndexes::VERSION
+  gem.authors       = ["ronen barzel"]
+  gem.email         = ["ronen@barzel.org"]
+  gem.summary       = %q{Adds shorthands and conveniences to ActiveRecord's handling of indexes}
+  gem.homepage      = "https://github.com/SchemaPlus/schema_plus_indexes"
+  gem.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  gem.files         = `git ls-files -z`.split("\x0")
+  gem.executables   = gem.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.require_paths = ["lib"]
 
-  spec.add_dependency "activerecord", "~> 4.2"
-  spec.add_dependency "schema_monkey", "~> 1.0"
+  gem.add_dependency "activerecord", "~> 4.2"
+  gem.add_dependency "schema_plus_core", "~> 0.1"
 
-  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 "simplecov"
-  spec.add_development_dependency "simplecov-gem-profile"
+  gem.add_development_dependency "bundler", "~> 1.7"
+  gem.add_development_dependency "rake", "~> 10.0"
+  gem.add_development_dependency "rspec", "~> 3.0.0"
+  gem.add_development_dependency "schema_dev", "~> 3.1"
+  gem.add_development_dependency "simplecov"
+  gem.add_development_dependency "simplecov-gem-profile"
 end

data/spec/spec_helper.rb

@@ -23,7 +23,7 @@ def define_schema(config={}, &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_indexes
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 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,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4.2'
 - !ruby/object:Gem::Dependency
-  name: schema_monkey
+  name: schema_plus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,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
@@ -147,7 +147,7 @@ files:
 - lib/schema_plus_indexes/middleware/dumper.rb
 - lib/schema_plus_indexes/middleware/migration.rb
 - lib/schema_plus_indexes/middleware/model.rb
-- lib/schema_plus_indexes/middleware/sqlite3.rb
+- lib/schema_plus_indexes/middleware/schema.rb
 - lib/schema_plus_indexes/version.rb
 - schema_dev.yml
 - schema_plus_indexes.gemspec