From b3eb26a161acb23781e55fc6c37b948f160cd9b5 Mon Sep 17 00:00:00 2001 From: Piotr Sarnacki Date: Thu, 5 Aug 2010 15:44:23 +0200 Subject: Removed deprecated RouteSet API, still many tests fail --- actionpack/lib/action_dispatch/routing/mapper.rb | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'actionpack/lib/action_dispatch/routing/mapper.rb') diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 900900ee24..cee3fd880c 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -443,11 +443,6 @@ module ActionDispatch options = args.extract_options! options = options.dup - if name_prefix = options.delete(:name_prefix) - options[:as] ||= name_prefix - ActiveSupport::Deprecation.warn ":name_prefix was deprecated in the new router syntax. Use :as instead.", caller - end - options[:path] = args.first if args.first.is_a?(String) recover = {} @@ -770,7 +765,7 @@ module ActionDispatch end resource_scope(Resource.new(resources.pop, options)) do - yield if block_given? + instance_eval(&block) if block_given? collection_scope do get :index if parent_resource.actions.include?(:index) -- cgit v1.2.3