acts-as-taggable-on 1.1.9 → 2.0.0.pre1

data/lib/acts_as_taggable_on/acts_as_tagger.rb

@@ -1,52 +1,60 @@
 module ActiveRecord
   module Acts
     module Tagger
+
       def self.included(base)
         base.extend ClassMethods
       end
-      
+
       module ClassMethods
+
         def acts_as_tagger(opts={})
-          has_many :owned_taggings, opts.merge(:as => :tagger, :dependent => :destroy, 
+          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 ActiveRecord::Acts::Tagger::InstanceMethods
-          extend ActiveRecord::Acts::Tagger::SingletonMethods       
+          extend ActiveRecord::Acts::Tagger::SingletonMethods
         end
-        
+
         def is_tagger?
           false
         end
+
       end
-      
+
       module InstanceMethods
+
         def self.included(base)
         end
-        
+
         def tag(taggable, opts={})
           opts.reverse_merge!(:force => true)
 
           return false unless taggable.respond_to?(:is_taggable?) && taggable.is_taggable?
-          raise "You need to specify a tag context using :on" unless opts.has_key?(:on)
-          raise "You need to specify some tags using :with" unless opts.has_key?(:with)
-          raise "No context :#{opts[:on]} defined in #{taggable.class.to_s}" unless 
-              ( opts[:force] || taggable.tag_types.include?(opts[:on]) )
+
+          raise "You need to specify a tag context using :on"                unless opts.has_key?(:on)
+          raise "You need to specify some tags using :with"                  unless opts.has_key?(:with)
+          raise "No context :#{opts[:on]} defined in #{taggable.class.to_s}" unless (opts[:force] || taggable.tag_types.include?(opts[:on]))
 
           taggable.set_tag_list_on(opts[:on].to_s, opts[:with], self)
           taggable.save
         end
-        
+
         def is_tagger?
           self.class.is_tagger?
         end
+
       end
-      
+
       module SingletonMethods
+
         def is_tagger?
           true
         end
+
       end
-      
+
     end
   end
 end

data/lib/acts_as_taggable_on/group_helper.rb

@@ -2,10 +2,12 @@ module ActiveRecord
   module Acts
     module TaggableOn
       module GroupHelper
+
         # all column names are necessary for PostgreSQL group clause
         def grouped_column_names_for(object)
           object.column_names.map { |column| "#{object.table_name}.#{column}" }.join(", ")
         end
+
       end
     end
   end

data/lib/acts_as_taggable_on/tag.rb

@@ -1,52 +1,53 @@
 class Tag < ActiveRecord::Base
-  
+
   attr_accessible :name
-  
+
   ### ASSOCIATIONS:
-  
+
   has_many :taggings, :dependent => :destroy
-  
+
   ### VALIDATIONS:
-  
+
   validates_presence_of :name
   validates_uniqueness_of :name
-  
+
   ### NAMED SCOPES:
-  
-  named_scope :named, lambda { |name| { :conditions => ["name LIKE ?", name] } }
-  named_scope :named_any, lambda { |list| { :conditions => list.map { |tag| sanitize_sql(["name LIKE ?", tag.to_s]) }.join(" OR ") } }
-  named_scope :named_like, lambda { |name| { :conditions => ["name LIKE ?", "%#{name}%"] } }
-  named_scope :named_like_any, lambda { |list| { :conditions => list.map { |tag| sanitize_sql(["name LIKE ?", "%#{tag.to_s}%"]) }.join(" OR ") } }
-  
+
+  scope :named,          lambda { |name| { :conditions => ["name LIKE ?", name] } }
+  scope :named_any,      lambda { |list| { :conditions => list.map { |tag| sanitize_sql(["name LIKE ?", tag.to_s]) }.join(" OR ") } }
+  scope :named_like,     lambda { |name| { :conditions => ["name LIKE ?", "%#{name}%"] } }
+  scope :named_like_any, lambda { |list| { :conditions => list.map { |tag| sanitize_sql(["name LIKE ?", "%#{tag.to_s}%"]) }.join(" OR ") } }
+
   ### 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 } }
+    new_tag_names = list.reject { |name| existing_tags.any? { |tag| tag.name.downcase == name.downcase } }
     created_tags  = new_tag_names.map { |name| Tag.create(:name => name) }
-  
-    existing_tags + created_tags    
+
+    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
+
 end

data/lib/acts_as_taggable_on/tag_list.rb

@@ -1,17 +1,19 @@
 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)
