acts-as-taggable-on 1.0.7 → 1.0.8

data/VERSION

@@ -1 +1 @@
-1.0.7
+1.0.8

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -141,8 +141,8 @@ module ActiveRecord
 
           
           if options.delete(:exclude)
-            tags_conditions = "(" + tags.map { |t| sanitize_sql(["#{Tag.table_name}.name LIKE ?", t]) }.join(" OR ") + ")"
-            conditions << "#{table_name}.#{primary_key} NOT IN (SELECT #{Tagging.table_name}.taggable_id FROM #{Tagging.table_name} JOIN #{Tag.table_name} ON #{Tagging.table_name}.tag_id = #{Tag.table_name}.id AND #{tags_conditions} WHERE #{Tagging.table_name}.taggable_type = #{quote_value(base_class.name)})"
+            tags_conditions = tags.map { |t| sanitize_sql(["#{Tag.table_name}.name LIKE ?", t]) }.join(" OR ")
+            conditions << "#{table_name}.#{primary_key} NOT IN (SELECT #{Tagging.table_name}.taggable_id FROM #{Tagging.table_name} JOIN #{Tag.table_name} ON #{Tagging.table_name}.tag_id = #{Tag.table_name}.id AND (#{tags_conditions}) WHERE #{Tagging.table_name}.taggable_type = #{quote_value(base_class.name)})"
           
           else          
             tags.each do |tag|
@@ -277,10 +277,10 @@ module ActiveRecord
         
         def tags_on(context, owner=nil)
           if owner
-            opts = {:conditions => ["context = ? AND tagger_id = ? AND tagger_type = ?",
+            opts = {:conditions => ["#{Tagging.table_name}.context = ? AND #{Tagging.table_name}.tagger_id = ? AND #{Tagging.table_name}.tagger_type = ?",
                                     context.to_s, owner.id, owner.class.to_s]}
           else
-            opts = {:conditions => ["context = ?", context.to_s]}
+            opts = {:conditions => ["#{Tagging.table_name}.context = ?", context.to_s]}
           end
           base_tags.find(:all, opts)
         end

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -60,7 +60,8 @@ describe "Taggable" do
     @taggable.skill_list = "ruby, rails, css"
     @taggable.tag_list = "bob, charlie"
     @taggable.save
-    TaggableModel.tagged_with("ruby", {}).first.should == @taggable
+    
+    TaggableModel.tagged_with("ruby").first.should == @taggable
     TaggableModel.tagged_with("bob", :on => :skills).first.should_not == @taggable
     TaggableModel.tagged_with("bob", :on => :tags).first.should == @taggable
   end
@@ -98,12 +99,22 @@ describe "Taggable" do
     bob.tags_on(:rotors).should_not be_empty
   end
   
+  it "should be able to find tagged" do
+    bob = TaggableModel.create(:name => "Bob", :tag_list => "fitter, happier, more productive", :skill_list => "ruby, rails, css")
+    frank = TaggableModel.create(:name => "Frank", :tag_list => "weaker, depressed, inefficient", :skill_list => "ruby, rails, css")
+    steve = TaggableModel.create(:name => 'Steve', :tag_list => 'fitter, happier, more productive', :skill_list => 'c++, java, ruby')
+    
+    TaggableModel.find_tagged_with("ruby", :order => 'taggable_models.name').should == [bob, frank, steve]
+    TaggableModel.find_tagged_with("ruby, rails", :order => 'taggable_models.name').should == [bob, frank]
+    TaggableModel.find_tagged_with(["ruby", "rails"], :order => 'taggable_models.name').should == [bob, frank]    
+  end
+  
   it "should be able to find tagged on a custom tag context" do
     bob = TaggableModel.create(:name => "Bob")
     bob.set_tag_list_on(:rotors, "spinning, jumping")
     bob.tag_list_on(:rotors).should == ["spinning","jumping"]
     bob.save
-    TaggableModel.find_tagged_with("spinning", :on => :rotors).should_not be_empty
+    TaggableModel.find_tagged_with("spinning", :on => :rotors).should == [bob]
   end
 
   it "should be able to use named scopes to chain tag finds" do
@@ -112,9 +123,10 @@ describe "Taggable" do
     steve = TaggableModel.create(:name => 'Steve', :tag_list => 'fitter, happier, more productive', :skill_list => 'c++, java, python')
     
     # Let's only find those productive Rails developers
-    TaggableModel.tagged_with('rails', :on => :skills).all(:order => 'taggable_models.name').should == [bob, frank]
-    TaggableModel.tagged_with('happier', :on => :tags).all(:order => 'taggable_models.name').should == [bob, steve]
+    TaggableModel.tagged_with('rails', :on => :skills, :order => 'taggable_models.name').should == [bob, frank]
+    TaggableModel.tagged_with('happier', :on => :tags, :order => 'taggable_models.name').should == [bob, steve]
     TaggableModel.tagged_with('rails', :on => :skills).tagged_with('happier', :on => :tags).should == [bob]
+    TaggableModel.tagged_with('rails').tagged_with('happier', :on => :tags).should == [bob]
   end
   
   it "should be able to find tagged with only the matching tags" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version 
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-12 00:00:00 -05:00
+date: 2009-11-13 00:00:00 +01:00
 default_executable: 
 dependencies: []