schema_plus_indexes 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c53c8e9e64713769dfa034d9f28f83251553e23b
-  data.tar.gz: 56b8cc58c8e1332ed557fa75e76c3c30e01a3e78
+  metadata.gz: c3204552a60115feff109316363cec1ab9cc45e2
+  data.tar.gz: a1087216a0144af5c299bc0972fca2989c81c122
 SHA512:
-  metadata.gz: f89e5ac13330c1e3a111fcd22c94376f362fda21d5fe52d17f909c87ff878e5a2d5fad4b7d477d96e93b84b3a77450f47c19d020296da080f0c467cadc5231ff
-  data.tar.gz: 63acf447a5afacc21fa08da17f4c9adc121dee9a16b364cdf77ec12e0012e245db3d6870ed5ef63a2bbc5851afb0631af5575bebe54b4d3202f1b2db3908b8d1
+  metadata.gz: 537929890d6ad08fd33f11a7f36c0b9413a93281e252258048e060eb71a05434f32d800f2887f13c044c0b2c3044fe684cb15e912fbfe00f6ce3706dc01611cc
+  data.tar.gz: f36b1a1c603c1ee61ffcb1ed80345eee92c7f177c953ee859da21feefcc2b5a892a08caeb40e3dcea4b5295aa84eca702b432a7ca757c2cfff2e377bf1e68f62

data/.gitignore

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

data/.travis.yml

@@ -8,9 +8,9 @@ rvm:
 - 1.9.3
 - 2.1.5
 gemfile:
-- gemfiles/rails-4.2/Gemfile.mysql2
-- gemfiles/rails-4.2/Gemfile.postgresql
-- gemfiles/rails-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-4.2/Gemfile.mysql2
+- gemfiles/activerecord-4.2/Gemfile.postgresql
+- gemfiles/activerecord-4.2/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
   postgresql: '9.3'

data/README.md

@@ -9,16 +9,16 @@ Schema_plus_index adds various convenient capabilities to `ActiveRecord`'s index
 
 * Adds shorthands to the `:index` option in migrations
 
-      create_table :parts do |t|
-        t.string :role,             index: true     # shorthand for index: {}
-        t.string :product_code,     index: :unique  # shorthand for index: { unique: true }
-        t.string :first_name
-        t.string :last_name,        index: { with: :first_name }  # multi-column index
+        create_table :parts do |t|
+          t.string :role,             index: true     # shorthand for index: {}
+          t.string :product_code,     index: :unique  # shorthand for index: { unique: true }
+          t.string :first_name
+          t.string :last_name,        index: { with: :first_name }  # multi-column index
 
-        t.string :country_code
-        t.string :area_code
-        t.string :local_number,     index: { with: [:country_code, :area_code] } # multi-column index
-      end
+          t.string :country_code
+          t.string :area_code
+          t.string :local_number,     index: { with: [:country_code, :area_code] } # multi-column index
+        end
 
   Of course options can be combined, such as `index: { with: :first_name, unique: true, name: "my_index"}`
 
@@ -54,13 +54,12 @@ gem "schema_plus_indexes"
 
 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 rails **4.2**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.1.5** with rails **4.2**, using **mysql2**, **sqlite3** or **postgresql**
