acts-as-taggable-on 2.1.1 → 2.2.0

data/lib/acts_as_taggable_on/tag.rb

@@ -1,8 +1,7 @@
 module ActsAsTaggableOn
   class Tag < ::ActiveRecord::Base
-    include ActsAsTaggableOn::ActiveRecord::Backports if ::ActiveRecord::VERSION::MAJOR < 3
     include ActsAsTaggableOn::Utils
-      
+
     attr_accessible :name
 
     ### ASSOCIATIONS:
@@ -15,21 +14,21 @@ module ActsAsTaggableOn
     validates_uniqueness_of :name
 
     ### SCOPES:
-    
+
     def self.named(name)
-      where(["name #{like_operator} ?", escape_like(name)])
+      where(["name #{like_operator} ? ESCAPE '!'", escape_like(name)])
     end
-  
+
     def self.named_any(list)
-      where(list.map { |tag| sanitize_sql(["name #{like_operator} ?", escape_like(tag.to_s)]) }.join(" OR "))
+      where(list.map { |tag| sanitize_sql(["name #{like_operator} ? ESCAPE '!'", escape_like(tag.to_s)]) }.join(" OR "))
     end
-  
+
     def self.named_like(name)
-      where(["name #{like_operator} ?", "%#{escape_like(name)}%"])
+      where(["name #{like_operator} ? ESCAPE '!'", "%#{escape_like(name)}%"])
     end
 
     def self.named_like_any(list)
-      where(list.map { |tag| sanitize_sql(["name #{like_operator} ?", "%#{escape_like(tag.to_s)}%"]) }.join(" OR "))
+      where(list.map { |tag| sanitize_sql(["name #{like_operator} ? ESCAPE '!'", "%#{escape_like(tag.to_s)}%"]) }.join(" OR "))
     end
 
     ### CLASS METHODS:
@@ -44,7 +43,7 @@ module ActsAsTaggableOn
       return [] if list.empty?
 
       existing_tags = Tag.named_any(list).all
-      new_tag_names = list.reject do |name| 
+      new_tag_names = list.reject do |name|
                         name = comparable_name(name)
                         existing_tags.any? { |tag| comparable_name(tag.name) == name }
                       end
@@ -66,13 +65,13 @@ module ActsAsTaggableOn
     def count
       read_attribute(:count).to_i
     end
-    
+
     def safe_name
       name.gsub(/[^a-zA-Z0-9]/, '')
     end
-    
+
     class << self
-      private        
+      private
         def comparable_name(str)
           RUBY_VERSION >= "1.9" ? str.downcase : str.mb_chars.downcase
         end

data/lib/acts_as_taggable_on/tagging.rb

@@ -1,7 +1,5 @@
 module ActsAsTaggableOn
   class Tagging < ::ActiveRecord::Base #:nodoc:
-    include ActsAsTaggableOn::ActiveRecord::Backports if ::ActiveRecord::VERSION::MAJOR < 3
-
     attr_accessible :tag,
                     :tag_id,
                     :context,

data/lib/acts_as_taggable_on/utils.rb

@@ -1,29 +1,28 @@
 module ActsAsTaggableOn
   module Utils
     def self.included(base)
-      
+
       base.send :include, ActsAsTaggableOn::Utils::OverallMethods
-      base.extend ActsAsTaggableOn::Utils::OverallMethods      
+      base.extend ActsAsTaggableOn::Utils::OverallMethods
     end
 
     module OverallMethods
       def using_postgresql?
         ::ActiveRecord::Base.connection && ::ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
       end
-      
+
       def using_sqlite?
         ::ActiveRecord::Base.connection && ::ActiveRecord::Base.connection.adapter_name == 'SQLite'
-      end 
-        
+      end
+
       private
       def like_operator
         using_postgresql? ? 'ILIKE' : 'LIKE'
       end
-      
+
       # escape _ and % characters in strings, since these are wildcards in SQL.
        def escape_like(str)
-         return str if using_sqlite? # skip escaping for SQLite
-         str.to_s.gsub("_", "\\\_").gsub("%", "\\\%")
+         str.gsub(/[!%_]/){ |x| '!' + x }
        end
     end
 

data/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb

@@ -12,7 +12,7 @@ describe "Acts As Taggable On" do
   describe "Taggable Method Generation" do
     before(:each) do
       clean_database!
