Ticket #360: fix_form_helper_scope_2.patch

lib/merb_helpers/form_helpers.rb

@@ -132 +132 @@
-      def fields_for(obj, attrs=nil, &block)
-        @_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
-      
-      def control_name(col) #:nodoc:

spec/merb_helpers_spec.rb

@@ -151 +151 @@
-    _buffer.should match_tag(:input, :name => "fake_model[foo]", :value => "foowee", :type => "text")
-  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
-
-describe "text_field (basic)" do