Changeset 1223

Timestamp:

01/09/08 00:04:27 (9 months ago)

Author:

has.s..@gmail.com

Message:

Fixes object naming for nested fileds_for. Closes #360

Files:

• plugins/merb_helpers/lib/merb_helpers/form_helpers.rb (modified) (1 diff)
• plugins/merb_helpers/spec/merb_helpers_spec.rb (modified) (1 diff)

plugins/merb_helpers/lib/merb_helpers/form_helpers.rb

@@ -133 +133 @@
-        @_obj ||= nil
-        @_block ||= nil
+        @_object_name ||= nil
-        obj = obj_from_ivar_or_sym(obj)
-        old_obj, @_obj = @_obj, obj
-        @_object_name = "#{@_obj.class}".snake_case
-        old_block, @_block = @_block, block
+        old_object_name, @_object_name = @_object_name, "#{@_obj.class}".snake_case
-        
-        concat(capture(&block), block.binding)
-
- = old_obj, old_block        
+, @_object_name = old_obj, old_block, old_object_name
-      end
-      

plugins/merb_helpers/spec/merb_helpers_spec.rb

@@ -152 +152 @@
-  end
-  
+  it "should pass context back to the old object after exiting block" do
+    @obj2 = FakeModel2.new
+    fields_for(:obj) do
+      text_control(:foo).should match_tag(:input, :id => "fake_model_foo", :name => "fake_model[foo]", :type => "text")
+      
+      fields_for(:obj2) do
+        text_control(:foo).should match_tag(:input, :id => "fake_model2_foo", :name => "fake_model2[foo]", :type => "text")
+      end
+      
+      text_control(:bar).should match_tag(:input, :id => "fake_model_bar", :name => "fake_model[bar]", :type => "text")
+    end
+  end
-end
-