moved Nested Attributes writer generation in separate module, with sa…

…me API as ActiveRecord

lib/ooor.rb

@@ -14,6 +14,7 @@ module Ooor
   autoload :Base
   autoload :ModelSchema
   autoload :Persistence
+  autoload :NestedAttributes
   autoload :Callbacks
   autoload :Cache, 'active_support/cache'
   autoload :Serialization

lib/ooor/base.rb

@@ -15,7 +15,7 @@ module Ooor
   # the base class for proxies to OpenERP objects
   class Base < Ooor::MiniActiveResource
     include Naming, TypeCasting, Serialization, ReflectionOoor, Reflection
-    include Associations, Report, FinderMethods, FieldMethods
+    include Associations, Report, FinderMethods, FieldMethods, NestedAttributes
 
     # ********************** class methods ************************************
     class << self

lib/ooor/field_methods.rb

@@ -30,28 +30,12 @@ def fast_fields(options={})
         end
       end
 
-      # this is used by fields_for in ActionView FormHelper
-      def define_nested_attributes_method(meth)
-        unless self.respond_to?(meth)
-          self.instance_eval do
-            define_method "#{meth}_attributes=" do |*args|
-              send("#{meth}_will_change!")
-              @associations[meth] = args[0]
-              @loaded_associations[meth] = args[0]
-            end
-            define_method "#{meth}_attributes" do |*args|
-              @loaded_associations[meth]
-            end
-          end
-        end
-      end
-
       private
 
       def generate_accessors #TODO we should cache this is a module cached like the template, or eventually generate source code or both
         fields.keys.each { |meth| define_field_method meth }
         associations_keys.each { |meth| define_association_method meth }
-        one2many_associations.keys.each { |meth| define_nested_attributes_method meth }
+        one2many_associations.keys.each { |meth| accepts_nested_attributes_for meth } #TODO do it for m2o too
         many2one_associations.keys.each do |meth|
           define_association_method meth
           define_m2o_association_method meth

lib/ooor/nested_attributes.rb

@@ -0,0 +1,48 @@
+require 'active_support/concern'
+
+module Ooor
+  module NestedAttributes #:nodoc:
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+
+      # Defines an attributes writer for the specified association(s).
+      # Note that in Ooor this is active by default for all one2many and many2one associations
+      def accepts_nested_attributes_for(*attr_names)
+        attr_names.each do |association_name|
+#          reflection = all_fields[association_name]
+          generate_association_writer(association_name, :collection) #TODO add support for m2o
+        end
+      end
+
+      private
+
+      # Generates a writer method for this association. Serves as a point for
+      # accessing the objects in the association. For example, this method
+      # could generate the following:
+      #
+      #   def pirate_attributes=(attributes)
+      #     assign_nested_attributes_for_one_to_one_association(:pirate, attributes)
+      #   end
+      #
+      # This redirects the attempts to write objects in an association through
+      # the helper methods defined below. Makes it seem like the nested
+      # associations are just regular associations.
+      def generate_association_writer(association_name, type)
+        unless self.respond_to?(association_name)
+          self.instance_eval do
+            define_method "#{association_name}_attributes=" do |*args|
+              send("#{association_name}_will_change!")
+              @associations[association_name] = args[0]
+              @loaded_associations[association_name] = args[0]
+            end
+            define_method "#{association_name}_attributes" do |*args|
+              @loaded_associations[association_name]
+            end
+          end
+        end
+      end
+
+    end
+  end
+end

lib/ooor/session.rb

@@ -95,9 +95,6 @@ def set_model_template!(klass, options)
       template = Ooor.model_registry.get_template(config, options[:model])
       if template
         klass.t = template
-        klass.one2many_associations.keys.each do |meth|
-          klass.define_nested_attributes_method(meth)
-        end
       else
         template = Ooor::ModelSchema.new
         template.openerp_model = options[:model]