active_remote 1.3.0 → 1.3.1

data/.gitignore

@@ -5,6 +5,7 @@
 .config
 .rvmrc
 .yardoc
+.idea
 Gemfile.lock
 coverage
 pkg/*

data/lib/active_remote/association.rb

@@ -39,7 +39,9 @@ module ActiveRemote
       #
       def belongs_to(belongs_to_klass, options={})
         perform_association( belongs_to_klass, options ) do |klass, obj|
-          klass.search(:guid => obj.read_attribute(:"#{belongs_to_klass}_guid")).first
+          foreign_key = options.fetch(:foreign_key) { :"#{belongs_to_klass}_guid" }
+          association_guid = obj.read_attribute(foreign_key)
+          klass.search(:guid => association_guid).first
         end
       end
 
@@ -75,7 +77,8 @@ module ActiveRemote
       #
       def has_many(has_many_class, options={})
         perform_association( has_many_class, options ) do |klass, obj|
-          klass.search(:"#{obj.class.name.demodulize.underscore}_guid" => obj.guid)
+          foreign_key = options.fetch(:foreign_key) { :"#{obj.class.name.demodulize.underscore}_guid" }
+          klass.search(foreign_key => obj.guid)
         end
       end
 
@@ -110,7 +113,8 @@ module ActiveRemote
       #
       def has_one(has_one_klass, options={})
         perform_association( has_one_klass, options ) do |klass, obj|
-          klass.search(:"#{obj.class.name.demodulize.underscore}_guid" => obj.guid).first
+          foreign_key = options.fetch(:foreign_key) { :"#{obj.class.name.demodulize.underscore}_guid" }
+          klass.search(foreign_key => obj.guid).first
         end
       end
 

data/lib/active_remote/version.rb

@@ -1,3 +1,3 @@
 module ActiveRemote
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/spec/lib/active_remote/association_spec.rb

@@ -17,7 +17,7 @@ describe ActiveRemote::Association do
         subject.author.should eq record
       end
 
-      it 'memorizes the result record' do
+      it 'memoizes the result record' do
         Author.should_receive(:search).once.with(:guid => subject.author_guid).and_return(records)
         3.times { subject.author.should eq record }
       end
@@ -42,6 +42,18 @@ describe ActiveRemote::Association do
       end
     end
 
+    context 'specific association with class name and foreign_key' do
+      let(:author_guid) { 'AUT-456' }
+
+      subject { Post.new(:author_guid => author_guid) }
+      it { should respond_to(:bestseller) }
+
+      it 'searches the associated model for a single record' do
+        Author.should_receive(:search).with(:guid => subject.bestseller_guid).and_return(records)
+        subject.author.should eq record
+      end
+    end
+
   end
 
   describe '.has_many' do
@@ -76,6 +88,15 @@ describe ActiveRemote::Association do
         subject.flagged_posts.should be_empty
       end
     end
+
+    context 'specific association with class name and foreign_key' do
+      it { should respond_to(:bestseller_posts) }
+
+      it 'searches the associated model for multiple record' do
+        Post.should_receive(:search).with(:bestseller_guid => subject.guid).and_return(records)
+        subject.bestseller_posts.should eq(records)
+      end
+    end
   end
 
   describe '.has_one' do
@@ -109,6 +130,15 @@ describe ActiveRemote::Association do
         subject.main_category.should eq record
       end
     end
+
+    context 'specific association with class name and foreign_key' do
+      it { should respond_to(:default_category) }
+
+      it 'searches the associated model for a single record' do
+        Category.should_receive(:search).with(:template_post_guid => subject.guid).and_return(records)
+        subject.default_category.should eq record
+      end
+    end
   end
 
 end

data/spec/support/models/author.rb

@@ -11,5 +11,6 @@ class Author < ::ActiveRemote::Base
 
   has_many :posts
   has_many :flagged_posts, :class_name => "::Post"
+  has_many :bestseller_posts, :class_name => "::Post", :foreign_key => :bestseller_guid
 
 end

data/spec/support/models/category.rb

@@ -8,7 +8,9 @@ class Category < ::ActiveRemote::Base
 
   attribute :guid
   attribute :name
+  attribute :post_id
 
   belongs_to :post
 
+  alias_method :template_post_guid, :post_id
 end

data/spec/support/models/post.rb

@@ -11,8 +11,11 @@ class Post < ::ActiveRemote::Base
   attribute :author_guid
 
   belongs_to :author
-  belongs_to :coauthor, :class_name => ::Author
+  belongs_to :coauthor, :class_name => '::Author'
+  belongs_to :bestseller, :class_name => '::Author', :foreign_key => :bestseller_guid
   has_one :category
-  has_one :main_category, :class_name => ::Category
+  has_one :main_category, :class_name => '::Category'
+  has_one :default_category, :class_name => '::Category', :foreign_key => :template_post_guid
 
+  alias_method :bestseller_guid, :author_guid
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_remote
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-09 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -218,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1289251465950014823
+      hash: 760636464474141912
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -227,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1289251465950014823
+      hash: 760636464474141912
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24