lib/reform/form/prepopulate.rb in reform-1.2.6 vs lib/reform/form/prepopulate.rb in reform-2.0.0.beta1

@@ -1,54 +1,24 @@
-# this will soon be handled in Disposable.
+# prepopulate!(options)
+# prepopulator: ->(model, user_options)
 module Reform::Form::Prepopulate
-  def prepopulate!
-    # TODO: representer.new(fields).from_object(fields)
-    hash = prepopulate_representer.new(fields).to_hash(:parent_form => self)
-    prepopulate_representer.new(fields).from_hash(hash)
+  def prepopulate!(options={})
+    prepopulate_local!(options)  # call #prepopulate! on local properties.
+    prepopulate_nested!(options) # THEN call #prepopulate! on nested forms.
 
-    recursive_prepopulate_representer.new(fields).to_hash # not sure if i leave that like this, consider private.
     self
   end
-private
-  def prepopulate_representer
-    self.class.representer(:prepopulate, :all => true) do |dfn|
-      next unless block = dfn[:prepopulate] or dfn[:form]
 
-      if dfn[:form]
-        dfn.merge!(
-          :render_filter => lambda do |v, h, options|
-            parent_form = options.user_options[:parent_form] # TODO: merge with Validate/populate_if_empty.
-
-            # execute in form context, pass user optioins.
-            object = parent_form.instance_exec(options.user_options, &options.binding[:prepopulate])
-
-            if options.binding.array?
-              object.collect { |item| options.binding[:form].new(item) }
-            else
-              options.binding[:form].new(object)
-            end
-          end,
-          :representable  => false,
-
-          :instance => lambda { |obj, *| obj } # needed for from_hash. TODO: make that in one go.
-        )
-      else
-        dfn.merge!(:render_filter => lambda do |v, h, options|
-          parent_form = options.user_options[:parent_form] # TODO: merge with Validate/populate_if_empty.
-
-          # execute in form context, pass user optioins.
-          parent_form.instance_exec(options.user_options, &options.binding[:prepopulate])
-        end)
-      end
+private
+  def prepopulate_local!(options)
+    schema.each do |dfn|
+      next unless block = dfn[:prepopulator]
+      Uber::Options::Value.new(block).evaluate(self, options)
     end
   end
 
-  def recursive_prepopulate_representer
-    self.class.representer(:recursive_prepopulate_representer) do |dfn|
-      dfn.merge!(
-        :serialize => lambda { |object, *| model = object.prepopulate! } # sync! returns the synced model.
-        # representable's :setter will do collection=([..]) or property=(..) for us on the model.
-      )
+  def prepopulate_nested!(options)
+    schema.each(twin: true) do |dfn|
+      Disposable::Twin::PropertyProcessor.new(dfn, self).() { |form| form.prepopulate!(options) }
     end
   end
-
 end
\ No newline at end of file