snusnu-dm-accepts_nested_attributes 0.0.3 → 0.0.4

data/Manifest.txt

@@ -9,6 +9,7 @@ lib/dm-accepts_nested_attributes.rb
 lib/dm-accepts_nested_attributes/association_proxies.rb
 lib/dm-accepts_nested_attributes/association_validation.rb
 lib/dm-accepts_nested_attributes/nested_attributes.rb
+lib/dm-accepts_nested_attributes/resource.rb
 lib/dm-accepts_nested_attributes/version.rb
 spec/fixtures/person.rb
 spec/fixtures/profile.rb

data/lib/dm-accepts_nested_attributes/association_validation.rb

@@ -2,64 +2,26 @@ module DataMapper
   module NestedAttributes
 
     module AssociationValidation
-
-      # NOTE: 
-      # overwriting Resource#save like this breaks the before(:save) hook stack
-      # this hopefully is no problem, since the current implementation doesn't rely on
-      # a before(:save) hook, but rather overwrites this hook with a no-op, and adds
-      # the desired behavior via overwriting Resource#save directly. I'd really appreciate
-      # any ideas for doing this differently, though. Anyways, I'm not really sure if this
-      # is the right approach. I don't even know if it works with custom validations,
-      # or maybe breaks other things. It's also really not well specced at all atm.
-      # Use at your own risk :-)
-
-      def save(context = :default)
-
-        # -----------------------------------------------------------------
-        #              ORIGINAL CODE from Resource#save
-        # -----------------------------------------------------------------
-        #
-        # associations_saved = false
-        # child_associations.each { |a| associations_saved |= a.save }
-        # 
-        # saved = new_record? ? create : update
-        # 
-        # if saved
-        #   original_values.clear
-        # end
-        # 
-        # parent_associations.each { |a| associations_saved |= a.save }
-        # 
-        # # We should return true if the model (or any of its associations)
-        # # were saved.
-        # (saved | associations_saved) == true
-        #
-        # -----------------------------------------------------------------
-
+      
+      def save_child_associations(saved, context)
         return super if context.nil? # preserve save! behavior
-
-        associations_saved = false
-
         child_associations.each do |a|
-  
           if a.respond_to?(:valid?)
             a.errors.each { |e| self.errors.add(:general, e) } unless a.valid?(context)
           else
             self.errors.add(:general, "child association is missing")
           end
-  
-          associations_saved |= a.save
-  
+          saved |= a.save
         end
+        saved
+      end
 
-        saved = self.valid? && (new_record? ? create : update)
-
-        if saved
-          original_values.clear
-        end
+      def save_self
+        self.valid? && super
+      end
 
+      def save_parent_associations(saved, context)
         parent_associations.each do |a|
-  
           if a.respond_to?(:each) 
             a.each do |r|
               r.errors.each { |e| self.errors.add(:general, e) } unless r.valid?(context)
@@ -67,20 +29,16 @@ module DataMapper
           else                  
             a.errors.each { |e| self.errors.add(:general, e) } unless a.valid?(context)
           end
-  
-          associations_saved |= a.save
-  
+          saved |= a.save
         end
-
-        (saved | associations_saved) == true
-
+        saved
       end
 
       # everything works the same if this method isn't overwritten with a no-op
       # however, i suspect that this is the case because the registered before(:save) hook
       # somehow gets lost when overwriting Resource#save here in this module.
       # I'll leave it in for now, to make the purpose clear
-
+      
       def check_validations(context = :default)
         true # no-op, validations are checked inside #save
       end

data/lib/dm-accepts_nested_attributes/resource.rb

@@ -0,0 +1,42 @@
+module DataMapper
+  module Resource
+  
+    # basic extract method refactorings to work around a bug in extlib
+    # see http://sick.snusnu.info/2009/04/29/extlibhook-breaks-if-hooked-method-is-redefined/
+    # maybe they are worth considering even when the bug in extlib (hopefully) gets fixed
+    
+    def save(context = :default)
+      
+      associations_saved = false
+      associations_saved = save_child_associations(associations_saved, context)
+      
+      saved = save_self
+      
+      if saved
+        original_values.clear
+      end
+      
+      associations_saved = save_parent_associations(associations_saved, context)
+      
+      # We should return true if the model (or any of its associations) were saved.
+      (saved | associations_saved) == true
+      
+    end
+    
+    
+    def save_child_associations(saved, context)
+      child_associations.each { |a| saved |= a.save }
+      saved
+    end
+    
+    def save_self
+      new_record? ? create : update
+    end
+    
+    def save_parent_associations(saved, context)
+      parent_associations.each { |a| saved |= a.save }
+      saved
+    end
+    
+  end
+end

data/lib/dm-accepts_nested_attributes/version.rb

@@ -1,7 +1,7 @@
 module DataMapper
   module NestedAttributes
     
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   
   end
 end

data/lib/dm-accepts_nested_attributes.rb

@@ -10,9 +10,10 @@ require 'dm-core'
 require 'dm-validations'
 
 # Require plugin-files
-require Pathname(__FILE__).dirname.expand_path / 'dm-accepts_nested_attributes' / 'nested_attributes'
-# monkeypatches for dm-core/associations/(many_to_one.rb and one_to_many.rb)
-require Pathname(__FILE__).dirname.expand_path / 'dm-accepts_nested_attributes' / 'association_proxies'
+dir = Pathname(__FILE__).dirname.expand_path / 'dm-accepts_nested_attributes'
+require dir / 'resource'
+require dir / 'association_proxies'
+require dir / 'nested_attributes'
 
 # Include the plugin in Model
 DataMapper::Model.append_extensions DataMapper::NestedAttributes::ClassMethods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: snusnu-dm-accepts_nested_attributes
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - "Martin Gamsj\xC3\xA4ger"
@@ -54,6 +54,7 @@ files:
 - lib/dm-accepts_nested_attributes/association_proxies.rb
 - lib/dm-accepts_nested_attributes/association_validation.rb
 - lib/dm-accepts_nested_attributes/nested_attributes.rb
+- lib/dm-accepts_nested_attributes/resource.rb
 - lib/dm-accepts_nested_attributes/version.rb
 - spec/fixtures/person.rb
 - spec/fixtures/profile.rb