acts-as-taggable-on 1.0.13 → 2.0.6

data/lib/acts_as_taggable_on/tag.rb

@@ -1,26 +1,74 @@
-class Tag < ActiveRecord::Base
-  has_many :taggings, :dependent => :destroy
+module ActsAsTaggableOn
+  class Tag < ::ActiveRecord::Base
+    include ActsAsTaggableOn::ActiveRecord::Backports if ::ActiveRecord::VERSION::MAJOR < 3
   
-  validates_presence_of :name
-  validates_uniqueness_of :name
+    attr_accessible :name
+
+    ### ASSOCIATIONS:
+
+    has_many :taggings, :dependent => :destroy, :class_name => 'ActsAsTaggableOn::Tagging'
+
+    ### VALIDATIONS:
+
+    validates_presence_of :name
+    validates_uniqueness_of :name
+
+    ### SCOPES:
+
+    def self.named(name)
+      where(["name #{like_operator} ?", name])
+    end
   
-  named_scope :named, lambda { |name| { :conditions => ["name = ?", name] } }
-  named_scope :named_like, lambda { |name| { :conditions => ["name LIKE ?", "%#{name}%"] } }
+    def self.named_any(list)
+      where(list.map { |tag| sanitize_sql(["name #{like_operator} ?", tag.to_s]) }.join(" OR "))
+    end
   
-  # LIKE is used for cross-database case-insensitivity
-  def self.find_or_create_with_like_by_name(name)
-    find(:first, :conditions => ["name LIKE ?", name]) || create(:name => name)
+    def self.named_like(name)
+      where(["name #{like_operator} ?", "%#{name}%"])
+    end
+
+    def self.named_like_any(list)
+      where(list.map { |tag| sanitize_sql(["name #{like_operator} ?", "%#{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)
+    end
+
+    def to_s
+      name
+    end
+
+    def count
+      read_attribute(:count).to_i
+    end
+
+    class << self
+      private
+        def like_operator
+          connection.adapter_name == 'PostgreSQL' ? 'ILIKE' : 'LIKE'
+        end
+    end
+
   end
-  
-  def ==(object)
-    super || (object.is_a?(Tag) && name == object.name)
-  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
-  cattr_accessor :delimiter
-  self.delimiter = ','
-  
-  def initialize(*args)
-    add(*args)
-  end
-  
-  attr_accessor :owner
-  
-  # Add tags to the tag_list. Duplicate or blank tags will be ignored.
-  #
-  #   tag_list.add("Fun", "Happy")
-  # 
-  # Use the <tt>:parse</tt> option to add an unparsed tag string.
-  #
-  #   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.
-  # 
-  #   tag_list.remove("Sad", "Lonely")
-  #
-  # Like #add, the <tt>:parse</tt> option can be used to remove multiple tags in a string.
-  # 
-  #   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.
-  #
-  #   tag_list = TagList.new("Round", "Square,Cube")
-  #   tag_list.to_s # 'Round, "Square,Cube"'
-  def to_s
-    clean!
-    
-    map do |name|
-      name.include?(delimiter) ? "\"#{name}\"" : name
-    end.join(delimiter.ends_with?(" ") ? delimiter : "#{delimiter} ")
-  end
-  
- private
-  # 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
-    
-    if options[:parse]
-      args.map! { |a| self.class.from(a) }
+module ActsAsTaggableOn
+  class TagList < Array
+    cattr_accessor :delimiter
+    self.delimiter = ','
+
+    attr_accessor :owner
+
+    def initialize(*args)
+      add(*args)
     end
-    
-    args.flatten!
-  end
   
-  class << self
+    ##
     # Returns a new TagList using the given tag string.
-    # 
+    #
+    # Example:
     #   tag_list = TagList.from("One , Two,  Three")
     #   tag_list # ["One", "Two", "Three"]
-    def from(string)
-      string = string.join(", ") if string.respond_to?(:join)
+    def self.from(string)
+      glue   = delimiter.ends_with?(" ") ? delimiter : "#{delimiter} "
+      string = string.join(glue) if string.respond_to?(:join)
 
-      returning new do |tag_list|
+      new.tap do |tag_list|
         string = string.to_s.dup
-        
+
         # Parse the quoted tags
-        string.gsub!(/"(.*?)"\s*#{delimiter}?\s*/) { tag_list << $1; "" }
-        string.gsub!(/'(.*?)'\s*#{delimiter}?\s*/) { tag_list << $1; "" }
-        
+        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))
       end
     end
-    
-    def from_owner(owner, *tags)
-      returning from(*tags) do |taglist|
-        taglist.owner = owner
+
+    ##
+    # 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
+
+    ##
+    # 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
+
+    private
+  
+    # 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
+
+      if options[:parse]
+        args.map! { |a| self.class.from(a) }
       end
+
+      args.flatten!
     end
   end
 end

data/lib/acts_as_taggable_on/tagging.rb

@@ -1,8 +1,24 @@
-class Tagging < ActiveRecord::Base #:nodoc:
-  belongs_to :tag
-  belongs_to :taggable, :polymorphic => true
-  belongs_to :tagger, :polymorphic => true
-  
-  validates_presence_of :context
-  validates_presence_of :tag_id
+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
+
+    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 ]
+  end
 end

data/lib/acts_as_taggable_on/tags_helper.rb

@@ -1,11 +1,17 @@
-module TagsHelper
-  # See the README for an example using tag_cloud.
-  def tag_cloud(tags, classes)
-    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]
+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)
+
+      return [] if tags.empty?
+
+      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]
+      end
     end
   end
 end

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

@@ -0,0 +1,32 @@
+require 'rails/generators/migration'
+
+module ActsAsTaggableOn
+  class MigrationGenerator < Rails::Generators::Base
+    include Rails::Generators::Migration
+
+    desc "Generates migration for Tag and Tagging models"
+
+    def self.orm
+      Rails::Generators.options[:rails][:orm]
+    end
+
+    def self.source_root
+      File.join(File.dirname(__FILE__), 'templates', (orm.to_s unless orm.class.eql?(String)) )
+    end
+
+    def self.orm_has_migration?
+      [:active_record].include? orm
+    end
+
+    def self.next_migration_number(path)
+      Time.now.utc.strftime("%Y%m%d%H%M%S")
+    end
+
+    def create_migration_file
+      if self.class.orm_has_migration?
+        migration_template 'migration.rb', 'db/migrate/acts_as_taggable_on_migration'
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,28 @@
+class ActsAsTaggableOnMigration < ActiveRecord::Migration
+  def self.up
+    create_table :tags do |t|
+      t.string :name
+    end
+
+    create_table :taggings do |t|
+      t.references :tag
+
+      # You should make sure that the column created is
+      # long enough to store the required class names.
+      t.references :taggable, :polymorphic => true
+      t.references :tagger, :polymorphic => true
+
+      t.string :context
+
+      t.datetime :created_at
+    end
+
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+  def self.down
+    drop_table :taggings
+    drop_table :tags
+  end
+end

data/rails/init.rb

@@ -1,7 +1 @@
-require 'acts-as-taggable-on'
-
-ActiveRecord::Base.send :include, ActiveRecord::Acts::TaggableOn
-ActiveRecord::Base.send :include, ActiveRecord::Acts::Tagger
-ActionView::Base.send :include, TagsHelper if defined?(ActionView::Base)
-
-RAILS_DEFAULT_LOGGER.info "** acts_as_taggable_on: initialized properly."
+require 'acts-as-taggable-on'