@@ -195,27 +195,6 @@ module Merb @_provided_formats ||= class_provided_formats.dup end - # Sets the provided formats for this action. Usually, you would use a - # combination of provides, only_provides and does_not_provide to manage - # this, but you can set it directly. - # - # ==== Parameters - # *formats<Symbol>:: A list of formats to be passed to provides. - # - # ==== Raises - # Merb::ResponderMixin::ContentTypeAlreadySet:: - # Content negotiation already occured, and the content_type is set. - # - # ==== Returns - # Array[Symbol]:: List of formats passed in. - def _set_provided_formats(*formats) - if @_content_type - raise ContentTypeAlreadySet, "Cannot modify provided_formats because content_type has already been set" - end - provides(*formats) - end - alias :_provided_formats= :_set_provided_formats - # Adds formats to the list of provided formats for this particular request. # Usually used to add formats to a single action. See also the # controller-level provides that affects all actions in a controller. @@ -237,8 +216,7 @@ module Merb if @_content_type raise ContentTypeAlreadySet, "Cannot modify provided_formats because content_type has already been set" end - @_provided_formats ||= [] - @_provided_formats |= formats + @_provided_formats = self._provided_formats | formats # merges with class_provided_formats if not already end # Sets list of provided formats for this particular request. Usually used @@ -255,7 +233,8 @@ module Merb #--- # @public def only_provides(*formats) - _set_provided_formats(*formats) + @_provided_formats = [] + provides(*formats) end # Removes formats from the list of provided formats for this particular @@ -273,8 +252,7 @@ module Merb #--- # @public def does_not_provide(*formats) - formats.flatten! - self._provided_formats -= formats + @_provided_formats -= formats.flatten end # Do the content negotiation: lib/merb-core/controller/mixins/responder.rb @@ -34,6 +34,13 @@ module Merb::Test::Fixtures::Controllers end end + class ClassAndLocalProvides < Responder + provides :html + def index + provides :xml + render + end + end class ClassOnlyProvides < Responder only_provides :text, :xml spec/public/controller/controllers/responder.rb @@ -13,7 +13,7 @@ describe Merb::Controller, " responds" do dispatch_to(Merb::Test::Fixtures::Controllers::HtmlDefault, :index).body.should == "HTML: Default" end - it "should use other mime-types if they are provided on the class level" do + it "should use other mime-types if they are provided on the controller-level" do controller = dispatch_to(Merb::Test::Fixtures::Controllers::ClassProvides, :index, {}, :http_accept => "application/xml") controller.body.should == "<XML:Class provides='true' />" end @@ -23,10 +23,24 @@ describe Merb::Controller, " responds" do should raise_error(Merb::ControllerExceptions::NotAcceptable) end - it "should use mime-types that are provided at the local level" do + it "should use mime-types that are provided at the action-level" do controller = dispatch_to(Merb::Test::Fixtures::Controllers::LocalProvides, :index, {}, :http_accept => "application/xml") controller.body.should == "<XML:Local provides='true' />" end + + it "should use mime-types that are provided at the controller-level as well as the action-level (controller)" do + controller = dispatch_to(Merb::Test::Fixtures::Controllers::ClassAndLocalProvides, :index, {}, :http_accept => "text/html") + controller.class_provided_formats.should == [:html] + controller._provided_formats.should == [:html, :xml] + controller.body.should == "HTML: Class and Local" + end + + it "should use mime-types that are provided at the controller-level as well as the action-level (action)" do + controller = dispatch_to(Merb::Test::Fixtures::Controllers::ClassAndLocalProvides, :index, {}, :http_accept => "application/xml") + controller.class_provided_formats.should == [:html] + controller._provided_formats.should == [:html, :xml] + controller.body.should == "<XML:ClassAndLocalProvides provides='true' />" + end it "should use the first mime-type when accepting anything */*" do controller = dispatch_to(Merb::Test::Fixtures::Controllers::MultiProvides, :index, {}, :http_accept => "*/*") @@ -53,43 +67,57 @@ describe Merb::Controller, " responds" do controller.body.should == "HTML: Multi" end - it "should select the format based on params supplied to it with class provides" do + it "should select the format based on params supplied to it with controller-level provides" do controller = dispatch_to(Merb::Test::Fixtures::Controllers::ClassProvides, :index, :format => "xml") controller.content_type.should == :xml end - it "should select the format based on params supplied to it with instance provides" do + it "should select the format based on params supplied to it with action-level provides" do controller = dispatch_to(Merb::Test::Fixtures::Controllers::LocalProvides, :index, :format => "xml") controller.content_type.should == :xml end + it "should select the format based on params supplied to it with controller and action provides (controller)" do + controller = dispatch_to(Merb::Test::Fixtures::Controllers::ClassAndLocalProvides, :index, :format => "html") + controller.content_type.should == :html + end + + it "should select the format based on params supplied to it with controller and action provides (action)" do + controller = dispatch_to(Merb::Test::Fixtures::Controllers::ClassAndLocalProvides, :index, :format => "xml") + controller.content_type.should == :xml + end + it "should properly add formats when only_provides is called in action" do controller = dispatch_to(Merb::Test::Fixtures::Controllers::OnlyProvides, :index, {}, :http_accept => "application/xml") + controller._provided_formats.should == [:text, :xml] controller.content_type.should == :xml end it "should properly remove formats when only_provides is called in action" do - controller = dispatch_to(Merb::Test::Fixtures::Controllers::OnlyProvides, :index, {}, :http_accept => "application/html") + controller = dispatch_to(Merb::Test::Fixtures::Controllers::OnlyProvides, :index, {}, :http_accept => "text/html") lambda { controller.content_type }.should raise_error(Merb::ControllerExceptions::NotAcceptable) end it "should properly add formats when only_provides is called in controller" do controller = dispatch_to(Merb::Test::Fixtures::Controllers::ClassOnlyProvides, :index, {}, :http_accept => "application/xml") + controller._provided_formats.should == [:text, :xml] controller.content_type.should == :xml end it "should properly remove formats when only_provides is called in controller" do - controller = dispatch_to(Merb::Test::Fixtures::Controllers::ClassOnlyProvides, :index, {}, :http_accept => "application/html") + controller = dispatch_to(Merb::Test::Fixtures::Controllers::ClassOnlyProvides, :index, {}, :http_accept => "text/html") lambda { controller.content_type }.should raise_error(Merb::ControllerExceptions::NotAcceptable) end - - it "should properly remove formats when does_not_provide is called in action" do - controller = dispatch_to(Merb::Test::Fixtures::Controllers::OnlyProvides, :index, {}, :http_accept => "application/html") + + it "should properly remove formats when does_not_provide is called in controller" do + controller = dispatch_to(Merb::Test::Fixtures::Controllers::ClassDoesntProvides, :index, {}, :http_accept => "text/html") + controller._provided_formats.should == [:xml] lambda { controller.content_type }.should raise_error(Merb::ControllerExceptions::NotAcceptable) end - it "should properly remove formats when does_not_provide is called in controller" do - controller = dispatch_to(Merb::Test::Fixtures::Controllers::ClassOnlyProvides, :index, {}, :http_accept => "application/html") + it "should properly remove formats when does_not_provide is called in action" do + controller = dispatch_to(Merb::Test::Fixtures::Controllers::DoesntProvide, :index, {}, :http_accept => "text/html") + controller._provided_formats.should == [:xml] lambda { controller.content_type }.should raise_error(Merb::ControllerExceptions::NotAcceptable) end spec/public/controller/responder_spec.rb df7306d346d9ee721f15e3adb0367f0c188f2e66 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/105a206920f0fb4bea379e968770527fcac6876b 105a206920f0fb4bea379e968770527fcac6876b 2008-07-25T03:43:34-07:00 2008-07-25T03:43:34-07:00 Fixed nasty bugs in controller/mixins/responder and its specs. 7093017540aed63e8af13486e17667f66c5b20bc Fabien Franzen info@atelierfabien.be