reactive_resource 0.6.1 → 0.7.0

data/.travis.yml

@@ -0,0 +1,10 @@
+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

data/Gemfile

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

data/Gemfile.lock

@@ -1,25 +1,28 @@
 PATH
   remote: .
   specs:
-    reactive_resource (0.6.0)
-      activeresource (>= 2.3.10)
+    reactive_resource (0.7.0)
+      activeresource (>= 3.1)
+      activesupport (>= 3.1)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.6)
-      activesupport (= 3.0.6)
-      builder (~> 2.1.2)
-      i18n (~> 0.5.0)
-    activeresource (3.0.6)
-      activemodel (= 3.0.6)
-      activesupport (= 3.0.6)
-    activesupport (3.0.6)
+    activemodel (3.2.2)
+      activesupport (= 3.2.2)
+      builder (~> 3.0.0)
+    activeresource (3.2.2)
+      activemodel (= 3.2.2)
+      activesupport (= 3.2.2)
+    activesupport (3.2.2)
+      i18n (~> 0.6)
+      multi_json (~> 1.0)
     addressable (2.2.2)
-    builder (2.1.2)
+    builder (3.0.0)
     crack (0.1.8)
-    i18n (0.5.0)
-    rake (0.8.7)
+    i18n (0.6.0)
+    multi_json (1.1.0)
+    rake (0.9.2)
     shoulda (2.11.3)
     webmock (1.6.2)
       addressable (>= 2.2.2)

data/lib/reactive_resource/base.rb

@@ -1,7 +1,8 @@
 require 'active_resource'
+require 'active_support/all'
 
 module ReactiveResource
-  
+
   # The class that all ReactiveResourse resources should inherit
   # from. This class fixes and patches over a lot of the broken stuff
   # in Active Resource, and smoothes out the differences between the
@@ -9,21 +10,23 @@ module ReactiveResource
   # It also adds support for ActiveRecord-like associations.
   class Base < ActiveResource::Base
     extend Extensions::RelativeConstGet
+    class_attribute :singleton_resource
+
     # Call this method to transform a resource into a 'singleton'
     # resource. This will fix the paths Active Resource generates for
     # singleton resources. See
     # https://rails.lighthouseapp.com/projects/8994/tickets/4348-supporting-singleton-resources-in-activeresource
     # for more info.
     def self.singleton
-      write_inheritable_attribute(:singleton, true)
+      self.singleton_resource = true
     end
 
     # +true+ if this resource is a singleton resource, +false+
     # otherwise
     def self.singleton?
-      read_inheritable_attribute(:singleton)
+      self.singleton_resource?
     end
-    
+
     # Active Resource's find_one does nothing if you don't pass a
     # +:from+ parameter. This doesn't make sense if you're dealing
     # with a singleton resource, so if we don't get anything back from
@@ -33,11 +36,11 @@ module ReactiveResource
       if !found_object && singleton?
         prefix_options, query_options = split_options(options[:params])
         path = element_path(nil, prefix_options, query_options)
-        found_object = instantiate_record(connection.get(path, headers), prefix_options)
+        found_object = instantiate_record(format.decode(connection.get(path, headers).body), prefix_options)
       end
       found_object
     end
-    
+
     # Override ActiveResource's +collection_name+ to support singular
     # names for singleton resources.
     def self.collection_name
@@ -75,7 +78,7 @@ module ReactiveResource
     def self.element_path(id, prefix_options = {}, query_options = nil)
       prefix_options, query_options = split_options(prefix_options) if query_options.nil?
       element_path = "#{prefix(prefix_options)}#{association_prefix(prefix_options)}#{collection_name}"
-      
+
       # singleton resources don't have an ID
       if id || !singleton?
         element_path += "/#{id}"
@@ -88,7 +91,7 @@ module ReactiveResource
     # keys corresponding to the belongs_to associations (since they'll
     # be in the URL anyway), so we'll try to inject them based on the
     # attributes of the object we just used.
-    def load(attributes)
+    def load(attributes, remove_root=false)
       attributes = attributes.stringify_keys
       self.class.belongs_to_with_parents.each do |belongs_to_param|
         attributes["#{belongs_to_param}_id"] ||= prefix_options["#{belongs_to_param}_id".intern]
