Ticket #10646: activeresource_nested_modules_support.diff

activeresource/test/base/load_test.rb

@@ -10 +10 @@
-  class Comment < ActiveResource::Base
-    self.site = "http://37s.sunrise.i:3000"
-  end
+  
+  module Deeply
+    module Nested      
+      
+      class Note < ActiveResource::Base
+        self.site = "http://37s.sunrise.i:3000"        
+      end
+
+       class Comment < ActiveResource::Base
+         self.site = "http://37s.sunrise.i:3000"
+       end   
+       
+       module TestDifferentLevels
+
+         class Note < ActiveResource::Base
+           self.site = "http://37s.sunrise.i:3000"        
+         end         
+         
+       end
+      
+    end    
+  end
+    
-end
-
-
@@ -108 +131 @@
-    n = Highrise::Note.new(:comments => [{ :name => "1" }])
-    assert_kind_of Highrise::Comment, n.comments.first
-  end
+
+  def test_nested_collections_within_deeply_nested_namespace
+    n = Highrise::Deeply::Nested::Note.new(:comments => [{ :name => "1" }])
+    assert_kind_of Highrise::Deeply::Nested::Comment, n.comments.first
+  end
+
+  def test_nested_collections_in_different_levels_of_namespaces
+    n = Highrise::Deeply::Nested::TestDifferentLevels::Note.new(:comments => [{ :name => "1" }])
+    assert_kind_of Highrise::Deeply::Nested::Comment, n.comments.first
+  end
+  
+  
-end

activeresource/lib/active_resource/base.rb

@@ -845 +845 @@
-        find_or_create_resource_for(name.to_s.singularize)
-      end
-      
+      # Tries to find a resource in a non empty list of nested modules
+      # Raises a NameError if it was not found in any of the given nested modules
+      def find_resource_in_modules(resource_name, module_names)
+        receiver = Object
+        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)
+        else
+          raise NameError
+        end
+      end
+      
-      # Tries to find a resource for a given name; if it fails, then the resource is created
-      def find_or_create_resource_for(name)
-        resource_name = name.to_s.camelize
-
-
-
-
-
-
-
-
+
+
+
-        else
-          self.class.const_get(resource_name)
-        end