From 1b1ddf17367f902dfbacf9143f0c90b7c42436dc Mon Sep 17 00:00:00 2001 From: Jeremy Kemper Date: Wed, 24 Jan 2007 18:27:36 +0000 Subject: Loading a resource preserves its prefix_options. Closes #7353. Silence prefix redefinition warnings; fix type in logged error. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6032 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activeresource/lib/active_resource/base.rb | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'activeresource/lib') diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb index faf0f046d6..a4e21b3253 100644 --- a/activeresource/lib/active_resource/base.rb +++ b/activeresource/lib/active_resource/base.rb @@ -45,13 +45,17 @@ module ActiveResource # Sets the resource prefix # prefix/collectionname/1.xml def prefix=(value = '/') + # Replace :placeholders with '#{embedded options[:lookups]}' prefix_call = value.gsub(/:\w+/) { |key| "\#{options[#{key}]}" } - instance_eval <<-end_eval, __FILE__, __LINE__ + + # Redefine the new methods. + code = <<-end_code def prefix_source() "#{value}" end def prefix(options={}) "#{prefix_call}" end - end_eval + end_code + silence_warnings { instance_eval code, __FILE__, __LINE__ } rescue - logger.error "Couldn't set prefix: #{$!}\n #{method_decl}" + logger.error "Couldn't set prefix: #{$!}\n #{code}" raise end @@ -235,7 +239,7 @@ module ActiveResource resource = find_or_create_resource_for(key) resource.new(value) when ActiveResource::Base - value.class.new(value.attributes) + value.class.new(value.attributes, value.prefix_options) else value.dup rescue value end -- cgit v1.2.3