-
-[//]: # SCHEMA_DEV: MATRIX - end
+<!-- 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 -->
 
 ## History
 

data/gemfiles/{rails-4.2 → activerecord-4.2}/Gemfile.base

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

data/lib/schema_plus_indexes/middleware/dumper.rb

@@ -1,14 +1,9 @@
 module SchemaPlusIndexes
   module Middleware
     module Dumper
+      module Table
 
-      def self.insert
-        SchemaMonkey::Middleware::Dumper::Table.append ColumnIndexes
-      end
-
-      class ColumnIndexes < SchemaMonkey::Middleware::Base
-        def call(env)
-          continue env
+        def after(env)
 
           # move each column's index to its column, and remove them from the
           # list of indexes that AR would dump after the table.  Any left

data/lib/schema_plus_indexes/middleware/migration.rb

@@ -2,28 +2,19 @@ module SchemaPlusIndexes
   module Middleware
     module Migration
 
-      def self.insert
-        SchemaMonkey::Middleware::Migration::Column.prepend Shortcuts
-        SchemaMonkey::Middleware::Migration::Column.append IndexOnAddColumn
-        SchemaMonkey::Middleware::Migration::Index.prepend NormalizeArgs
-        SchemaMonkey::Middleware::Migration::Index.prepend IgnoreDuplicates
-      end
-
-      class Shortcuts < SchemaMonkey::Middleware::Base
-        def call(env)
+      module Column
+       
+        # Shortcuts
+        def before(env)
           case env.options[:index]
           when true then env.options[:index] = {}
           when :unique then env.options[:index] = { :unique => true }
           end
-          continue env
         end
-      end
 
-      class IndexOnAddColumn < SchemaMonkey::Middleware::Base
-        def call(env)
-          continue env
+        # Support :index option in Migration.add_column
+        def after(env)
           return unless env.options[:index]
-
           case env.operation
           when :add, :record
             env.caller.add_index(env.table_name, env.column_name, env.options[:index])
@@ -31,25 +22,26 @@ module SchemaPlusIndexes
         end
       end
 
-      class NormalizeArgs < SchemaMonkey::Middleware::Base
-        def call(env)
+      module Index
+
+        # Normalize Args
+        def before(env)
           [:length, :order].each do |key|
             env.options[key].stringify_keys! if env.options[key].is_a? Hash
           end
           env.column_names = Array.wrap(env.column_names).map(&:to_s) + Array.wrap(env.options.delete(:with)).map(&:to_s)
-          continue env
         end
-      end
 
-      class IgnoreDuplicates < SchemaMonkey::Middleware::Base
+        # Ignore duplicates
+        #
         # SchemaPlusIndexes modifies SchemaStatements::add_index so that it ignores
         # errors raised about add an index that already exists -- i.e. that has
         # the same index name, same columns, and same options -- and writes a
         # warning to the log. Some combinations of rails & DB adapter versions
         # would log such a warning, others would raise an error; with
         # SchemaPlusIndexes all versions log the warning and do not raise the error.
-        def call(env)
-          continue env
+        def around(env)
+          yield env
         rescue => e
           raise unless e.message.match(/["']([^"']+)["'].*already exists/)
           name = $1

data/lib/schema_plus_indexes/middleware/model.rb

@@ -1,14 +1,8 @@
 module SchemaPlusIndexes
   module Middleware
     module Model
-
-      def self.insert
-        SchemaMonkey::Middleware::Model::ResetColumnInformation.append ResetColumnInformation
-      end
-
-      class ResetColumnInformation < SchemaMonkey::Middleware::Base
-        def call(env)
-          continue env
+      module ResetColumnInformation
+        def after(env)
           env.model.reset_index_information
         end
       end

data/lib/schema_plus_indexes/middleware/sqlite3.rb

@@ -1,23 +1,19 @@
 module SchemaPlusIndexes
   module Middleware
     module Sqlite3
-      def self.insert
-        SchemaMonkey::Middleware::Query::Indexes.append LookupExtensions
-      end
+      module Query
+        module Indexes
 
-      class LookupExtensions < SchemaMonkey::Middleware::Base
-        def call(env)
-          continue env
-          indexes = Hash[env.index_definitions.map{ |d| [d.name, d] }]
+          def after(env)
+            indexes = Hash[env.index_definitions.map{ |d| [d.name, d] }]
 
-          env.connection.exec_query("SELECT name, sql FROM sqlite_master WHERE type = 'index'").map do |row|
-            if (desc_columns = row['sql'].scan(/['"`]?(\w+)['"`]? DESC\b/).flatten).any?
-              index = indexes[row['name']]
-              index.orders = Hash[index.columns.map {|column| [column, desc_columns.include?(column) ? :desc : :asc]}]
+            env.connection.exec_query("SELECT name, sql FROM sqlite_master WHERE type = 'index'").map do |row|
+              if (desc_columns = row['sql'].scan(/['"`]?(\w+)['"`]? DESC\b/).flatten).any?
+                index = indexes[row['name']]
+                index.orders = Hash[index.columns.map {|column| [column, desc_columns.include?(column) ? :desc : :asc]}]
+              end
             end
           end
-
-          env.index_definitions
         end
       end
     end

data/lib/schema_plus_indexes/version.rb

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

data/schema_dev.yml

@@ -1,7 +1,7 @@
 ruby:
     - 1.9.3
     - 2.1.5
-rails:
+activerecord:
     - 4.2
 db:
     - mysql2

data/schema_plus_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_monkey", "~> 0.2"
+  spec.add_dependency "schema_monkey", "~> 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", "~> 2.0"
+  spec.add_development_dependency "schema_dev", "~> 3.0"
   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_indexes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -136,10 +136,10 @@ files:
 - README.md
 - Rakefile
 - gemfiles/Gemfile.base
-- gemfiles/rails-4.2/Gemfile.base
-- gemfiles/rails-4.2/Gemfile.mysql2
-- gemfiles/rails-4.2/Gemfile.postgresql
-- gemfiles/rails-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-4.2/Gemfile.base
+- gemfiles/activerecord-4.2/Gemfile.mysql2
+- gemfiles/activerecord-4.2/Gemfile.postgresql
+- gemfiles/activerecord-4.2/Gemfile.sqlite3
 - lib/schema_plus_indexes.rb
 - lib/schema_plus_indexes/active_record/base.rb
 - lib/schema_plus_indexes/active_record/connection_adapters/abstract_adapter.rb
@@ -155,7 +155,6 @@ files:
 - spec/index_spec.rb
 - spec/migration_spec.rb
 - spec/named_schema_spec.rb
-- spec/sanity_spec.rb
 - spec/schema_dumper_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/have_index.rb
@@ -188,7 +187,6 @@ test_files:
 - spec/index_spec.rb
 - spec/migration_spec.rb
 - spec/named_schema_spec.rb
-- spec/sanity_spec.rb
 - spec/schema_dumper_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/have_index.rb

data/spec/sanity_spec.rb

@@ -1,13 +0,0 @@
-require 'spec_helper'
-
-
-# A basic sanity check to have as a spec when first starting.  Feel free to delete this
-# once you've got real content.
-
-describe "Sanity Check" do
-
-  it "database is connected" do
-    expect(ActiveRecord::Base).to be_connected
-  end
-
-end