@@ -21,20 +23,20 @@ class TagList < Array
     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.
   #
@@ -43,12 +45,12 @@ class TagList < Array
   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!
@@ -56,35 +58,38 @@ class TagList < Array
     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
-  
+
   class << self
+
     # Returns a new TagList using the given tag string.
-    # 
+    #
     #   tag_list = TagList.from("One , Two,  Three")
     #   tag_list # ["One", "Two", "Three"]
     def from(string)
       string = string.join(", ") 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!(/(\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
+
   end
-end
+
+end

data/lib/acts_as_taggable_on/tagging.rb

@@ -1,14 +1,22 @@
 class Tagging < ActiveRecord::Base #:nodoc:
-  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 :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_uniqueness_of :tag_id, :scope => [ :taggable_type, :taggable_id, :context, :tagger_id, :tagger_type ]
+
 end

data/lib/acts_as_taggable_on/tags_helper.rb

@@ -1,13 +1,17 @@
 module TagsHelper
+
   # See the README for an example using tag_cloud.
   def tag_cloud(tags, classes)
+    tags = tags.all if tags.is_a? ActiveRecord::Relation
+
     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,31 @@
+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)
+    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/{generators/acts_as_taggable_on_migration/templates → lib/generators/acts_as_taggable_on/migration/templates/active_record}/migration.rb

@@ -1,27 +1,26 @@
 class ActsAsTaggableOnMigration < ActiveRecord::Migration
   def self.up
     create_table :tags do |t|
-      t.column :name, :string
+      t.string :name
     end
-    
+
     create_table :taggings do |t|
-      t.column :tag_id, :integer
-      t.column :taggable_id, :integer
-      t.column :tagger_id, :integer
-      t.column :tagger_type, :string
-      
+      t.references :tag
+
       # You should make sure that the column created is
       # long enough to store the required class names.
-      t.column :taggable_type, :string
-      t.column :context, :string
-      
-      t.column :created_at, :datetime
+      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

data/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb

@@ -2,9 +2,9 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Acts As Taggable On" do
   before(:each) do
-    clean_database!  
+    clean_database!
   end
-  
+
   it "should provide a class method 'taggable?' that is false for untaggable models" do
     UntaggableModel.should_not be_taggable
   end
@@ -22,7 +22,7 @@ describe "Acts As Taggable On" do
     it "should create a class attribute for tag types" do
       @taggable.class.should respond_to(:tag_types)
     end
-    
+
     it "should create an instance attribute for tag types" do
       @taggable.should respond_to(:tag_types)
     end
@@ -36,7 +36,7 @@ describe "Acts As Taggable On" do
     end
 
     it "should add tagged_with and tag_counts to singleton" do
-      TaggableModel.should respond_to(:find_tagged_with, :tag_counts)
+      TaggableModel.should respond_to(:tagged_with, :tag_counts)
     end
 
     it "should add saving of tag lists and cached tag lists to the instance" do
@@ -48,10 +48,6 @@ 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 for getting all tags for each tag type" do
-      @taggable.should respond_to(:all_tags_list, :all_skills_list, :all_languages_list)
-    end
   end
 
   describe "Single Table Inheritance" do
@@ -212,4 +208,4 @@ describe "Acts As Taggable On" do
     end
   end
 
-end
+end

data/spec/acts_as_taggable_on/group_helper_spec.rb

@@ -15,7 +15,7 @@ describe "Group Helper" do
     end
 
     it "should return all column names joined for TaggableModel GROUP clause" do
-      @taggable.grouped_column_names_for(TaggableModel).should == "taggable_models.id, taggable_models.name, taggable_models.type, taggable_models.cached_tag_list"
+      @taggable.grouped_column_names_for(TaggableModel).should == "taggable_models.id, taggable_models.name, taggable_models.type"
     end
   end
 end