scopes_for_associations 0.1.2 → 0.1.3

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 pkg/*
 .*.sw*
+.DS_Store

data/README.rdoc

@@ -11,6 +11,8 @@ Define very basic, commonly used scopes for ActiveRecord associations.
     scopes_for_associations
   end
   
+  Movie.for_director_id(Director.first.id)
+  #=> [#<Movie ..., director_id: 1>]
   Movie.for_director(Director.first)
   #=> [#<Movie ..., director_id: 1>]
   Movie.for(Director.first)
@@ -31,6 +33,8 @@ The examples here are basically reproductions of the tests.
     scopes_for_associations
   end
   
+  Movie.for_director_id(Director.first.id)
+  #=> [#<Movie ..., director_id: 1>]
   Movie.for_director(Director.first)
   #=> [#<Movie ..., director_id: 1>]
   Movie.for(Director.first)
@@ -46,8 +50,10 @@ The examples here are basically reproductions of the tests.
     belongs_to :commentable, :polymorphic => true
   end
 
-  Comment.for_commentable_type('Movie')
+  Comment.for_commentable_id(Movie.first.id)
   #=> [#<Comment ..., commentable_type: "Movie", commentable_id: 1>]
+  Comment.for_commentable_type('Movie')
+  #=> [#<Comment ..., commentable_type: "Movie", commentable_id: 1>, ...]
   Comment.for_commentable(movie)
   #=> [#<Comment ..., commentable_type: "Movie", commentable_id: 1>]
   Comment.for(Movie.first)

data/lib/scopes_for_associations/version.rb

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

data/lib/scopes_for_associations.rb

@@ -19,7 +19,10 @@ module ScopesForAssociations
   def define_scopes_for_non_polymorpic_belongs_to_associations
     non_polymorphic_belongs_to_reflections.each do |reflection|
       name = reflection.name
-      scope :"for_#{name}", proc { |obj| where(:"#{name}_id" => obj.id) }
+      attribute_name = :"#{name}_id"
+      scope_name_for_attribute_id = :"for_#{attribute_name}"
+      scope scope_name_for_attribute_id, proc { |id| where(attribute_name => id) }
+      scope :"for_#{name}", proc { |obj| send(scope_name_for_attribute_id, obj.id) }
     end
   end
 
@@ -27,7 +30,10 @@ module ScopesForAssociations
     polymorphic_belongs_to_reflections.each do |reflection|
       name = reflection.name
       attribute_name_for_polymorphic_type = :"#{name}_type"
+      attribute_name_for_polymorphic_id = :"#{name}_id"
+      scope_name_for_polymorphic_id = :"for_#{attribute_name_for_polymorphic_id}"
       scope_name_for_polymorphic_type = :"for_#{attribute_name_for_polymorphic_type}"
+      scope scope_name_for_polymorphic_id, proc { |id| where(attribute_name_for_polymorphic_id => id) }
       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

data/spec/scopes_for_associations_spec.rb

@@ -15,22 +15,33 @@ describe ScopesForAssociations do
 
   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)
+    it 'should define useful scopes' do
+      Movie.should define_scopes(
+        :for_director_id,
+        :for_director,
+        :for_production_company_id,
+        :for_production_company,
+        :for
+      )
+    end
+
+    it 'should scope for association id' do
+      Movie.for_director_id(director.id).should query_the_same_as(Movie.where(:director_id => director.id))
+      Movie.for_production_company_id(production_company.id).should query_the_same_as(Movie.where(:production_company_id => production_company.id))
     end
 
     it 'should scope for association as object' do
-      Movie.for_director(director).to_sql.should eq(Movie.where(:director_id => director.id).to_sql)
-      Movie.for_director(director).should eq([movie])
-      Movie.for_production_company(production_company).to_sql.should eq(Movie.where(:production_company_id => production_company.id).to_sql)
-      Movie.for_production_company(director).should eq([movie])
+      Movie.for_director(director).should query_the_same_as(Movie.for_director_id(director.id))
+      Movie.for_production_company(production_company).should query_the_same_as(Movie.for_production_company_id(production_company.id))
     end
 
     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 query_the_same_as(Movie.for_director(director))
+      Movie.for(production_company).should query_the_same_as(Movie.for_production_company(production_company))
+    end
+
+    it 'should return correct results' do
       Movie.for(director).should eq([movie])
-      Movie.for(production_company).to_sql.should eq(Movie.for_production_company(production_company).to_sql)
       Movie.for(production_company).should eq([movie])
     end
 
@@ -38,27 +49,36 @@ 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_type)
-      Comment.should respond_to(:for)
+    it 'should define uesful scopes' do
+      Comment.should define_scopes(
+        :for_commentable_id,
+        :for_commentable_type,
+        :for_commentable,
+        :for
+      )
+    end
+
+    it 'should scope for polymorphic id' do
+      Comment.for_commentable_type('Movie').should query_the_same_as(Comment.where(:commentable_type => 'Movie'))
     end
 
     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])
+      Comment.for_commentable_id(movie.id).should query_the_same_as(Comment.where(:commentable_id => movie.id))
     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([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])
+      Comment.for_commentable(movie).should query_the_same_as(Comment.where(:commentable_type => 'Movie', :commentable_id => movie.id))
+      Comment.for_commentable(trailer).should query_the_same_as(Comment.where(:commentable_type => 'Trailer', :commentable_id => trailer.id))
     end
 
     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)
+      Comment.for(movie).should query_the_same_as(Comment.for_commentable(movie))
+      Comment.for(trailer).should query_the_same_as(Comment.for_commentable(trailer))
+    end
+
+    it 'should return correct results' do
+      Comment.for(movie).should eq([movie_comment])
+      Comment.for(trailer).should eq([trailer_comment])
     end
 
   end

data/spec/support/matchers.rb

@@ -0,0 +1,13 @@
+RSpec::Matchers.define :define_scopes do |*scopes|
+  match do |model_class|
+    scopes.each do |scope|
+      model_class.scopes.keys.should include(scope)
+    end
+  end
+end
+
+RSpec::Matchers.define :query_the_same_as do |expected_relation|
+  match do |example_relation|
+    example_relation.to_sql.should eq(expected_relation.to_sql)
+  end
+end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scopes_for_associations
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: 
-  version: 0.1.2
+  segments: 
+  - 0
+  - 1
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jared Ning
@@ -10,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-12 00:00:00 -06:00
+date: 2011-02-13 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +26,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
   type: :runtime
   version_requirements: *id001
@@ -32,6 +42,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
   type: :development
   version_requirements: *id002
@@ -43,6 +56,11 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
   type: :development
   version_requirements: *id003
@@ -54,6 +72,11 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 1
+        - 2
+        - 5
         version: 1.2.5
   type: :development
   version_requirements: *id004
@@ -79,6 +102,7 @@ files:
 - scopes_for_associations.gemspec
 - spec/scopes_for_associations_spec.rb
 - spec/spec_helper.rb
+- spec/support/matchers.rb
 - spec/support/models.rb
 - spec/support/schema.rb
 has_rdoc: true
@@ -95,12 +119,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
@@ -112,5 +142,6 @@ summary: Define very basic, commonly used scopes for ActiveRecord associations
 test_files: 
 - spec/scopes_for_associations_spec.rb
 - spec/spec_helper.rb
+- spec/support/matchers.rb
 - spec/support/models.rb
 - spec/support/schema.rb