deferring 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmJiMDFiYWJiZWI2Y2UzNTU3NDk3ZmNiOWNhNmYwNzBhNmUwZDk1Yg==
+    ZDI2ZGZlZTRiMjIzMmE3NGUxYjE5N2Y1NThiNDA2ZWJmYzc4NGRhMQ==
   data.tar.gz: !binary |-
-    Y2YwOWRmZjA1NzkwMzZiZGIwYzU0NDdjMWQ4MWFkZGRkODNhMjA1MQ==
+    MWE1NDE1MTI2YTY0OGI5YzQyMTk3NDg1NjczNGNhMDE5YThhMWE2ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NDg0NTNkMzkwYjc2ZjJhZjgxNzE1NGMyMjE2YTcwMzVjNWE1MDEzYjM2MzVk
-    YTc3MDRjOGM4YjJmNTBhNGQ3YmMwYzQ5Njk1N2QxOWUxMTFhMmEzNWQwOGIw
-    YzNlOGFmNjAwZjg3OWI1NWY0NWZiY2VkNTdmMTM4Mzc2ZmY0NzA=
+    ZjYzZmRmNGY2YmNmMDM3YjZmM2ViZDliYWZhN2IyOThiNDIxYjE0ZDhkZmI2
+    ZGY5ZWJiYjhiMjMxZDM4ZjlhNmM3N2Y0NWI2NWQ2Zjc1ZmEwMjA2M2E1YmI5
+    MWUwMmNkMmI4YzQxNGNhNTJmNzk3MDNlOTlkYzAwYTM2M2QxOGU=
   data.tar.gz: !binary |-
-    N2RlNzQxOTBhYzk5NGQzN2Q0OWM1NjE4MDI4YmVmNjlkYmNhMTk0OGMwODk1
-    N2UyNzhiZGIzYzllMDVkYjY4MzJlNjViZWVhZGZhZTQxNWQ3ZmI5NDhiMzIx
-    MDBjZGFmYWE5YjZiOTAyMmYzOGM5NWZmMGRmZTZjOWIzNmU0NGM=
+    MGVjYzM2MjA3NDFkYjU2NjA0ZDU0Yzk2ZWYzMmVjYzdhNTA0MTYwZTcwZWNj
+    YTY5MmJiNmQ1M2U2MGI4MDk1M2I4YTU3ZmE1NGU0MGI2NWZlMWU4MGFiMzI3
+    Yzc3MWFlZDVmZjIzODVkZDU3YTY5MWM4NjNlNGMyMTc1NGYyNzQ=

data/gemfiles/rails_30.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    deferring (0.0.7)
+    deferring (0.0.9)
       activerecord (> 3.0)
 
 GEM

data/gemfiles/rails_32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    deferring (0.0.7)
+    deferring (0.0.9)
       activerecord (> 3.0)
 
 GEM

data/gemfiles/rails_40.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    deferring (0.0.7)
+    deferring (0.0.9)
       activerecord (> 3.0)
 
 GEM

data/gemfiles/rails_41.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    deferring (0.0.7)
+    deferring (0.0.9)
       activerecord (> 3.0)
 
 GEM

data/lib/deferring.rb

@@ -34,44 +34,85 @@ module Deferring
   def deferred_accepts_nested_attributes_for(*args)
     options = args.extract_options!
     inverse_association_name = options.fetch(:as, self.name.underscore.to_sym)
-    reject_if_proc = options.delete(:reject_if)
+    reject_if = options.delete(:reject_if)
     accepts_nested_attributes_for(*args, options)
 
     association_name = args.first.to_s
 
     # teams_attributes=
-    define_method :"#{association_name}_attributes=" do |attributes|
+    define_method :"#{association_name}_attributes=" do |attributes_collection|
       find_or_create_deferred_association(association_name, [], inverse_association_name)
 
