acts_as_list 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b89748f05d5967e1a76360d733d46cce9e8d792c
-  data.tar.gz: f5cedd8786d6d4a4ab5fb2446974b05fe481bf95
+  metadata.gz: 66daa5cd56691f7a638ae9dd8f1a9c3feec0577c
+  data.tar.gz: 7574120085bc23b698489eeb890112df78dd7689
 SHA512:
-  metadata.gz: b6e8877539d4c8d88a53fe4b81b78835541f5ea9906a8a0da51e6dc9f615e72a519116f8fecf37053654bbf5cd605bc9d70d5a86c8317f0cb86a4346bf28a826
-  data.tar.gz: 23dc051623bd30cce636ec1db440a1d7cbaae9bf66c16397f4a602fa94f3899c6f5a1a1d82becaee0c2ce176c16ef6818d6ad0d935764a0171aa77b01f744619
+  metadata.gz: acad50db58bda1347963b54c71929bf9d79fce33e47b3efc0c3d7f2ffe17a370ff984c3ff83796e3a31350ec10fce07d2448d95adf796cf1661166070f06ada6
+  data.tar.gz: 7d3bdb848e5a1bc50ed1b5e620eaaaa940cb956a23f1fc12649ca1fab410a2dd3d9df8e0190fd6229ec69048c0066fad59d86d5f48ef07b8e2602d3b1bcf4ee8

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v0.9.4](https://github.com/swanandp/acts_as_list/tree/v0.9.4) (2017-03-16)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.9.3...v0.9.4)
+
+**Merged pull requests:**
+
+- Optimize first? and last? instance methods. [\#262](https://github.com/swanandp/acts_as_list/pull/262) ([marshall-lee](https://github.com/marshall-lee))
+
 ## [v0.9.3](https://github.com/swanandp/acts_as_list/tree/v0.9.3) (2017-03-14)
 [Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.9.2...v0.9.3)
 

data/lib/acts_as_list/active_record/acts/list.rb

@@ -164,7 +164,7 @@ module ActiveRecord
           acts_as_list_list.
             where("#{quoted_position_column_with_table_name} <= ?", position_value).
             where("#{quoted_table_name}.#{self.class.primary_key} != ?", self.send(self.class.primary_key)).
-            order("#{quoted_position_column_with_table_name} DESC").
+            reorder("#{quoted_position_column_with_table_name} DESC").
             limit(limit)
         end
 
@@ -182,7 +182,7 @@ module ActiveRecord
           acts_as_list_list.
             where("#{quoted_position_column_with_table_name} >= ?", position_value).
             where("#{quoted_table_name}.#{self.class.primary_key} != ?", self.send(self.class.primary_key)).
-            order("#{quoted_position_column_with_table_name} ASC").
+            reorder("#{quoted_position_column_with_table_name} ASC").
             limit(limit)
         end
 
@@ -219,8 +219,12 @@ module ActiveRecord
         end
 
         def acts_as_list_list
-          acts_as_list_class.unscoped do
-            acts_as_list_class.where(scope_condition)
+          if ActiveRecord::VERSION::MAJOR < 4
+            acts_as_list_class.unscoped do
+              acts_as_list_class.where(scope_condition)
+            end
+          else
+            acts_as_list_class.unscope(:where).where(scope_condition)
           end
         end
 
@@ -274,7 +278,7 @@ module ActiveRecord
             scope = scope.where("#{quoted_table_name}.#{self.class.primary_key} != ?", except.id)
           end
 
-          scope.in_list.order("#{quoted_position_column_with_table_name} DESC").first
+          scope.in_list.reorder("#{quoted_position_column_with_table_name} DESC").first
         end
 
         # Forces item to assume the bottom position in the list.
@@ -346,7 +350,7 @@ module ActiveRecord
             )
 
             if sequential_updates?
-              items.order("#{quoted_position_column_with_table_name} ASC").each do |item|
+              items.reorder("#{quoted_position_column_with_table_name} ASC").each do |item|
                 item.decrement!(position_column)
               end
             else
@@ -364,7 +368,7 @@ module ActiveRecord
             )
 
             if sequential_updates?
-              items.order("#{quoted_position_column_with_table_name} DESC").each do |item|
+              items.reorder("#{quoted_position_column_with_table_name} DESC").each do |item|
                 item.increment!(position_column)
               end
             else
@@ -382,7 +386,7 @@ module ActiveRecord
               # temporary move after bottom with gap, avoiding duplicate values
               # gap is required to leave room for position increments
               # positive number will be valid with unique not null check (>= 0) db constraint
-              temporary_position = acts_as_list_class.maximum(position_column).to_i + 2
+              temporary_position = bottom_position_in_list + 2
               set_list_position(temporary_position)
               shuffle_positions_on_intermediate_items(old_position, position, id)
             else
@@ -403,7 +407,9 @@ module ActiveRecord
         end
 
         def position_before_save
-          if ActiveRecord::VERSION::MAJOR >= 5 && ActiveRecord::VERSION::MINOR >= 1
+          if ActiveRecord::VERSION::MAJOR == 5 && ActiveRecord::VERSION::MINOR >= 1 ||
+            ActiveRecord::VERSION::MAJOR > 5
+
             send("#{position_column}_before_last_save")
           else
             send("#{position_column}_was")

data/lib/acts_as_list/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.9.4'
+      VERSION = '0.9.5'
     end
   end
 end

data/test/helper.rb

@@ -48,6 +48,7 @@ end
 
 require "shared"
 
+# require 'logger'
 # ActiveRecord::Base.logger = Logger.new(STDOUT)
 
 def assert_equal_or_nil(a, b)

data/test/test_list.rb

@@ -103,7 +103,13 @@ class DefaultScopedWhereMixin < Mixin
   default_scope { order('pos ASC').where(active: true) }
 
   def self.for_active_false_tests
-    unscoped.order('pos ASC').where(active: false)
+    if ActiveRecord::VERSION::MAJOR < 4
+      unscoped do
+        order('pos ASC').where(active: false)
+      end
+    else
+      unscope(:where).where(active: false)
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord