reactive_resource 0.5.1 → 0.6.0

data/Gemfile.lock

@@ -1,20 +1,20 @@
 PATH
   remote: .
   specs:
-    reactive_resource (0.5.1)
+    reactive_resource (0.6.0)
       activeresource (>= 2.3.10)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.6)
+      activesupport (= 3.0.6)
       builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
+      i18n (~> 0.5.0)
+    activeresource (3.0.6)
+      activemodel (= 3.0.6)
+      activesupport (= 3.0.6)
+    activesupport (3.0.6)
     addressable (2.2.2)
     builder (2.1.2)
     crack (0.1.8)
@@ -29,7 +29,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activeresource (>= 2.3.10)
   rake
   reactive_resource!
   shoulda (~> 2.11.3)

data/LICENSE

@@ -0,0 +1,19 @@
+Copyright (C) 2011 by Justin Weiss
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/reactive_resource/association/belongs_to_association.rb

@@ -60,6 +60,7 @@ module ReactiveResource
           # address.lawyer_id = 3
           define_method("#{attribute}_id=") do |value|
             prefix_options["#{attribute}_id".intern] = value
+            attributes["#{attribute}_id".intern] = value
           end
 
           # address.lawyer

data/lib/reactive_resource/base.rb

@@ -91,6 +91,11 @@ module ReactiveResource
     def load(attributes)
       self.class.belongs_to_with_parents.each do |belongs_to_param|
         attributes["#{belongs_to_param}_id".intern] ||= prefix_options["#{belongs_to_param}_id".intern]
+
+        # also set prefix attributes as real attributes. Otherwise,
+        # belongs_to attributes will be stripped out of the response
+        # even if we aren't actually using the association.
+        @attributes["#{belongs_to_param}_id".intern] = attributes["#{belongs_to_param}_id".intern]
       end
       super(attributes)
     end
@@ -109,6 +114,33 @@ module ReactiveResource
       @prefix_parameters
     end
 
+    # Returns a list of the belongs_to associations we will use to
+    # generate the full path for this resource.
+    def self.prefix_associations(options)
+      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.
+      parents.each do |parent|
+        parent_associations = parent.prefix_associations(options)
+        break unless parent_associations.empty?
+      end
+
+      # 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
+          break
+        end
+      end
+      parent_associations + used_associations
+    end
+
     # Generates the URL prefix that the belongs_to parameters and
     # associations refer to. For example, a license with params
     # :lawyer_id => 2 will return 'lawyers/2/' and a phone with params
@@ -117,23 +149,21 @@ module ReactiveResource
     def self.association_prefix(options)
       options = options.dup
       association_prefix = ''
-      parent_prefix = ''
       
       if belongs_to_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.
-        parents.each do |parent|
-          parent_prefix = parent.association_prefix(options) if parent_prefix.blank?
-        end
 
-        belongs_to_associations.each do |association|
-          if association_prefix.blank? && param_value = options.delete("#{association.attribute}_id".intern) # only take the first one
-            association_prefix = "#{association.associated_class.collection_name}/#{param_value}/"
-          end
-        end
+        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)
+          "#{collection_name}/#{value}"
+        end.join('/')
+
+        # add trailing slash
+        association_prefix << '/' unless used_associations.empty?
       end
-      parent_prefix + association_prefix
+      association_prefix
     end
 
     class << self
@@ -213,6 +243,27 @@ module ReactiveResource
       end
     end
 
+    # In order to support two-way belongs_to associations in a
+    # reasonable way, we duplicate all of the prefix options as real
+    # attributes (so license.lawyer_id will set both the lawyer_id
+    # attribute and the lawyer_id prefix option). When we're ready to
+    # save, we should take all the parameters that we're already
+    # sending as prefix options and remove them from the model's
+    # attributes so we don't send duplicates down the wire. This way,
+    # if you have an object that belongs_to :lawyer and belongs_to
+    # :phone (in that order), setting lawyer_id and phone_id will
+    # treat lawyer_id as a prefix option and phone_id as a normal
+    # attribute.
+    def save
+      if self.class.belongs_to_associations
+        used_attributes = self.class.prefix_associations(prefix_options).map {|association| association.attribute}
+        used_attributes.each do |attribute|
+          attributes.delete("#{attribute}_id".intern)
+        end
+      end
+      super
+    end
+
     # belongs_to in ReactiveResource works a little differently than
     # ActiveRecord. Because we have to deal with full class hierachies
     # in order to generate the full URL (as mentioned in

data/lib/reactive_resource/version.rb

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

data/test/test_objects.rb

@@ -28,6 +28,19 @@ class ReactiveResource::Address < ReactiveResource::Base
   has_many :phones
 end
 
+class ReactiveResource::Phone < ReactiveResource::Base
+  belongs_to :address
+end
+
+class ReactiveResource::Post < ReactiveResource::Base
+  has_one :lawyer_post
+end
+
+class ReactiveResource::LawyerPost < ReactiveResource::Base
+  belongs_to :lawyer
+  belongs_to :post
+end
+
 module ChildResource
   
   class Address < ReactiveResource::Address
@@ -39,10 +52,6 @@ module ChildResource
   end
 end
 
-class ReactiveResource::Phone < ReactiveResource::Base
-  belongs_to :address
-end
-
 module ActiveResource
   module Formats
     module NoFormatFormat

data/test/unit/base_test.rb

@@ -166,4 +166,20 @@ class ReactiveResource::BaseTest < Test::Unit::TestCase
       assert_requested(:get, "https://api.avvo.com/api/1/no_extensions/test")
     end
   end
+
+  context "A resource with a two-way belongs to association" do
+    should "convert unused prefix options to attributes" do
+      stub_request(:post, "https://api.avvo.com/api/1/lawyers/1/lawyer_posts.json").
+        with(:body => {"lawyer_post" => {"post_id" => 2}})
+      @object = ReactiveResource::LawyerPost.new(:lawyer_id => 1, :post_id => 2).save
+      assert_requested(:post, "https://api.avvo.com/api/1/lawyers/1/lawyer_posts.json")
+    end
+
+    should "set the attributes correctly when it's created" do
+      @object = ReactiveResource::LawyerPost.new(:lawyer_id => 1, :post_id => 2)
+      assert_not_nil @object.attributes[:post_id]
+      assert_not_nil @object.attributes[:lawyer_id]
+    end
+  end
+  
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Justin Weiss
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-28 00:00:00 -08:00
+date: 2011-04-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,6 +75,7 @@ files:
 - .gitignore
 - Gemfile
 - Gemfile.lock
+- LICENSE
 - README.rdoc
 - Rakefile
 - lib/reactive_resource.rb
@@ -104,7 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4176716010993460221
+      hash: -2570327779021755250
       segments: 
       - 0
       version: "0"
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 4176716010993460221
+      hash: -2570327779021755250
       segments: 
       - 0
       version: "0"