acts-as-taggable-on 1.1.5 → 1.1.6

data/README.rdoc

@@ -89,6 +89,9 @@ also improves compatibility with the will_paginate gem:
     User.tagged_with("awesome").by_date
     User.tagged_with("awesome").by_date.paginate(:page => params[:page], :per_page => 20)
 
+    #Find a user with matching all tags, not just one
+    User.tagged_with(["awesome", "cool"], :match_all => :true)
+
 === Relationships
 
 You can find objects of the same type based on similar tags on certain contexts.

data/VERSION

@@ -1 +1 @@
-1.1.5
+1.1.6

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -398,12 +398,12 @@ module ActiveRecord
               
               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 })
+                taggings = Tagging.find(:all, :conditions => { :taggable_id => self.id, :taggable_type => self.class.base_class.to_s })
 
                 # 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.id, :tagger_type => owner.class.to_s, :context => context })
+                  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)
                 else

data/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb

@@ -1,6 +1,10 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Acts As Taggable On" do
+  before(:each) do
+    clean_database!  
+  end
+  
   it "should provide a class method 'taggable?' that is false for untaggable models" do
     UntaggableModel.should_not be_taggable
   end

data/spec/acts_as_taggable_on/acts_as_tagger_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "acts_as_tagger" do
   before(:each) do
-    [TaggableUser, TaggableModel, Tagging, Tag].each(&:destroy_all)
+    clean_database!
   end
   
   context "Tagger Method Generation" do
@@ -85,18 +85,19 @@ describe "acts_as_tagger" do
     
     context "when called by multiple tagger's" do
       before(:each) do
-        @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 = TaggableUser.create(:name => "User X")
+        @user_y = TaggableUser.create(:name => "User Y")
+        @taggable = TaggableModel.create(: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)
+        @user_y.tag(@taggable, :with => '', :on => :tags)
       end
       
       it "should delete owned tags" do        
-        @user_y.owned_tags.should be_empty
+        @user_y.owned_tags.should == []
       end
       
       it "should not delete other taggers tags" do

data/spec/acts_as_taggable_on/group_helper_spec.rb

@@ -1,6 +1,9 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Group Helper" do
+  before(:each) do
+    clean_database!    
+  end
 
   describe "grouped_column_names_for method" do
     before(:each) do

data/spec/acts_as_taggable_on/tag_spec.rb

@@ -2,9 +2,9 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Tag do
   before(:each) do
+    clean_database!
     @tag = Tag.new
-    @user = TaggableModel.create(:name => "Pablo")  
-    Tag.delete_all
+    @user = TaggableModel.create(:name => "Pablo")
   end
   
   describe "named like any" do

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Taggable" do
   before(:each) do
-    [TaggableModel, Tag, Tagging, TaggableUser].each(&:delete_all)
+    clean_database!
     @taggable = TaggableModel.new(:name => "Bob Jones")
   end
 
@@ -247,5 +247,15 @@ describe "Taggable" do
       AlteredInheritingTaggableModel.tag_counts_on(:tags).map(&:name).should == %w(fork spoon)
       TaggableModel.tag_counts_on(:tags).map(&:name).should == %w(bob kelso fork spoon)
     end
+    
+    it 'should store same tag without validation conflict' do
+      @taggable.tag_list = 'one'
+      @taggable.save!
+      
+      @inherited_same.tag_list = 'one'
+      @inherited_same.save!
+      
+      @inherited_same.update_attributes! :name => 'foo'
+    end
   end
 end

data/spec/acts_as_taggable_on/tagger_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Tagger" do
   before(:each) do
-    [TaggableModel, Tag, Tagging, TaggableUser].each(&:delete_all)
+    clean_database!
     @user = TaggableUser.new
     @taggable = TaggableModel.new(:name => "Bob Jones")
   end

data/spec/acts_as_taggable_on/tagging_spec.rb

@@ -2,6 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Tagging do
   before(:each) do
+    clean_database!
     @tagging = Tagging.new
   end
   

data/spec/acts_as_taggable_on/tags_helper_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe TagsHelper do
   before(:each) do
-    [TaggableModel, Tag, Tagging].each(&:delete_all)
+    clean_database!
     
     @bob = TaggableModel.create(:name => "Bob Jones",  :language_list => "ruby, php")
     @tom = TaggableModel.create(:name => "Tom Marley", :language_list => "ruby, java")

data/spec/spec_helper.rb

@@ -56,4 +56,13 @@ class TaggableUser < ActiveRecord::Base
 end
 
 class UntaggableModel < ActiveRecord::Base
+end
+
+def clean_database!
+  $debug = false
+  models = [Tag, Tagging, TaggableModel, OtherTaggableModel, InheritingTaggableModel,
+            AlteredInheritingTaggableModel, TaggableUser]
+  models.each do |model|
+    model.destroy_all
+  end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-13 00:00:00 +01:00
+date: 2010-02-27 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -63,18 +68,20 @@ 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.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ActsAsTaggableOn is a tagging plugin for Rails that provides multiple tagging contexts on a single model.