-      RAILS_3 ? TaggableModel.tag_types = [] : TaggableModel.write_inheritable_attribute(:tag_types, [])
+      TaggableModel.tag_types = []
       TaggableModel.acts_as_taggable_on(:tags, :languages, :skills, :needs, :offerings)
       @taggable = TaggableModel.new(:name => "Bob Jones")
     end
@@ -28,7 +28,7 @@ describe "Acts As Taggable On" do
     it "should create an instance attribute for tag types" do
       @taggable.should respond_to(:tag_types)
     end
-    
+
     it "should have all tag types" do
       @taggable.tag_types.should == [:tags, :languages, :skills, :needs, :offerings]
     end
@@ -45,7 +45,7 @@ describe "Acts As Taggable On" do
       @taggable.should respond_to(:tag_list, :skill_list, :language_list)
       @taggable.should respond_to(:tag_list=, :skill_list=, :language_list=)
     end
-    
+
     it "should generate a tag_list accessor, that includes owned tags, for each tag type" do
       @taggable.should respond_to(:all_tags_list, :all_skills_list, :all_languages_list)
     end
@@ -57,17 +57,17 @@ describe "Acts As Taggable On" do
       @inherited_same = InheritingTaggableModel.new(:name => "inherited same")
       @inherited_different = AlteredInheritingTaggableModel.new(:name => "inherited different")
     end
-  
+
     it "should pass on tag contexts to STI-inherited models" do
       @inherited_same.should respond_to(:tag_list, :skill_list, :language_list)
       @inherited_different.should respond_to(:tag_list, :skill_list, :language_list)
     end
-  
+
     it "should have tag contexts added in altered STI models" do
       @inherited_different.should respond_to(:part_list)
     end
   end
-  
+
   describe "Reloading" do
     it "should save a model instantiated by Model.find" do
       taggable = TaggableModel.create!(:name => "Taggable")
@@ -81,51 +81,121 @@ describe "Acts As Taggable On" do
       taggable1 = TaggableModel.create!(:name => "Taggable 1")
       taggable2 = TaggableModel.create!(:name => "Taggable 2")
       taggable3 = TaggableModel.create!(:name => "Taggable 3")
-  
+
+      taggable1.tag_list = "one, two"
+      taggable1.save
+
+      taggable2.tag_list = "three, four"
+      taggable2.save
+
+      taggable3.tag_list = "one, four"
+      taggable3.save
+
+      taggable1.find_related_tags.should include(taggable3)
+      taggable1.find_related_tags.should_not include(taggable2)
+    end
+
+    it "should find related objects based on tag names on context - non standard id" do
+      taggable1 = NonStandardIdTaggableModel.create!(:name => "Taggable 1")
+      taggable2 = NonStandardIdTaggableModel.create!(:name => "Taggable 2")
+      taggable3 = NonStandardIdTaggableModel.create!(:name => "Taggable 3")
+
       taggable1.tag_list = "one, two"
       taggable1.save
-  
+
       taggable2.tag_list = "three, four"
       taggable2.save
-  
+
       taggable3.tag_list = "one, four"
       taggable3.save
-  
+
       taggable1.find_related_tags.should include(taggable3)
       taggable1.find_related_tags.should_not include(taggable2)
     end
-  
+
     it "should find other related objects based on tag names on context" do
       taggable1 = TaggableModel.create!(:name => "Taggable 1")
       taggable2 = OtherTaggableModel.create!(:name => "Taggable 2")
       taggable3 = OtherTaggableModel.create!(:name => "Taggable 3")
-  
+
       taggable1.tag_list = "one, two"
       taggable1.save
-  
+
       taggable2.tag_list = "three, four"
       taggable2.save
-  
+
       taggable3.tag_list = "one, four"
       taggable3.save
-  
+
       taggable1.find_related_tags_for(OtherTaggableModel).should include(taggable3)
       taggable1.find_related_tags_for(OtherTaggableModel).should_not include(taggable2)
     end
-  
+
     it "should not include the object itself in the list of related objects" do
       taggable1 = TaggableModel.create!(:name => "Taggable 1")
       taggable2 = TaggableModel.create!(:name => "Taggable 2")
-  
+
       taggable1.tag_list = "one"
       taggable1.save
-  
+
       taggable2.tag_list = "one, two"
       taggable2.save
