From e07193e32a31f34a3e02a0ac385bf6037cc6d056 Mon Sep 17 00:00:00 2001 From: David Genord II Date: Wed, 25 Feb 2009 11:20:55 -0500 Subject: [PATCH] Fixed non eager loading resource lookup --- activeresource/lib/active_resource/base.rb | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/activeresource/lib/active_resource/base.rb b/activeresource/lib/active_resource/base.rb index a8c0da3..9d332d6 100644 --- a/activeresource/lib/active_resource/base.rb +++ b/activeresource/lib/active_resource/base.rb @@ -1030,8 +1030,14 @@ module ActiveResource namespaces = module_names[0, module_names.size-1].map do |module_name| receiver = receiver.const_get(module_name) end - if namespace = namespaces.reverse.detect { |ns| ns.const_defined?(resource_name) } - return namespace.const_get(resource_name) + resource = namespaces.reverse.inject(nil) do |s,ns| + begin + break ns.const_get(resource_name) + rescue NameError + end + end + if resource + return resource else raise NameError end -- 1.5.5.1 From b714e7b43e442269ba0ca5c7aa906cf302673593 Mon Sep 17 00:00:00 2001 From: David Genord II Date: Mon, 9 Mar 2009 12:45:18 -0400 Subject: [PATCH] Tests for active resource namespace eager load bug --- activeresource/test/base/load_test.rb | 19 +++++++++++++++++++ activeresource/test/fixtures/accounts/address.rb | 5 +++++ activeresource/test/fixtures/accounts/user.rb | 5 +++++ 3 files changed, 29 insertions(+), 0 deletions(-) create mode 100644 activeresource/test/fixtures/accounts/address.rb create mode 100644 activeresource/test/fixtures/accounts/user.rb diff --git a/activeresource/test/base/load_test.rb b/activeresource/test/base/load_test.rb index a475fab..0e32ebf 100644 --- a/activeresource/test/base/load_test.rb +++ b/activeresource/test/base/load_test.rb @@ -144,3 +144,22 @@ class BaseLoadTest < Test::Unit::TestCase end + + +class NamespaceLoadTest < Test::Unit::TestCase + def setup + ActiveSupport::Dependencies.load_paths << "#{File.dirname(__FILE__)}/../../test/fixtures" + @user = Accounts::User.new + end + + def teardown + ActiveSupport::Dependencies.load_paths.delete "#{File.dirname(__FILE__)}/../../test/fixtures" + end + + def test_user_load + @user.load(:addresses => [{:street => '123 Main'}]) + assert_kind_of Accounts::Address, @user.addresses.first + end + + +end diff --git a/activeresource/test/fixtures/accounts/address.rb b/activeresource/test/fixtures/accounts/address.rb new file mode 100644 index 0000000..a074bd2 --- /dev/null +++ b/activeresource/test/fixtures/accounts/address.rb @@ -0,0 +1,5 @@ +module Accounts + class Address < ActiveResource::Base + self.site = "http://37s.sunrise.i:3000" + end +end diff --git a/activeresource/test/fixtures/accounts/user.rb b/activeresource/test/fixtures/accounts/user.rb new file mode 100644 index 0000000..ae38a89 --- /dev/null +++ b/activeresource/test/fixtures/accounts/user.rb @@ -0,0 +1,5 @@ +module Accounts + class User < ActiveResource::Base + self.site = "http://37s.sunrise.i:3000" + end +end -- 1.5.5.1