schema_plus_indexes 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5638466e8b8f9304248cd04d06746103896d8617
-  data.tar.gz: 8603bafd7eaf1c843f85514aabd981700d377131
+  metadata.gz: 2d3bfc7477305f922af889109040fc663c5f02a2
+  data.tar.gz: aa44cff033d8bc35026cc0ac78b821dc0f5cef3b
 SHA512:
-  metadata.gz: fa3559dc69bb4c775c2c19b7d7cc3ce09f1538cc519eabe885114e2d75efa0a906f84392a64dfce0b8514a7f3f4194029bddd6334a7bc78a25482024923faa45
-  data.tar.gz: 5f8f66e397fed0b0aa9a5bca73d6011f70445b0a9a68e9f5e145cf8035943b01bdf7491a0972a8347b3918fa246c3aae83c8e511482ae1375ff01f8a5df528e3
+  metadata.gz: 1211fb491159c60fab14c1829170326944e60aa67af3fae43ccb80e17761be54c203e25b33aac2d21c6305dd32ffa5ebc09a11cfd8a1a7d46be6a3b89386cb22
+  data.tar.gz: 5a7b893f6e89058df0b8a2f23af5012a6fc0f126775b1c2aabfc1380d5516bb2919bb81be686303a3a2883176075c78c5d29f325486cbf367ce5c818528cfcb9

data/.travis.yml

@@ -5,11 +5,14 @@
 ---
 sudo: false
 rvm:
-- 2.1.5
+- 2.3.1
 gemfile:
 - gemfiles/activerecord-4.2/Gemfile.mysql2
 - gemfiles/activerecord-4.2/Gemfile.postgresql
 - gemfiles/activerecord-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-5.0/Gemfile.mysql2
+- gemfiles/activerecord-5.0/Gemfile.postgresql
+- gemfiles/activerecord-5.0/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
   postgresql: '9.4'

data/README.md