-  
+
       taggable1.find_related_tags.should include(taggable2)
       taggable1.find_related_tags.should_not include(taggable1)
     end
+
+    it "should not include the object itself in the list of related objects - non standard id" do
+      taggable1 = NonStandardIdTaggableModel.create!(:name => "Taggable 1")
+      taggable2 = NonStandardIdTaggableModel.create!(:name => "Taggable 2")
+
+      taggable1.tag_list = "one"
+      taggable1.save
+
+      taggable2.tag_list = "one, two"
+      taggable2.save
+
+      taggable1.find_related_tags.should include(taggable2)
+      taggable1.find_related_tags.should_not include(taggable1)
+    end
+
+    context "Inherited Models" do
+      before do
+        @taggable1 = InheritingTaggableModel.create!(:name => "InheritingTaggable 1")
+        @taggable2 = InheritingTaggableModel.create!(:name => "InheritingTaggable 2")
+        @taggable3 = InheritingTaggableModel.create!(:name => "InheritingTaggable 3")
+        @taggable4 = TaggableModel.create!(:name => "Taggable 4")
+
+        @taggable1.tag_list = "one, two"
+        @taggable1.save
+
+        @taggable2.tag_list = "three, four"
+        @taggable2.save
+
+        @taggable3.tag_list = "one, four"
+        @taggable3.save
+
+        @taggable4.tag_list = "one, two, three, four"
+        @taggable4.save
+      end
+
+      it "should find related objects based on tag names on context" do
+        @taggable1.find_related_tags.should include(@taggable3)
+        @taggable1.find_related_tags.should_not include(@taggable2)
+        @taggable1.find_related_tags.should_not include(@taggable4)
+
+        @taggable1.find_related_tags_for(TaggableModel).should include(@taggable3)
+        @taggable1.find_related_tags_for(TaggableModel).should_not include(@taggable2)
+        @taggable1.find_related_tags_for(TaggableModel).should include(@taggable4)
+      end
+
+      it "should not include the object itself in the list of related objects" do
+        @taggable1.find_related_tags.should_not include(@taggable1)
+        @taggable1.find_related_tags_for(InheritingTaggableModel).should_not include(@taggable1)
+        @taggable1.find_related_tags_for(TaggableModel).should_not include(@taggable1)
+      end
+    end
+
   end
 
   describe "Matching Contexts" do
@@ -133,50 +203,95 @@ describe "Acts As Taggable On" do
       taggable1 = TaggableModel.create!(:name => "Taggable 1")
       taggable2 = TaggableModel.create!(:name => "Taggable 2")
       taggable3 = TaggableModel.create!(:name => "Taggable 3")
-  
+
       taggable1.offering_list = "one, two"
       taggable1.save!
-  
+
       taggable2.need_list = "one, two"
       taggable2.save!
-  
+
       taggable3.offering_list = "one, two"
       taggable3.save!
-  
+
       taggable1.find_matching_contexts(:offerings, :needs).should include(taggable2)
       taggable1.find_matching_contexts(:offerings, :needs).should_not include(taggable3)
     end
-  
+
     it "should find other related objects with tags of matching contexts" do
       taggable1 = TaggableModel.create!(:name => "Taggable 1")
       taggable2 = OtherTaggableModel.create!(:name => "Taggable 2")
       taggable3 = OtherTaggableModel.create!(:name => "Taggable 3")
-  
+
       taggable1.offering_list = "one, two"
       taggable1.save
-  
+
       taggable2.need_list = "one, two"
       taggable2.save
-  
+
       taggable3.offering_list = "one, two"
       taggable3.save
-  
+
       taggable1.find_matching_contexts_for(OtherTaggableModel, :offerings, :needs).should include(taggable2)
       taggable1.find_matching_contexts_for(OtherTaggableModel, :offerings, :needs).should_not include(taggable3)
     end
-  
-    it "should not include the object itself in the list of related objects" do
+
+    it "should not include the object itself in the list of related objects with tags of matching contexts" do
       taggable1 = TaggableModel.create!(:name => "Taggable 1")
       taggable2 = TaggableModel.create!(:name => "Taggable 2")
-  
-      taggable1.tag_list = "one"
+
+      taggable1.offering_list = "one, two"
+      taggable1.need_list = "one, two"
       taggable1.save
-  
-      taggable2.tag_list = "one, two"
+
+      taggable2.need_list = "one, two"
       taggable2.save
