lib/merb_resource_controller/action_descriptor.rb spec/mrc_test_app/spec/lib/action_descriptor_spec.rb @@ -200,57 +200,62 @@ how the controllers behave. Of course you are also free to override all the meth <pre> <code> def index + set_action_specific_provides(:index) load_resource display requested_resource end def show + set_action_specific_provides(:show) load_resource raise Merb::ControllerExceptions::NotFound unless requested_resource display requested_resource end def new - only_provides :html + set_action_specific_provides(:new) load_resource set_member(new_member) display member end def edit - only_provides :html + set_action_specific_provides(:edit) load_resource raise Merb::ControllerExceptions::NotFound unless requested_resource display requested_resource end def create + set_action_specific_provides(:create) load_resource - set_member(new_member(params[member_name])) + set_member(new_member) if member.save - on_successful_create + handle_successful_create else - on_failing_create + handle_failed_create end end def update + set_action_specific_provides(:update) load_resource raise Merb::ControllerExceptions::NotFound unless requested_resource if requested_resource.update_attributes(params[member_name]) - on_successful_update + handle_successful_update else - on_failing_update + handle_failed_update end end def destroy + set_action_specific_provides(:destroy) load_resource raise Merb::ControllerExceptions::NotFound unless requested_resource if requested_resource.destroy - on_successful_destroy + handle_successful_destroy else - on_failing_destroy + handle_failed_destroy end end </code> @@ -261,20 +266,48 @@ h2. Additional Methods to override In addition to the actions and the methods they are using, you will probably want to override some other methods that @merb_resource_controller@ uses to do its thing. Here are some default method implementations you can override to this effect: +h3. Customize the create action + <pre> <code> -# Customize the create action +def handle_successful_create + handle_content_type(:create, content_type, :success) +end + +def handle_failed_create + handle_content_type(:create, content_type, :failure) +end -def on_successful_create + +def html_response_on_successful_create options = flash_messages_for?(:create) ? { :message => successful_create_messages } : {} redirect redirect_on_successful_create, options end - -def on_failing_create + +def html_response_on_failed_create message.merge!(failed_create_messages) if flash_messages_for?(:create) - render :new, :status => 406 + render :new, :status => 406 +end + + +def xml_response_on_successful_create + display member, :status => 201, :location => resource(member) +end + +def xml_response_on_failed_create + display member.errors, :status => 422 +end + + +def json_response_on_successful_create + display member, :status => 201, :location => resource(member) +end + +def json_response_on_failed_create + display member.errors, :status => 422 end + def redirect_on_successful_create target = singleton_controller? ? member_name : member resource(*(has_parent? ? parents + [ target ] : [ target ])) @@ -292,19 +325,50 @@ end def failed_create_messages { :error => "Failed to create new #{member.class.name}" } end +</code> +</pre> -# Customize the update action +h3. Customize the update action -def on_successful_update - options = flash_messages_for?(:update) ? { :message => successful_update_messages } : {} - redirect redirect_on_successful_update, options +<code> +<pre> +def handle_successful_update + handle_content_type(:update, content_type, :success) +end + +def handle_failed_update + handle_content_type(:update, content_type, :failure) end -def on_failing_update + +def html_response_on_successful_update + options = flash_messages_for?(:update) ? { :message => successful_update_messages } : {} + redirect redirect_on_successful_update, options +end + +def html_response_on_failed_update message.merge!(failed_update_messages) if flash_messages_for?(:update) display requested_resource, :edit, :status => 406 end + +def xml_response_on_successful_update + "" # render no content, just 200 (OK) status. +end + +def xml_response_on_failed_update + display member.errors, :status => 422 +end + + +def json_response_on_successful_update + "" # render no content, just 200 (OK) status. +end + +def json_response_on_failed_update + display member.errors, :status => 422 +end + def redirect_on_successful_update target = singleton_controller? ? member_name : member resource(*(has_parent? ? parents + [ target ] : [ target ])) @@ -322,18 +386,36 @@ end def failed_update_messages { :error => "Failed to update #{member.class.name}" } end +</code> +</pre> -# Customize the destroy action +h3. Customize the destroy action -def on_successful_destroy - options = flash_messages_for?(:destroy) ? { :message => successful_destroy_messages } : {} - redirect redirect_on_successful_destroy, options +<code> +<pre> +def handle_successful_destroy + handle_content_type(:destroy, content_type, :success) end -def on_failing_destroy +def handle_failed_destroy raise Merb::ControllerExceptions::InternalServerError end + +def html_response_on_successful_destroy + options = flash_messages_for?(:destroy) ? { :message => successful_destroy_messages } : {} + redirect redirect_on_successful_destroy, options +end + +def xml_response_on_successful_destroy + "" # render no content, just 200 (OK) status. +end + +def json_response_on_successful_destroy + "" # render no content, just 200 (OK) status. +end + + def redirect_on_successful_destroy if singleton_controller? has_parent? ? resource(parent) : '/' @@ -370,6 +452,5 @@ behaves under the given circumstances. h2. TODO # Infer route nesting strategy from @Merb::Router@ -# Customizable support for @provides@ and @only_provides@ # Support for user stamps (aka created_by and updated_by) # Support for pagination once an _official_ merb pagination solution exists \ No newline at end of file README.textile @@ -6,7 +6,7 @@ require 'merb-core/tasks/merb' require "spec/rake/spectask" GEM_NAME = "merb_resource_controller" -GEM_VERSION = "0.1.0" +GEM_VERSION = "0.2.0" AUTHOR = "Martin Gamsjaeger" EMAIL = "gamsnjaga@gmail.com" HOMEPAGE = "http://merbivore.com/" Rakefile @@ -2,6 +2,5 @@ TODO ==== # Infer route nesting strategy from @Merb::Router@ -# Customizable support for @provides@ and @only_provides@ # Support for user stamps (aka created_by and updated_by) # Support for pagination once an _official_ merb pagination solution exists \ No newline at end of file TODO @@ -11,9 +11,10 @@ if defined?(Merb::Plugins) Merb::BootLoader.before_app_loads do # require code that must be loaded before the application mrc = File.join(File.dirname(__FILE__), 'merb_resource_controller') - require mrc / 'resource_proxy' require mrc / 'actions' + require mrc / 'action_descriptor' require mrc / 'resource_controller' + require mrc / 'resource_proxy' if Merb::Plugins.config[:merb_resource_controller][:identity_map] require mrc / 'identity_map_support' end lib/merb_resource_controller.rb @@ -11,6 +11,7 @@ module Merb # end def index + set_action_specific_provides(:index) load_resource display requested_resource end @@ -26,6 +27,7 @@ module Merb # end def show + set_action_specific_provides(:show) load_resource raise Merb::ControllerExceptions::NotFound unless requested_resource display requested_resource @@ -42,7 +44,7 @@ module Merb # end def new - only_provides :html + set_action_specific_provides(:new) load_resource set_member(new_member) display member @@ -60,7 +62,7 @@ module Merb # end def edit - only_provides :html + set_action_specific_provides(:edit) load_resource raise Merb::ControllerExceptions::NotFound unless requested_resource display requested_resource @@ -81,27 +83,56 @@ module Merb # end def create + set_action_specific_provides(:create) load_resource set_member(new_member) if member.save - on_successful_create + handle_successful_create else - on_failing_create + handle_failed_create end end protected + + def handle_successful_create + handle_content_type(:create, content_type, :success) + end + + def handle_failed_create + handle_content_type(:create, content_type, :failure) + end + - def on_successful_create + def html_response_on_successful_create options = flash_messages_for?(:create) ? { :message => successful_create_messages } : {} redirect redirect_on_successful_create, options end - - def on_failing_create + + def html_response_on_failed_create message.merge!(failed_create_messages) if flash_messages_for?(:create) - render :new, :status => 406 + render :new, :status => 406 + end + + + def xml_response_on_successful_create + display member, :status => 201, :location => resource(member) + end + + def xml_response_on_failed_create + display member.errors, :status => 422 + end + + + def json_response_on_successful_create + display member, :status => 201, :location => resource(member) + end + + def json_response_on_failed_create + display member.errors, :status => 422 end + def redirect_on_successful_create target = singleton_controller? ? member_name : member resource(*(has_parent? ? parents + [ target ] : [ target ])) @@ -136,27 +167,55 @@ module Merb # end def update + set_action_specific_provides(:update) load_resource raise Merb::ControllerExceptions::NotFound unless requested_resource if requested_resource.update_attributes(params[member_name]) - on_successful_update + handle_successful_update else - on_failing_update + handle_failed_update end end protected - def on_successful_update - options = flash_messages_for?(:update) ? { :message => successful_update_messages } : {} - redirect redirect_on_successful_update, options + def handle_successful_update + handle_content_type(:update, content_type, :success) end - def on_failing_update + def handle_failed_update + handle_content_type(:update, content_type, :failure) + end + + + def html_response_on_successful_update + options = flash_messages_for?(:update) ? { :message => successful_update_messages } : {} + redirect redirect_on_successful_update, options + end + + def html_response_on_failed_update message.merge!(failed_update_messages) if flash_messages_for?(:update) display requested_resource, :edit, :status => 406 end + + def xml_response_on_successful_update + "" # render no content, just 200 (OK) status. + end + + def xml_response_on_failed_update + display member.errors, :status => 422 + end + + + def json_response_on_successful_update + "" # render no content, just 200 (OK) status. + end + + def json_response_on_failed_update + display member.errors, :status => 422 + end + def redirect_on_successful_update target = singleton_controller? ? member_name : member resource(*(has_parent? ? parents + [ target ] : [ target ])) @@ -191,26 +250,41 @@ module Merb # end def destroy + set_action_specific_provides(:destroy) load_resource raise Merb::ControllerExceptions::NotFound unless requested_resource if requested_resource.destroy - on_successful_destroy + handle_successful_destroy else - on_failing_destroy + handle_failed_destroy end end protected - def on_successful_destroy - options = flash_messages_for?(:destroy) ? { :message => successful_destroy_messages } : {} - redirect redirect_on_successful_destroy, options + def handle_successful_destroy + handle_content_type(:destroy, content_type, :success) end - def on_failing_destroy + def handle_failed_destroy raise Merb::ControllerExceptions::InternalServerError end + + def html_response_on_successful_destroy + options = flash_messages_for?(:destroy) ? { :message => successful_destroy_messages } : {} + redirect redirect_on_successful_destroy, options + end + + def xml_response_on_successful_destroy + "" # render no content, just 200 (OK) status. + end + + def json_response_on_successful_destroy + "" # render no content, just 200 (OK) status. + end + + def redirect_on_successful_destroy if singleton_controller? has_parent? ? resource(parent) : '/' lib/merb_resource_controller/actions.rb @@ -10,21 +10,16 @@ module Merb module ClassMethods def controlling(name, options = {}) - @resource_proxy = Merb::ResourceController::ResourceProxy.new(name, options) + @resource_proxy = ResourceProxy.new(name, class_provided_formats, options) yield @resource_proxy if block_given? class_inheritable_reader :resource_proxy include InstanceMethods - @resource_proxy.registered_actions.each do |action| - action_support = action_module(action[:name]) - include action_support - include action_support.const_get("FlashSupport") if action[:flash] - show_action(action[:name]) + @resource_proxy.registered_actions.each do |action_descriptor| + include action_descriptor.action_module + include action_descriptor.flash_module if action_descriptor.supports_flash_messages? + show_action(action_descriptor.action_name) end end - - def action_module(action) - Merb::ResourceController::Actions.const_get(Extlib::Inflection.classify(action)) - end end @@ -37,6 +32,26 @@ module Merb end + def handle_content_type(action, format, scenario) + if handler = content_type_handler(action, format, scenario) + self.send(handler) if self.respond_to?(handler) + else + raise "no content type handler registered for #{action} #{format} #{scenario}" + end + end + + def content_type_handler(action, format, scenario) + resource_proxy.content_type_handler(action, format, scenario) + end + + def set_action_specific_provides(action) + if resource_proxy.has_format_restriction?(action) + provides_api, formats = resource_proxy.action_specific_provides(action) + self.send(provides_api, *formats) + end + end + + def singleton_controller? resource_proxy.singleton_resource? end @@ -67,8 +82,7 @@ module Merb def load_resource - path = resource_proxy.path_to_resource(params) - path.each do |pc| + resource_proxy.path_to_resource(params).each do |pc| instance_variable_set("@#{pc[0]}", pc[1]) if pc[1] end end @@ -119,8 +133,7 @@ module Merb def flash_messages_for?(action) - return false unless action_support = self.class.action_module(action) - self.kind_of?(action_support.const_get("FlashSupport")) + resource_proxy.flash_messages_for?(action) end end lib/merb_resource_controller/resource_controller.rb @@ -13,11 +13,12 @@ module Merb :use => :all }) - attr_reader :resource, :parents, :registered_methods + attr_reader :resource, :provided_formats, :parents, :registered_methods - def initialize(resource, options = {}) + def initialize(resource, provided_formats, options = {}) options = DEFAULT_OPTIONS.merge(options) @resource, @singleton = load_resource(resource), !!options[:singleton] + @provided_formats = provided_formats || [ :html ] @fully_qualified = !!options[:fully_qualified] @actions, @registered_methods, @parents = [], [], [] @specific_methods_registered = options[:use] != :all @@ -26,7 +27,10 @@ module Merb end def action(name, options = {}) - @actions << { :name => name.to_sym }.merge(options) + options = { :default_formats => true }.merge(options) + descriptor = ActionDescriptor.new(name, @provided_formats, options) + yield descriptor if block_given? + @actions << descriptor end def actions(*action_specs) @@ -37,6 +41,40 @@ module Merb @actions end + def flash_messages_for?(action) + return false unless @actions.map { |ad| ad.action_name }.include?(action.to_sym) + @actions.any? { |ad| ad.action_name == action.to_sym && ad.supports_flash_messages? } + end + + + def action_descriptor(action) + ad = @actions.select { |ad| ad.action_name == action.to_sym } + ad.first ? ad.first : raise("No action named #{action} is registered for this controller") + end + + def content_type_handler(action, format, scenario) + action_descriptor(action).content_type_handler(format, scenario) + end + + def has_format_restriction?(action) + action_descriptor(action).has_format_restriction? + end + + def action_specific_provides(action) + ad = action_descriptor(action) + [ ad.format_restriction_api, ad.restricted_formats ] + end + + def register_default_actions! + action :index unless @singleton + action :show + action :new, :only_provides => :html + action :edit, :only_provides => :html + action :create, :flash => true + action :update, :flash => true + action :destroy, :flash => true + end + # ---------------------------------------------------------------------------------------- # # one level nestings # ---------------------------------------------------------------------------------------- @@ -275,16 +313,6 @@ module Merb end end - def register_default_actions! - action :index unless @singleton - action :show - action :new - action :edit - action :create, :flash => true - action :update, :flash => true - action :destroy, :flash => true - end - # KEEP THESE for later lib/merb_resource_controller/resource_proxy.rb @@ -2,66 +2,67 @@ Gem::Specification.new do |s| s.name = %q{merb_resource_controller} - s.version = "0.1.0" + s.version = "0.2.0" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Martin Gamsjaeger"] - s.date = %q{2008-12-10} + s.date = %q{2008-12-17} s.description = %q{A merb plugin that provides the default restful actions for controllers.} s.email = %q{gamsnjaga@gmail.com} s.extra_rdoc_files = ["LICENSE", "TODO"] s.files = [ - 'LICENSE', - 'README.textile', - 'Rakefile', - 'TODO', - 'lib/merb_resource_controller/action_timeout_support.rb', - 'lib/merb_resource_controller/actions.rb', - 'lib/merb_resource_controller/identity_map_support.rb', - 'lib/merb_resource_controller/resource_controller.rb', - 'lib/merb_resource_controller/resource_proxy.rb', - 'lib/merb_resource_controller.rb', - 'spec/mrc_test_app', - 'spec/mrc_test_app/Rakefile', - 'spec/mrc_test_app/app/controllers/application.rb', - 'spec/mrc_test_app/app/controllers/articles.rb', - 'spec/mrc_test_app/app/controllers/community/comments.rb', - 'spec/mrc_test_app/app/controllers/community/ratings.rb', - 'spec/mrc_test_app/app/controllers/editors.rb', - 'spec/mrc_test_app/app/models/article.rb', - 'spec/mrc_test_app/app/models/comment.rb', - 'spec/mrc_test_app/app/models/editor.rb', - 'spec/mrc_test_app/app/models/rating.rb', - 'spec/mrc_test_app/config/database.yml', - 'spec/mrc_test_app/config/environments/development.rb', - 'spec/mrc_test_app/config/environments/rake.rb', - 'spec/mrc_test_app/config/environments/test.rb', - 'spec/mrc_test_app/config/init.rb', - 'spec/mrc_test_app/config/rack.rb', - 'spec/mrc_test_app/config/router.rb', - 'spec/mrc_test_app/app/views/articles/edit.html.erb', - 'spec/mrc_test_app/app/views/articles/index.html.erb', - 'spec/mrc_test_app/app/views/articles/new.html.erb', - 'spec/mrc_test_app/app/views/articles/show.html.erb', - 'spec/mrc_test_app/app/views/community/comments/edit.html.erb', - 'spec/mrc_test_app/app/views/community/comments/index.html.erb', - 'spec/mrc_test_app/app/views/community/comments/new.html.erb', - 'spec/mrc_test_app/app/views/community/comments/show.html.erb', - 'spec/mrc_test_app/app/views/community/ratings/edit.html.erb', - 'spec/mrc_test_app/app/views/community/ratings/index.html.erb', - 'spec/mrc_test_app/app/views/community/ratings/ne.html.erb', - 'spec/mrc_test_app/app/views/community/ratings/show.html.erb', - 'spec/mrc_test_app/app/views/editors/edit.html.erb', - 'spec/mrc_test_app/app/views/editors/new.html.erb', - 'spec/mrc_test_app/app/views/editors/show.html.erb', - 'spec/mrc_test_app/spec/lib/resource_proxy_spec.rb', - 'spec/mrc_test_app/spec/request/article_comment_rtings_spec.rb', - 'spec/mrc_test_app/spec/request/article_comments_spec.rb', - 'spec/mrc_test_app/spec/request/article_editor_spec.rb', - 'spec/mrc_test_app/spec/request/articles_spec.rb', - 'spec/mrc_test_app/spec/request/comments_spec.rb', - 'spec/mrc_test_app/spec/spec_helper.rb', - 'spec/mrc_test_app/spec/spec.opts' + "LICENSE", + "README.textile", + "Rakefile", + "TODO", + "lib/merb_resource_controller/action_descriptor.rb", + "lib/merb_resource_controller/action_timeout_support.rb", + "lib/merb_resource_controller/actions.rb", + "lib/merb_resource_controller/identity_map_support.rb", + "lib/merb_resource_controller/resource_controller.rb", + "lib/merb_resource_controller/resource_proxy.rb", + "lib/merb_resource_controller.rb", + "spec/mrc_test_app/app/controllers/application.rb", + "spec/mrc_test_app/app/controllers/articles.rb", + "spec/mrc_test_app/app/controllers/community/comments.rb", + "spec/mrc_test_app/app/controllers/community/ratings.rb", + "spec/mrc_test_app/ap/controllers/editors.rb", + "spec/mrc_test_app/app/models/article.rb", + "spec/mrc_test_app/app/models/community/comment.rb", + "spec/mrc_test_app/app/models/community/rating.rb", + "spec/mrc_test_app/app/models/editor.rb", + "spec/mrc_test_app/config/environments/development.rb", + "spec/mrc_test_app/config/environments/rake.rb", + "spec/mrc_test_app/config/environments/test.rb", + "spec/mrc_test_app/config/init.rb", + "spec/mrc_test_app/config/rack.rb", + "spec/mrc_test_app/config/router.rb", + "spec/mrc_test_app/spec/lib/action_descriptor_spec.rb", + "spec/mrc_test_app/spec/lib/resource_proxy_spec.rb", + "spec/mrc_test_app/spec/request/article_comment_ratings_spec.rb", + "spec/mrc_test_app/spec/request/article_comments_spec.rb", + "spec/mrc_test_app/spec/request/article_editor_spec.rb", + "spec/mrc_test_app/spec/request/articles_spec.rb", + "spec/mrc_test_app/spec/request/comments_spec.rb", + "spec/mrc_test_app/spec/spec_helper.rb", + "spec/mrc_test_app", + "spec/mrc_test_app/config/database.yml", + "spec/mrc_test_app/spec/spec.opts", + "spec/mrc_test_app/app/views/articles/edit.html.erb", + "spec/mrc_test_app/app/views/articles/index.html.erb", + "spec/mrc_test_app/app/views/articles/new.html.erb", + "spec/mrc_test_app/app/views/articles/show.html.erb", + "spec/mrc_test_app/app/views/community/comments/edit.html.erb", + "spec/mrc_test_app/app/views/community/comments/index.html.erb", + "spec/mrc_test_app/app/views/community/comments/new.html.erb", + "spec/mrc_test_app/app/views/community/comments/show.html.erb", + "spec/mrc_test_app/app/views/community/ratings/eit.html.erb", + "spec/mrc_test_app/app/views/community/ratings/index.html.erb", + "spec/mrc_test_app/app/views/community/ratings/new.html.erb", + "spec/mrc_test_app/app/views/community/ratings/show.html.erb", + "spec/mrc_test_app/app/views/editors/edit.html.erb", + "spec/mrc_test_app/app/views/editors/new.html.erb", + "spec/mrc_test_app/app/views/editors/show.html.erb" ] s.homepage = %q{http://merbivore.com/} s.require_paths = ["lib"] merb_resource_controller.gemspec @@ -1,3 +1,4 @@ class Articles < Application + provides :xml, :json controlling :articles end \ No newline at end of file spec/mrc_test_app/app/controllers/articles.rb @@ -11,7 +11,6 @@ dependency "dm-constraints", dm_gems_version dependency "merb-assets", merb_gems_version dependency "merb-helpers", merb_gems_version - use_orm :datamapper use_test :rspec use_template_engine :erb spec/mrc_test_app/config/init.rb @@ -31,7 +31,7 @@ describe "Merb::ResourceController::ResourceProxy" do describe "with default options" do before(:each) do - options = { :defaults => true, :flash => true, :use => :all } + options = { :defaults => true, :use => :all } @p = Merb::ResourceController::ResourceProxy.new(:articles, options) end @@ -53,7 +53,7 @@ describe "Merb::ResourceController::ResourceProxy" do it "should have the default actions registered" do default_actions = [ :index, :show, :new, :edit, :create, :update, :destroy ] - actions = @p.registered_actions.map { |h| h[:name] } + actions = @p.registered_actions.map { |ad| ad.action_name } actions.size.should == default_actions.size actions.all? { |a| default_actions.include?(a) }.should be_true @@ -77,14 +77,14 @@ describe "Merb::ResourceController::ResourceProxy" do describe "with invalid (parent) resource" do it "should raise NameError when initialized with an invalid resource" do - options = { :defaults => true, :flash => true, :use => :all } + options = { :defaults => true, :use => :all } lambda { Merb::ResourceController::ResourceProxy.new(:foo, options) }.should raise_error(NameError) end it "should raise NameError when it should belong to an invalid parent resource" do - options = { :defaults => true, :flash => true, :use => :all } + options = { :defaults => true, :use => :all } lambda { p = Merb::ResourceController::ResourceProxy.new("Community::Comment", options) p.belongs_to :foo @@ -97,7 +97,7 @@ describe "Merb::ResourceController::ResourceProxy" do describe "with no parent resource" do before(:each) do - options = { :defaults => true, :flash => true, :use => :all } + options = { :defaults => true, :use => :all } @p = Merb::ResourceController::ResourceProxy.new(:articles, options) end @@ -146,7 +146,7 @@ describe "Merb::ResourceController::ResourceProxy" do describe "with a single parent resource" do before(:each) do - options = { :defaults => true, :flash => true, :use => :all } + options = { :defaults => true, :use => :all } @p = Merb::ResourceController::ResourceProxy.new("Community::Comment", options) @p.belongs_to :article end @@ -208,7 +208,7 @@ describe "Merb::ResourceController::ResourceProxy" do describe "with multiple parent resources with default keys" do before(:each) do - options = { :defaults => true, :flash => true, :use => :all } + options = { :defaults => true, :use => :all } @p = Merb::ResourceController::ResourceProxy.new("Community::Rating", options) @p.belongs_to [ :article, "Community::Comment" ] end spec/mrc_test_app/spec/lib/resource_proxy_spec.rb @@ -134,6 +134,108 @@ describe "POST resource(:articles)" do end +describe "XML POST resource(:articles)" do + + describe "Success" do + + before(:each) do + Article.all.destroy! + @response = request(resource(:articles), + :method => "POST", + :params => { :article => { :id => nil, :title => "Hey there", :body => "Me like snusnu" }}, + "HTTP_ACCEPT" => "application/xml" + ) + end + + it "should return a 201 (Created) status" do + @response.status.should == 201 + @response.body.length.should_not == 0 + end + + end + + describe "Failure" do + + before(:each) do + Article.all.destroy! + @response = request( + resource(:articles), + :method => "POST", + :params => { + :article => { + :id => nil, + :title => nil, + :body => "article body" + } + }, + "HTTP_ACCEPT" => "application/xml" + ) + end + + it "should not be successful" do + @response.should_not be_successful + @response.status.should == 422 + end + + it "should return the serialized errors that occured" do + @response.body.size.should >= 0 + end + + end + +end + +describe "XML POST resource(:articles)" do + + describe "Success" do + + before(:each) do + Article.all.destroy! + @response = request(resource(:articles), + :method => "POST", + :params => { :article => { :id => nil, :title => "Hey there", :body => "Me like snusnu" }}, + "HTTP_ACCEPT" => "application/json" + ) + end + + it "should return a 201 (Created) status" do + @response.status.should == 201 + @response.body.length.should_not == 0 + end + + end + + describe "Failure" do + + before(:each) do + Article.all.destroy! + @response = request( + resource(:articles), + :method => "POST", + :params => { + :article => { + :id => nil, + :title => nil, + :body => "article body" + } + }, + "HTTP_ACCEPT" => "application/json" + ) + end + + it "should not be successful" do + @response.should_not be_successful + @response.status.should == 422 + end + + it "should return the serialized errors that occured" do + @response.body.size.should >= 0 + end + + end + +end + describe "PUT resource(@article)", :given => "an Article exists" do describe "Success" do @@ -177,6 +279,96 @@ describe "PUT resource(@article)", :given => "an Article exists" do end +describe "XML PUT resource(@article)", :given => "an Article exists" do + + describe "Success" do + + before(:each) do + @article = Article.first + @response = request(resource(@article), + :method => "PUT", + :params => { :article => { :id => @article.id } }, + "HTTP_ACCEPT" => "application/xml") + end + + it "should return an empty response with a 200 (OK) status" do + @response.status.should == 200 + @response.body.length.should == 0 + end + + end + + + describe "Failure" do + + before(:each) do + @article = Article.first + @response = request( + resource(@article), + :method => "PUT", + :params => { :article => { :id => @article.id, :title => nil, :body => "updated body" } }, + "HTTP_ACCEPT" => "application/xml" + ) + end + + it "should not be successful" do + @response.should_not be_successful + @response.status.should == 422 + end + + it "should return the serialized errors that occured" do + @response.body.size.should >= 0 + end + + end + +end + +describe "JSON PUT resource(@article)", :given => "an Article exists" do + + describe "Success" do + + before(:each) do + @article = Article.first + @response = request(resource(@article), + :method => "PUT", + :params => { :article => { :id => @article.id } }, + "HTTP_ACCEPT" => "application/json") + end + + it "should return an empty response with a 200 (OK) status" do + @response.status.should == 200 + @response.body.length.should == 0 + end + + end + + + describe "Failure" do + + before(:each) do + @article = Article.first + @response = request( + resource(@article), + :method => "PUT", + :params => { :article => { :id => @article.id, :title => nil, :body => "updated body" } }, + "HTTP_ACCEPT" => "application/json" + ) + end + + it "should not be successful" do + @response.should_not be_successful + @response.status.should == 422 + end + + it "should render the serialized errors that occured" do + @response.body.size.should >= 0 + end + + end + +end + describe "DELETE resource(@article)" do describe "Success", :given => "an Article exists" do @@ -206,3 +398,77 @@ describe "DELETE resource(@article)" do end end + +describe "XML DELETE resource(@article)" do + + describe "Success", :given => "an Article exists" do + + before(:each) do + @response = request(resource(Article.first), + :method => "DELETE", + "HTTP_ACCEPT" => "application/xml" + ) + end + + it "should return an empty response with a 200 (OK) status" do + @response.status.should == 200 + @response.body.length.should == 0 + end + + end + + describe "Failure" do + + before(:each) do + Article.all.destroy! + @response = request('/articles/1', + :method => "DELETE", + "HTTP_ACCEPT" => "application/xml" + ) + end + + it "should not be successful" do + @response.should_not be_successful + @response.status.should == 404 + end + + end + +end + +describe "JSON DELETE resource(@article)" do + + describe "Success", :given => "an Article exists" do + + before(:each) do + @response = request(resource(Article.first), + :method => "DELETE", + "HTTP_ACCEPT" => "application/json" + ) + end + + it "should return an empty response with a 200 (OK) status" do + @response.status.should == 200 + @response.body.length.should == 0 + end + + end + + describe "Failure" do + + before(:each) do + Article.all.destroy! + @response = request('/articles/1', + :method => "DELETE", + "HTTP_ACCEPT" => "application/json" + ) + end + + it "should not be successful" do + @response.should_not be_successful + @response.status.should == 404 + end + + end + +end spec/mrc_test_app/spec/request/articles_spec.rb e37740339a01e6a055563ae16a5ee21b65e1a86a Martin Gamsjaeger gamsnjaga@gmail.com http://github.com/snusnu/merb_resource_controller/commit/be081befe771c2ec3af343a16a9cf8f819433983 be081befe771c2ec3af343a16a9cf8f819433983 2008-12-17T14:14:48-08:00 2008-12-17T14:14:48-08:00 Allow action specific content type restrictions. It's now possible to serve :html, :xml, :json, :yml and :csv out of the box. Additional content types are handled equally easily by registering their symbols and then following simple naming conventions. The current README kind of reflects this, but it needs further explanation. Along with this to work correctly for displaying datamapper validation error collections, I filed a patch to the datamapper lighthouse which can be found at http://tinyurl.com/4czxm7 622c5f15f582b4dd6229db7179234c8d3667667a Martin Gamsjaeger gamsnjaga@gmail.com