remote_association 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    remote_association (0.0.3)
+    remote_association (0.0.4)
       activerecord (~> 3.2)
       activeresource (~> 3.2)
       activesupport (~> 3.2)

data/lib/remote_association/active_record/relation.rb

@@ -103,9 +103,10 @@ module ActiveRecord
       keys = @records.uniq.map(&:id)
 
       remote_objects = fetch_remote_objects(settings.ar_class, keys, settings.ar_accessor)
+      join_key = klass.primary_key
 
       @records.each do |record|
-        record.send("#{settings.ar_accessor}=", remote_objects.select { |s| s.send(settings.foreign_key) == record.id })
+        record.send("#{settings.ar_accessor}=", remote_objects.select { |s| s.send(settings.foreign_key) == record.send(join_key) })
       end
     end
 
@@ -115,9 +116,10 @@ module ActiveRecord
       return if keys.empty?
 
       remote_objects = fetch_remote_objects(settings.ar_class, keys, settings.ar_accessor)
+      join_key = settings.ar_class.primary_key
 
       @records.each do |record|
-        record.send("#{settings.ar_accessor}=", remote_objects.select { |s| record.send(settings.foreign_key) == s.id })
+        record.send("#{settings.ar_accessor}=", remote_objects.select { |s| record.send(settings.foreign_key) == s.send(join_key) })
       end
     end
 
@@ -129,13 +131,12 @@ module ActiveRecord
     end
 
     def fetch_remote_objects(ar_class, keys, ar_accessor)
-      params = klass.build_params_hash(keys).deep_merge(remote_conditions[ar_accessor.to_sym])
+      params = klass.send(:"build_params_hash_for_#{ar_accessor}", keys).deep_merge(remote_conditions[ar_accessor.to_sym])
       ar_class.find(:all, :params => params )
     end
 
     def remote_resources_loaded?
       !!@remote_resources_loaded
     end
-
   end
 end

data/lib/remote_association/belongs_to_remote.rb

@@ -48,7 +48,7 @@ module RemoteAssociation
                        class_name:  remote_rel.to_s.classify,
                        foreign_key: remote_rel.to_s.foreign_key,
                        association_type: :belongs_to_remote,
-                       primary_key: 'id'
+                       primary_key: primary_key
                       }.merge(options.symbolize_keys)
 
         add_activeresource_relation(remote_rel.to_sym, rel_options)
@@ -61,19 +61,18 @@ module RemoteAssociation
             if remote_resources_loaded?
               @#{remote_rel} ? @#{remote_rel}.first : nil
             else
-              @#{remote_rel} ||= self.#{rel_options[:foreign_key]}.present? ? #{rel_options[:class_name]}.find(:first, params: self.class.build_params_hash(self.#{rel_options[:foreign_key]})) : nil
+              @#{remote_rel} ||= self.#{rel_options[:foreign_key]}.present? ? #{rel_options[:class_name]}.find(:first, params: self.class.build_params_hash_for_#{remote_rel}(self.#{rel_options[:foreign_key]})) : nil
             end
           end
 
           ##
           # Returns Hash with HTTP parameters to query remote API
-          def self.build_params_hash(keys)
+          def self.build_params_hash_for_#{remote_rel}(keys)
             keys = [keys] unless keys.kind_of?(Array)
             {"#{rel_options[:primary_key]}" => keys}
           end
 
         RUBY
-
       end
   end
 end

data/lib/remote_association/has_many_remote.rb

@@ -50,18 +50,42 @@ module RemoteAssociation
 
         attr_accessor :#{remote_rel}
 