-  
-      taggable1.find_related_tags.should include(taggable2)
-      taggable1.find_related_tags.should_not include(taggable1)
+
+      taggable1.find_matching_contexts_for(TaggableModel, :offerings, :needs).should include(taggable2)
+      taggable1.find_matching_contexts_for(TaggableModel, :offerings, :needs).should_not include(taggable1)
+    end
+
+    context "Inherited Models" do
+      before do
+        @taggable1 = InheritingTaggableModel.create!(:name => "InheritingTaggable 1")
+        @taggable2 = InheritingTaggableModel.create!(:name => "InheritingTaggable 2")
+        @taggable3 = InheritingTaggableModel.create!(:name => "InheritingTaggable 3")
+        @taggable4 = InheritingTaggableModel.create!(:name => "InheritingTaggable 4")
+        @taggable5 = TaggableModel.create!(:name => "Taggable 5")
+
+        @taggable1.offering_list = "one, two"
+        @taggable1.need_list = "one, two"
+        @taggable1.save!
+
+        @taggable2.need_list = "one, two"
+        @taggable2.save!
+
+        @taggable3.offering_list = "one, two"
+        @taggable3.save!
+
+        @taggable4.tag_list = "one, two, three, four"
+        @taggable4.save!
+
+        @taggable5.need_list = "one, two"
+        @taggable5.save!
+      end
+
+      it "should find objects with tags of matching contexts" do
+        @taggable1.find_matching_contexts(:offerings, :needs).should include(@taggable2)
+        @taggable1.find_matching_contexts(:offerings, :needs).should_not include(@taggable3)
+        @taggable1.find_matching_contexts(:offerings, :needs).should_not include(@taggable4)
+        @taggable1.find_matching_contexts(:offerings, :needs).should_not include(@taggable5)
+
+        @taggable1.find_matching_contexts_for(TaggableModel, :offerings, :needs).should include(@taggable2)
+        @taggable1.find_matching_contexts_for(TaggableModel, :offerings, :needs).should_not include(@taggable3)
+        @taggable1.find_matching_contexts_for(TaggableModel, :offerings, :needs).should_not include(@taggable4)
+        @taggable1.find_matching_contexts_for(TaggableModel, :offerings, :needs).should include(@taggable5)
+      end
+
+      it "should not include the object itself in the list of related objects with tags of matching contexts" do
+        @taggable1.find_matching_contexts(:offerings, :needs).should_not include(@taggable1)
+        @taggable1.find_matching_contexts_for(InheritingTaggableModel, :offerings, :needs).should_not include(@taggable1)
+        @taggable1.find_matching_contexts_for(TaggableModel, :offerings, :needs).should_not include(@taggable1)
+      end
     end
   end
 
@@ -208,67 +323,67 @@ describe "Acts As Taggable On" do
       }.should_not raise_error
     end
   end
-  
+
   describe 'Caching' do
     before(:each) do
-      @taggable = CachedModel.new(:name => "Bob Jones")  
+      @taggable = CachedModel.new(:name => "Bob Jones")
       @another_taggable = OtherCachedModel.new(:name => "John Smith")
     end
-    
+
     it "should add saving of tag lists and cached tag lists to the instance" do
       @taggable.should respond_to(:save_cached_tag_list)
       @another_taggable.should respond_to(:save_cached_tag_list)
-      
+
       @taggable.should respond_to(:save_tags)
-    end  
+    end
 
     it "should add cached tag lists to the instance if cached column is not present" do
       TaggableModel.new(:name => "Art Kram").should_not respond_to(:save_cached_tag_list)
     end
-    
+
     it "should generate a cached column checker for each tag type" do
       CachedModel.should respond_to(:caching_tag_list?)
       OtherCachedModel.should respond_to(:caching_language_list?)
-    end  
-    
+    end
+
     it 'should not have cached tags' do
-      @taggable.cached_tag_list.should be_blank  
-      @another_taggable.cached_language_list.should be_blank      
+      @taggable.cached_tag_list.should be_blank
+      @another_taggable.cached_language_list.should be_blank
     end
-    
+
     it 'should cache tags' do
       @taggable.update_attributes(:tag_list => 'awesome, epic')
       @taggable.cached_tag_list.should == 'awesome, epic'
-      
+
       @another_taggable.update_attributes(:language_list => 'ruby, .net')
-      @another_taggable.cached_language_list.should == 'ruby, .net'      
+      @another_taggable.cached_language_list.should == 'ruby, .net'
     end
-    
+
     it 'should keep the cache' do
       @taggable.update_attributes(:tag_list => 'awesome, epic')
-      @taggable = CachedModel.find(@taggable)  
+      @taggable = CachedModel.find(@taggable)
       @taggable.save!
-      @taggable.cached_tag_list.should == 'awesome, epic'   
+      @taggable.cached_tag_list.should == 'awesome, epic'
     end
-    
+
     it 'should update the cache' do
       @taggable.update_attributes(:tag_list => 'awesome, epic')
       @taggable.update_attributes(:tag_list => 'awesome')
-      @taggable.cached_tag_list.should == 'awesome'      
+      @taggable.cached_tag_list.should == 'awesome'
     end
-    
+
     it 'should remove the cache' do
       @taggable.update_attributes(:tag_list => 'awesome, epic')
       @taggable.update_attributes(:tag_list => '')
-      @taggable.cached_tag_list.should be_blank  
+      @taggable.cached_tag_list.should be_blank
     end
-    
+
     it 'should have a tag list' do
       @taggable.update_attributes(:tag_list => 'awesome, epic')
       @taggable = CachedModel.find(@taggable.id)
       @taggable.tag_list.sort.should == %w(awesome epic).sort
     end
-    
+
     it 'should keep the tag list' do
       @taggable.update_attributes(:tag_list => 'awesome, epic')
       @taggable = CachedModel.find(@taggable.id)
@@ -277,11 +392,63 @@ describe "Acts As Taggable On" do
     end
   end
 
-  describe "taggings" do 
+  context 'when tagging context ends in an "s" when singular (ex. "status", "glass", etc.)' do
+   describe 'caching' do
+     before  { @taggable = OtherCachedModel.new(:name => "John Smith") }
+     subject { @taggable }
+
+     it { should respond_to(:save_cached_tag_list) }
+     its(:cached_language_list) { should be_blank }
+     its(:cached_status_list)   { should be_blank }
+     its(:cached_glass_list)    { should be_blank }
+
+     context 'language taggings cache after update' do
+       before  { @taggable.update_attributes(:language_list => 'ruby, .net') }
+       subject { @taggable }
+
+       its(:language_list)        { should == ['ruby', '.net']}
+       its(:cached_language_list) { should == 'ruby, .net' }           # passes
+       its(:instance_variables)   { should     include((RUBY_VERSION < '1.9' ? '@language_list' : :@language_list)) }
+     end
+
+     context 'status taggings cache after update' do
+       before  { @taggable.update_attributes(:status_list => 'happy, married') }
+       subject { @taggable }
+
+       its(:status_list)        { should     == ['happy', 'married'] }
+       its(:cached_status_list) { should     == 'happy, married'     } # fails
+       its(:cached_status_list) { should_not == ''                   } # fails, is blank
+       its(:instance_variables) { should     include((RUBY_VERSION < '1.9' ? '@status_list' : :@status_list)) }
+       its(:instance_variables) { should_not include((RUBY_VERSION < '1.9' ? '@statu_list' : :@statu_list))  } # fails, note: one "s"
+
+     end
+
+     context 'glass taggings cache after update' do
+       before do
+         @taggable.update_attributes(:glass_list => 'rectangle, aviator')
+       end
+
+       subject { @taggable }
+       its(:glass_list)         { should     == ['rectangle', 'aviator'] }
+       its(:cached_glass_list)  { should     == 'rectangle, aviator'     } # fails
+       its(:cached_glass_list)  { should_not == ''                       } # fails, is blank
+       if RUBY_VERSION < '1.9'
+         its(:instance_variables) { should     include('@glass_list')      }
+         its(:instance_variables) { should_not include('@glas_list')       } # fails, note: one "s"
+       else
+         its(:instance_variables) { should     include(:@glass_list)      }
+         its(:instance_variables) { should_not include(:@glas_list)       } # fails, note: one "s"
+       end
+
+     end
+   end
+  end
+
+  describe "taggings" do
     before(:each) do
       @taggable = TaggableModel.new(:name => "Art Kram")
     end
-    
+
     it 'should return [] taggings' do
       @taggable.taggings.should == []
     end