schema_plus_indexes 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df1b409660d57bf87cb28e5b46ff7f4121d9b4db
-  data.tar.gz: afb439a86e897f10b6bab354f5f0643d39f3b7f8
+  metadata.gz: 3121eeeae9f409e4f1d0c4a379e39de02a8806a0
+  data.tar.gz: f2ce9696d738ba265d3277bd8d8ca13bd379a981
 SHA512:
-  metadata.gz: 2cf73bec7659a3e32a047fa092352ca1a9fd3de1d3fb3c78bdeba59459413b62550771aa6e7cad2198fc255ca56d995c85826a1b14f2c471e4e85fa2c3d0dc4c
-  data.tar.gz: e14c80880a1746ce6d03108b7566126682d2d570adc37144dce9b6fdab8f5aa2379d563660f91c41269f3be0b3e977db5b9b0dc2a59285bdbae894cfedd13470
+  metadata.gz: a2edcfebaa5b39ab374348071042afe30773e3338f35669f7075cc472ac8b1788071140650c241d6b3423b10fd933cda245878ecc8c24bd27eb1317f71428165
+  data.tar.gz: d4713ba88555e4ee3982adf7cc5bed6e1e88c479b0efc8c642d0b82b88692f6865e7a19b866ad790569b4ee45d85c479f8af68c714a5865e73114de15bc21838

data/README.md

@@ -112,6 +112,10 @@ schema_plus_indexes is tested on
 
 ## History
 
+### v0.2.1
+
+* Upgrade to schema_plus_core 1.0 and conform
+
 ### v0.2.0
 
 * Prevent down :change migrations from failing due to trying to remove non-existent indexes

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/gemfiles/activerecord-4.2/Gemfile.mysql2

@@ -2,9 +2,9 @@ require "pathname"
 eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
 
 platform :ruby do
-  gem "mysql2"
+  gem "mysql2", '>= 0.3.18', '< 0.5'
 end
 
 platform :jruby do
   gem 'activerecord-jdbcmysql-adapter'
-end
+end

data/lib/schema_plus/indexes/middleware/dumper.rb

@@ -12,12 +12,12 @@ module SchemaPlus::Indexes
 
             # first check for a single-column index
             if (index = env.table.indexes.find(&its.columns == [column.name]))
-              column.add_option column_index(env, column, index)
+              column.options[:index] = index_options(env, column, index)
               env.table.indexes.delete(index)
 
             # then check for the first of a multi-column index
             elsif (index = env.table.indexes.find(&its.columns.first == column.name))
-              column.add_option column_index(env, column, index)
+              column.options[:index] = index_options(env, column, index)
               env.table.indexes.delete(index)
             end
 
@@ -25,12 +25,11 @@ module SchemaPlus::Indexes
 
         end
 
-        def column_index(env, column, index)
-          parts = []
-          parts << "name: #{index.name.inspect}"
-          parts << "with: #{(index.columns - [column.name]).inspect}" if index.columns.length > 1
-          parts << index.options unless index.options.blank?
-          "index: {#{parts.join(', ')}}"
+        def index_options(env, column, index)
+          options = {}
+          options[:name] = index.name
+          options[:with] = (index.columns - [column.name]) if index.columns.length > 1
+          options.merge index.options
         end
       end
     end

data/lib/schema_plus/indexes/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module Indexes
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

data/schema_plus_indexes.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency "activerecord", "~> 4.2"
-  gem.add_dependency "schema_plus_core", "~> 0.1"
+  gem.add_dependency "schema_plus_core", "~> 1.0"
 
   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.3"
+  gem.add_development_dependency "schema_dev", "~> 3.6"
   gem.add_development_dependency "simplecov"
   gem.add_development_dependency "simplecov-gem-profile"
 end

data/spec/schema_dumper_spec.rb

@@ -43,7 +43,7 @@ describe "Schema dump" do
 
   it "should include in-table index definition" do
     with_index Post, :user_id do
-      expect(dump_posts).to match(/"user_id",.*index:/)
+      expect(dump_posts).to match(/"user_id",.*:index=>/)
     end
   end
 
@@ -55,19 +55,19 @@ describe "Schema dump" do
 
   it "should include index name" do
     with_index Post, :user_id, :name => "custom_name" do
-      expect(dump_posts).to match(/"user_id",.*index:.*name: "custom_name"/)
+      expect(dump_posts).to match(/"user_id",.*:index=>.*:name=>"custom_name"/)
     end
   end
 
   it "should define unique index" do
     with_index Post, :user_id, :name => "posts_user_id_index", :unique => true do
-      expect(dump_posts).to match(/"user_id",.*index:.*name: "posts_user_id_index", unique: true/)
+      expect(dump_posts).to match(/"user_id",.*:index=>.*:name=>"posts_user_id_index", :unique=>true/)
     end
   end
 
   it "should include index order", :mysql => :skip do
     with_index Post, [:user_id, :first_comment_id, :short_id], :order => { :user_id => :asc, :first_comment_id => :desc } do
-      expect(dump_posts).to match(/"user_id".*index: {.*with: \["first_comment_id", "short_id"\],.*order: {"user_id"=>:asc, "first_comment_id"=>:desc, "short_id"=>:asc}/)
+      expect(dump_posts).to match(/"user_id".*:index=>{.*:with=>\["first_comment_id", "short_id"\],.*:order=>{"user_id"=>:asc, "first_comment_id"=>:desc, "short_id"=>:asc}/)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_indexes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        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: '3.3'
+        version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement