@@ -785,14 +785,18 @@ module Ardes#:nodoc: def load_enclosing_resource_from_specification(spec) spec.segment == route_enclosing_names[enclosing_resources.size].first or ResourcesController.raise_resource_mismatch(self) returning spec.find_from(self) do |resource| - update_name_prefix(spec.name_prefix) - enclosing_resources << resource - enclosing_collection_resources << resource unless spec.singleton? - instance_variable_set("@#{spec.name}", resource) - instance_variable_set("@#{spec.as}", resource) if spec.as + add_enclosing_resource(resource, spec.name, :name_prefix => spec.name_prefix, :is_singleton => spec.singleton?, :as => spec.as ) end end - + + def add_enclosing_resource(resource, name, options = {}) + 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("@#{name}", resource) + instance_variable_set("@#{options[:as]}", resource) if options[:as] + end + # The name prefix is used for forwarding urls and will be different depending on # which route the controller was invoked by. The resource specifications build # up the name prefix as the resources are loaded. lib/ardes/resources_controller.rb d82eedac75ba1eb821c50fe542df956b89be73db Joel Chippindale joel.chippindale@gmail.com http://github.com/ianwhite/resources_controller/commit/93b29a469bf994434f3e661f29fefc5f51bd4109 93b29a469bf994434f3e661f29fefc5f51bd4109 2008-10-09T06:56:04-07:00 2008-10-09T06:56:04-07:00 Extracted #add_enclosing_resource from #load_enclosing_resource_from_specification This makes it much easier to override #load_enclosing_resources in your controller if you have a route (or set of routes) which cannot easily be mapped onto a specification. e69ab26c055e7c34ec1775097d4c45cb9e88d2c7 Joel Chippindale joel.chippindale@gmail.com