@@ -98,7 +101,7 @@ module ReactiveResource
         # even if we aren't actually using the association.
         @attributes["#{belongs_to_param}_id"] = attributes["#{belongs_to_param}_id"]
       end
-      super(attributes)
+      super(attributes, remove_root)
     end
 
     # Add all of the belongs_to attributes as prefix parameters. This is
@@ -121,7 +124,7 @@ module ReactiveResource
       options = options.dup
       used_associations = []
       parent_associations = []
-      
+
       # Recurse to add the parent resource hierarchy. For Phone, for
       # instance, this will add the '/lawyers/:id' part of the URL,
       # which it knows about from the Address class.
@@ -132,7 +135,7 @@ module ReactiveResource
 
       # The association chain we're following
       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
           used_associations << association
@@ -150,11 +153,11 @@ module ReactiveResource
     def self.association_prefix(options)
       options = options.dup
       association_prefix = ''
-      
+
       if belongs_to_associations
 
         used_associations = prefix_associations(options)
-        
+
         association_prefix = used_associations.map do |association|
           collection_name = association.associated_class.collection_name
           value = options.delete("#{association.attribute}_id".intern)
@@ -172,7 +175,7 @@ module ReactiveResource
       attr_accessor :associations
     end
     self.associations = []
-    
+
     # Add a has_one relationship to another class. +options+ is a hash
     # of extra parameters:
     #
@@ -182,7 +185,7 @@ module ReactiveResource
     def self.has_one(attribute, options = {})
       self.associations << Association::HasOneAssociation.new(self, attribute, options)
     end
-    
+
     # Add a has_many relationship to another class. +options+ is a hash
     # of extra parameters:
     #

data/lib/reactive_resource/version.rb

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

data/reactive_resource.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+rails_version = ENV.key?('RAILS_VERSION') ? "~> #{ENV['RAILS_VERSION']}" : '>= 3.1'
 $:.push File.expand_path("../lib", __FILE__)
 require "reactive_resource/version"
 
@@ -14,10 +15,11 @@ Gem::Specification.new do |s|
 
   s.rubyforge_project = "reactive_resource"
 
-  s.add_dependency "activeresource", '>= 2.3.10'
+  s.add_dependency "activeresource", rails_version
+  s.add_dependency "activesupport", rails_version
   s.add_development_dependency "shoulda", '~> 2.11.3'
   s.add_development_dependency "webmock", '~> 1.6.1'
-  
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/test/unit/base_test.rb

@@ -19,13 +19,13 @@ class ReactiveResource::BaseTest < Test::Unit::TestCase
       assert_equal ReactiveResource::Lawyer, @object.class.associations.detect {|assoc| assoc.attribute == :lawyer }.associated_class
     end
   end
-  
+
   context "A resource that inherits from ReactiveResource::Base" do
-    
+
     setup do
       @object = ReactiveResource::Lawyer.new
     end
-    
+
     should "hit the Avvo API with the correct URL when saved" do
       stub_request(:post, "https://api.avvo.com/api/1/lawyers.json")
       @object.save
@@ -33,14 +33,16 @@ class ReactiveResource::BaseTest < Test::Unit::TestCase
     end
 
     should "hit the Avvo API with the correct URL when retrieved" do 
-      stub_request(:get, "https://api.avvo.com/api/1/lawyers/1.json").to_return(:body => {:id => '1'}.to_json)
+      stub_request(:get, "https://api.avvo.com/api/1/lawyers/1.json")\
+        .to_return(:body => {:lawyer => {:id => '1'}}.to_json)
       ReactiveResource::Lawyer.find(1)
       assert_requested(:get, "https://api.avvo.com/api/1/lawyers/1.json")      
     end
 
     context "with a has_many relationship to another object" do
       should "hit the associated object's URL with the correct parameters when requested" do
