acts_as_list 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a58bb02b59b9251aa9959060342f81fe5aa83467
-  data.tar.gz: 6b8f6ba9c5f16cbe5a93cacb754b721b3dd40b56
+  metadata.gz: 5b311fb3c5f9b0839f22ff361020142db9c63045
+  data.tar.gz: 7600388596e829712e8936f9a31b70008ee7d18b
 SHA512:
-  metadata.gz: 5c25e5a32b9def627747a36a7fe4e232ae946b3cde83039c4a893dfc4e8469808fc6ceefac353b4f6bd5e251eb6b0d28df3b00a0d8c69b7b2b1c96ce81eafb42
-  data.tar.gz: 1494350922d065eab1cf1bd0309b56a9a0246055a0eb61f45401682f3f7fa21060ac8367b138a2e29644ba24de838864061a176d2e89711a676c76469d6e897a
+  metadata.gz: dc169373691b7a79c44393a368f4f589b04462c341f8f423f7eeedf846f29346dd3c6821f618287244a24ceafe04ebe416b4c6b6704f0be8470e69a1cd098a76
+  data.tar.gz: 748929065353ef8d675953d0469a4bd26ec8aee6921edfe6710b97186b25f75abc4a57bd648a2b076923cf5283e6dafb225ba0e6596efd21b23734897adc2f66

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Change Log
 
+## [v0.8.1](https://github.com/swanandp/acts_as_list/tree/v0.8.1) (2016-09-06)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.8.0...v0.8.1)
+
+**Closed issues:**
+
+- Rubinius Intermittent testing error [\#218](https://github.com/swanandp/acts_as_list/issues/218)
+- ActiveRecord dependency causes rake assets:compile to fail without access to a database [\#84](https://github.com/swanandp/acts_as_list/issues/84)
+
+**Merged pull requests:**
+
+- Refactor class\_eval with string into class\_eval with block [\#215](https://github.com/swanandp/acts_as_list/pull/215) ([rdvdijk](https://github.com/rdvdijk))
+
 ## [v0.8.0](https://github.com/swanandp/acts_as_list/tree/v0.8.0) (2016-08-23)
 [Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.7.7...v0.8.0)
 
@@ -75,7 +87,6 @@
 - Creating an item with a nil scope should not add it to the list [\#92](https://github.com/swanandp/acts_as_list/issues/92)
 - Performance Improvements  [\#88](https://github.com/swanandp/acts_as_list/issues/88)
 - has\_many :through or has\_many\_and\_belongs\_to\_many support [\#86](https://github.com/swanandp/acts_as_list/issues/86)
-- ActiveRecord dependency causes rake assets:compile to fail without access to a database [\#84](https://github.com/swanandp/acts_as_list/issues/84)
 - move\_higher/move\_lower vs move\_to\_top/move\_to\_bottom act differently when item is already at top or bottom [\#77](https://github.com/swanandp/acts_as_list/issues/77)
 - Limiting the list size [\#61](https://github.com/swanandp/acts_as_list/issues/61)
 - Adding multiple creates strange ordering [\#55](https://github.com/swanandp/acts_as_list/issues/55)

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

@@ -266,7 +266,8 @@ module ActiveRecord
           limit ||= acts_as_list_list.count
           position_value = send(position_column)
           acts_as_list_list.
-            where("#{quoted_position_column_with_table_name} < ?", position_value).
+            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").
             limit(limit)
         end
@@ -283,7 +284,8 @@ module ActiveRecord
           limit ||= acts_as_list_list.count
           position_value = send(position_column)
           acts_as_list_list.
-            where("#{quoted_position_column_with_table_name} > ?", position_value).
+            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").
             limit(limit)
         end
@@ -468,7 +470,7 @@ module ActiveRecord
           end
 
           def update_positions
-            old_position = send("#{position_column}_was").to_i
+            old_position = send("#{position_column}_was") || bottom_position_in_list + 1
             new_position = send(position_column).to_i
 
             return unless acts_as_list_list.where(
@@ -523,4 +525,4 @@ module ActiveRecord
       end
     end
   end
-end
+end

data/lib/acts_as_list/version.rb

@@ -1,7 +1,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.8.1'
+      VERSION = '0.8.2'
     end
   end
 end

data/test/shared_list_sub.rb

@@ -85,6 +85,23 @@ module Shared
       assert_equal [], li1.higher_items
     end
 
+    def test_next_prev_groups_with_same_position
+      li1 = ListMixin.where(id: 1).first
+      li2 = ListMixin.where(id: 2).first
+      li3 = ListMixin.where(id: 3).first
+      li4 = ListMixin.where(id: 4).first
+
+      li3.update_column(:pos, 2) # Make the same position as li2
+
+      assert_equal [1, 2, 2, 4], ListMixin.pluck(:pos)
+
+      assert_equal [li3, li4], li2.lower_items
+      assert_equal [li2, li4], li3.lower_items
+
+      assert_equal [li3, li1], li2.higher_items
+      assert_equal [li2, li1], li3.higher_items
+    end
+
     def test_injection
       item = ListMixin.new("parent_id"=>1)
       assert_equal({ parent_id: 1 }, item.scope_condition)

data/test/test_list.rb

@@ -748,3 +748,33 @@ class ActsAsListTopTest < ActsAsListTestCase
     assert_equal 0, ZeroBasedMixin.acts_as_list_top
   end
 end
+
+class NilPositionTest < ActsAsListTestCase
+  def setup
+    setup_db
+  end
+
+  def test_nil_position_ordering
+    new1 = DefaultScopedMixin.create pos: nil
+    new2 = DefaultScopedMixin.create pos: nil
+    new3 = DefaultScopedMixin.create pos: nil
+    DefaultScopedMixin.update_all(pos: nil)
+
+    assert_equal [nil, nil, nil], DefaultScopedMixin.all.map(&:pos)
+
+    new1.reload.pos = 1
+    new1.save
+
+    new3.reload.pos = 1
+    new3.save
+
+    assert_equal [nil, 1, 2], DefaultScopedMixin.all.map(&:pos)
+    assert_equal [2, 3, 1], DefaultScopedMixin.all.map(&:id)
+
+    new2.reload.pos = 1
+    new2.save
+
+    assert_equal [1, 2, 3], DefaultScopedMixin.all.map(&:pos)
+    assert_equal [2, 3, 1], DefaultScopedMixin.all.map(&:id)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord