acts_as_list 0.9.13 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb0226cb2a1505d4baf4dce3e6987ac31f4468b4
-  data.tar.gz: d418ae9ae5b4db5c20dcdc5d056f5458c5823a92
+  metadata.gz: 9c9b9604fc6198654f18e08d86d1d9b036fa2430
+  data.tar.gz: 9a3bd7ece52927226cfdd073f9071525189f0f07
 SHA512:
-  metadata.gz: 3819051f4dcdad3e3d88968138194d9c2572bb26738b06eb615746f8456d03954b822c0bc443e9f50da46b4b6d297516a286d02980c3f191827bea31666b3f6e
-  data.tar.gz: cd2c5e384d77e2c287905451d49bd7594a2562b41fd0e6334ed62a2ea38a543114f9798078f090aca5505247aec523acdf28d440b13d3dcdcb32580f466719d4
+  metadata.gz: e9ba06d872a758fc9a0f7e32cb7439b6db5f59742a6c0b407a8be43915309f84df7e4c740ca56f0be99e78937bfb1522104ee6a90b025598497c952eaeba3e52
+  data.tar.gz: 14581f4471d860d9619e9a84a1762b785f83b3d1b4856dfd1439ff72f680a73000ab68f87fb1e9b9629394f49d730e26d447b67af474d4e0f085b6f5642b0903

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## [v0.9.13](https://github.com/swanandp/acts_as_list/tree/v0.9.13) (2018-06-05)
+[Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.9.12...v0.9.13)
+
+**Merged pull requests:**
+
+- Fix unique index constraint failure on item destroy [\#313](https://github.com/swanandp/acts_as_list/pull/313) ([yjukaku](https://github.com/yjukaku))
+
 ## [v0.9.12](https://github.com/swanandp/acts_as_list/tree/v0.9.12) (2018-05-02)
 [Full Changelog](https://github.com/swanandp/acts_as_list/compare/v0.9.11...v0.9.12)
 

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

@@ -69,6 +69,10 @@ module ActiveRecord
           insert_at_position(position)
         end
 
+        def insert_at!(position = acts_as_list_top)
+          insert_at_position(position, true)
+        end
+
         # Swap positions with the next lower item, if one exists.
         def move_lower
           return unless lower_item
@@ -208,9 +212,9 @@ module ActiveRecord
         end
 
         # Sets the new position and saves it
-        def set_list_position(new_position)
+        def set_list_position(new_position, raise_exception_if_save_fails=false)
           write_attribute position_column, new_position
-          save(validate: false)
+          raise_exception_if_save_fails ? save! : save
         end
 
         private
@@ -394,8 +398,8 @@ module ActiveRecord
           end
         end
 
-        def insert_at_position(position)
-          return set_list_position(position) if new_record?
+        def insert_at_position(position, raise_exception_if_save_fails=false)
+          return set_list_position(position, raise_exception_if_save_fails) if new_record?
           with_lock do
             if in_list?
               old_position = send(position_column).to_i
@@ -404,12 +408,12 @@ module ActiveRecord
               # gap is required to leave room for position increments
               # positive number will be valid with unique not null check (>= 0) db constraint
               temporary_position = bottom_position_in_list + 2
-              set_list_position(temporary_position)
+              set_list_position(temporary_position, raise_exception_if_save_fails)
               shuffle_positions_on_intermediate_items(old_position, position, id)
             else
               increment_positions_on_lower_items(position)
             end
-            set_list_position(position)
+            set_list_position(position, raise_exception_if_save_fails)
           end
         end
 

data/lib/acts_as_list/version.rb

@@ -3,7 +3,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.9.13'
+      VERSION = '0.9.14'
     end
   end
 end

data/test/shared_list.rb

@@ -293,8 +293,22 @@ module Shared
 
     def test_non_persisted_records_dont_get_lock_called
       new = ListMixin.new(parent_id: 5)
-
       new.destroy
     end
+
+    def test_invalid_records_dont_get_inserted
+      new = ListMixinError.new(parent_id: 5, state: nil)
+      assert !new.valid?
+      new.insert_at(1)
+      assert !new.persisted?
+    end
+
+    def test_invalid_records_raise_error_with_insert_at!
+      new = ListMixinError.new(parent_id: 5, state: nil)
+      assert !new.valid?
+      assert_raises ActiveRecord::RecordInvalid do
+        new.insert_at!(1)
+      end
+    end
   end
 end

data/test/test_list.rb

@@ -74,6 +74,14 @@ class ListMixinSub2 < ListMixin
   end
 end
 
+class ListMixinError < ListMixin
+  if rails_3
+    validates :state, presence: true
+  else
+    validates_presence_of :state
+  end
+end
+
 class ListWithStringScopeMixin < Mixin
   acts_as_list column: "pos", scope: 'parent_id = #{parent_id}'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.14
 platform: ruby
 authors:
 - David Heinemeier Hansson