acts-as-taggable-on 1.1.8 → 1.1.9

data/VERSION

@@ -1 +1 @@
-1.1.8
+1.1.9

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -323,6 +323,7 @@ module ActiveRecord
           else
             opts = {:conditions => ["#{Tagging.table_name}.context = ? AND #{Tagging.table_name}.tagger_id IS NULL", context.to_s]}
           end
+
           base_tags.find(:all, opts)
         end
 
@@ -408,10 +409,16 @@ module ActiveRecord
                   old_tags = tags_on(context, owner) - new_tags
                   old_taggings = Tagging.find(:all, :conditions => { :taggable_id => self.id, :taggable_type => self.class.base_class.to_s, :tag_id => old_tags, :tagger_id => owner.id, :tagger_type => owner.class.to_s, :context => context })
 
-                  Tagging.destroy_all :id => old_taggings.map(&:id)
+                  if old_taggings.present?
+                    Tagging.destroy_all :id => old_taggings.map(&:id)
+                  end
                 else
                   old_tags = tags_on(context) - new_tags
-                  base_tags.delete(*old_tags)                
+                  old_taggings = Tagging.find(:all, :conditions => { :taggable_id => self.id, :taggable_type => self.class.base_class.to_s, :tag_id => old_tags, :tagger_id => nil, :tagger_type => nil, :context => context })
+                  
+                  if old_taggings.present?
+                    Tagging.destroy_all :id => old_taggings.map(&:id)
+                  end           
                 end
  
                 new_tags.reject! { |tag| taggings.any? { |tagging|

metadata

@@ -1,12 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 8
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -68,20 +63,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: ActsAsTaggableOn is a tagging plugin for Rails that provides multiple tagging contexts on a single model.