schema_plus_indexes 0.2.4 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2d3bfc7477305f922af889109040fc663c5f02a2
-  data.tar.gz: aa44cff033d8bc35026cc0ac78b821dc0f5cef3b
+SHA256:
+  metadata.gz: decc66bcf6d7441ebc8722b1f6391d13240d897df6f940fc0543f6450cee507b
+  data.tar.gz: 429fb39c11a09a551d65fb8f8fd88b9baee2e4508c422cbfbaeddc0b630f3c56
 SHA512:
-  metadata.gz: 1211fb491159c60fab14c1829170326944e60aa67af3fae43ccb80e17761be54c203e25b33aac2d21c6305dd32ffa5ebc09a11cfd8a1a7d46be6a3b89386cb22
-  data.tar.gz: 5a7b893f6e89058df0b8a2f23af5012a6fc0f126775b1c2aabfc1380d5516bb2919bb81be686303a3a2883176075c78c5d29f325486cbf367ce5c818528cfcb9
+  metadata.gz: 1579a9a36aaee5fc3445f5c239bf6a245ae88bd4628b96af588ec0c83cec1e2e7dca6b8bc895ca574038ab9d895cc62b193b1fcbfc3208d98d706c0ffb3b23f9
+  data.tar.gz: e896e9910e9773aba80263462ad1c03c9b9517c376797ac6afa17f37d66a0e1a34c2b976eb9a81284b6e2a640cb9259e479bc848baed9b4c171998c3bc584a8b

data/.github/workflows/prs.yml

@@ -0,0 +1,134 @@
+# This file was auto-generated by the schema_dev tool, based on the data in
+#                 ./schema_dev.yml
+# Please do not edit this file; any changes will be overwritten next time
+# schema_dev gets run.
+---
+name: CI PR Builds
+'on':
+  push:
+    branches:
+    - master
+  pull_request:
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+        - '2.5'
+        - '2.7'
+        - '3.0'
+        activerecord:
+        - '5.2'
+        - '6.0'
+        db:
+        - mysql2
+        - sqlite3
+        - skip
+        dbversion:
+        - skip
+        exclude:
+        - ruby: '3.0'
+          activerecord: '5.2'
+        - db: skip
+          dbversion: skip
+        include:
+        - ruby: '2.5'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.5'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '5.2'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '2.7'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+        - ruby: '3.0'
+          activerecord: '6.0'
+          db: postgresql
+          dbversion: '9.6'
+    env:
+      BUNDLE_GEMFILE: "${{ github.workspace }}/gemfiles/activerecord-${{ matrix.activerecord }}/Gemfile.${{ matrix.db }}"
+      MYSQL_DB_HOST: 127.0.0.1
+      MYSQL_DB_USER: root
+      MYSQL_DB_PASS: database
+      POSTGRESQL_DB_HOST: 127.0.0.1
+      POSTGRESQL_DB_USER: schema_plus_test
+      POSTGRESQL_DB_PASS: database
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: "${{ matrix.ruby }}"
+        bundler-cache: true
+    - name: Run bundle update
+      run: bundle update
+    - name: Start Mysql
+      if: matrix.db == 'mysql2'
+      run: |
+        docker run --rm --detach \
+          -e MYSQL_ROOT_PASSWORD=$MYSQL_DB_PASS \
+          -p 3306:3306 \
+          --health-cmd "mysqladmin ping --host=127.0.0.1 --password=$MYSQL_DB_PASS --silent" \
+          --health-interval 5s \
+          --health-timeout 5s \
+          --health-retries 5 \
+          --name database mysql:5.6
+    - name: Start Postgresql
+      if: matrix.db == 'postgresql'
+      run: |
+        docker run --rm --detach \
+          -e POSTGRES_USER=$POSTGRESQL_DB_USER \
+          -e POSTGRES_PASSWORD=$POSTGRESQL_DB_PASS \
+          -p 5432:5432 \
+          --health-cmd "pg_isready -q" \
+          --health-interval 5s \
+          --health-timeout 5s \
+          --health-retries 5 \
+          --name database postgres:${{ matrix.dbversion }}
+    - name: Wait for database to start
+      if: "(matrix.db == 'postgresql' || matrix.db == 'mysql2')"
+      run: |
+        COUNT=0
+        ATTEMPTS=20
+        until [[ $COUNT -eq $ATTEMPTS ]]; do
+          [ "$(docker inspect -f {{.State.Health.Status}} database)" == "healthy" ] && break
+          echo $(( COUNT++ )) > /dev/null
+          sleep 2
+        done
+    - name: Create testing database
+      if: "(matrix.db == 'postgresql' || matrix.db == 'mysql2')"
+      run: bundle exec rake create_ci_database
+    - name: Run tests
+      run: bundle exec rake spec
+    - name: Shutdown database
+      if: always() && (matrix.db == 'postgresql' || matrix.db == 'mysql2')
+      run: docker stop database
+    - name: Coveralls Parallel
+      if: "${{ !env.ACT }}"
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"
+        flag-name: run-${{ matrix.ruby }}-${{ matrix.activerecord }}-${{ matrix.db }}-${{ matrix.dbversion }}
+        parallel: true
+  finish:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+    - name: Coveralls Finished
+      if: "${{ !env.ACT }}"
+      uses: coverallsapp/github-action@master
+      with:
+        github-token: "${{ secrets.GITHUB_TOKEN }}"
+        parallel-finished: true

data/.gitignore

@@ -2,6 +2,7 @@
 /tmp
 /pkg
 /Gemfile.local
+/.idea
 
 *.lock
 *.log

data/.simplecov

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+SimpleCov.configure do
+  enable_coverage :branch
+  add_filter '/spec/'
+
+  add_group 'Binaries', '/bin/'
+  add_group 'Libraries', '/lib/'
+
+  if ENV['CI']
+    require 'simplecov-lcov'
+
+    SimpleCov::Formatter::LcovFormatter.config do |c|
+      c.report_with_single_file = true
+      c.single_report_path = 'coverage/lcov.info'
+    end
+
+    formatter SimpleCov::Formatter::LcovFormatter
+  end
+end

data/Gemfile

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

data/README.md

@@ -1,6 +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)
+[![Build Status](https://github.com/SchemaPlus/schema_plus_indexes/actions/workflows/prs.yml/badge.svg)](https://github.com/SchemaPlus/schema_plus_indexes/actions)
+[![Coverage Status](https://coveralls.io/repos/github/SchemaPlus/schema_plus_indexes/badge.svg)](https://coveralls.io/github/SchemaPlus/schema_plus_indexes)
 
 # SchemaPlus::Indexes
 
@@ -105,16 +105,33 @@ 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.3.1** with activerecord **4.2**, using **mysql2**, **sqlite3** or **postgresql**
-* ruby **2.3.1** with activerecord **5.0**, using **mysql2**, **sqlite3** or **postgresql**
+* ruby **2.5** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **2.5** with activerecord **6.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **2.7** with activerecord **5.2**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **2.7** with activerecord **6.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
+* ruby **3.0** with activerecord **6.0**, using **mysql2**, **sqlite3** or **postgresql:9.6**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
-## History
+## Release Notes
+
+### v1.0.0
+
+* Drop AR < 5.2 and add 6.0 support
+* Drop Ruby < 2.5 and add Ruby 3.0 support
+* Remove its-it GEM
+
+### v0.3.1
+
+* Support AR 5.2.   Thanks to [@jeremyyap](https://github.com/jeremyyap)
+
+### v0.3.0
+
+* Supports AR 5.1.  Thanks to [@iagopiimenta](https://github.com/iagopiimenta)
 
 ### v0.2.4
 
-* Supports AR 5.0.  Thanks to [@myabc][https://github.com/myabc]
+* Supports AR 5.0.  Thanks to [@myabc](https://github.com/myabc)
 
 
 ### v0.2.3
@@ -149,7 +166,7 @@ Some things to know about to help you develop and test:
 * **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)
+  [github actions](https://github.com/SchemaPlus/schema_plus_indexes/actions)
 
   To to run rspec locally on the full matrix, do:
 
@@ -161,7 +178,6 @@ Some things to know about to help you develop and test:
   The matrix of configurations is specified in `schema_dev.yml` in
   the project root.
 
-
 <!-- 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 -->

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/gemfiles/Gemfile.base

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
-gemspec :path => File.expand_path('..', __FILE__)
+gemspec path: File.expand_path('..', __FILE__)
 
 File.exist?(gemfile_local = File.expand_path('../Gemfile.local', __FILE__)) and eval File.read(gemfile_local), binding, gemfile_local

data/gemfiles/activerecord-5.2/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 5.2.0.beta0", "< 5.3"

data/gemfiles/activerecord-5.2/Gemfile.mysql2

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-5.2/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/{activerecord-4.2 → activerecord-5.2}/Gemfile.sqlite3

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

data/gemfiles/activerecord-6.0/Gemfile.base

@@ -0,0 +1,4 @@
+base_gemfile = File.expand_path('../../Gemfile.base', __FILE__)
+eval File.read(base_gemfile)
+
+gem "activerecord", ">= 6.0", "< 6.1"

data/gemfiles/activerecord-6.0/Gemfile.mysql2

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-6.0/Gemfile.postgresql

@@ -0,0 +1,10 @@
+base_gemfile = File.expand_path('../Gemfile.base', __FILE__)
+eval File.read(base_gemfile), binding, base_gemfile
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/{activerecord-5.0 → activerecord-6.0}/Gemfile.sqlite3

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

data/lib/schema_plus/indexes/active_record/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Indexes
   module ActiveRecord
     module Base
@@ -6,10 +8,10 @@ module SchemaPlus::Indexes
         public
 
         # Returns a list of IndexDefinition objects, for each index
-        # defind on this model's table.
+        # defined on this model's table.
         #
         def indexes
-          @indexes ||= connection.indexes(table_name, "#{name} Indexes")
+          @indexes ||= connection.indexes(table_name)
         end
 
         # (reset_index_information gets called by by Middleware::Model::ResetColumnInformation)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Indexes
   module ActiveRecord
     module ConnectionAdapters

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

@@ -1,21 +1,23 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Indexes
   module ActiveRecord
     module ConnectionAdapters
 
       module IndexDefinition
+        attr_accessor :orders
+
+        def initialize(*args, **kwargs) #:nodoc:
+          super
 
-        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 + [{}]
-            super table_name, options[:name], options[:unique], column_names, options[:length], options[:orders], options[:where], options[:type], options[:using]
-          else # backwards compatibility
-            super
-          end
           unless orders.blank?
             # fill out orders with :asc when undefined.  make sure hash ordering
             # follows column ordering.
-            self.orders = Hash[columns.map{|column| [column, orders[column] || :asc]}]
+            if self.orders.is_a?(Hash)
+              self.orders = Hash[columns.map{|column| [column, orders[column] || :asc]}]
+            else
+              self.orders = Hash[columns.map{|column| [column, orders || :asc]}]
+            end
           end
         end
 
@@ -25,7 +27,7 @@ module SchemaPlus::Indexes
           return false unless self.name == other.name
           return false unless Array.wrap(self.columns).collect(&:to_s).sort == Array.wrap(other.columns).collect(&:to_s).sort
           return false unless !!self.unique == !!other.unique
-          return false unless Array.wrap(self.lengths).compact.sort == Array.wrap(other.lengths).compact.sort
+          return false if (self.lengths || {}) != (other.lengths || {}) # treat nil same as empty hash
           return false unless self.where == other.where
           return false unless (self.using||:btree) == (other.using||:btree)
           true

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Indexes
   module ActiveRecord
     module ConnectionAdapters

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Indexes
   module ActiveRecord
     module ConnectionAdapters

data/lib/schema_plus/indexes/active_record/migration/command_recorder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Indexes
   module ActiveRecord
     module Migration

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Indexes
   module Middleware
     module Dumper
@@ -11,12 +13,12 @@ module SchemaPlus::Indexes
           env.table.columns.each do |column|
 
             # first check for a single-column index
-            if (index = env.table.indexes.find(&its.columns == [column.name]))
+            if (index = env.table.indexes.find{ |it| it.columns == [column.name] })
               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))
+            elsif (index = env.table.indexes.find { |it| it.columns.first == column.name })
               column.options[:index] = index_options(env, column, index)
               env.table.indexes.delete(index)
             end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Indexes
   module Middleware
     module Migration
@@ -44,9 +46,13 @@ module SchemaPlus::Indexes
           yield env
         rescue => e
           raise unless e.message.match(/["']([^"']+)["'].*already exists/)
+
           name = $1
           existing = env.caller.indexes(env.table_name).find{|i| i.name == name}
-          attempted = ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(env.table_name, env.column_names, env.options.merge(:name => name))
+          attempted = ::ActiveRecord::ConnectionAdapters::IndexDefinition.new(
+            env.table_name, name, env.options[:unique], env.column_names,
+            **env.options.except(:unique)
+          )
           raise if attempted != existing
           ::ActiveRecord::Base.logger.warn "[schema_plus_indexes] Index name #{name.inspect}' on table #{env.table_name.inspect} already exists. Skipping."
         end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Indexes
   module Middleware
     module Model

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Indexes
   module Middleware
     module Schema

data/lib/schema_plus/indexes/remove_if_exists.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::Indexes
   module RemoveIfExists
     # Extends rails' remove_index to include this options:
@@ -6,7 +8,7 @@ module SchemaPlus::Indexes
       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)
+      return if if_exists && !index_name_exists?(table_name, options[:name] || index_name(table_name, *args))
       super table_name, *args
     end
   end

data/lib/schema_plus/indexes/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module SchemaPlus
   module Indexes
-    VERSION = "0.2.4"
+    VERSION = "1.0.0"
   end
 end

data/lib/schema_plus/indexes.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 require 'schema_plus/core'
-require 'its-it'
+require 'active_record'
 
 require_relative 'indexes/remove_if_exists'
 require_relative 'indexes/active_record/base'

data/lib/schema_plus_indexes.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative 'schema_plus/indexes'

data/schema_dev.yml

@@ -1,8 +1,10 @@
 ruby:
-    - 2.3.1
+    - 2.5
+    - 2.7
+    - 3.0
 activerecord:
-    - 4.2
-    - 5.0
+    - 5.2
+    - 6.0
 db:
     - mysql2
     - sqlite3

data/schema_plus_indexes.gemspec

@@ -1,4 +1,5 @@
-# coding: utf-8
+# frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'schema_plus/indexes/version'
@@ -17,14 +18,13 @@ 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", "< 5.1"
-  gem.add_dependency "schema_plus_core"
-  gem.add_dependency "its-it", "~> 1.2"
+  gem.required_ruby_version = ">= 2.5.0"
+
+  gem.add_dependency "activerecord", ">= 5.2", "< 6.1"
+  gem.add_dependency "schema_plus_core", "~> 3.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.6"
-  gem.add_development_dependency "simplecov"
-  gem.add_development_dependency "simplecov-gem-profile"
+  gem.add_development_dependency "bundler"
+  gem.add_development_dependency "rake", "~> 13.0"
+  gem.add_development_dependency "rspec", "~> 3.0"
+  gem.add_development_dependency "schema_dev", "~> 4.1"
 end

data/spec/command_recorder_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 module AddIndexBefore

data/spec/index_definition_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 
@@ -24,7 +26,7 @@ describe "Index definition" do
   end
 
   after(:each) do
-    migration.remove_index :users, :name => 'users_login_index' if migration.index_name_exists? :users, 'users_login_index', true
+    migration.remove_index :users, :name => 'users_login_index' if migration.index_name_exists?(:users, 'users_login_index')
   end
 
   context "when index is multicolumn" do

data/spec/index_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "index" do
@@ -53,6 +55,11 @@ describe "index" do
       expect(index_for([:login, :deleted_at]).orders).to eq({"login" => :desc, "deleted_at" => :asc})
     end
 
+    it "should assign order (all same direction)", :mysql => :skip do
+      add_index(:users, [:login, :deleted_at], :order => {:login => :desc, :deleted_at => :desc})
+      expect(index_for([:login, :deleted_at]).orders).to eq({"login" => :desc, "deleted_at" => :desc})
+    end
+
     context "for duplicate index" do
       it "should not complain if the index is the same" do
         add_index(:users, :login)
@@ -64,7 +71,7 @@ describe "index" do
       it "should complain if the index is different" do
         add_index(:users, :login, :unique => true)
         expect(index_for(:login)).not_to be_nil
-        expect { add_index(:users, :login) }.to raise_error
+        expect { add_index(:users, :login) }.to raise_error(ArgumentError, /already exists/)
         expect(index_for(:login)).not_to be_nil
       end
     end
@@ -150,7 +157,7 @@ describe "index" do
     it "raises exception if doesn't exist" do
       expect {
         remove_index :users, :login
-      }.to raise_error
+      }.to raise_error(ArgumentError)
     end
 
     it "doesn't raise exception with :if_exists" do

data/spec/migration_spec.rb

@@ -1,4 +1,5 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe ActiveRecord::Migration do
@@ -62,7 +63,12 @@ describe ActiveRecord::Migration do
         t.string :bar, :index => { :with => :foo, :length => { :foo => 8, :bar => 12 }}
       end
       index = @model.indexes.first
-      expect(Hash[index.columns.zip(index.lengths.map(&:to_i))]).to eq({ "foo" => 8, "bar" => 12})
+
+      if index.lengths.is_a? Hash  # as of AR 5.1
+        expect(index.lengths).to eq({ "foo" => 8, "bar" => 12})
+      else
+        expect(Hash[index.columns.zip(index.lengths.map(&:to_i))]).to eq({ "foo" => 8, "bar" => 12})
+      end
     end
 
     it "should create an index if specified explicitly" do
@@ -157,9 +163,9 @@ describe ActiveRecord::Migration do
 
     protected
 
-    def add_column(column_name, *args)
+    def add_column(column_name, type, **args)
       table = @model.table_name
-      ActiveRecord::Migration.add_column(table, column_name, *args)
+      ActiveRecord::Migration.add_column(table, column_name, type, **args)
       @model.reset_column_information
       yield if block_given?
       ActiveRecord::Migration.remove_column(table, column_name)
@@ -167,16 +173,14 @@ describe ActiveRecord::Migration do
 
   end
 
-
-  def recreate_table(model, opts={}, &block)
-    ActiveRecord::Migration.create_table model.table_name, opts.merge(:force => true), &block
+  def recreate_table(model, **opts, &block)
+    ActiveRecord::Migration.create_table model.table_name, **opts.merge(:force => true), &block
     model.reset_column_information
   end
 
-  def change_table(model, opts={}, &block)
-    ActiveRecord::Migration.change_table model.table_name, opts, &block
+  def change_table(model, **opts, &block)
+    ActiveRecord::Migration.change_table model.table_name, **opts, &block
     model.reset_column_information
   end
 
 end
-

data/spec/named_schema_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe "with multiple schemas" do

data/spec/schema_dumper_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'stringio'
 
@@ -67,7 +69,8 @@ describe "Schema dump" do
 
   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}/)
+      # allow :order hash to key on strings (AR 5.0) or symbols (AR 5.1)
+      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
 

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 require 'simplecov'
-require 'simplecov-gem-profile'
-SimpleCov.start "gem"
+
+SimpleCov.start
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

data/spec/support/enableable.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Enableable
 
   def enabled_middleware(root, env)
-    middleware = self.singleton_class.ancestors.find(&it.to_s.start_with?("#{root}::Middleware"))
+    middleware = self.singleton_class.ancestors.find { |it| it.to_s.start_with?("#{root}::Middleware") }
     return nil unless middleware.enabled?(env)
     middleware.disable if middleware.once?(env)
     middleware

data/spec/support/matchers/have_index.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SchemaPlus::IndexesMatchers
 
   class HaveIndex

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema_plus_indexes
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 1.0.0
 platform: ruby
 authors:
 - ronen barzel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-08-24 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,154 +16,113 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: schema_plus_core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: its-it
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: schema_dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-gem-profile
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: 
+        version: '4.1'
+description:
 email:
 - ronen@barzel.org
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/prs.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".simplecov"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - gemfiles/Gemfile.base
-- gemfiles/activerecord-4.2/Gemfile.base
-- 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
+- gemfiles/activerecord-5.2/Gemfile.base
+- gemfiles/activerecord-5.2/Gemfile.mysql2
+- gemfiles/activerecord-5.2/Gemfile.postgresql
+- gemfiles/activerecord-5.2/Gemfile.sqlite3
+- gemfiles/activerecord-6.0/Gemfile.base
+- gemfiles/activerecord-6.0/Gemfile.mysql2
+- gemfiles/activerecord-6.0/Gemfile.postgresql
+- gemfiles/activerecord-6.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
@@ -193,7 +152,7 @@ homepage: https://github.com/SchemaPlus/schema_plus_indexes
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -201,16 +160,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.0.8
+signing_key:
 specification_version: 4
 summary: Adds shorthands and conveniences to ActiveRecord's handling of indexes
 test_files:

data/.travis.yml

@@ -1,21 +0,0 @@
-# This file was auto-generated by the schema_dev tool, based on the data in
-#                 ./schema_dev.yml
-# Please do not edit this file; any changes will be overwritten next time
-# schema_dev gets run.
----
-sudo: false
-rvm:
-- 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'
-before_script: bundle exec rake create_databases
-after_script: bundle exec rake drop_databases
-script: bundle exec rake travis

data/gemfiles/activerecord-4.2/Gemfile.base

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

data/gemfiles/activerecord-4.2/Gemfile.mysql2

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

data/gemfiles/activerecord-4.2/Gemfile.postgresql

@@ -1,10 +0,0 @@
-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.base

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

data/gemfiles/activerecord-5.0/Gemfile.mysql2

@@ -1,10 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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