scopes_for_associations 0.1.1 → 0.1.2

data/README.rdoc

@@ -46,9 +46,11 @@ The examples here are basically reproductions of the tests.
     belongs_to :commentable, :polymorphic => true
   end
 
-  Commentable.for_movie(Movie.first)
+  Comment.for_commentable_type('Movie')
   #=> [#<Comment ..., commentable_type: "Movie", commentable_id: 1>]
-  Commentable.for(Movie.first)
+  Comment.for_commentable(movie)
+  #=> [#<Comment ..., commentable_type: "Movie", commentable_id: 1>]
+  Comment.for(Movie.first)
   #=> [#<Comment ..., commentable_type: "Movie", commentable_id: 1>]
 
 == Installation

data/lib/scopes_for_associations/version.rb

@@ -1,3 +1,3 @@
 module ScopesForAssociations
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/scopes_for_associations.rb

@@ -26,7 +26,10 @@ module ScopesForAssociations
   def define_scopes_for_polymorpic_belongs_to_associations
     polymorphic_belongs_to_reflections.each do |reflection|
       name = reflection.name
-      scope :"for_#{name}", proc { |obj| where(:"#{name}_type" => obj.class.name, :"#{name}_id" => obj.id) }
+      attribute_name_for_polymorphic_type = :"#{name}_type"
+      scope_name_for_polymorphic_type = :"for_#{attribute_name_for_polymorphic_type}"
+      scope scope_name_for_polymorphic_type, proc { |string| where(attribute_name_for_polymorphic_type => string) }
+      scope :"for_#{name}", proc { |obj| send(scope_name_for_polymorphic_type, obj.class.name).where(:"#{name}_id" => obj.id) }
     end
   end
 
@@ -48,7 +51,7 @@ module ScopesForAssociations
         if reflection
           send(:"for_#{reflection.options[:as]}", object)
         else
-          raise "no scope for #{object.class}"
+          raise "No scope for #{object.class}. If the associaton is polymorphic, make sure #{object.class} defines something like 'has_many :#{self.name.underscore.pluralize}, :as => :#{self.name.underscore + 'able'}'."
         end
       end
     }

data/spec/scopes_for_associations_spec.rb

@@ -5,17 +5,19 @@ describe ScopesForAssociations do
   let(:director) { Director.create! }
   let(:production_company) { ProductionCompany.create! }
   let(:movie) { Movie.create!(:director => director, :production_company => production_company) }
-  let(:comment) { Comment.create! :commentable_type => 'Movie', :commentable_id => movie.id }
+  let(:trailer) { Trailer.create!(:director => director, :production_company => production_company, :movie => movie) }
+  let(:movie_comment) { Comment.create! :commentable_type => 'Movie', :commentable_id => movie.id }
+  let(:trailer_comment) { Comment.create! :commentable_type => 'Trailer', :commentable_id => trailer.id }
 
   it 'should be included in ActiveRecord::Base' do
-    ActiveRecord::Base.should respond_to('scopes_for_associations')
+    ActiveRecord::Base.should respond_to(:scopes_for_associations)
   end
 
   context 'for non-polymorphic belongs_to associations' do
 
     it 'should define for_x scopes' do
-      Movie.should respond_to('for_director')
-      Movie.should respond_to('for_production_company')
+      Movie.should respond_to(:for_director)
+      Movie.should respond_to(:for_production_company)
     end
 
     it 'should scope for association as object' do
@@ -25,7 +27,7 @@ describe ScopesForAssociations do
       Movie.for_production_company(director).should eq([movie])
     end
 
-    it 'should have a "polymorphic" scope :for' do
+    it 'should have an all encompassing scope :for' do
       Movie.for(director).to_sql.should eq(Movie.for_director(director).to_sql)
       Movie.for(director).should eq([movie])
       Movie.for(production_company).to_sql.should eq(Movie.for_production_company(production_company).to_sql)
@@ -37,20 +39,26 @@ describe ScopesForAssociations do
   context 'for polymorphic belongs_to associations' do
 
     it 'should define for_x scopes' do
-      Comment.should respond_to('for_commentable')
+      Comment.should respond_to(:for_commentable)
+      Comment.should respond_to(:for_commentable_type)
+      Comment.should respond_to(:for)
     end
 
-    it 'should scope for association as object' do
-      Comment.for_commentable(movie)
+    it 'should scope for polymorphic type' do
+      Comment.for_commentable_type('Movie').to_sql.should eq(Comment.where(:commentable_type => 'Movie').to_sql)
+      Comment.for_commentable_type('Movie').should eq([movie_comment])
     end
 
     it 'should scope for association as object' do
       Comment.for_commentable(movie).to_sql.should eq(Comment.where(:commentable_type => 'Movie', :commentable_id => movie.id).to_sql)
-      Comment.for_commentable(movie).should eq([comment])
+      Comment.for_commentable(movie).should eq([movie_comment])
+      Comment.for_commentable(trailer).to_sql.should eq(Comment.where(:commentable_type => 'Trailer', :commentable_id => trailer.id).to_sql)
+      Comment.for_commentable(trailer).should eq([trailer_comment])
     end
 
-    it 'should have a "polymorphic" scope :for' do
+    it 'should have an all encompassing scope :for' do
       Comment.for(movie).to_sql.should eq(Comment.for_commentable(movie).to_sql)
+      Comment.for(trailer).to_sql.should eq(Comment.for_commentable(trailer).to_sql)
     end
 
   end

data/spec/support/models.rb

@@ -16,6 +16,7 @@ class Trailer < ActiveRecord::Base
   belongs_to :movie
   belongs_to :director
   belongs_to :production_company
+  has_many :comments, :as => :commentable
   scopes_for_associations
 end
 

metadata

@@ -2,7 +2,7 @@
 name: scopes_for_associations
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jared Ning
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-08 00:00:00 -06:00
+date: 2011-02-12 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency