@@ -1,7 +1,8 @@ module ResourceController - ACTIONS = [:index, :show, :new_action, :create, :edit, :update, :destroy].freeze - FAILABLE_ACTIONS = ACTIONS - [:index, :new_action, :edit].freeze - NAME_ACCESSORS = [:model_name, :route_name, :object_name] + ACTIONS = [:index, :show, :new_action, :create, :edit, :update, :destroy].freeze + SINGLETON_ACTIONS = (ACTIONS - [:index]).freeze + FAILABLE_ACTIONS = ACTIONS - [:index, :new_action, :edit].freeze + NAME_ACCESSORS = [:model_name, :route_name, :object_name] module ActionControllerExtension unloadable lib/resource_controller.rb @@ -10,8 +10,10 @@ module ResourceController config = {} config.merge!(opts.pop) if opts.last.is_a?(Hash) + all_actions = (singleton? ? ResourceController::SINGLETON_ACTIONS : ResourceController::ACTIONS) - [:new_action] + [:new] + actions_to_remove = [] - actions_to_remove += (ResourceController::ACTIONS - [:new_action] + [:new]) - opts unless opts.first == :all + actions_to_remove += all_actions - opts unless opts.first == :all actions_to_remove += [*config[:except]] if config[:except] actions_to_remove.uniq! lib/resource_controller/class_methods.rb @@ -57,6 +57,12 @@ module ResourceController flash "Successfully removed!" wants.html { redirect_to collection_url } end + + class << self + def singleton? + false + end + end end end end lib/resource_controller/controller.rb @@ -8,6 +8,12 @@ module ResourceController::Helpers::SingletonCustomizations methods_to_undefine = [:param, :index, :collection, :load_collection, :collection_url, :collection_path, :hash_for_collection_url, :hash_for_collection_path] methods_to_undefine.each { |method| undef_method(method) if method_defined? method } + + class << self + def singleton? + true + end + end end end lib/resource_controller/helpers/singleton_customizations.rb @@ -1,3 +1,4 @@ class ImagesController < ResourceController::Singleton belongs_to :user + actions :create end \ No newline at end of file test/app/controllers/images_controller.rb @@ -26,6 +26,12 @@ class ImagesControllerTest < Test::Unit::TestCase assert users(:one), assigns(:image).user end end + end + should "not respond to show" do + assert_raise(ActionController::UnknownAction) do + get :show + end + end end test/test/functional/images_controller_test.rb test/app/views/images/show.html.erb df29959181e1a4140ce0d0f8a50d81ffbe7b17b6 James Golick james@giraffesoft.ca http://github.com/mattswell/resource_controller/commit/6fa9cee1785aad6ee9a6c1fd1a4866075823388f 6fa9cee1785aad6ee9a6c1fd1a4866075823388f 2008-06-24T11:04:14-07:00 2008-06-24T11:04:14-07:00 make it possible to specify actions on singleton controller 0daddab61c155e211a84bb40351e3eaf077eb254 James Golick james@giraffesoft.ca