active_remote 1.2.1 → 1.3.0

data/.gitignore

@@ -3,6 +3,7 @@
 .DS_Store
 .bundle
 .config
+.rvmrc
 .yardoc
 Gemfile.lock
 coverage

data/Gemfile

@@ -1,7 +1,5 @@
 source 'http://gems.moneydesktop.com'
 source 'https://rubygems.org'
 
-gem 'builder', '~> 3.0.0' # Geminabox will to go to 3.1.3, which causes problems with ActiveModel.
-
 # Specify your gem's dependencies in active_remote.gemspec
 gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 MDev
+Copyright (c) 2012 Adam Hutchison
 
 MIT License
 

data/active_remote.gemspec

@@ -19,7 +19,6 @@ Gem::Specification.new do |s|
   ##
   # Dependencies
   #
-  s.add_dependency "activemodel"
   s.add_dependency "active_attr"
   s.add_dependency "protobuf", ">= 2.0"
 

data/lib/active_remote/association.rb

@@ -37,20 +37,9 @@ module ActiveRemote
       #     end
       #   end
       #
-      def belongs_to(*klass_names)
-        klass_names.flatten.compact.uniq.each do |klass_name|
-
-          define_method(klass_name) do
-            value = instance_variable_get(:"@#{klass_name}")
-
-            unless value
-              klass = klass_name.to_s.classify.constantize
-              value = klass.search(:guid => read_attribute(:"#{klass_name}_guid")).first
-              instance_variable_set(:"@#{klass_name}", value)
-            end
-
-            return value
-          end
+      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
         end
       end
 
@@ -84,21 +73,9 @@ module ActiveRemote
       #     end
       #   end
       #
-      def has_many(*klass_names)
-        klass_names.flatten.compact.uniq.each do |plural_klass_name|
-          singular_name = plural_klass_name.to_s.singularize
-
-          define_method(plural_klass_name) do
-            values = instance_variable_get(:"@#{plural_klass_name}")
-
-            unless values
-              klass = plural_klass_name.to_s.classify.constantize
-              values = klass.search(:"#{self.class.name.demodulize.underscore}_guid" => self.guid)
-              instance_variable_set(:"@#{plural_klass_name}", values)
-            end
-
-            return values
-          end
+      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)
         end
       end
 
@@ -131,20 +108,26 @@ module ActiveRemote
       #     end
       #   end
       #
-      def has_one(*klass_names)
-        klass_names.flatten.compact.uniq.each do |klass_name|
+      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
+        end
+      end
 
-          define_method(klass_name) do
-            value = instance_variable_get(:"@#{klass_name}")
+    private
 
-            unless value
-              klass = klass_name.to_s.classify.constantize
-              value = klass.search(:"#{self.class.name.demodulize.underscore}_guid" => self.guid).first
-              instance_variable_set(:"@#{klass_name}", value)
-            end
+      def perform_association(associated_klass, optionz={})
+        define_method(associated_klass) do
+          value = instance_variable_get(:"@#{associated_klass}")
 
-            return value
+          unless value
+            klass_name = optionz.fetch(:class_name){ associated_klass }
+            klass = klass_name.to_s.classify.constantize
+            value = yield( klass, self )
+            instance_variable_set(:"@#{associated_klass}", value)
           end
+
+          return value
         end
       end
     end

data/lib/active_remote/version.rb

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

data/spec/lib/active_remote/association_spec.rb

@@ -5,27 +5,43 @@ describe ActiveRemote::Association do
   let(:records) { [ record ] }
 
   describe '.belongs_to' do
-    let(:author_guid) { 'AUT-123' }
 
-    subject { Post.new(:author_guid => author_guid) }
-    it { should respond_to(:author) }
+    context 'simple association' do
+      let(:author_guid) { 'AUT-123' }
 
-    it 'searches the associated model for a single record' do
-      Author.should_receive(:search).with(:guid => subject.author_guid).and_return(records)
-      subject.author.should eq record
-    end
+      subject { Post.new(:author_guid => author_guid) }
+      it { should respond_to(:author) }
 
-    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 }
+      it 'searches the associated model for a single record' do
+        Author.should_receive(:search).with(:guid => subject.author_guid).and_return(records)
+        subject.author.should eq record
+      end
+
+      it 'memorizes 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
+
+      context 'when the search is empty' do
+        it 'returns a nil' do
+          Author.should_receive(:search).with(:guid => subject.author_guid).and_return([])
+          subject.author.should be_nil
+        end
+      end
     end
 
-    context 'when the search is empty' do
-      it 'returns a nil' do
-        Author.should_receive(:search).with(:guid => subject.author_guid).and_return([])
-        subject.author.should be_nil
+    context 'specific association with class name' do
+      let(:author_guid) { 'AUT-456' }
+
+      subject { Post.new(:author_guid => author_guid) }
+      it { should respond_to(:coauthor) }
+
+      it 'searches the associated model for a single record' do
+        Author.should_receive(:search).with(:guid => subject.author_guid).and_return(records)
+        subject.author.should eq record
       end
     end
+
   end
 
   describe '.has_many' do
@@ -51,6 +67,15 @@ describe ActiveRemote::Association do
         subject.posts.should be_empty
       end
     end
+
+    context 'specific association with class name' do
+      it { should respond_to(:flagged_posts) }
+
+      it 'searches the associated model for a single record' do
+        Post.should_receive(:search).with(:author_guid => subject.guid).and_return([])
+        subject.flagged_posts.should be_empty
+      end
+    end
   end
 
   describe '.has_one' do
@@ -75,6 +100,15 @@ describe ActiveRemote::Association do
         subject.category.should be_nil
       end
     end
+
+    context 'specific association with class name' do
+      it { should respond_to(:main_category) }
+
+      it 'searches the associated model for a single record' do
+        Category.should_receive(:search).with(:post_guid => subject.guid).and_return(records)
+        subject.main_category.should eq record
+      end
+    end
   end
 
 end

data/spec/support/models/author.rb

@@ -10,5 +10,6 @@ class Author < ::ActiveRemote::Base
   attribute :name
 
   has_many :posts
+  has_many :flagged_posts, :class_name => "::Post"
 
 end

data/spec/support/models/post.rb

@@ -11,6 +11,8 @@ class Post < ::ActiveRemote::Base
   attribute :author_guid
 
   belongs_to :author
+  belongs_to :coauthor, :class_name => ::Author
   has_one :category
+  has_one :main_category, :class_name => ::Category
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_remote
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2013-01-09 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: active_attr
   requirement: !ruby/object:Gem::Requirement
@@ -166,7 +150,6 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
-- .rvmrc
 - Gemfile
 - LICENSE
 - README.md
@@ -235,7 +218,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4325357550838090592
+      hash: 1289251465950014823
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -244,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4325357550838090592
+      hash: 1289251465950014823
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/.rvmrc

@@ -1 +0,0 @@
-rvm use 1.9.3@active_remote --create