-      # Convert the attributes to an array if a Hash is passed. This is possible
-      # as the keys of the hash are ignored in this case.
-      #
-      # Example:
-      #   {
-      #     first: { name: 'Service Desk' },
-      #     second: { name: 'DBA' }
-      #   }
-      #   becomes
-      #   [
-      #     { name: 'Service Desk' },
-      #     { name: 'DBA'}
-      #   ]
-      attributes = attributes.values if attributes.is_a? Hash
-
-      # Remove the attributes that are to be destroyed from the ids that are to
-      # be assigned to the DeferredAssociation instance.
-      attributes.reject! { |record| record.delete(:_destroy) == '1' }
-
-      # Remove the attributes that fail the pass :reject_if proc.
-      attributes.reject! { |record| reject_if_proc.call(record) } if reject_if_proc
+      unless attributes_collection.is_a?(Hash) || attributes_collection.is_a?(Array)
+        raise ArgumentError, "Hash or Array expected, got #{attributes_collection.class.name} (#{attributes_collection.inspect})"
+      end
 
-      klass = self.class.reflect_on_association(:"#{association_name}").klass
+      # TODO: Implement :limit checks. Check rails source.
 
-      objects = attributes.map do |record|
-        record[:id] ? klass.find(record[:id]) : klass.new(record)
+      if attributes_collection.is_a? Hash
+        keys = attributes_collection.keys
+        attributes_collection = if keys.include?('id') || keys.include?(:id)
+          [attributes_collection]
+        else
+          attributes_collection.values
+        end
       end
 
-      send(:"deferred_#{association_name}").objects = objects
+      attributes_collection.each do |attributes|
+        attributes = attributes.with_indifferent_access
+
+        if attributes['id'].blank?
+          if !reject_new_record?(attributes)
+            send(:"#{association_name}").build(attributes.except(*unassignable_keys))
+          end
+
+        elsif existing_record = send(:"#{association_name}").detect { |record| record.id.to_s == attributes['id'].to_s }
+          if !call_reject_if(attributes)
+
+            existing_record.attributes = attributes.except(*unassignable_keys)
+
+            # TODO: Implement value_to_boolean code from rails for checking _destroy field.
+            if attributes['_destroy'] == '1' && options[:allow_destroy]
+              # remove from existing records
+              send(:"#{association_name}").delete(existing_record)
+            end
+          end
+
+        else # new record referenced by id
+          if !call_reject_if(attributes)
+            klass = self.class.reflect_on_association(:"#{association_name}").klass
+
+            attribute_ids = attributes_collection.map { |a| a['id'] || a[:id] }.compact
+            # TODO: Find out how to get send(:"#{association_name}").scoped.where working
+            new_records = attribute_ids.empty? ? [] : klass.where(klass.primary_key => attribute_ids)
+            new_record = new_records.detect { |record| record.id.to_s == attributes['id'].to_s }
+
+            send(:"#{association_name}").push(new_record)
+          end
+        end
+      end
+    end
+
+    # Determines if a new record should be build by checking for
+    # has_destroy_flag? or if a <tt>:reject_if</tt> proc exists for this
+    # association and evaluates to +true+.
+    define_method :reject_new_record? do |attributes|
+      # TODO: Implement value_to_boolean code from rails for checking _destroy field.
+      attributes['_destroy'] == '1' || call_reject_if(attributes)
+    end
+
+    define_method :call_reject_if do |attributes|
+      return false if attributes['_destroy'] == '1'
+      case callback = reject_if
+      when Symbol
+        method(callback).arity == 0 ? send(callback) : send(callback, attributes)
+      when Proc
+        callback.call(attributes)
+      end
+    end
+
+    define_method :unassignable_keys do
+      %w(_destroy)
     end
 
     generate_find_or_create_deferred_association_method

data/lib/deferring/version.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
 
 module Deferring
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/spec/lib/deferring_has_many_spec.rb

@@ -122,6 +122,21 @@ RSpec.describe 'deferred has_many associations' do
       expect{ p.save! }.to change{ Person.first.issues.size }.from(3).to(2)
     end
 
+    it 'updates associated records' do
+      p = Person.first
+      p.issues << printer_issue << db_issue << sandwich_issue
+      p.save
+
+      # Update printer issue.
+      p = Person.first
+      p.attributes = {
+        issues_attributes: [{ id: printer_issue.id, subject: 'Toner low!' }]
+      }
+      p.save!
+
+      expect(Issue.find(printer_issue.id).subject).to eq 'Toner low!'
+    end
+
     it 'sets associated records when posting a hash of hashes' do
       p = Person.first
       p.attributes = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: deferring
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Robin Roestenburg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-02 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord