junk_drawer 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ccbaed0545acce12327a2220ffd61a1f2c89a88
-  data.tar.gz: bb229cb6b5d34628b6122a1476bb854afd474726
+  metadata.gz: d60be93d64ee4342cb14f414e72b1844e9f640b9
+  data.tar.gz: 04edabc898bec4b016d171ad9b2f9b31465f100f
 SHA512:
-  metadata.gz: dc88c0d245fe98b677b94b172968605fa4bec3070fb889e226ce2eb92b848cc24fba1c59bbe92ec99a834c66498f5642b69681a4f34ade042c0db3c6c716a287
-  data.tar.gz: 1743c1dc5149e743d231ff3aa0708ef1cfdc52b19b78f094ed03eaa2e5dbbb8a57cb2cf7def040918e47f766ff5d63898d60bd9103be6eb7062ca1adacec95cc
+  metadata.gz: 5f287f07b3d588795ba80267818cf8fd5794fba500d7a5bbc5396447d4299cd7ac44c562778d49be9ebbcaca8f016215bec1d28ae1c26cf33a28623338becbe7
+  data.tar.gz: 7d0a4b6a89fd495b32a3b40566af88b3e0c777ae7c4fba6ba7217f1782292f8dcc40802cacc0506ba6a57f2863faa18cc1c3aac8f1e88d0ae1055ccd1d63be43

data/lib/junk_drawer/rails/bulk_updatable.rb

@@ -11,13 +11,30 @@ module JunkDrawer
       objects = objects.select(&:changed?)
       return unless objects.any?
 
-      changed_attributes = extract_changed_attributes(objects)
-      query = build_query_for(objects, changed_attributes)
+      unique_objects = uniquify_and_merge(objects)
+      changed_attributes = extract_changed_attributes(unique_objects)
+      query = build_query_for(unique_objects, changed_attributes)
       connection.execute(query)
+      objects.each(&:clear_changes_information)
     end
 
   private
 
+    def uniquify_and_merge(objects)
+      grouped_objects = objects.group_by(&:id).values
+      grouped_objects.each do |group|
+        next if group.length == 1
+
+        attrs = group.each_with_object({}) do |object, changes|
+          object.changed.each do |changed_attribute|
+            changes[changed_attribute] = object[changed_attribute]
+          end
+        end
+        group.each { |object| object.attributes = attrs }
+      end
+      grouped_objects.map(&:first)
+    end
+
     def extract_changed_attributes(objects)
       now = Time.zone.now
       objects.each { |object| object.updated_at = now }

data/lib/junk_drawer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JunkDrawer
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junk_drawer
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Robert Fletcher
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler