sortability 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e811a6edc06dbfee9c4432f0b81eec7a36aec4cf07e40e5604f397f84a62007f
-  data.tar.gz: 172646fbe4de26f3def8354d671378a9fc5d6faea2b95757d0973c06c6e9de43
+  metadata.gz: 468cc73b34b9eeca08746606ce03659756b65e9743a2f94a84b3e91476684c3b
+  data.tar.gz: c351cb7e7185e39e2a40003d8e38a168bd09c7e7c85d24c15c54f164bacc82ed
 SHA512:
-  metadata.gz: 6844492fe3c495616404aa9cf5edcda32fd8082d6c3a515f706e2b64710a9e8cc459c5845647d26ab8b9f65599af332bc56c085f0cae670072fddd8293cdfadb
-  data.tar.gz: 118dd54f18ad0de05bab919d8f65dddeb0de04861fdb1b3be819ca57fce7b4b00a71531e407f3c37299ca19a293154d497c752293c7ba8093144be1a4f98f67e
+  metadata.gz: 7aad0bc50eb8804585962e1f713bbc3afdaad93c2f044a1dffb85a9d146f4ae082d57e94de16ae9a24a2d814174c80ba9eab360892b9103b2dbdf819f30bbe14
+  data.tar.gz: e4549124e9f4027510e7e034daa867c0362f1dcc9093bd40d25e474715746f371de7ffde0613b7b0c9e043c3ecc5c5641298596ab2fe3777bc51d06007b6a450

data/Rakefile

@@ -1,18 +1,22 @@
+#!/usr/bin/env rake
+# http://viget.com/extend/rails-engine-testing-with-rspec-capybara-and-factorygirl
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
+APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
+load 'rails/tasks/engine.rake'
+
 Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
+Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each { |file| load file }
 
-Rake::TestTask.new(:spec) do |t|
-  t.libs << 'lib'
-  t.libs << 'spec'
-  t.pattern = 'spec/**/*_spec.rb'
-  t.verbose = false
-end
+require 'rspec/core'
+require 'rspec/core/rake_task'
+
+desc 'Run all specs in spec directory (excluding plugin specs)'
+RSpec::Core::RakeTask.new(spec: 'app:db:test:prepare')
 
 task default: :spec

data/lib/sortability/active_record/base.rb

@@ -8,7 +8,7 @@ module Sortability
       module ClassMethods
         # Defines methods that are used to sort records
         # Use via sortable_belongs_to or sortable_class
-        def sortable_methods(options = {})
+        def sortable_methods(**options)
           on = options[:on] || :sort_position
           container = options[:container]
           inverse_of = options[:inverse_of]
@@ -159,11 +159,11 @@ module Sortability
           end
 
           options[:container] = container
-          sortable_methods(options)
+          sortable_methods(**options)
         end
 
         # Defines a sortable class without a container
-        def sortable_class(options = {})
+        def sortable_class(**options)
           on = options[:on] || :sort_position
           scope = options[:scope]
 
@@ -176,7 +176,7 @@ module Sortability
                           uniqueness: (scope.nil? ? true : { scope: scope })
           end
 
-          sortable_methods(options)
+          sortable_methods(**options)
         end
 
         protected

data/lib/sortability/active_record/connection_adapters/table_definition.rb

@@ -3,11 +3,11 @@ module Sortability
     module ConnectionAdapters
       module TableDefinition
         # Adds a non-null sortable column on table creation (no index)
-        def sortable(options = {})
+        def sortable(**options)
           options[:null] = false if options[:null].nil?
           on = options.delete(:on) || :sort_position
 
-          integer on, options
+          integer on, **options
         end
       end
     end

data/lib/sortability/active_record/migration.rb

@@ -2,21 +2,21 @@ module Sortability
   module ActiveRecord
     module Migration
       # Adds a non-null sortable column to an existing table (no index)
-      def add_sortable_column(table, options = {})
+      def add_sortable_column(table, **options)
         options[:null] = false if options[:null].nil?
         on = options.delete(:on) || :sort_position
 
-        add_column table, on, :integer, options
+        add_column table, on, :integer, **options
       end
 
       # Adds a unique index covering the sort scope cols in an existing table
-      def add_sortable_index(table, options = {})
+      def add_sortable_index(table, **options)
         options[:unique] = true if options[:unique].nil?
         scope = options.delete(:scope)
         on = options.delete(:on) || :sort_position
         columns = ([scope] << on).flatten.compact
 
-        add_index table, columns, options
+        add_index table, columns, **options
       end
     end
   end

data/lib/sortability/version.rb

@@ -1,3 +1,3 @@
 module Sortability
-  VERSION = "1.1.0"
+  VERSION = '1.1.1'
 end

data/spec/dummy/config/application.rb

@@ -3,12 +3,12 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 
 Bundler.require(*Rails.groups)
-require "sortability"
+require 'sortability'
 
 module Dummy
   class Application < Rails::Application
     # Initialize configuration defaults for originally generated Rails version.
-    config.load_defaults 5.2
+    config.load_defaults 6.1
 
     # Settings in config/environments/* take precedence over those specified here.
     # Application configuration should go into files in config/initializers