diff options
Diffstat (limited to 'activeresource')
| -rw-r--r-- | activeresource/lib/active_resource/base.rb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb index 1cbbfaccf4..d2253186b0 100644 --- a/activeresource/lib/active_resource/base.rb +++ b/activeresource/lib/active_resource/base.rb @@ -152,7 +152,7 @@ module ActiveResource private # Find every resource def find_every(options) - case from = options.delete(:from) + case from = options[:from] when Symbol instantiate_collection(get(from, options[:params])) when String @@ -368,7 +368,11 @@ module ActiveResource # FIXME: Make it generic enough to support any depth of module nesting if (ancestors = self.class.name.split("::")).size > 1 - ancestors.first.constantize.const_get(resource_name) + begin + ancestors.first.constantize.const_get(resource_name) + rescue NameError + self.class.const_get(resource_name) + end else self.class.const_get(resource_name) end |