acts_as_list 0.9.18 → 0.9.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7f90b8a37019ae091449a79440aca7cb8862960
-  data.tar.gz: db75dccae8c652a84e9dfaaffb2f195ca238b442
+  metadata.gz: 01e6f5e3817634aa371273af2786776b0e0dd9e5
+  data.tar.gz: c305a4fa8ea72eebbac9aa74a1933d6713741d1a
 SHA512:
-  metadata.gz: 65c7f4c2b1ee583aeb3f2ddc8a9c9c07b5428ad6b0d4b3f5d45e0ad9f1e2a55b7ac98c1f0f1ea7a4ee79969bf2bd343b748f1b9463c65a6635120a3235ad02c1
-  data.tar.gz: 8bd08749b808b25f33e9f8f398731973625ff0ee42dc76080944a94ab88ca6e817412609af0897d69db7e2c7a8843a36a5a90177fffee17d2cadbfa483a87df8
+  metadata.gz: 99c8762a0530f4f3e2cce408eb156f9a6eaa85a3b9d9194ad1f0858f4d47095365726a29a188b8b69a9d7a7d70c4bb828db1386c3c46d23134e341c56fac8731
+  data.tar.gz: 9faea6f72ce9cc2ea854eaa921390d5edc212a1a94018e149fae835fd480dc8175bbcc5a8645fecd29763bea00d7950d06222972b1d9e1bef2087cd540c4e471

data/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.9.19] - 2019-03-12
+### Added
+- Allow `acts_as_list_no_update` blocks to be nested [@conorbdaly](https://github.com/conorbdaly)
+
 ## [0.9.18] - 2019-03-08
 ### Added
 - Added additional gemspec metadata [@boone](https://github.com/boone)

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

@@ -89,20 +89,30 @@ module ActiveRecord
 
         class << self
           def apply_to(klasses)
-            extracted_klasses.push(*klasses)
+            klasses.map {|klass| add_klass(klass)}
             yield
           ensure
-            extracted_klasses.clear
+            klasses.map {|klass| remove_klass(klass)}
           end
 
           def applied_to?(klass)
-            !(klass.ancestors & extracted_klasses).empty?
+            !(klass.ancestors & extracted_klasses.keys).empty?
           end
 
           private
 
           def extracted_klasses
-            Thread.current[:act_as_list_no_update] ||= []
+            Thread.current[:act_as_list_no_update] ||= {}
+          end
+
+          def add_klass(klass)
+            extracted_klasses[klass] = 0 unless extracted_klasses.key?(klass)
+            extracted_klasses[klass] += 1
+          end
+
+          def remove_klass(klass)
+            extracted_klasses[klass] -= 1
+            extracted_klasses.delete(klass) if extracted_klasses[klass] <= 0
           end
         end
 

data/lib/acts_as_list/version.rb

@@ -3,7 +3,7 @@
 module ActiveRecord
   module Acts
     module List
-      VERSION = '0.9.18'
+      VERSION = '0.9.19'
     end
   end
 end

data/test/test_no_update_for_extra_classes.rb

@@ -52,6 +52,7 @@ class NoUpdateForCollectionClassesTest < NoUpdateForCollectionClassesTestCase
 
     @item_1, @item_2 = (1..2).map { |counter| TodoItem.create!(position: counter, todo_list_id: @list_1.id) }
     @attachment_1, @attachment_2 = (1..2).map { |counter| TodoItemAttachment.create!(position: counter, todo_item_id: @item_1.id) }
+    @attachment_3, @attachment_4 = (1..2).map {|counter| TodoItemAttachment.create!(position: counter, todo_item_id: @item_2.id)}
   end
 
   def test_update
@@ -80,6 +81,30 @@ class NoUpdateForCollectionClassesTest < NoUpdateForCollectionClassesTestCase
     assert_equal 1, @list_2.reload.position
   end
 
+  def test_no_update_for_nested_blocks
+    new_list = @list_1.dup
+    new_list.save!
+
+    TodoItem.acts_as_list_no_update do
+      @list_1.todo_items.reverse.each do |item|
+        new_item = item.dup
+        new_list.todo_items << new_item
+        new_item.save!
+
+        assert_equal new_item.position, item.reload.position
+
+        TodoItemAttachment.acts_as_list_no_update do
+          item.todo_item_attachments.reverse.each do |attach|
+            new_attach = attach.dup
+            new_item.todo_item_attachments << new_attach
+            new_attach.save!
+            assert_equal new_attach.position, attach.reload.position
+          end
+        end
+      end
+    end
+  end
+
   def test_raising_array_type_error
     exception = assert_raises ActiveRecord::Acts::List::NoUpdate::ArrayTypeError do
       TodoList.acts_as_list_no_update(nil)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts_as_list
 version: !ruby/object:Gem::Version
-  version: 0.9.18
+  version: 0.9.19
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-07 00:00:00.000000000 Z
+date: 2019-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord