reactive_resource 0.7.2 → 0.7.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 192e1ce2551ece81aa583a972e8ab4eeff0a09f8
+  data.tar.gz: 727d9b8b1a90a9099084f737255bc362db82ec1a
+SHA512:
+  metadata.gz: 33e0e21457396220e42ff5bf65c93bed5d115d778798b958ec47d91e91b6fc6eb4ed90e1e0c61a2c9087d6d1ae572b98fa3ba207547cdc5f0a3246784630190a
+  data.tar.gz: a696dea8f9ceb26fb3b3eaf074931f346b1afe6385cedcb77f2e244f4cda062b2494edbcdd58d175a29cb500daaddc8e9aab0f3607bab397ccc6403109deb6f0

data/.travis.yml

@@ -1,10 +1,8 @@
 language: ruby
 rvm:
-  - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx-18mode
   - rbx-19mode
 env:
   - RAILS_VERSION=3.1.0
-  - RAILS_VERSION=3.2.0
+  - RAILS_VERSION=3.2.0

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 # Specify your gem's dependencies in reactive_resource.gemspec
 gemspec

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    reactive_resource (0.7.1)
+    reactive_resource (0.7.3)
       activeresource (>= 3.1)
       activesupport (>= 3.1)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.2.12)
       activesupport (= 3.2.12)
@@ -20,7 +20,7 @@ GEM
     addressable (2.2.2)
     builder (3.0.4)
     crack (0.1.8)
-    i18n (0.6.1)
+    i18n (0.6.4)
     multi_json (1.6.1)
     rake (0.9.2)
     shoulda (2.11.3)

data/lib/reactive_resource/base.rb

@@ -137,7 +137,7 @@ module ReactiveResource
       used_association = nil
 
       belongs_to_associations.each do |association|
-        if !used_association && param_value = options.delete("#{association.attribute}_id".intern) # only take the first one
+        if !used_association && (association.associated_class.singleton? || param_value = options.delete("#{association.attribute}_id".intern)) # only take the first one
           used_associations << association
           break
         end
@@ -160,8 +160,12 @@ module ReactiveResource
 
         association_prefix = used_associations.map do |association|
           collection_name = association.associated_class.collection_name
-          value = options.delete("#{association.attribute}_id".intern)
-          "#{collection_name}/#{value}"
+          if association.associated_class.singleton?
+            collection_name
+          else
+            value = options.delete("#{association.attribute}_id".intern)
+            "#{collection_name}/#{value}"
+          end
         end.join('/')
 
         # add trailing slash
@@ -280,7 +284,11 @@ module ReactiveResource
     # associations and merge them in. This allows us to have both
     # lawyer_id and address_id at url generation time.
     def self.belongs_to_with_parents
-      belongs_to_associations.map(&:associated_attributes).flatten.uniq
+      @belongs_to_with_parents ||= begin
+        ret = belongs_to_associations.map(&:associated_attributes)
+        ret += parents.map(&:belongs_to_with_parents)
+        ret.flatten.uniq
+      end
     end
 
     # All the classes that this class references in its +belongs_to+,

data/lib/reactive_resource/version.rb

@@ -1,4 +1,4 @@
 module ReactiveResource
   # The current version of ReactiveResource
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/test/test_objects.rb

@@ -20,6 +20,12 @@ class ReactiveResource::Headshot < ReactiveResource::Base
   singleton
   belongs_to :lawyer
   belongs_to :doctor
+  has_one :file
+end
+
+class ReactiveResource::File < ReactiveResource::Base
+  singleton
+  belongs_to :headshot
 end
 
 class ReactiveResource::Address < ReactiveResource::Base

data/test/unit/base_test.rb

@@ -63,6 +63,19 @@ class ReactiveResource::BaseTest < Test::Unit::TestCase
       end
     end
 
+    context "with a nested has_one relationships" do
+      should "hit the correct url" do
+        stub_request(:get, "https://api.avvo.com/api/1/lawyers/1/headshot.json")\
+          .to_return(:body => {:headshot => {:headshot_url => "blah"}}.to_json)
+        stub_request(:get, "https://api.avvo.com/api/1/lawyers/1/headshot/file.json")\
+          .to_return(:body => {:file => {:file_url => "blah"}}.to_json)
+        @object.id = 1
+        @object.headshot.file
+        assert_requested(:get, "https://api.avvo.com/api/1/lawyers/1/headshot.json")
+        assert_requested(:get, "https://api.avvo.com/api/1/lawyers/1/headshot/file.json")
+      end
+    end
+
     context "with a belongs_to association and correct parameters" do
       setup do 
         @object = ReactiveResource::Address.new(:lawyer_id => 2)

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: reactive_resource
 version: !ruby/object:Gem::Version
-  version: 0.7.2
-  prerelease: 
+  version: 0.7.3
 platform: ruby
 authors:
 - Justin Weiss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.1'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -104,27 +95,26 @@ files:
 - test/unit/base_test.rb
 homepage: ''
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: reactive_resource
-rubygems_version: 1.8.24
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: ActiveRecord-like associations for ActiveResource
 test_files:
 - test/test_helper.rb