api_resource 0.6.2 → 0.6.3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    api_resource (0.6.1)
+    api_resource (0.6.2)
       colorize
       differ
       json
@@ -39,12 +39,14 @@ GEM
     activesupport (3.2.10)
       i18n (~> 0.6)
       multi_json (~> 1.0)
+    archive-tar-minitar (0.5.2)
     arel (3.0.2)
     builder (3.0.4)
     childprocess (0.3.6)
       ffi (~> 1.0, >= 1.0.6)
     coderay (1.0.8)
     colorize (0.5.8)
+    columnize (0.3.6)
     diff-lcs (1.1.3)
     differ (0.1.2)
     erubis (2.7.0)
@@ -77,10 +79,12 @@ GEM
       activesupport
       colorize
       i18n
-    hike (1.2.1)
+    hike (1.2.2)
     i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.6)
+    json (1.7.7)
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
     listen (0.7.1)
     log4r (1.1.10)
     lumberjack (1.0.2)
@@ -90,7 +94,7 @@ GEM
       treetop (~> 1.4.8)
     metaclass (0.0.1)
     method_source (0.8.1)
-    mime-types (1.19)
+    mime-types (1.22)
     mocha (0.12.7)
       metaclass (~> 0.0.1)
     multi_json (1.5.0)
@@ -99,10 +103,10 @@ GEM
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.3.1)
-    rack (1.4.3)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-ssl (1.3.2)
+    rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -123,7 +127,7 @@ GEM
       thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
     rb-fsevent (0.9.3)
-    rdoc (3.12)
+    rdoc (3.12.2)
       json (~> 1.4)
     rest-client (1.6.7)
       mime-types (>= 1.16)
@@ -135,6 +139,16 @@ GEM
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.12.1)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
     ruby_parser (3.1.1)
       sexp_processor (~> 4.1)
     sexp_processor (4.1.3)
@@ -151,11 +165,11 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.6)
     thor (0.16.0)
-    tilt (1.3.3)
+    tilt (1.3.7)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.35)
+    tzinfo (0.3.37)
 
 PLATFORMS
   ruby
@@ -174,6 +188,7 @@ DEPENDENCIES
   rake
   rb-fsevent
   rspec
+  ruby-debug19
   simplecov
   spork
   sqlite3

data/api_resource.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "flog"
   gem.add_development_dependency "hash_dealer"
   gem.add_development_dependency "rb-fsevent"
+  gem.add_development_dependency "ruby-debug19"
   gem.add_development_dependency "simplecov"
   # stuff that seems like crap
   gem.add_development_dependency "sqlite3"

data/lib/api_resource/associations.rb

@@ -144,7 +144,7 @@ module ApiResource
 
       # TODO: add a special foreign_key option to associations
       def association_foreign_key_field(assoc, type = nil)
-
+        
         if type.nil? && has_many?(assoc)
           type = :has_many
         else
@@ -154,7 +154,7 @@ module ApiResource
         # for now just use the association name
         str = assoc.to_s.singularize.foreign_key
 
-        if type == :has_many
+        if type.to_s =~ /^has_many/
           str = str.pluralize
         end
 