-        stub_request(:get, "https://api.avvo.com/api/1/lawyers/1/addresses.json")
+        stub_request(:get, "https://api.avvo.com/api/1/lawyers/1/addresses.json")\
+          .to_return(:body => [{:address => {:id => 1}}].to_json)
         @object.id = 1
         @object.addresses
         assert_requested(:get, "https://api.avvo.com/api/1/lawyers/1/addresses.json")
@@ -49,7 +51,8 @@ class ReactiveResource::BaseTest < Test::Unit::TestCase
 
     context "with a has_one relationship to another object" do
       should "hit the associated object's URL with the correct parameters when requested" do
-        stub_request(:get, "https://api.avvo.com/api/1/lawyers/1/headshot.json").to_return(:body => {:headshot_url => "blah"}.to_json)
+        stub_request(:get, "https://api.avvo.com/api/1/lawyers/1/headshot.json")\
+          .to_return(:body => {:headshot => {:headshot_url => "blah"}}.to_json)
         @object.id = 1
         @object.headshot
         assert_requested(:get, "https://api.avvo.com/api/1/lawyers/1/headshot.json")
@@ -60,21 +63,23 @@ class ReactiveResource::BaseTest < Test::Unit::TestCase
       setup do 
         @object = ReactiveResource::Address.new(:lawyer_id => 2)
       end
-      
+
       should "hit the Avvo API with the correct URL when saved" do
         stub_request(:post, "https://api.avvo.com/api/1/lawyers/2/addresses.json")
         @object.save
         assert_requested(:post, "https://api.avvo.com/api/1/lawyers/2/addresses.json")
       end
-      
+
       should "hit the Avvo API with the correct URL when retrieved" do 
-        stub_request(:get, "https://api.avvo.com/api/1/lawyers/2/addresses/3.json").to_return(:body => {:id => '3'}.to_json)
+        stub_request(:get, "https://api.avvo.com/api/1/lawyers/2/addresses/3.json")\
+          .to_return(:body => {:address => {:id => '3'}}.to_json)
         ReactiveResource::Address.find(3, :params => {:lawyer_id => 2})
-        assert_requested(:get, "https://api.avvo.com/api/1/lawyers/2/addresses/3.json")      
+        assert_requested(:get, "https://api.avvo.com/api/1/lawyers/2/addresses/3.json")
       end
 
       should "hit the Avvo API with the correct URL when updated" do 
-        stub_request(:get, "https://api.avvo.com/api/1/lawyers/2/addresses/3.json").to_return(:body => {:id => '3'}.to_json)
+        stub_request(:get, "https://api.avvo.com/api/1/lawyers/2/addresses/3.json")\
+          .to_return(:body => {:address => {:id => '3'}}.to_json)
         license = ReactiveResource::Address.find(3, :params => {:lawyer_id => 2})
         assert_requested(:get, "https://api.avvo.com/api/1/lawyers/2/addresses/3.json")  
         stub_request(:put, "https://api.avvo.com/api/1/lawyers/2/addresses/3.json")
@@ -83,7 +88,8 @@ class ReactiveResource::BaseTest < Test::Unit::TestCase
       end
 
       should "set the prefix parameters correctly when saved" do
-        stub_request(:post, "https://api.avvo.com/api/1/lawyers/2/addresses.json").to_return(:body => {:id => '2'}.to_json)
+        stub_request(:post, "https://api.avvo.com/api/1/lawyers/2/addresses.json")\
+          .to_return(:body => {:address => {:id => '2'}}.to_json)
         @object.save
         assert_requested(:post, "https://api.avvo.com/api/1/lawyers/2/addresses.json")
 
@@ -112,7 +118,8 @@ class ReactiveResource::BaseTest < Test::Unit::TestCase
         @object.doctor_id = 2
         @object.address_id = 3
         assert_equal 3, @object.address_id
-        stub_request(:get, "https://api.avvo.com/api/1/doctors/2/addresses/3.json").to_return(:body => {:id => '3'}.to_json)
+        stub_request(:get, "https://api.avvo.com/api/1/doctors/2/addresses/3.json")\
+          .to_return(:body => {:address => {:id => '3'}}.to_json)
         @object.address
         @object.address
         assert_requested(:get, "https://api.avvo.com/api/1/doctors/2/addresses/3.json", :times => 1)
