Changeset 1014

Timestamp:

11/17/07 08:10:24 (1 year ago)

Author:

in..@loobmedia.com

Message:

added arguments/proc logic to provides with transform_method object rendering (eg. obj.to_xml(:include => ...)

Files:

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

trunk/lib/merb/mixins/render.rb

@@ -146 +146 @@
-          if transform_method = Merb.mime_transform_method(fmt)
-            set_response_headers fmt
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-          end  
-        end

trunk/lib/merb/mixins/responder.rb

@@ -19 +19 @@
-      ResponderMixin::Rest::TYPES.update(key => values)
-      add_response_headers!(key, new_response_headers)   
- 
+
-    end    
-    
@@ -26 +26 @@
-    end
-    
+    # Return the method name (if any) for the mimetype
-    def mime_transform_method(key)
-      ResponderMixin::Rest::TRANSFORM_METHODS[key]
-    end
-    
+    # Return default arguments for transform method (if any)
+    def mime_transform_method_defaults(key)
+      ResponderMixin::Rest::TRANSFORM_METHOD_DEFAULTS[key]
+    end
+    
+    # Set default arguments for transform method
+    def set_mime_transform_method_defaults(key, *args)
+      raise "Unknown mimetype #{key}" unless ResponderMixin::Rest::TRANSFORM_METHODS[key]
+      ResponderMixin::Rest::TRANSFORM_METHOD_DEFAULTS[key] = args unless args.empty?
+    end
-    
-    # Adds outgoing headers to a mime type.  This can be done with the Merb.add_mime_type method
@@ -166 +177 @@
-    def self.included(base) # :nodoc:
-      base.extend(ClassMethods)
-
-
+
+
+
+
+
-    end
-
@@ -175 +189 @@
-      # default list of provided_formats.  These will apply to
-      # every action in the controller, unless modified in the action.
-
-
+
+
+
+
+
-          self.class_provided_formats << fmt unless class_provided_formats.include?(fmt)
-
+
+
-      end
-      
@@ -185 +203 @@
-      # in the action.
-      def only_provides(*formats)
-
+
+
-      end
-      
-      # Removes formats from the controller's
- 
+
-      # every action in the controller, unless modified in the action.
-      def does_not_provide(*formats)
-        self.class_provided_formats -= formats
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    end
-    
@@ -200 +243 @@
-    # (or :html by default) but can be modifed on a per-action basis.
-    def provided_formats
-
+.dup
-    end
-    
@@ -206 +249 @@
-    # use a combination of +provides+, +only_provides+ and +does_not_provide+
-    # to manage this, but you can set it directly.
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    end
-    
@@ -214 +272 @@
-    # request.  Usually used to add formats to a single action.  See also
-    # the controller-level provides that affects all actions in a controller.
-
-
-
-
+
+
+
+
+
+
+
-    end
-    
@@ -224 +285 @@
-    # the controller-level provides that affects all actions in a controller.
-    def only_provides(*formats)
-provided_formats = formats.flatten
+set_provided_formats(*formats)
-    end
-    
@@ -232 +293 @@
-    # controller.
-    def does_not_provide(*formats)
-
+
+
+
-    end
-    
@@ -298 +361 @@
-    end
-
+    private
+    
+    def raise_if_content_type_already_set!
+      raise "Cannot modify provided_formats because content_type has already been set" if content_type_set?
+    end
+
-    module Rest
-      
@@ -303 +372 @@
-      RESPONSE_HEADERS = {}
-      TRANSFORM_METHODS = {}
+      TRANSFORM_METHOD_DEFAULTS = {}
-
-      class Responder

trunk/spec/fixtures/controllers/render_spec_controllers.rb

@@ -22 +22 @@
-class FakeModel
-  
-
+(*args)
-    "{'foo':'bar'}"
-  end
-  
-
+(*args)
-    "<foo>bar</foo>"
-  end
-end
-
+class FakeModelWithArguments
+  
+  def to_json(*args)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    '[' + args.map { |arg| "'#{arg}'" }.join(',') + ']'
+  end
+  
+  def to_xml(*args)
+    options = args.last.is_a?(Hash) ? args.pop.stringify_keys : {}
+    options.keys.sort.inject('') do |str, tag|
+      str << "<#{tag}>#{options[tag]}</#{tag}>"
+    end
+  end
+  
+end
+
-class RenderObjectController < Merb::Controller
-  
-  
-  def render_object
@@ -46 +61 @@
-  end
-    
+end
+
+class RenderObjectWithArgumentsController < Merb::Controller
+  
+  provides :xml, :foo => 'bar'
+  provides :json, ['foo', 'bar']
+  
+  def render_standard
+    @foo = FakeModelWithArguments.new
+    render @foo
+  end
+  
+  def render_specific
+    provides :xml, :foo => 'bar', :biz => 'baz'
+    provides :json, ['foo', 'bar', 'baz']
+    @foo = FakeModelWithArguments.new
+    render @foo
+  end
+      
+end
+
+class RenderObjectWithBlockController < Merb::Controller
+  
+  provides :xml do |obj, controller|
+    obj.to_xml(:foo => controller.class.name)
+  end
+  
+  provides :json do |obj|
+    obj.to_json('foo')
+  end
+  
+  def render_standard
+    @foo = FakeModelWithArguments.new
+    render @foo
+  end
+  
+  def render_specific
+    callback = lambda { |obj, controller, method| obj.send(method, controller.class.name, 'foo', 'bar', 'baz', :foo => controller.class.name.upcase) }
+    provides :xml, :json, callback
+    @foo = FakeModelWithArguments.new
+    render @foo
+  end
+      
-end
-

trunk/spec/merb/render_spec.rb

@@ -369 +369 @@
-end
-
+describe "Merb rendering with an object calls to_json or to_xml on the object (using specified arguments)" do
+  
+  it "render @foo should call @foo.to_json when json is requested (using default options)" do
+    c = new_spec_controller(:format => 'json', :controller => 'RenderObjectWithArgumentsController')
+    c.provided_format_arguments_for(:json).should == ["foo", "bar"]
+    c.dispatch(:render_standard)
+    c.body.should == "['foo','bar']"
+  end
+  
+  it "render @foo should call @foo.to_json when json is requested (using action options)" do
+    c = new_spec_controller(:format => 'json', :controller => 'RenderObjectWithArgumentsController')
+    c.dispatch(:render_specific)
+    c.body.should == "['foo','bar','baz']"
+  end
+  
+  it "render @foo should call @foo.to_xml when xml is requested (using default options)" do
+    c = new_spec_controller(:format => 'xml', :controller => 'RenderObjectWithArgumentsController')
+    c.provided_format_arguments_for(:xml).should == [{:foo=>"bar"}]
+    c.dispatch(:render_standard)
+    c.body.should == "<foo>bar</foo>"
+  end
+  
+  it "render @foo should call @foo.to_xml when xml is requested (using action options)" do
+    c = new_spec_controller(:format => 'xml', :controller => 'RenderObjectWithArgumentsController')
+    c.dispatch(:render_specific)
+    c.body.should == "<biz>baz</biz><foo>bar</foo>"
+  end
+  
+end
+
+describe "Merb rendering with an object and using a block/lambda for provides" do
+  
+  it "render @foo should use the default block when xml is requested" do
+    c = new_spec_controller(:format => 'xml', :controller => 'RenderObjectWithBlockController')
+    c.provided_format_arguments_for(:xml).should be_kind_of(Proc)
+    c.dispatch(:render_standard)
+    c.body.should == "<foo>RenderObjectWithBlockController</foo>"
+  end
+  
+  it "render @foo should use the default block when json is requested" do
+    c = new_spec_controller(:format => 'json', :controller => 'RenderObjectWithBlockController')
+    c.provided_format_arguments_for(:json).should be_kind_of(Proc)
+    c.dispatch(:render_standard)
+    c.body.should == "['foo']"
+  end
+  
+  it "render @foo should use the specific proc when xml is requested" do
+    c = new_spec_controller(:format => 'xml', :controller => 'RenderObjectWithBlockController')
+    c.dispatch(:render_specific)
+    c.body.should == "<foo>RENDEROBJECTWITHBLOCKCONTROLLER</foo>"
+  end
+  
+  it "render @foo should use the specific proc when json is requested" do
+    c = new_spec_controller(:format => 'json', :controller => 'RenderObjectWithBlockController')
+    c.dispatch(:render_specific)
+    c.body.should == "['RenderObjectWithBlockController','foo','bar','baz']"
+  end
+  
+end
+
-def new_spec_controller(options={})
-  params = {:controller => 'ExtensionTemplateController'}