-        def #{remote_rel}                                                 #  def customers
-          if remote_resources_loaded?                                     #    if remote_resources_loaded?
-            @#{remote_rel} ? @#{remote_rel} : []                          #      @customers ? @customers : []
-          else                                                            #    else
-            @#{remote_rel} ||= #{rel_options[:class_name]}.               #      @customers ||= Person.
-              find(:all, params: self.class.build_params_hash(self.id))   #        find(:all, params: self.class.build_params_hash(self.id))
-          end                                                             #    end
-        end                                                               #  end
+        ##
+        # Adds a method to call remote relation
+        #
+        # === Example
+        #
+        #  def customers
+        #    if remote_resources_loaded?
+        #      @customers ? @customers : nil
+        #    else
+        #      join_key = self.class.primary_key
+        #      @customers ||= Person.
+        #        find(:all, params: self.class.build_params_hash_for_customers(self.send(join_key)))
+        #    end
+        #  end
+        #
+        def #{remote_rel}
+          if remote_resources_loaded?
+            @#{remote_rel} ? @#{remote_rel} : []
+          else
+            join_key = self.class.primary_key
+            @#{remote_rel} ||= #{rel_options[:class_name]}.
+              find(:all, params: self.class.build_params_hash_for_#{remote_rel}(self.send(join_key)))
+          end
+        end
 
         ##
         # Returns Hash with HTTP parameters to query remote API
-        def self.build_params_hash(keys)
+        #
+        # == Example
+        #
+        #  def self.build_params_hash_for_customer(keys)
+        #    keys = [keys] unless keys.kind_of?(Array)
+        #    {"user_id" => keys}
+        #  end
+        #
+        def self.build_params_hash_for_#{remote_rel}(keys)
           keys = [keys] unless keys.kind_of?(Array)
           {"#{rel_options[:foreign_key]}" => keys}
         end

data/lib/remote_association/has_one_remote.rb

@@ -54,13 +54,14 @@ module RemoteAssociation
             if remote_resources_loaded?
               @#{remote_rel} ? @#{remote_rel}.first : nil
             else
-              @#{remote_rel} ||= #{rel_options[:class_name]}.find(:first, params: self.class.build_params_hash(self.id))
+              join_key = self.class.primary_key
+              @#{remote_rel} ||= #{rel_options[:class_name]}.find(:first, params: self.class.build_params_hash_for_#{remote_rel}(self.send(join_key)))
             end
           end
 
           ##
           # Returns Hash with HTTP parameters to query remote API
-          def self.build_params_hash(keys)
+          def self.build_params_hash_for_#{remote_rel}(keys)
             keys = [keys] unless keys.kind_of?(Array)
             {"#{rel_options[:foreign_key]}" => keys}
           end

data/lib/remote_association/version.rb

@@ -1,3 +1,3 @@
 module RemoteAssociation
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/remote_association.rb

@@ -40,16 +40,18 @@ module RemoteAssociation
       #
       # Author.add_activeresource_relation(:profile, {class_name: "Profile", foreign_key: "author_id"})
       def add_activeresource_relation(name, options)
-        existing_relations = activeresource_relations
-        existing_relations[name] = options
-        @activeresource_relations = existing_relations
+        activeresource_relations[name] = options
       end
 
       # Returns settings for relations to ActiveResource models.
       #
       # === Examples
       #
-      # Author.activeresource_relations #=> [{profile: {class_name: "Profile", foreign_key: "author_id"}}]
+      # Author.activeresource_relations #=>
+      #   {
+      #     profile: {class_name: "Profile", foreign_key: "author_id"},
+      #     badges: {class_name: "Badge", foreign_key: "author_id"}
+      #   }
       def activeresource_relations
         @activeresource_relations ||= {}
       end

data/spec/remote_association/belongs_to_remote_spec.rb

@@ -62,7 +62,7 @@ describe RemoteAssociation, "method :belongs_to_remote" do
     profile.user.should be_nil
   end
 
-  describe "#build_params_hash" do
+  describe "#build_params_hash_for_relation" do
     it "returns valid Hash of HTTP query string parameters" do
       unset_const(:Profile)
       class Profile < ActiveRecord::Base
@@ -70,8 +70,8 @@ describe RemoteAssociation, "method :belongs_to_remote" do
         belongs_to_remote :user
       end
 
-      Profile.build_params_hash(10).should eq({'id' => [10]})
-      Profile.build_params_hash([10, 13, 15]).should eq({'id' => [10, 13, 15]})
+      Profile.build_params_hash_for_user(10).should eq({'id' => [10]})
+      Profile.build_params_hash_for_user([10, 13, 15]).should eq({'id' => [10, 13, 15]})
     end
   end
 
@@ -113,4 +113,41 @@ describe RemoteAssociation, "method :belongs_to_remote" do
       Profile.first.user.name.should eq('User A')
     end
   end
+
+  context "safe when using several remotes" do
+    before do
+      unset_const(:User)
+      class User < ActiveRecord::Base
+        include RemoteAssociation::Base
+        belongs_to_remote :foo, foreign_key: 'user_side_foo_id', class_name: "CustomFoo", primary_key: 'foo_id'
+        belongs_to_remote :bar, foreign_key: 'user_side_bar_id', class_name: "CustomBar", primary_key: 'bar_id'
+
+        def user_side_foo_id; self.id; end
+        def user_side_bar_id; self.id; end
+      end
+      class CustomFoo < ActiveResource::Base
+        self.site = REMOTE_HOST
+        self.element_name = "foo"
+      end
+      class CustomBar < ActiveResource::Base
+        self.site = REMOTE_HOST
+        self.element_name = "bar"
+      end
+
+      @foo_body = [{foo: {id: 1, foo_id: 1, value: "F1"}}].to_json
+      @bar_body = [{bar: {id: 1, bar_id: 1, value: "B1"}}].to_json
+
+      FakeWeb.register_uri(:get, "#{REMOTE_HOST}/foos.json?foo_id%5B%5D=1", body: @foo_body)
+      FakeWeb.register_uri(:get, "#{REMOTE_HOST}/bars.json?bar_id%5B%5D=1", body: @bar_body)
+    end
+
+    it "returns remotes respectively by primary and classname" do
+      User.delete_all
+      add_user(1, 'Tester')
+      User.first.foo.id.should == 1
+      User.first.foo.value.should == 'F1'
+      User.first.bar.id.should == 1
+      User.first.bar.value.should == 'B1'
+    end
+  end
 end

data/spec/remote_association/has_many_remote_spec.rb

@@ -46,10 +46,10 @@ describe RemoteAssociation, 'method :has_many_remote' do
     users.last.profiles.map(&:like).should eq ["letter C"]
   end
 
-  describe '#build_params_hash' do
+  describe '#build_params_hash_for_relation' do
     it 'returns valid Hash of HTTP query string parameters' do
-      User.build_params_hash(10).should eq({'user_id' => [10]})
-      User.build_params_hash([10, 13, 15]).should eq({'user_id' => [10, 13, 15]})
+      User.build_params_hash_for_profiles(10).should eq({'user_id' => [10]})
+      User.build_params_hash_for_profiles([10, 13, 15]).should eq({'user_id' => [10, 13, 15]})
     end
   end
 
@@ -81,4 +81,44 @@ describe RemoteAssociation, 'method :has_many_remote' do
       User.first.profiles.map(&:like).should eq(['letter A', 'letter B'])
     end
   end
+
+  context "safe when using several remotes" do
+    before do
+      unset_const(:User)
+      class User < ActiveRecord::Base
+        include RemoteAssociation::Base
+        has_many_remote :foos, foreign_key: 'foo_id', class_name: "CustomFoo"
+        has_many_remote :bars, foreign_key: 'bar_id', class_name: "CustomBar"
+      end
+      class CustomFoo < ActiveResource::Base
+        self.site = REMOTE_HOST
+        self.element_name = "foo"
+      end
+      class CustomBar < ActiveResource::Base
+        self.site = REMOTE_HOST
+        self.element_name = "bar"
+      end
+
+      @foos_body = [
+          {foo: {id: 1, foo_id: 1, value: "F1"}},
+      ].to_json
+
+      @bars_body = [
+          {bar: {id: 1, bar_id: 1, value: "B1"}},
+          {bar: {id: 2, bar_id: 1, value: "B2"}},
+          {bar: {id: 3, bar_id: 1, value: "B3"}},
+      ].to_json
+
+      FakeWeb.register_uri(:get, "#{REMOTE_HOST}/foos.json?foo_id%5B%5D=1", body: @foos_body)
+      FakeWeb.register_uri(:get, "#{REMOTE_HOST}/bars.json?bar_id%5B%5D=1", body: @bars_body)
+    end
+
+    it "returns remotes respectively by foreign key and classname" do
+      User.delete_all
+      add_user(1, 'Tester')
+
+      User.first.foos.collect {|f| [f.id, f.value] }.should =~ [[1, 'F1']]
+      User.first.bars.collect {|b| [b.id, b.value] }.should =~ [[1, 'B1'], [2, 'B2'], [3, 'B3']]
+    end
+  end
 end

data/spec/remote_association/has_one_remote_spec.rb

@@ -43,10 +43,10 @@ describe RemoteAssociation, "method :has_one_remote" do
     users.last.profile.like.should eq('letter B')
   end
 
-  describe "#build_params_hash" do
+  describe "#build_params_hash_for_relation" do
     it "returns valid Hash of HTTP query string parameters" do
-      User.build_params_hash(10).should eq({'user_id' => [10]})
-      User.build_params_hash([10, 13, 15]).should eq({'user_id' => [10, 13, 15]})
+      User.build_params_hash_for_profile(10).should eq({'user_id' => [10]})
+      User.build_params_hash_for_profile([10, 13, 15]).should eq({'user_id' => [10, 13, 15]})
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remote_association
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-01 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -166,7 +166,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2376249119482484222
+      hash: 2390194235140856121
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2376249119482484222
+      hash: 2390194235140856121
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24