@@ -228,10 +228,12 @@ module ApiResource
 
             def #{id_method_name}
               @attributes_cache[:#{id_method_name}] ||= begin
-                if @attributes.key?(:#{id_method_name})
-                  @attributes[:#{id_method_name}]
-                else
+                if @attributes.has_key?("#{id_method_name}")
+                  @attributes["#{id_method_name}"]
+                elsif self.#{assoc_name}.collection?
                   self.#{assoc_name}.collect(&:id)
+                else
+                  self.#{assoc_name}? ? self.#{assoc_name}.id : nil
                 end
               end
             end
@@ -241,6 +243,7 @@ module ApiResource
                 #{id_method_name}_will_change!
               end
               @attributes_cache[:#{id_method_name}] = val
+              write_attribute(:#{id_method_name}, val)
             end
 
           EOE

data/lib/api_resource/associations/multi_object_proxy.rb

@@ -16,6 +16,10 @@ module ApiResource
           self.internal_object
         end
 
+        def collection?
+          true
+        end
+
         def each(*args, &block)
           self.internal_object.each(*args, &block)
         end

data/lib/api_resource/associations/single_object_proxy.rb

@@ -9,6 +9,10 @@ module ApiResource
         self.internal_object.serializable_hash(options)
       end
 
+      def collection?
+        false
+      end
+
       def internal_object
         unless instance_variable_defined?(:@internal_object)
           if self.remote_path.present?

data/lib/api_resource/base.rb

@@ -152,6 +152,9 @@ module ApiResource
       
       def load_resource_definition
         unless instance_variable_defined?(:@resource_definition)
+          # the last time we checked
+          @resource_load_time = Time.now
+        
           # set to not nil so we don't get an infinite loop
           @resource_definition = true
           self.set_class_attributes_upon_load
@@ -354,12 +357,28 @@ module ApiResource
       end
 
       protected
+
+        # do we have an invalid resource
+        def resource_definition_is_invalid?
+          # if we have a Hash, it's valid
+          return false if @resource_definition.is_a?(Hash)
+          # if we have no recheck time, it's invalid
+          return true if @resource_load_time.nil?
+          # have we checked in the last minute?
+          return @resource_load_time < Time.now - 1.minute
+        end
+
         def method_missing(meth, *args, &block)
           # make one attempt to load remote attrs
-          if self.load_resource_definition
+          if self.resource_definition_is_invalid?
+            self.reload_resource_definition
+          end
+          # see if we respond to the method now
+          if self.respond_to?(meth)
             return self.send(meth, *args, &block)
+          else
+            super
           end
-          super
         end
       
       private
@@ -663,7 +682,7 @@ module ApiResource
     include AssociationActivation
     self.activate_associations
     
-    include Scopes, Callbacks, Observing, Attributes, ModelErrors, Conditions, Finders
+    include Scopes, Callbacks, Observing, Attributes, ModelErrors, Conditions, Finders, Typecast
     
   end
   

data/lib/api_resource/version.rb

@@ -1,3 +1,3 @@
 module ApiResource
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/spec/lib/associations/association_scope_spec.rb

@@ -6,6 +6,16 @@ describe ApiResource::Associations::AssociationProxy do
     TestResource.reload_resource_definition
   end
 
+  context "Methods that collide with enumerables" do
+
+    it "should not include enumerables" do
+      test_resource = TestResource.find(1)
+      # the #zip method is included in enumerable
+      test_resource.belongs_to_object.zip.should_not be_blank
+    end
+
+  end
+
   context "#remote_path" do
 
     it "should provide access to its remote path when 

data/spec/lib/associations_spec.rb

@@ -804,6 +804,8 @@ describe "Associations" do
           before(:all) do
             TestAR.class_eval do
               has_one_remote :test_resource
+              has_one_remote :other_test_resource, 
+                :class_name => "TestResource"
             end
           end
           it "should attempt to load a single remote object for a has_one relationship" do
@@ -815,6 +817,27 @@ describe "Associations" do
             # load the test resource
             tar.test_resource.name.should eql "testing"
           end
+
+          it "should use its object's primary_key as the _id method" do
+            tar = TestAR.new
+            tar.stubs(:id).returns(1)
+            TestResource.connection.expects(:get)
+              .with("/test_resources.json?test_ar_id=1")
+              .returns([{"name" => "testing", "id" => 14}])
+            # load the test resource
+            tar.other_test_resource_id.should eql(14)
+          end
+
+          it "should handle mising objects in its _id method" do
+            tar = TestAR.new
+            tar.stubs(:id).returns(1)
+            TestResource.connection.expects(:get)
+              .with("/test_resources.json?test_ar_id=1")
+              .returns([])
+            # load the test resource
+            tar.other_test_resource_id.should be_nil
+          end
+
         end
         context "Has Many" do
           before(:all) do
@@ -826,9 +849,12 @@ describe "Associations" do
             tar = TestAR.new
             tar.stubs(:id).returns(1)
             HasManyObject.load_resource_definition
-            HasManyObject.connection.expects(:get).with("/has_many_objects.json?test_ar_id=1").once.returns([{"name" => "testing"}])
+            HasManyObject.connection.expects(:get).with("/has_many_objects.json?test_ar_id=1").once.returns(
+                [{"name" => "testing", "id" => 22}]
+              )
             # load the test resource
             tar.has_many_objects.first.name.should eql "testing"
+            tar.has_many_object_ids.should eql([22])
           end
         end
         context "Has Many Through" do

data/spec/spec_helper.rb

@@ -14,6 +14,9 @@ Spork.prefork do
   require 'api_resource'
   require 'simplecov'
 
+  require 'ruby-debug'
+  Debugger.start
+
 
   SimpleCov.start do
     add_filter "/spec/"

data/spec/support/mocks/association_mocks.rb

@@ -49,8 +49,17 @@ Mocks.define do
   end
   
   endpoint("/belongs_to_objects/new") do
-    get({})
+    get({
+      "attributes" => {
+        "public" => ["zip"]
+      }
+    })
+  end
+
+  endpoint("/belongs_to_objects/:id") do
+    get(HashDealer.roll(:belongs_to_object_response))
   end
+
   
   endpoint("/test_associations/new") do
     get({})

data/spec/support/requests/association_requests.rb

@@ -29,3 +29,7 @@ end
 HashDealer.define(:has_many_object) do
   name("name")
 end
+
+HashDealer.define(:belongs_to_object_response) do
+  zip "11201"
+end

data/spec/support/requests/test_resource_requests.rb

@@ -40,6 +40,7 @@ HashDealer.define(:test_resource_with_proxies, :parent => :test_resource) do
   has_one_object{HashDealer.roll(:has_one_object)}
   has_many_objects{(0..4).to_a.collect{HashDealer.roll(:has_many_object)}}
   has_many_service_uri{[{:service_uri => "/test_resource/1/has_many"}]}
+  belongs_to_object({:service_uri => "/belongs_to_objects/4"})
 end
 
 HashDealer.define(:test_resource_errors) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: api_resource
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-07 00:00:00.000000000 Z
+date: 2013-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -221,6 +221,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-debug19
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -477,7 +493,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: ActiveRecord for restful APIs