api_resource 0.6.6 → 0.6.7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api_resource (0.6.4)
+    api_resource (0.6.7)
       colorize
       differ
       json

data/lib/api_resource/associations/association_proxy.rb

@@ -34,7 +34,7 @@ module ApiResource
               instance = #{self}.new(
                 #{associated_class}, self, #{opts}
               )
-              if @attributes[:#{assoc_name}].present?
+              if @attributes.key?(:#{assoc_name})
                 instance.internal_object = @attributes[:#{assoc_name}]
               end
               instance

data/lib/api_resource/associations/single_object_proxy.rb

@@ -14,12 +14,13 @@ module ApiResource
       end
 
       def internal_object
-        @internal_object ||= begin
-          if self.remote_path.present? && !self.loaded?
-            self.load
-          else
-            nil
-          end
+        # we are already loaded - return the internal object
+        if self.loaded?
+          return @internal_object
+        elsif self.remote_path.present?
+          @internal_object = self.load
+        else
+          nil
         end
       end
       

data/lib/api_resource/finders/single_finder.rb

@@ -6,6 +6,7 @@ module ApiResource
 
 			def load
 				data = self.klass.connection.get(self.build_load_path)
+
 				@loaded = true
 				return nil if data.blank?
 				@internal_object = self.klass.instantiate_record(data)

data/lib/api_resource/version.rb

@@ -1,3 +1,3 @@
 module ApiResource
-  VERSION = "0.6.6"
+  VERSION = "0.6.7"
 end

data/spec/lib/associations/has_one_remote_object_proxy_spec.rb

@@ -17,7 +17,6 @@ module ApiResource
           tr = TestResource.new(
             :has_one_object => {:service_uri => "/has_one_objects/1.json"} 
           )
-
           tr.has_one_object.internal_object.should be_instance_of(
             HasOneObject
           )

data/spec/lib/base_spec.rb

@@ -11,31 +11,51 @@ describe "Base" do
     HasManyObject.reload_resource_definition
   end
 
-  context ".new_element_path" do
 
-    before(:all) do
+  context ".instantiate_record" do
 
-      PrefixResource = Class.new(ApiResource::Base) do
-        self.prefix = "/path/to/project"
-      end
+    context "should handle blank associations and not load them 
+      afterwards" do
 
-      DynamicPrefixResource = Class.new(ApiResource::Base) do
-        self.prefix = "/path/to/nested/:id/"
+      it "belongs_to_remote" do
+        tr = TestResource.instantiate_record(
+          :name => "X",
+          :belongs_to_object => nil
+        )
+        # load our resource definition so we can say we never expect a 
+        # get
+        BelongsToObject.reload_resource_definition
+        BelongsToObject.connection.expects(:get).never
+
+        tr.belongs_to_object?.should be false
       end
 
-    end
+      it "has_one_remote" do
+        tr = TestResource.instantiate_record(
+          :name => "X",
+          :has_one_object => nil
+        )
+        # load our resource definition so we can say we never expect a 
+        # get
+        HasOneObject.reload_resource_definition
+        HasOneObject.connection.expects(:get).never
 
+        tr.has_one_object?.should be false
+      end
 
-    it "should return a full path if there are no nested ids" do
-      PrefixResource.new_element_path.should eql(
-        "/path/to/project/prefix_resources/new.json"
-      )
-    end
+      it "has_many_remote" do
+        tr = TestResource.instantiate_record(
+          :name => "X",
+          :has_many_objects => []
+        )
+        # load our resource definition so we can say we never expect a 
+        # get
+        HasManyObject.reload_resource_definition
+        HasManyObject.connection.expects(:get).never
+
+        tr.has_many_objects?.should be false
+      end
 
-    it "should return a non-nested path if there are nested ids" do
-      DynamicPrefixResource.new_element_path.should eql(
-        "/dynamic_prefix_resources/new.json"
-      )
     end
 
   end
@@ -61,6 +81,35 @@ describe "Base" do
 
   end
 
+  context ".new_element_path" do
+
+    before(:all) do
+
+      PrefixResource = Class.new(ApiResource::Base) do
+        self.prefix = "/path/to/project"
+      end
+
+      DynamicPrefixResource = Class.new(ApiResource::Base) do
+        self.prefix = "/path/to/nested/:id/"
+      end
+
+    end
+
+
+    it "should return a full path if there are no nested ids" do
+      PrefixResource.new_element_path.should eql(
+        "/path/to/project/prefix_resources/new.json"
+      )
+    end
+
+    it "should return a non-nested path if there are nested ids" do
+      DynamicPrefixResource.new_element_path.should eql(
+        "/dynamic_prefix_resources/new.json"
+      )
+    end
+
+  end
+
   context "#method_missing" do
 
     after(:all) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_resource
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake