sortifiable 0.2.7 → 0.2.8

data/CHANGELOG

@@ -1,3 +1,8 @@
+*0.2.8 (June 25th, 2013)
+
+* Fix deprecations with ActiveRecord 4.0
+
+
 *0.2.7 (February 23rd, 2013)
 
 * Fix a bug when using insert_at to move an existing item down the list [Arthur Holstvoogd]

data/Rakefile

@@ -1,6 +1,7 @@
 require 'rake/testtask'
 require 'rdoc/task'
 require "bundler/gem_tasks"
+require 'appraisal'
 
 desc 'Default: run sortifiable unit tests.'
 task :default => "test:all"

data/lib/sortifiable.rb

@@ -147,7 +147,7 @@ module Sortifiable
 
     # Return items lower than this item or an empty array if it is the last item
     def higher_items
-      list_scope.where(["#{quoted_position_column} < ?", current_position]).all
+      list_scope.where(["#{quoted_position_column} < ?", current_position]).to_a
     end
 
     # Test if this record is in a list
@@ -234,7 +234,7 @@ module Sortifiable
 
     # Return items lower than this item or an empty array if it is the last item
     def lower_items
-      list_scope.where(["#{quoted_position_column} > ?", current_position]).all
+      list_scope.where(["#{quoted_position_column} > ?", current_position]).to_a
     end
 
     # Swap positions with the next higher item, if one exists.
@@ -387,7 +387,7 @@ module Sortifiable
           else
             update = "#{quoted_position_column} = #{quoted_position_column} - 1"
             conditions = "#{quoted_position_column} > #{current_position}"
-            list_scope.update_all(update, conditions) > 0
+            list_scope.where(conditions).update_all(update) > 0
           end
         end
       end
@@ -446,7 +446,7 @@ module Sortifiable
       def lock_list! #:nodoc:
         sql = list_scope.select(list_class.primary_key).lock(true).to_sql
         column = list_class.columns_hash[list_class.primary_key]
-        connection.select_values(sql).map do |value|
+        list_class.connection.select_values(sql).map do |value|
           column.type_cast(value)
         end
       end
@@ -464,7 +464,7 @@ module Sortifiable
       end
 
       def quoted_position_column #:nodoc:
-        connection.quote_column_name(position_column)
+        list_class.connection.quote_column_name(position_column)
       end
 
       def scope_condition #:nodoc:
@@ -476,7 +476,7 @@ module Sortifiable
       end
 
       def update_position(new_position) #:nodoc:
-        base_scope.update_all({ position_column => new_position }, { list_class.primary_key => id })
+        base_scope.where({ list_class.primary_key => id }).update_all({ position_column => new_position })
         set_position new_position
       end
   end

data/lib/sortifiable/version.rb

@@ -1,3 +1,3 @@
 module Sortifiable
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/sortifiable.gemspec

@@ -37,6 +37,7 @@ EOF
 
   s.add_dependency "activesupport", ">= 3.0"
   s.add_dependency "activerecord", ">= 3.0"
+  s.add_development_dependency "appraisal", "~> 0.5"
   s.add_development_dependency "mysql", ">= 2.8.1"
   s.add_development_dependency "mysql2", ">= 0.2.7"
   s.add_development_dependency "pg", ">= 0.9.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sortifiable
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-23 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: mysql
   requirement: !ruby/object:Gem::Requirement
@@ -148,18 +164,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1709003177613176418
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1709003177613176418
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25