@@ -1,7 +1,6 @@
 [![Gem Version](https://badge.fury.io/rb/schema_plus_indexes.svg)](http://badge.fury.io/rb/schema_plus_indexes)
 [![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_plus_indexes.svg)](http://travis-ci.org/SchemaPlus/schema_plus_indexes)
 [![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_plus_indexes.svg)](https://coveralls.io/r/SchemaPlus/schema_plus_indexes)
-[![Dependency Status](https://gemnasium.com/lomba/schema_plus_indexes.svg)](https://gemnasium.com/SchemaPlus/schema_plus_indexes)
 
 # SchemaPlus::Indexes
 
@@ -106,12 +105,17 @@ schema_plus_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 **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.3.1** with activerecord **4.2**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.3.1** with activerecord **5.0**, using **mysql2**, **sqlite3** or **postgresql**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
 ## History
 
+### v0.2.4
+
+* Supports AR 5.0.  Thanks to [@myabc][https://github.com/myabc]
+
 
 ### v0.2.3
 

data/gemfiles/activerecord-5.0/Gemfile.base

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

data/gemfiles/activerecord-5.0/Gemfile.mysql2

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-5.0/Gemfile.postgresql

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-5.0/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/lib/schema_plus/indexes.rb

@@ -1,8 +1,11 @@
 require 'schema_plus/core'
 require 'its-it'
 
+require_relative 'indexes/remove_if_exists'
 require_relative 'indexes/active_record/base'
 require_relative 'indexes/active_record/connection_adapters/abstract_adapter'
+require_relative 'indexes/active_record/connection_adapters/postgresql_adapter'
+require_relative 'indexes/active_record/connection_adapters/sqlite3_adapter'
 require_relative 'indexes/active_record/connection_adapters/index_definition'
 require_relative 'indexes/active_record/migration/command_recorder'
 require_relative 'indexes/middleware/dumper'

data/lib/schema_plus/indexes/active_record/connection_adapters/abstract_adapter.rb

@@ -2,17 +2,7 @@ module SchemaPlus::Indexes
   module ActiveRecord
     module ConnectionAdapters
       module AbstractAdapter
-
-        # Extends rails' remove_index to include this options:
-        #   :if_exists
-        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)
-          super table_name, *args
-        end
-
+        include ::SchemaPlus::Indexes::RemoveIfExists
       end
     end
   end

data/lib/schema_plus/indexes/active_record/connection_adapters/postgresql_adapter.rb

@@ -0,0 +1,9 @@
+module SchemaPlus::Indexes
+  module ActiveRecord
+    module ConnectionAdapters
+      module PostgresqlAdapter
+        include ::SchemaPlus::Indexes::RemoveIfExists
+      end
+    end
+  end
+end

data/lib/schema_plus/indexes/active_record/connection_adapters/sqlite3_adapter.rb

@@ -0,0 +1,9 @@
+module SchemaPlus::Indexes
+  module ActiveRecord
+    module ConnectionAdapters
+      module Sqlite3Adapter
+        include ::SchemaPlus::Indexes::RemoveIfExists
+      end
+    end
+  end
+end

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

@@ -8,7 +8,7 @@ module SchemaPlus::Indexes
             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?
+              if row['sql'] && (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

data/lib/schema_plus/indexes/remove_if_exists.rb

@@ -0,0 +1,13 @@
+module SchemaPlus::Indexes
+  module RemoveIfExists
+    # Extends rails' remove_index to include this options:
+    #   :if_exists
+    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 && !index_name_exists?(table_name, options[:name] || index_name(table_name, *args), false)
+      super table_name, *args
+    end
+  end
+end

data/lib/schema_plus/indexes/version.rb

@@ -1,5 +1,5 @@
 module SchemaPlus
   module Indexes
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/schema_dev.yml

@@ -1,7 +1,8 @@
 ruby:
-    - 2.1.5
+    - 2.3.1
 activerecord:
     - 4.2
+    - 5.0
 db:
     - mysql2
     - sqlite3

data/schema_plus_indexes.gemspec

@@ -17,8 +17,8 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "activerecord", "~> 4.2"
-  gem.add_dependency "schema_plus_core", "~> 1.0"
+  gem.add_dependency "activerecord", ">= 4.2", "< 5.1"
+  gem.add_dependency "schema_plus_core"
   gem.add_dependency "its-it", "~> 1.2"
 
   gem.add_development_dependency "bundler", "~> 1.7"

data/spec/command_recorder_spec.rb

@@ -37,7 +37,9 @@ describe "Command Recorder" do
     end
 
     it "does not fail when reverting" do
-      migration = Class.new ::ActiveRecord::Migration do
+      migration = ::ActiveRecord::Migration
+      migration = migration[5.0] if migration.respond_to? :[] # without [], will be rails 4.2 migration
+      migration = Class.new migration do
         define_method(:change) {
           change_table("comments") do |t|
             t.integer :column

data/spec/index_spec.rb

@@ -8,7 +8,7 @@ describe "index" do
   describe "add_index" do
 
     before(:each) do
-      connection.tables.each do |table| connection.drop_table table, cascade: true end
+      each_table connection do |table| connection.drop_table table, cascade: true end
 
       define_schema(:auto_create => false) do
         create_table :users, :force => true do |t|
@@ -80,7 +80,7 @@ describe "index" do
   describe "remove_index" do
 
     before(:each) do
-      connection.tables.each do |table| connection.drop_table table, cascade: true end
+      each_table connection do |table| connection.drop_table table, cascade: true end
       define_schema(:auto_create => false) do
         create_table :users, :force => true do |t|
           t.string :login

data/spec/spec_helper.rb

@@ -24,9 +24,17 @@ RSpec.configure do |config|
   end
 end
 
+# shim to handle connection.tables deprecation in favor of
+# connection.data_sources
+def each_table(connection)
+  (connection.try :data_sources || connection.tables).each do |table|
+    yield table
+  end
+end
+
 def define_schema(config={}, &block)
   ActiveRecord::Schema.define do
-    connection.tables.each do |table|
+    each_table(connection) do |table|
       drop_table table, :force => :cascade
     end
     instance_eval &block

metadata

@@ -1,43 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_indexes
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - ronen barzel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: schema_plus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: its-it
   requirement: !ruby/object:Gem::Requirement
@@ -154,15 +160,22 @@ files:
 - gemfiles/activerecord-4.2/Gemfile.mysql2
 - gemfiles/activerecord-4.2/Gemfile.postgresql
 - gemfiles/activerecord-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-5.0/Gemfile.base
+- gemfiles/activerecord-5.0/Gemfile.mysql2
+- gemfiles/activerecord-5.0/Gemfile.postgresql
+- gemfiles/activerecord-5.0/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
 - lib/schema_plus/indexes/active_record/connection_adapters/index_definition.rb
+- lib/schema_plus/indexes/active_record/connection_adapters/postgresql_adapter.rb
+- lib/schema_plus/indexes/active_record/connection_adapters/sqlite3_adapter.rb
 - lib/schema_plus/indexes/active_record/migration/command_recorder.rb
 - 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/schema.rb
+- lib/schema_plus/indexes/remove_if_exists.rb
 - lib/schema_plus/indexes/version.rb
 - lib/schema_plus_indexes.rb
 - schema_dev.yml
@@ -196,7 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Adds shorthands and conveniences to ActiveRecord's handling of indexes