acts-as-taggable-on 2.0.3 → 2.1.0

data/lib/acts_as_taggable_on/acts_as_taggable_on/ownership.rb

@@ -30,9 +30,13 @@ module ActsAsTaggableOn::Taggable
     
     module InstanceMethods
       def owner_tags_on(owner, context)
-        base_tags.where([%(#{Tagging.table_name}.context = ? AND
-                           #{Tagging.table_name}.tagger_id = ? AND
-                           #{Tagging.table_name}.tagger_type = ?), context.to_s, owner.id, owner.class.to_s]).all
+        if owner.nil?
+          base_tags.where([%(#{ActsAsTaggableOn::Tagging.table_name}.context = ?), context.to_s]).all                    
+        else
+          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]).all          
+        end
       end
 
       def cached_owned_tag_list_on(context)
@@ -46,7 +50,7 @@ module ActsAsTaggableOn::Taggable
         cache = cached_owned_tag_list_on(context)
         cache.delete_if { |key, value| key.id == owner.id && key.class == owner.class }
         
-        cache[owner] ||= TagList.new(*owner_tags_on(owner, context).map(&:name))
+        cache[owner] ||= ActsAsTaggableOn::TagList.new(*owner_tags_on(owner, context).map(&:name))
       end
       
       def set_owner_tag_list_on(owner, context, new_list)
@@ -55,22 +59,22 @@ module ActsAsTaggableOn::Taggable
         cache = cached_owned_tag_list_on(context)
         cache.delete_if { |key, value| key.id == owner.id && key.class == owner.class }
 
-        cache[owner] = TagList.from(new_list)
+        cache[owner] = ActsAsTaggableOn::TagList.from(new_list)
       end
       
-      def reload
+      def reload(*args)
         self.class.tag_types.each do |context|
           instance_variable_set("@owned_#{context}_list", nil)
         end
       
-        super
+        super(*args)
       end
     
       def save_owned_tags
         tagging_contexts.each do |context|
           cached_owned_tag_list_on(context).each do |owner, tag_list|
             # Find existing tags or create non-existing tags:
-            tag_list = Tag.find_or_create_all_with_like_by_name(tag_list.uniq)            
+            tag_list = ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name(tag_list.uniq)            
 
             owned_tags = owner_tags_on(owner, context)              
             old_tags   = owned_tags - tag_list
@@ -78,13 +82,13 @@ module ActsAsTaggableOn::Taggable
           
             # Find all taggings that belong to the taggable (self), are owned by the owner, 
             # have the correct context, and are removed from the list.
-            old_taggings = Tagging.where(:taggable_id => id, :taggable_type => self.class.base_class.to_s,
-                                         :tagger_type => owner.class.to_s, :tagger_id => owner.id,
-                                         :tag_id => old_tags, :context => context).all
+            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,
+                                                           :tag_id => old_tags, :context => context).all
           
             if old_taggings.present?
               # Destroy old taggings:
-              Tagging.destroy_all(:id => old_taggings.map(&:id))
+              ActsAsTaggableOn::Tagging.destroy_all(:id => old_taggings.map(&:id))
             end
 
             # Create new taggings:

data/lib/acts_as_taggable_on/acts_as_taggable_on/related.rb

@@ -18,7 +18,11 @@ module ActsAsTaggableOn::Taggable
             def find_related_#{tag_type}_for(klass, options = {})
               related_tags_for('#{tag_type}', klass, options)
             end
-
+          )
+        end
+        
+        unless tag_types.empty?
+          class_eval %(
             def find_matching_contexts(search_context, result_context, options = {})
               matching_contexts_for(search_context.to_s, result_context.to_s, self.class, options)
             end
@@ -42,10 +46,12 @@ module ActsAsTaggableOn::Taggable
 
         exclude_self = "#{klass.table_name}.id != #{id} AND" if self.class == klass
         
-        klass.scoped({ :select     => "#{klass.table_name}.*, COUNT(#{Tag.table_name}.id) AS count",
-                       :from       => "#{klass.table_name}, #{Tag.table_name}, #{Tagging.table_name}",
-                       :conditions => ["#{exclude_self} #{klass.table_name}.id = #{Tagging.table_name}.taggable_id AND #{Tagging.table_name}.taggable_type = '#{klass.to_s}' AND #{Tagging.table_name}.tag_id = #{Tag.table_name}.id AND #{Tag.table_name}.name IN (?) AND #{Tagging.table_name}.context = ?", tags_to_find, result_context],
-                       :group      => grouped_column_names_for(klass),
+        group_columns = ActsAsTaggableOn::Tag.using_postgresql? ? grouped_column_names_for(klass) : "#{klass.table_name}.#{klass.primary_key}"
+        
+        klass.scoped({ :select     => "#{klass.table_name}.*, COUNT(#{ActsAsTaggableOn::Tag.table_name}.id) AS count",
+                       :from       => "#{klass.table_name}, #{ActsAsTaggableOn::Tag.table_name}, #{ActsAsTaggableOn::Tagging.table_name}",
+                       :conditions => ["#{exclude_self} #{klass.table_name}.id = #{ActsAsTaggableOn::Tagging.table_name}.taggable_id AND #{ActsAsTaggableOn::Tagging.table_name}.taggable_type = '#{klass.to_s}' AND #{ActsAsTaggableOn::Tagging.table_name}.tag_id = #{ActsAsTaggableOn::Tag.table_name}.id AND #{ActsAsTaggableOn::Tag.table_name}.name IN (?) AND #{ActsAsTaggableOn::Tagging.table_name}.context = ?", tags_to_find, result_context],
+                       :group      => group_columns,
                        :order      => "count DESC" }.update(options))
       end
       
@@ -54,10 +60,12 @@ module ActsAsTaggableOn::Taggable
 
         exclude_self = "#{klass.table_name}.id != #{id} AND" if self.class == klass
 
-        klass.scoped({ :select     => "#{klass.table_name}.*, COUNT(#{Tag.table_name}.id) AS count",
-                       :from       => "#{klass.table_name}, #{Tag.table_name}, #{Tagging.table_name}",
-                       :conditions => ["#{exclude_self} #{klass.table_name}.id = #{Tagging.table_name}.taggable_id AND #{Tagging.table_name}.taggable_type = '#{klass.to_s}' AND #{Tagging.table_name}.tag_id = #{Tag.table_name}.id AND #{Tag.table_name}.name IN (?)", tags_to_find],
-                       :group      => grouped_column_names_for(klass),
+group_columns = ActsAsTaggableOn::Tag.using_postgresql? ? grouped_column_names_for(klass) : "#{klass.table_name}.#{klass.primary_key}"
+
+        klass.scoped({ :select     => "#{klass.table_name}.*, COUNT(#{ActsAsTaggableOn::Tag.table_name}.id) AS count",
+                       :from       => "#{klass.table_name}, #{ActsAsTaggableOn::Tag.table_name}, #{ActsAsTaggableOn::Tagging.table_name}",
+                       :conditions => ["#{exclude_self} #{klass.table_name}.id = #{ActsAsTaggableOn::Tagging.table_name}.taggable_id AND #{ActsAsTaggableOn::Tagging.table_name}.taggable_type = '#{klass.to_s}' AND #{ActsAsTaggableOn::Tagging.table_name}.tag_id = #{ActsAsTaggableOn::Tag.table_name}.id AND #{ActsAsTaggableOn::Tag.table_name}.name IN (?)", tags_to_find],
+                       :group      => group_columns,
                        :order      => "count DESC" }.update(options))
       end
     end

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -28,19 +28,29 @@ module ActsAsTaggableOn
       tag_types = tag_types.to_a.flatten.compact.map(&:to_sym)
 
       if taggable?
-        write_inheritable_attribute(:tag_types, (self.tag_types + tag_types).uniq)
+        if RAILS_3
+          self.tag_types = (self.tag_types + tag_types).uniq        
+        else
+          write_inheritable_attribute(:tag_types, (self.tag_types + tag_types).uniq)                  
+        end
       else
-        write_inheritable_attribute(:tag_types, tag_types)
-        class_inheritable_reader(:tag_types)
+        if RAILS_3
+          class_attribute :tag_types
+          self.tag_types = tag_types
+        else
+          write_inheritable_attribute(:tag_types, tag_types)
+          class_inheritable_reader(:tag_types)
+        end
         
         class_eval do
-          has_many :taggings, :as => :taggable, :dependent => :destroy, :include => :tag
-          has_many :base_tags, :class_name => "Tag", :through => :taggings, :source => :tag
+          has_many :taggings, :as => :taggable, :dependent => :destroy, :include => :tag, :class_name => "ActsAsTaggableOn::Tagging"
+          has_many :base_tags, :through => :taggings, :source => :tag, :class_name => "ActsAsTaggableOn::Tag"
 
           def self.taggable?
             true
           end
-        
+          
+          include ActsAsTaggableOn::Utils        
           include ActsAsTaggableOn::Taggable::Core
           include ActsAsTaggableOn::Taggable::Collection
           include ActsAsTaggableOn::Taggable::Cache

data/lib/acts_as_taggable_on/acts_as_tagger.rb

@@ -16,8 +16,8 @@ module ActsAsTaggableOn
       def acts_as_tagger(opts={})
         class_eval do
           has_many :owned_taggings, opts.merge(:as => :tagger, :dependent => :destroy,
-                                               :include => :tag, :class_name => "Tagging")
-          has_many :owned_tags, :through => :owned_taggings, :source => :tag, :uniq => true
+                                               :include => :tag, :class_name => "ActsAsTaggableOn::Tagging")
+          has_many :owned_tags, :through => :owned_taggings, :source => :tag, :uniq => true, :class_name => "ActsAsTaggableOn::Tag"
         end
 
         include ActsAsTaggableOn::Tagger::InstanceMethods

data/lib/acts_as_taggable_on/compatibility/Gemfile

@@ -3,4 +3,6 @@ source :gemcutter
 # Rails 2.3
 gem 'rails',        '2.3.5'
 gem 'rspec',        '1.3.0', :require => 'spec'
-gem 'sqlite3-ruby', '1.2.5', :require => 'sqlite3'
+gem 'sqlite3-ruby', '1.2.5', :require => 'sqlite3'
+gem 'mysql2',       '~> 0.2.7'
+gem 'pg'

data/lib/acts_as_taggable_on/compatibility/active_record_backports.rb

@@ -9,7 +9,11 @@ module ActsAsTaggableOn
           named_scope :order,    lambda { |order|      { :order => order } }
           named_scope :select,   lambda { |select|     { :select => select } }
           named_scope :limit,    lambda { |limit|      { :limit => limit } }
-          named_scope :readonly, lambda { |readonly|   { :readonly => readonly } }   
+          named_scope :readonly, lambda { |readonly|   { :readonly => readonly } }
+          
+          def self.to_sql
+            construct_finder_sql({})
+          end
         end
       end
     end

data/lib/acts_as_taggable_on/tag.rb

@@ -1,65 +1,81 @@
-class Tag < ActiveRecord::Base
-  include ActsAsTaggableOn::ActiveRecord::Backports if ActiveRecord::VERSION::MAJOR < 3
-  
-  attr_accessible :name
-
-  ### ASSOCIATIONS:
+module ActsAsTaggableOn
+  class Tag < ::ActiveRecord::Base
+    include ActsAsTaggableOn::ActiveRecord::Backports if ::ActiveRecord::VERSION::MAJOR < 3
+    include ActsAsTaggableOn::Utils
+      
+    attr_accessible :name
 
-  has_many :taggings, :dependent => :destroy
+    ### ASSOCIATIONS:
 
-  ### VALIDATIONS:
+    has_many :taggings, :dependent => :destroy, :class_name => 'ActsAsTaggableOn::Tagging'
 
-  validates_presence_of :name
-  validates_uniqueness_of :name
+    ### VALIDATIONS:
 
-  ### SCOPES:
+    validates_presence_of :name
+    validates_uniqueness_of :name
 
-  def self.named(name)
-    where(["name LIKE ?", name])
-  end
+    ### SCOPES:
+    
+    def self.named(name)
+      where(["name #{like_operator} ?", escape_like(name)])
+    end
   
-  def self.named_any(list)
-    where(list.map { |tag| sanitize_sql(["name LIKE ?", tag.to_s]) }.join(" OR "))
-  end
+    def self.named_any(list)
+      where(list.map { |tag| sanitize_sql(["name #{like_operator} ?", escape_like(tag.to_s)]) }.join(" OR "))
+    end
   
-  def self.named_like(name)
-    where(["name LIKE ?", "%#{name}%"])
-  end
-
-  def self.named_like_any(list)
-    where(list.map { |tag| sanitize_sql(["name LIKE ?", "%#{tag.to_s}%"]) }.join(" OR "))
-  end
-
-  ### CLASS METHODS:
-
-  def self.find_or_create_with_like_by_name(name)
-    named_like(name).first || create(:name => name)
-  end
-
-  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.mb_chars.downcase == name.mb_chars.downcase } }
-    created_tags  = new_tag_names.map { |name| Tag.create(:name => name) }
-
-    existing_tags + created_tags
-  end
-
-  ### INSTANCE METHODS:
-
-  def ==(object)
-    super || (object.is_a?(Tag) && name == object.name)
+    def self.named_like(name)
+      where(["name #{like_operator} ?", "%#{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 "))
+    end
+
+    ### CLASS METHODS:
+
+    def self.find_or_create_with_like_by_name(name)
+      named_like(name).first || create(:name => name)
+    end
+
+    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 do |name| 
+                        name = comparable_name(name)
+                        existing_tags.any? { |tag| comparable_name(tag.name) == name }
+                      end
+      created_tags  = new_tag_names.map { |name| Tag.create(:name => name) }
+
+      existing_tags + created_tags
+    end
+
+    ### INSTANCE METHODS:
+
+    def ==(object)
+      super || (object.is_a?(Tag) && name == object.name)
+    end
+
+    def to_s
+      name
+    end
+
+    def count
+      read_attribute(:count).to_i
+    end
+    
+    def safe_name
+      name.gsub(/[^a-zA-Z0-9]/, '')
+    end
+    
+    class << self
+      private        
+        def comparable_name(str)
+          RUBY_VERSION >= "1.9" ? str.downcase : str.mb_chars.downcase
+        end
+    end
   end
-
-  def to_s
-    name
-  end
-
-  def count
-    read_attribute(:count).to_i
-  end
-
-end
+end

data/lib/acts_as_taggable_on/tag_list.rb

@@ -1,95 +1,96 @@
-class TagList < Array
+module ActsAsTaggableOn
+  class TagList < Array
+    cattr_accessor :delimiter
+    self.delimiter = ','
 
-  cattr_accessor :delimiter
-  self.delimiter = ','
+    attr_accessor :owner
 
-  attr_accessor :owner
-
-  def initialize(*args)
-    add(*args)
-  end
+    def initialize(*args)
+      add(*args)
+    end
   
-  ##
-  # Returns a new TagList using the given tag string.
-  #
-  # Example:
-  #   tag_list = TagList.from("One , Two,  Three")
-  #   tag_list # ["One", "Two", "Three"]
-  def self.from(string)
-    string = string.join(", ") if string.respond_to?(:join)
+    ##
+    # Returns a new TagList using the given tag string.
+    #
+    # Example:
+    #   tag_list = TagList.from("One , Two,  Three")
+    #   tag_list # ["One", "Two", "Three"]
+    def self.from(string)
+      glue   = delimiter.ends_with?(" ") ? delimiter : "#{delimiter} "
+      string = string.join(glue) if string.respond_to?(:join)
 
-    new.tap do |tag_list|
-      string = string.to_s.dup
+      new.tap do |tag_list|
+        string = string.to_s.dup
 
-      # Parse the quoted tags
-      string.gsub!(/(\A|#{delimiter})\s*"(.*?)"\s*(#{delimiter}\s*|\z)/) { tag_list << $2; $3 }
-      string.gsub!(/(\A|#{delimiter})\s*'(.*?)'\s*(#{delimiter}\s*|\z)/) { tag_list << $2; $3 }
+        # Parse the quoted tags
+        string.gsub!(/(\A|#{delimiter})\s*"(.*?)"\s*(#{delimiter}\s*|\z)/) { tag_list << $2; $3 }
+        string.gsub!(/(\A|#{delimiter})\s*'(.*?)'\s*(#{delimiter}\s*|\z)/) { tag_list << $2; $3 }
 
-      tag_list.add(string.split(delimiter))
+        tag_list.add(string.split(delimiter))
+      end
     end
-  end
 
-  ##
-  # Add tags to the tag_list. Duplicate or blank tags will be ignored.
-  # Use the <tt>:parse</tt> option to add an unparsed tag string.
-  #
-  # Example:
-  #   tag_list.add("Fun", "Happy")
-  #   tag_list.add("Fun, Happy", :parse => true)
-  def add(*names)
-    extract_and_apply_options!(names)
-    concat(names)
-    clean!
-    self
-  end
+    ##
+    # Add tags to the tag_list. Duplicate or blank tags will be ignored.
+    # Use the <tt>:parse</tt> option to add an unparsed tag string.
+    #
+    # Example:
+    #   tag_list.add("Fun", "Happy")
+    #   tag_list.add("Fun, Happy", :parse => true)
+    def add(*names)
+      extract_and_apply_options!(names)
+      concat(names)
+      clean!
+      self
+    end
 
-  ##
-  # Remove specific tags from the tag_list.
-  # Use the <tt>:parse</tt> option to add an unparsed tag string.
-  #
-  # Example:
-  #   tag_list.remove("Sad", "Lonely")
-  #   tag_list.remove("Sad, Lonely", :parse => true)
-  def remove(*names)
-    extract_and_apply_options!(names)
-    delete_if { |name| names.include?(name) }
-    self
-  end
+    ##
+    # Remove specific tags from the tag_list.
+    # Use the <tt>:parse</tt> option to add an unparsed tag string.
+    #
+    # Example:
+    #   tag_list.remove("Sad", "Lonely")
+    #   tag_list.remove("Sad, Lonely", :parse => true)
+    def remove(*names)
+      extract_and_apply_options!(names)
+      delete_if { |name| names.include?(name) }
+      self
+    end
 
-  ##
-  # Transform the tag_list into a tag string suitable for edting in a form.
-  # The tags are joined with <tt>TagList.delimiter</tt> and quoted if necessary.
-  #
-  # Example:
-  #   tag_list = TagList.new("Round", "Square,Cube")
-  #   tag_list.to_s # 'Round, "Square,Cube"'
-  def to_s
-    tags = frozen? ? self.dup : self
-    tags.send(:clean!)
+    ##
+    # Transform the tag_list into a tag string suitable for edting in a form.
+    # The tags are joined with <tt>TagList.delimiter</tt> and quoted if necessary.
+    #
+    # Example:
+    #   tag_list = TagList.new("Round", "Square,Cube")
+    #   tag_list.to_s # 'Round, "Square,Cube"'
+    def to_s
+      tags = frozen? ? self.dup : self
+      tags.send(:clean!)
 
-    tags.map do |name|
-      name.include?(delimiter) ? "\"#{name}\"" : name
-    end.join(delimiter.ends_with?(" ") ? delimiter : "#{delimiter} ")
-  end
+      tags.map do |name|
+        name.include?(delimiter) ? "\"#{name}\"" : name
+      end.join(delimiter.ends_with?(" ") ? delimiter : "#{delimiter} ")
+    end
 
-  private
+    private
   
-  # Remove whitespace, duplicates, and blanks.
-  def clean!
-    reject!(&:blank?)
-    map!(&:strip)
-    uniq!
-  end
+    # Remove whitespace, duplicates, and blanks.
+    def clean!
+      reject!(&:blank?)
+      map!(&:strip)
+      uniq!
+    end
 
-  def extract_and_apply_options!(args)
-    options = args.last.is_a?(Hash) ? args.pop : {}
-    options.assert_valid_keys :parse
+    def extract_and_apply_options!(args)
+      options = args.last.is_a?(Hash) ? args.pop : {}
+      options.assert_valid_keys :parse
 
-    if options[:parse]
-      args.map! { |a| self.class.from(a) }
-    end
+      if options[:parse]
+        args.map! { |a| self.class.from(a) }
+      end
 
-    args.flatten!
+      args.flatten!
+    end
   end
-
-end
+end

data/lib/acts_as_taggable_on/tagging.rb

@@ -1,23 +1,24 @@
-class Tagging < ActiveRecord::Base #:nodoc:
-  include ActsAsTaggableOn::ActiveRecord::Backports if ActiveRecord::VERSION::MAJOR < 3
+module ActsAsTaggableOn
+  class Tagging < ::ActiveRecord::Base #:nodoc:
+    include ActsAsTaggableOn::ActiveRecord::Backports if ::ActiveRecord::VERSION::MAJOR < 3
 
-  attr_accessible :tag,
-                  :tag_id,
-                  :context,
-                  :taggable,
-                  :taggable_type,
-                  :taggable_id,
-                  :tagger,
-                  :tagger_type,
-                  :tagger_id
+    attr_accessible :tag,
+                    :tag_id,
+                    :context,
+                    :taggable,
+                    :taggable_type,
+                    :taggable_id,
+                    :tagger,
+                    :tagger_type,
+                    :tagger_id
 
-  belongs_to :tag
-  belongs_to :taggable, :polymorphic => true
-  belongs_to :tagger,   :polymorphic => true
+    belongs_to :tag, :class_name => 'ActsAsTaggableOn::Tag'
+    belongs_to :taggable, :polymorphic => true
+    belongs_to :tagger,   :polymorphic => true
 
-  validates_presence_of :context
-  validates_presence_of :tag_id
-
-  validates_uniqueness_of :tag_id, :scope => [ :taggable_type, :taggable_id, :context, :tagger_id, :tagger_type ]
+    validates_presence_of :context
+    validates_presence_of :tag_id
 
+    validates_uniqueness_of :tag_id, :scope => [ :taggable_type, :taggable_id, :context, :tagger_id, :tagger_type ]
+  end
 end

data/lib/acts_as_taggable_on/tags_helper.rb

@@ -1,17 +1,17 @@
-module TagsHelper
+module ActsAsTaggableOn
+  module TagsHelper
+    # See the README for an example using tag_cloud.
+    def tag_cloud(tags, classes)
+      tags = tags.all if tags.respond_to?(:all)
 
-  # See the README for an example using tag_cloud.
-  def tag_cloud(tags, classes)
-    tags = tags.all if tags.respond_to?(:all)
+      return [] if tags.empty?
 
-    return [] if tags.empty?
+      max_count = tags.sort_by(&:count).last.count.to_f
 
-    max_count = tags.sort_by(&:count).last.count.to_f
-
-    tags.each do |tag|
-      index = ((tag.count / max_count) * (classes.size - 1)).round
-      yield tag, classes[index]
+      tags.each do |tag|
+        index = ((tag.count / max_count) * (classes.size - 1)).round
+        yield tag, classes[index]
+      end
     end
   end
-
-end
+end

data/lib/acts_as_taggable_on/utils.rb

@@ -0,0 +1,31 @@
+module ActsAsTaggableOn
+  module Utils
+    def self.included(base)
+      
+      base.send :include, 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 
+        
+      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("%", "\\\%")
+       end
+    end
+
+  end
+end

data/lib/generators/acts_as_taggable_on/migration/migration_generator.rb

@@ -11,7 +11,7 @@ module ActsAsTaggableOn
     end
 
     def self.source_root
-      File.join(File.dirname(__FILE__), 'templates', orm)
+      File.join(File.dirname(__FILE__), 'templates', (orm.to_s unless orm.class.eql?(String)) )
     end
 
     def self.orm_has_migration?
@@ -19,7 +19,7 @@ module ActsAsTaggableOn
     end
 
     def self.next_migration_number(path)
-      Time.now.utc.strftime("%Y%m%d%H%M%S")
+      ActiveRecord::Generators::Base.next_migration_number(path)
     end
 
     def create_migration_file
@@ -29,3 +29,4 @@ module ActsAsTaggableOn
     end
   end
 end
+