acts-as-taggable-on 1.1.1 → 1.1.2

data/VERSION

@@ -1 +1 @@
-1.1.1
+1.1.2

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -395,14 +395,16 @@ module ActiveRecord
           transaction do
             contexts.each do |context|
               cache = tag_list_cache_on(context)
-            
+              
               cache.each do |owner, list|
                 new_tags = Tag.find_or_create_all_with_like_by_name(list.uniq)
+                taggings = Tagging.find(:all, :conditions => { :taggable_id => self.id, :taggable_type => self.class.to_s })
 
                 # Destroy old taggings:
                 if owner
                   old_tags = tags_on(context, owner) - new_tags
-                  old_taggings = taggings.find(:all, :conditions => { :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, :tagger_type => owner.class.to_s, :context => context })
+
                   old_taggings.each(&:destroy)
                 else                  
                   old_tags = tags_on(context) - new_tags
@@ -415,7 +417,7 @@ module ActiveRecord
                 
                 # create new taggings:
                 new_tags.each do |tag|
-                  taggings.create!(:tag_id => tag.id, :context => context, :tagger => owner)
+                  Tagging.create!(:tag_id => tag.id, :context => context, :tagger => owner, :taggable => self)
                 end
               end
             end

data/lib/acts_as_taggable_on/tag.rb

@@ -26,6 +26,8 @@ class Tag < ActiveRecord::Base
   
   def self.find_or_create_all_with_like_by_name(*list)
     list = [list].flatten
+    
+    return [] if list.empty?
 
     existing_tags = Tag.named_any(list).all
     new_tag_names = list.reject { |name| existing_tags.any? { |tag| tag.name.downcase == name.downcase } }

data/spec/acts_as_taggable_on/acts_as_tagger_spec.rb

@@ -85,21 +85,25 @@ describe "acts_as_tagger" do
     
     context "when called by multiple tagger's" do
       before(:each) do
-        @user_x = TaggableUser.new
-        @user_y = TaggableUser.new
+        @user_x = TaggableUser.new(:name => "User X")
+        @user_y = TaggableUser.new(:name => "User Y")
         @taggable = TaggableModel.new(:name => 'acts_as_taggable_on', :tag_list => 'plugin')
         
         @user_x.tag(@taggable, :with => 'ruby, rails',  :on => :tags)
         @user_y.tag(@taggable, :with => 'ruby, plugin', :on => :tags)
+
+        @user_y.tag(@taggable, :with => '', :on => :tags)
+      end
+      
+      it "should delete owned tags" do        
+        @user_y.owned_tags.should be_empty
       end
       
       it "should not delete other taggers tags" do
-        @user_y.tag(@taggable, :with => '', :on => :tags)
-        @taggable.all_tags_list_on(:tags).should include('ruby')
+        @user_x.owned_tags.should have(2).items
       end
       
       it "should not delete original tags" do
-        @user_y.tag(@taggable, :with => '', :on => :tags)
         @taggable.all_tags_list_on(:tags).should include('plugin')
       end
     end

data/spec/acts_as_taggable_on/tag_spec.rb

@@ -64,6 +64,10 @@ describe Tag do
         Tag.find_or_create_all_with_like_by_name("awesome", "epic").map(&:name).should == ["awesome", "epic"]
       }.should change(Tag, :count).by(1)      
     end
+    
+    it "should return an empty array if no tags are specified" do
+      Tag.find_or_create_all_with_like_by_name([]).should == []
+    end
   end
 
   it "should require a name" do

data/spec/acts_as_taggable_on/tagger_spec.rb

@@ -24,10 +24,12 @@ describe "Tagger" do
       @user2.tag(@taggable, :with => 'java, python, lisp, ruby', :on => :tags)
     }.should change(Tagging, :count).by(6)
 
-    @user.owned_tags.map(&:name).sort.should == %w(ruby scheme)
+    @user.owned_tags.map(&:name).sort.should == %w(ruby scheme).sort
     @user2.owned_tags.map(&:name).sort.should == %w(java python lisp ruby).sort
-    @taggable.tags_from(@user).sort.should == %w(ruby scheme)
-    @taggable.tags_from(@user2).sort.should == %w(java lisp python ruby)
+    
+    @taggable.tags_from(@user).sort.should == %w(ruby scheme).sort
+    @taggable.tags_from(@user2).sort.should == %w(java lisp python ruby).sort
+    
     @taggable.all_tags_list_on(:tags).sort.should == %w(ruby scheme java python lisp).sort
     @taggable.all_tags_on(:tags).size.should == 6
   end

metadata

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