acts-as-taggable-on 1.1.3 → 1.1.4

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -158,7 +158,7 @@ module ActiveRecord
             conditions << "#{table_name}.#{primary_key} 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 = Tag.named_like_any(tag_list)
+            tags = Tag.named_any(tag_list)
             return { :conditions => "1 = 0" } unless tags.length == tag_list.length
                       
             tags.each do |tag|
@@ -380,11 +380,11 @@ module ActiveRecord
             :order      => "count DESC"
           }.update(options)
         end
-        
+
         def save_cached_tag_list
           self.class.tag_types.map(&:to_s).each do |tag_type|
-            if self.class.send("caching_#{tag_type.singularize}_list?")
-              self["cached_#{tag_type.singularize}_list"] = tag_list_cache_on(tag_type.singularize).tags.join(', ')
+            if self.class.send("caching_#{tag_type.singularize}_list?")              
+              self["cached_#{tag_type.singularize}_list"] = tag_list_cache_on(tag_type.singularize).to_a.flatten.compact.join(', ')
             end
           end
         end
@@ -403,17 +403,21 @@ module ActiveRecord
                 # Destroy old taggings:
                 if owner
                   old_tags = tags_on(context, owner) - new_tags
-                  old_taggings = Tagging.find(:all, :conditions => { :taggable_id => self.id, :taggable_type => self.class.to_s, :tag_id => old_tags, :tagger_id => owner, :tagger_type => owner.class.to_s, :context => context })
+                  old_taggings = Tagging.find(:all, :conditions => { :taggable_id => self.id, :taggable_type => self.class.to_s, :tag_id => old_tags, :tagger_id => owner.id, :tagger_type => owner.class.to_s, :context => context })
 
-                  old_taggings.each(&:destroy)
-                else                  
+                  Tagging.destroy_all :id => old_taggings.map(&:id)
+                else
                   old_tags = tags_on(context) - new_tags
                   base_tags.delete(*old_tags)                
                 end
-                
-                new_tags.reject! { |tag| taggings.any? { |tagging| tagging.tag     == tag   &&
-                                                                   tagging.tagger  == owner &&
-                                                                   tagging.context == context } }
+ 
+                new_tags.reject! { |tag| taggings.any? { |tagging|
+                    tagging.tag_id      == tag.id &&
+                    tagging.tagger_id   == (owner ? owner.id : nil) &&
+                    tagging.tagger_type == (owner ? owner.class.to_s : nil) &&
+                    tagging.context     == context
+                  }
+                }
                 
                 # create new taggings:
                 new_tags.each do |tag|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-07 00:00:00 +01:00
+date: 2010-02-13 00:00:00 +01:00
 default_executable: 
 dependencies: []