@@ -628,7 +628,7 @@ module Ardes#:nodoc: # returns the name of the immediately enclosing resource def enclosing_resource_name - enclosing_resource.class.name.underscore + @enclosing_resource_name end # returns the resource service for the controller - this will be lazilly created @@ -781,6 +781,7 @@ module Ardes#:nodoc: update_name_prefix(options[:name_prefix] || (options[:name_prefix] == false ? '' : "#{name}_")) enclosing_resources << resource enclosing_collection_resources << resource unless options[:is_singleton] + instance_variable_set("@enclosing_resource_name", options[:name]) instance_variable_set("@#{name}", resource) instance_variable_set("@#{options[:as]}", resource) if options[:as] end lib/ardes/resources_controller.rb @@ -15,23 +15,23 @@ describe "ResourcesController (in general)" do it "resources_controller_for :forums, :in => [:user, '*', '*', :comment] should raise argument error (no multiple wildcards in a row)" do lambda { @controller.resources_controller_for :forums, :in => [:user, '*', '*', :comment] }.should raise_error(ArgumentError) end - - end describe "ResourcesController#enclosing_resource_name" do before do - @controller = ForumsController.new + @controller = TagsController.new + info = mock_model(Info, :tags => []) + @controller.stub!(:current_user).and_return(mock_model(User, :info => info)) + @controller.stub!(:recognized_route).and_return(ActionController::Routing::Routes.named_routes[:account_info_tags]) + @controller.send :load_enclosing_resources end - it "should be the class name underscored" do - @controller.instance_variable_set('@enclosing_resources', [mock_model(User)]) - @controller.enclosing_resource_name.should == 'user' + it "should be the name of the mapped enclosing_resource" do + @controller.enclosing_resource_name.should == 'info' end end describe "A controller's resource_service" do - before do @controller = ForumsController.new end @@ -54,4 +54,4 @@ describe "deprecated methods" do @controller.save_resource end end -end \ No newline at end of file +end spec/lib/resources_controller_spec.rb 264608d09733b602cb3a4e97db7c0a9cc10c56a6 Ian White ian.w.white@gmail.com http://github.com/ianwhite/resources_controller/commit/40174b572fa933173d5d3c1983eaad7da015b13f 40174b572fa933173d5d3c1983eaad7da015b13f 2008-10-10T16:35:22-07:00 2008-10-10T16:35:22-07:00 enclosing_resource_name is the name of the mapped enclosing resource (which may not be the class name underscored). This keeps parity with resource_name, and allows sending params to the enclosing_resource_path like enclosing_resource_path(enclosing_resource_name => {:enabled => true}) ff4b9869683f22e3112882198948c255f3746e50 Ian White ian.w.white@gmail.com