@@ -125,7 +132,8 @@ class ReactiveResource::BaseTest < Test::Unit::TestCase
       end
 
       should "hit the Avvo API with the correct URL when updated" do 
-        stub_request(:get, "https://api.avvo.com/api/1/doctors/2/addresses/3/phones/4.json").to_return(:body => {:id => '4'}.to_json)
+        stub_request(:get, "https://api.avvo.com/api/1/doctors/2/addresses/3/phones/4.json")\
+          .to_return(:body => {:address => {:id => '4'}}.to_json)
         phone = ReactiveResource::Phone.find(4, :params => {:doctor_id => 2, :address_id => 3})
         assert_requested(:get, "https://api.avvo.com/api/1/doctors/2/addresses/3/phones/4.json")
 
@@ -141,9 +149,10 @@ class ReactiveResource::BaseTest < Test::Unit::TestCase
 
         assert_equal "/api/1/doctors/2/addresses/3/phones/4.json", @object.send(:element_path)
       end
-      
+
       should "hit the Avvo API with the correct URL when retrieved" do 
-        stub_request(:get, "https://api.avvo.com/api/1/doctors/2/addresses/3/phones/4.json").to_return(:body => {:id => '4'}.to_json)
+        stub_request(:get, "https://api.avvo.com/api/1/doctors/2/addresses/3/phones/4.json")\
+          .to_return(:body => {:phone => {:id => '4'}}.to_json)
         ReactiveResource::Phone.find(4, :params => {:doctor_id => 2, :address_id => 3})
         assert_requested(:get, "https://api.avvo.com/api/1/doctors/2/addresses/3/phones/4.json")      
       end
@@ -153,15 +162,17 @@ class ReactiveResource::BaseTest < Test::Unit::TestCase
 
   context "A resource without an extension" do
     should "hit the correct urls" do
-      stub_request(:get, "https://api.avvo.com/api/1/no_extensions")
+      stub_request(:get, "https://api.avvo.com/api/1/no_extensions")\
+        .to_return(:body => [].to_json)
       @object = ReactiveResource::NoExtension.find(:all)
       assert_requested(:get, "https://api.avvo.com/api/1/no_extensions")
 
-      stub_request(:put, "https://api.avvo.com/api/1/no_extensions/1")
+      stub_request(:post, "https://api.avvo.com/api/1/no_extensions")
       @object = ReactiveResource::NoExtension.new(:id => 1).save
-      assert_requested(:put, "https://api.avvo.com/api/1/no_extensions/1")
+      assert_requested(:post, "https://api.avvo.com/api/1/no_extensions")
 
-      stub_request(:get, "https://api.avvo.com/api/1/no_extensions/test")
+      stub_request(:get, "https://api.avvo.com/api/1/no_extensions/test")\
+        .to_return(:body => {:test => {:id => 1}}.to_json)
       @object = ReactiveResource::NoExtension.get(:test)
       assert_requested(:get, "https://api.avvo.com/api/1/no_extensions/test")
     end

metadata

@@ -1,78 +1,69 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: reactive_resource
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 1
-  version: 0.6.1
+version: !ruby/object:Gem::Version
+  version: 0.7.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Justin Weiss
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-14 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-03-06 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activeresource
+  requirement: &70203673686620 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: *70203673686620
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70203673686140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 10
-        version: 2.3.10
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70203673686140
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: &70203673685680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 11
-        - 3
+      - !ruby/object:Gem::Version
         version: 2.11.3
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70203673685680
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70203673685220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.6.1
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70203673685220
 description: ActiveRecord-like associations for ActiveResource
-email: 
+email:
 - justin@uberweiss.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -91,39 +82,37 @@ files:
 - test/test_helper.rb
 - test/test_objects.rb
 - test/unit/base_test.rb
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1783378317626943238
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -1783378317626943238
 requirements: []
-
 rubyforge_project: reactive_resource
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: ActiveRecord-like associations for ActiveResource
-test_files: 
+test_files:
 - test/test_helper.rb
 - test/test_objects.rb
 - test/unit/base_test.rb