acts-as-taggable-on 2.3.1 → 2.3.2

data/.gitignore

@@ -8,3 +8,4 @@ spec/database.yml
 tmp*.sw?
 *.sw?
 tmp
+*.gem

data/README.rdoc

@@ -24,7 +24,7 @@ Not supported any more! It is time for update guys.
 
 To use it, add it to your Gemfile:
 
-  gem 'acts-as-taggable-on', '~> 2.2.2'
+  gem 'acts-as-taggable-on', '~> 2.3.1'
 
 ==== Post Installation
 

data/lib/acts-as-taggable-on.rb

@@ -20,7 +20,8 @@ module ActsAsTaggableOn
   self.remove_unused_tags = false
 
   def self.glue
-    @@delimiter.ends_with?(" ") ? @@delimiter : "#{@@delimiter} "
+    delimiter = @@delimiter.kind_of?(Array) ? @@delimiter[0] : @@delimiter
+    delimiter.ends_with?(" ") ? delimiter : "#{delimiter} "
   end
 
   def self.setup

data/lib/acts-as-taggable-on/version.rb

@@ -1,4 +1,4 @@
 module ActsAsTaggableOn
-  VERSION = '2.3.1'
+  VERSION = '2.3.2'
 end
 

data/lib/acts_as_taggable_on/acts_as_taggable_on/core.rb

@@ -90,6 +90,7 @@ module ActsAsTaggableOn::Taggable
         context = options.delete(:on)
         owned_by = options.delete(:owned_by)
         alias_base_name = undecorated_table_name.gsub('.','_')
+        quote = ActsAsTaggableOn::Tag.using_postgresql? ? '"' : ''
 
         if options.delete(:exclude)
           if options.delete(:wild)
@@ -119,7 +120,7 @@ module ActsAsTaggableOn::Taggable
           )
 
           tagging_join  = "JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" +
-                          "  ON #{taggings_alias}.taggable_id = #{table_name}.#{primary_key}" +
+                          "  ON #{taggings_alias}.taggable_id = #{quote}#{table_name}#{quote}.#{primary_key}" +
                           " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name)}"
           tagging_join << " AND " + sanitize_sql(["#{taggings_alias}.context = ?", context.to_s]) if context
 
@@ -138,7 +139,7 @@ module ActsAsTaggableOn::Taggable
             taggings_alias = adjust_taggings_alias("#{alias_base_name[0..11]}_taggings_#{sha_prefix(tag.name)}")
 
             tagging_join  = "JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" +
-                            "  ON #{taggings_alias}.taggable_id = #{table_name}.#{primary_key}" +
+                            "  ON #{taggings_alias}.taggable_id = #{quote}#{table_name}#{quote}.#{primary_key}" +
                             " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name)}" +
                             " AND #{taggings_alias}.tag_id = #{tag.id}"
             tagging_join << " AND " + sanitize_sql(["#{taggings_alias}.context = ?", context.to_s]) if context
@@ -148,7 +149,7 @@ module ActsAsTaggableOn::Taggable
                     sanitize_sql([
                         "#{taggings_alias}.tagger_id = ? AND #{taggings_alias}.tagger_type = ?",
                         owned_by.id,
-                        owned_by.class.to_s
+                        owned_by.class.base_class.to_s
                     ])
             end
 
@@ -160,17 +161,19 @@ module ActsAsTaggableOn::Taggable
 
         if options.delete(:match_all)
           joins << "LEFT OUTER JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" +
-                   "  ON #{taggings_alias}.taggable_id = #{table_name}.#{primary_key}" +
+                   "  ON #{taggings_alias}.taggable_id = #{quote}#{table_name}#{quote}.#{primary_key}" +
                    " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name)}"
 
 
           group_columns = ActsAsTaggableOn::Tag.using_postgresql? ? grouped_column_names_for(self) : "#{table_name}.#{primary_key}"
-          group = "#{group_columns} HAVING COUNT(#{taggings_alias}.taggable_id) = #{tags.size}"
+          group = group_columns
+          having = "COUNT(#{taggings_alias}.taggable_id) = #{tags.size}"
         end
 
         scoped(:select     => select_clause,
                :joins      => joins.join(" "),
                :group      => group,
+               :having     => having,
                :conditions => conditions.join(" AND "),
                :order      => options[:order],
                :readonly   => false)

data/lib/acts_as_taggable_on/acts_as_taggable_on/ownership.rb

@@ -35,7 +35,7 @@ module ActsAsTaggableOn::Taggable
         else
           scope = base_tags.where([%(#{ActsAsTaggableOn::Tagging.table_name}.context = ? AND
                                      #{ActsAsTaggableOn::Tagging.table_name}.tagger_id = ? AND
-                                     #{ActsAsTaggableOn::Tagging.table_name}.tagger_type = ?), context.to_s, owner.id, owner.class.to_s])          
+                                     #{ActsAsTaggableOn::Tagging.table_name}.tagger_type = ?), context.to_s, owner.id, owner.class.base_class.to_s])          
         end
         # when preserving tag order, return tags in created order
         # if we added the order to the association this would always apply
@@ -103,7 +103,7 @@ module ActsAsTaggableOn::Taggable
             # have the correct context, and are removed from the list.
             if old_tags.present?
               old_taggings = ActsAsTaggableOn::Tagging.where(:taggable_id => id, :taggable_type => self.class.base_class.to_s,
-                                                             :tagger_type => owner.class.to_s, :tagger_id => owner.id,
+                                                             :tagger_type => owner.class.base_class.to_s, :tagger_id => owner.id,
                                                              :tag_id => old_tags, :context => context).all
             end
           
@@ -123,4 +123,4 @@ module ActsAsTaggableOn::Taggable
       end
     end
   end
-end
+end

data/lib/acts_as_taggable_on/tag.rb

@@ -21,7 +21,7 @@ module ActsAsTaggableOn
     end
 
     def self.named_any(list)
-      where(list.map { |tag| sanitize_sql(["lower(name) = ?", tag.to_s.downcase]) }.join(" OR "))
+      where(list.map { |tag| sanitize_sql(["lower(name) = ?", tag.to_s.mb_chars.downcase]) }.join(" OR "))
     end
 
     def self.named_like(name)

data/lib/acts_as_taggable_on/tag_list.rb

@@ -21,10 +21,12 @@ module ActsAsTaggableOn
         string = string.to_s.dup
 
         # Parse the quoted tags
-        string.gsub!(/(\A|#{ActsAsTaggableOn.delimiter})\s*"(.*?)"\s*(#{ActsAsTaggableOn.delimiter}\s*|\z)/) { tag_list << $2; $3 }
-        string.gsub!(/(\A|#{ActsAsTaggableOn.delimiter})\s*'(.*?)'\s*(#{ActsAsTaggableOn.delimiter}\s*|\z)/) { tag_list << $2; $3 }
+        d = ActsAsTaggableOn.delimiter
+        d = d.join("|") if d.kind_of?(Array) 
+        string.gsub!(/(\A|#{d})\s*"(.*?)"\s*(#{d}\s*|\z)/) { tag_list << $2; $3 }
+        string.gsub!(/(\A|#{d})\s*'(.*?)'\s*(#{d}\s*|\z)/) { tag_list << $2; $3 }
 
-        tag_list.add(string.split(ActsAsTaggableOn.delimiter))
+        tag_list.add(string.split(Regexp.new d))
       end
     end
 
@@ -67,7 +69,9 @@ module ActsAsTaggableOn
       tags.send(:clean!)
 
       tags.map do |name|
-        name.include?(ActsAsTaggableOn.delimiter) ? "\"#{name}\"" : name
+        d = ActsAsTaggableOn.delimiter
+        d = Regexp.new d.join("|") if d.kind_of? Array
+        name.index(d) ? "\"#{name}\"" : name
       end.join(ActsAsTaggableOn.glue)
     end
 
@@ -94,4 +98,4 @@ module ActsAsTaggableOn
       args.flatten!
     end
   end
-end
+end

data/lib/generators/acts_as_taggable_on/migration/templates/active_record/migration.rb

@@ -12,8 +12,8 @@ class ActsAsTaggableOnMigration < ActiveRecord::Migration
       t.references :taggable, :polymorphic => true
       t.references :tagger, :polymorphic => true
 
-      # limit is created to prevent mysql error o index lenght for myisam table type.
-      # http://bit.ly/vgW2Ql
+      # Limit is created to prevent MySQL error on index
+      # length for MyISAM table type: http://bit.ly/vgW2Ql
       t.string :context, :limit => 128
 
       t.datetime :created_at

data/spec/acts_as_taggable_on/tag_list_spec.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require File.expand_path('../../spec_helper', __FILE__)
 
 describe ActsAsTaggableOn::TagList do
@@ -90,4 +91,36 @@ describe ActsAsTaggableOn::TagList do
     end
 
   end
-end
+
+  describe "Multiple Delimiter" do
+    before do 
+      @old_delimiter = ActsAsTaggableOn.delimiter
+    end
+
+    after do 
+      ActsAsTaggableOn.delimiter = @old_delimiter
+    end
+
+    it "should separate tags by delimiters" do
+      ActsAsTaggableOn.delimiter = [',', ' ', '\|']
+      tag_list = ActsAsTaggableOn::TagList.from "cool, data|I have"
+      tag_list.to_s.should == 'cool, data, I, have'
+    end
+
+    it "should escape quote" do 
+      ActsAsTaggableOn.delimiter = [',', ' ', '\|']
+      tag_list = ActsAsTaggableOn::TagList.from "'I have'|cool, data"
+      tag_list.to_s.should == '"I have", cool, data'
+
+      tag_list = ActsAsTaggableOn::TagList.from '"I, have"|cool, data'
+      tag_list.to_s.should == '"I, have", cool, data'
+    end
+
+    it "should work for utf8 delimiter and long delimiter" do 
+      ActsAsTaggableOn.delimiter = ['，', '的', '可能是']
+      tag_list = ActsAsTaggableOn::TagList.from "我的东西可能是不见了，还好有备份"
+      tag_list.to_s.should == "我， 东西， 不见了， 还好有备份"
+    end
+  end
+
+end

data/spec/acts_as_taggable_on/tagger_spec.rb

@@ -107,6 +107,32 @@ describe "Tagger" do
     lambda {
       @user.tag(@taggable, :with => 'epic', :on => :tags, :skip_save => true)
     }.should_not change(ActsAsTaggableOn::Tagging, :count)
+  end
 
+  describe "Single Table Inheritance" do
+    before do
+      @user3 = InheritingTaggableUser.create
+    end
+
+    it "should have taggings" do
+      @user3.tag(@taggable, :with=>'ruby,scheme', :on=>:tags)
+      @user3.owned_taggings.size == 2
+    end
+
+    it "should have tags" do
+      @user3.tag(@taggable, :with=>'ruby,scheme', :on=>:tags)
+      @user3.owned_tags.size == 2
+    end
+
+    it "should return tags for the inheriting tagger" do
+      @user3.tag(@taggable, :with => 'ruby, scheme', :on => :tags)
+      @taggable.tags_from(@user3).sort.should == %w(ruby scheme).sort
+    end
+
+    it "should scope objects returned by tagged_with by owners" do
+      @user3.tag(@taggable, :with => 'ruby, scheme', :on => :tags)
+      TaggableModel.tagged_with(%w(ruby scheme), :owned_by => @user3).count.should == 1
+    end
   end
+
 end

data/spec/models.rb

@@ -30,12 +30,15 @@ class TaggableUser < ActiveRecord::Base
   acts_as_tagger
 end
 
+class InheritingTaggableUser < TaggableUser
+end
+
 class UntaggableModel < ActiveRecord::Base
   belongs_to :taggable_model
 end
 
 class NonStandardIdTaggableModel < ActiveRecord::Base
-  set_primary_key "an_id"
+  primary_key = "an_id"
   acts_as_taggable
   acts_as_taggable_on :languages
   acts_as_taggable_on :skills

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70289733250580 !ruby/object:Gem::Requirement
+  requirement: &70159399452180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70289733250580
+  version_requirements: *70159399452180
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70289733250080 !ruby/object:Gem::Requirement
+  requirement: &70159399451660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70289733250080
+  version_requirements: *70159399451660
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70289733265980 !ruby/object:Gem::Requirement
+  requirement: &70159399451200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.3
   type: :development
   prerelease: false
-  version_requirements: *70289733265980
+  version_requirements: *70159399451200
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70289733265560 !ruby/object:Gem::Requirement
+  requirement: &70159399450820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289733265560
+  version_requirements: *70159399450820
 - !ruby/object:Gem::Dependency
   name: mysql2
-  requirement: &70289733264720 !ruby/object:Gem::Requirement
+  requirement: &70159399466580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 0.3.7
   type: :development
   prerelease: false
-  version_requirements: *70289733264720
+  version_requirements: *70159399466580
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &70289733264020 !ruby/object:Gem::Requirement
+  requirement: &70159399465880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289733264020
+  version_requirements: *70159399465880
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70289733263160 !ruby/object:Gem::Requirement
+  requirement: &70159399465200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289733263160
+  version_requirements: *70159399465200
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70289733262700 !ruby/object:Gem::Requirement
+  requirement: &70159399464400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70289733262700
+  version_requirements: *70159399464400
 description: With ActsAsTaggableOn, you can tag a single model on several contexts,
   such as skills, interests, and awards. It also provides other advanced functionality.
 email: michael@intridea.com
@@ -164,7 +164,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1337901759790366478
+      hash: -4435573899217005925
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1337901759790366478
+      hash: -4435573899217005925
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10