restful_resource 0.8.18 → 0.8.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4333040aefc4230aa100dbd68d871a44e2920ba9
-  data.tar.gz: ac2b15eeac7f8c1a18d200b4745bb6df543994d5
+  metadata.gz: ee2cd0cbeb47f73c4698b263fdb12f0fd9f8ba31
+  data.tar.gz: c7bee8e65111360e37d50b6e1a930a8ffa0c07ba
 SHA512:
-  metadata.gz: 8cf0775238a03d37776b352b1b3c524261e209d76d41ccd7f74ea79b0becc9e2be137ccef78f91cfdabe3b1ad3f9227d6211c86015f0dd9db46b9a0c91178502
-  data.tar.gz: 1052de7c40ac072b0f3bdc16941b2df243d386971f8327455e8e9c2490b39ab36cbddb3068a64726e46e09bd208f2821339a29e672097ecb6e645563f2b3b768
+  metadata.gz: b600cd921813075123dc916f63c0a431e231e8275a7bc0c0763b3a6e2d571535c863267db73d40c9b5318a9d971a1c7540be7025d6232828f947ebdd7dfb9188
+  data.tar.gz: 153e70baf50ea3302a9f4bd5ac5031e690167b3752ea276175e5a434b0d3edafd5b27065490ede7c9dd42ca298dbff48105ea9b5f9db3050555439bee4830462

data/lib/restful_resource/associations.rb

@@ -1,19 +1,25 @@
 module RestfulResource
   module Associations
     def has_many(nested_resource_type)
-      klass = nested_resource_type.to_s.singularize.camelize.safe_constantize
-      klass = RestfulResource::OpenObject if (klass.nil? || (klass.superclass != RestfulResource))
+      namespace = self.to_s.deconstantize
+      klass_name = "#{nested_resource_type.to_s.singularize.camelize}"
+      klass_name = "#{namespace}::#{klass_name}" if namespace.present?
 
       self.send(:define_method, nested_resource_type) do
+        klass = klass_name.safe_constantize
+        klass = RestfulResource::OpenObject if (klass.nil? || (klass.superclass != RestfulResource::Base))
         @inner_object.send(nested_resource_type).map { |obj| klass.new(obj) }
       end
     end
 
     def has_one(nested_resource_type)
-      klass = nested_resource_type.to_s.camelize.safe_constantize
-      klass = RestfulResource::OpenObject if (klass.nil? || klass.superclass != RestfulResource)
+      namespace = self.to_s.deconstantize
+      klass_name = "#{nested_resource_type.to_s.camelize}"
+      klass_name = "#{namespace}::#{klass_name}" if namespace.present?
 
       self.send(:define_method, nested_resource_type) do
+        klass = klass_name.safe_constantize
+        klass = RestfulResource::OpenObject if (klass.nil? || (klass.superclass != RestfulResource::Base))
         nested_resource = @inner_object.send(nested_resource_type)
         return nil if nested_resource.nil?
         klass.new(@inner_object.send(nested_resource_type))

data/lib/restful_resource/version.rb

@@ -1,3 +1,3 @@
 module RestfulResource
-  VERSION = "0.8.18"
+  VERSION = "0.8.19"
 end

data/spec/fixtures.rb

@@ -27,3 +27,23 @@ end
 class TestB < BaseB
   self.resource_path "testb"
 end
+
+module ComplicatedModule
+  class Parent < RestfulResource::Base
+    resource_path "parent"
+    has_many :children
+
+    def is_parent?
+      true
+    end
+  end
+
+  class Child < RestfulResource::Base
+    resource_path 'parents/:parent_id/children'
+    has_one :parent
+
+    def full_name
+      "#{self.first_name} #{self.second_name}"
+    end
+  end
+end

data/spec/restful_resource/associations_spec.rb

@@ -2,33 +2,43 @@ require_relative '../spec_helper'
 
 describe RestfulResource::Associations do
   describe "#has_many" do
-    it "should add a method to access nested resource" do
-      make = Make.new({
-        name: 'Volkswagen',
-        models:
+    before :each do
+      @parent = ComplicatedModule::Parent.new({
+        name: 'John Doe',
+        children:
           [
-            {name: 'Golf', rrp: 1000},
-            {name: 'Passat', rrp: 3000}
+            {first_name: 'David', second_name: 'Doe'},
+            {first_name: 'Mary', second_name: 'Doe'}
           ]
       })
+    end
+
+    it "should add a method to access nested resource" do
+      expect(@parent.children.first.first_name).to eq 'David'
+      expect(@parent.children.last.first_name).to eq 'Mary'
+      expect(@parent.children.first.to_json).to eq({first_name: 'David', second_name: 'Doe'}.to_json)
+    end
 
-      expect(make.models.first.name).to eq 'Golf'
-      expect(make.models.last.name).to eq 'Passat'
-      expect(make.models.first.rrp).to eq 1000
-      expect(make.models.last.rrp).to eq 3000
-      expect(make.models.first.to_json).to eq({name: 'Golf', rrp: 1000}.to_json)
+    it "should pick the right class for the instantiation of chilren" do
+      expect(@parent.children.first.full_name).to eq 'David Doe'
     end
   end
 
   describe "#has_one" do
-    it "should add a method to access nested resource" do
-      model = Model.new({
-        name: 'Golf',
-        make: {name: 'Volkswagen'}
+    before :each do
+      @child = ComplicatedModule::Child.new({
+        first_name: 'David', second_name: 'Smith',
+        parent: {name: 'John Smith'}
       })
+    end
+
+    it "should add a method to access nested resource" do
+      expect(@child.parent.name).to eq 'John Smith'
+      expect(@child.parent.to_json).to eq({name: 'John Smith'}.to_json)
+    end
 
-      expect(model.make.name).to eq 'Volkswagen'
-      expect(model.make.to_json).to eq({name: 'Volkswagen'}.to_json)
+    it "should pick the right class for the instantiation of chilren" do
+      expect(@child.parent.is_parent?).to be_truthy
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restful_resource
 version: !ruby/object:Gem::Version
-  version: 0.8.18
+  version: 0.8.19
 platform: ruby
 authors:
 - David Santoro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-27 00:00:00.000000000 Z
+date: 2014-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler