Changeset 1320

Timestamp:

01/18/08 13:03:46 (9 months ago)

Author:

v..@exdolo.com

Message:

allow for explicitly rendering an object, which might otherwise not be renderable (such as a Hash, which would be taken for an options hash)

Files:

• trunk/lib/merb/mixins/render.rb (modified) (2 diffs)
• trunk/spec/fixtures/controllers/render_spec_controllers.rb (modified) (1 diff)
• trunk/spec/merb/render_spec.rb (modified) (1 diff)

trunk/lib/merb/mixins/render.rb

@@ -118 +118 @@
-    #   end
-    #   
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    # 
-    # When using multiple calls to render in one action, the context of the render is cached for performance reasons
@@ -140 +153 @@
-      
-      # Handles the case where render is called with an object
-
+ || opts[:obj]
-        # Check for a template
-        unless find_template({:action => action}.merge(opts))

trunk/spec/fixtures/controllers/render_spec_controllers.rb

@@ -59 +59 @@
-    @foo = FakeModel.new
-    render @foo
+  end
+    
+end
+
+class RenderHashObjectController < Merb::Controller
+  
+  def render_object
+    provides :xml,:json
+    @foo = {:foo => 'bar', :baz => 'quuz'}
+    render :obj => @foo
-  end
-    

trunk/spec/merb/render_spec.rb

@@ -413 +413 @@
-end
-
+describe "Merb rendering with a hash object calls to_json or to_xml on the object" do
+  
+  it "render :obj => @foo should call @foo.to_json when json is requested" do
+    c = new_spec_controller(:format => 'json', :controller => 'RenderHashObjectController')
+    c.dispatch(:render_object)
+    c.body.should == "{\"foo\": \"bar\", \"baz\": \"quuz\"}"
+  end
+  
+  it "render @foo should call @foo.to_xml when xml is requested" do
+    c = new_spec_controller(:format => 'xml', :controller => 'RenderHashObjectController')
+    c.dispatch(:render_object)
+    c.body.should == "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<hash>\n  <foo>bar</foo>\n  <baz>quuz</baz>\n</hash>\n"
+  end
+    
+end
+
-describe "Merb rendering with an object and using a block/lambda for provides" do
-