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

data/lib/acts_as_taggable_on/tag.rb

@@ -1,26 +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_scope :named, lambda { |name| { :conditions => ["name = ?", name] } }
-  named_scope :named_like, lambda { |name| { :conditions => ["name LIKE ?", "%#{name}%"] } }
-  
-  # LIKE is used for cross-database case-insensitivity
+
+  ### NAMED SCOPES:
+
+  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)
-    find(:first, :conditions => ["name LIKE ?", name]) || create(: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.downcase == name.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
+
 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,33 +23,34 @@ 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.
   #
   #   tag_list = TagList.new("Round", "Square,Cube")
   #   tag_list.to_s # 'Round, "Square,Cube"'
   def to_s
-    clean!
-    
-    map do |name|
+    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!
@@ -55,41 +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!(/"(.*?)"\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
-      end
-    end
+
   end
-end
+
+end

data/lib/acts_as_taggable_on/tagging.rb

@@ -1,8 +1,22 @@
 class Tagging < ActiveRecord::Base #:nodoc:
+
+  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 ]
+
 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)
+    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/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/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb

@@ -1,6 +1,10 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Acts As Taggable On" do
+  before(:each) do
+    clean_database!
+  end
+
   it "should provide a class method 'taggable?' that is false for untaggable models" do
     UntaggableModel.should_not be_taggable
   end
@@ -18,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
@@ -32,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
@@ -176,16 +180,6 @@ describe "Acts As Taggable On" do
   end
 
   describe 'Tagging Contexts' do
-    before(:all) do
-      class Array
-        def freq
-          k=Hash.new(0)
-          self.each {|e| k[e]+=1}
-          k
-        end
-      end
-    end
-
     it 'should eliminate duplicate tagging contexts ' do
       TaggableModel.acts_as_taggable_on(:skills, :skills)
       TaggableModel.tag_types.freq[:skills].should_not == 3
@@ -212,10 +206,6 @@ describe "Acts As Taggable On" do
         TaggableModel.acts_as_taggable_on([nil])
       }.should_not raise_error
     end
-
-    after(:all) do
-      class Array; remove_method :freq; end
-    end
   end
 
-end
+end

data/spec/acts_as_taggable_on/acts_as_tagger_spec.rb

@@ -1,8 +1,11 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "acts_as_tagger" do
+  before(:each) do
+    clean_database!
+  end
+  
   context "Tagger Method Generation" do
-
     before(:each) do
       @tagger = TaggableUser.new()
     end
@@ -48,8 +51,22 @@ describe "acts_as_tagger" do
       
       it 'should by default create the tag context on-the-fly' do
         @taggable.tag_list_on(:here_ond_now).should be_empty
-        @tagger.tag(@taggable, :with=>'that', :on=>:here_ond_now)
-        @taggable.tag_list_on(:here_ond_now).should include('that')
+        @tagger.tag(@taggable, :with=>'that', :on => :here_ond_now)
+        @taggable.tag_list_on(:here_ond_now).should_not include('that')
+        @taggable.all_tags_list_on(:here_ond_now).should include('that')
+      end
+      
+      it "should show all the tag list when both public and owned tags exist" do
+        @taggable.tag_list = 'ruby, python'
+        @tagger.tag(@taggable, :with => 'java, lisp', :on => :tags)
+        @taggable.all_tags_on(:tags).map(&:name).sort.should == %w(ruby python java lisp).sort
+      end
+      
+      it "should not add owned tags to the common list" do
+        @taggable.tag_list = 'ruby, python'
+        @tagger.tag(@taggable, :with => 'java, lisp', :on => :foo)
+        @tagger.tag(@taggable, :with => '', :on => :foo)
+        @taggable.tag_list.should == %w(ruby python)
       end
       
       it "should throw an exception when the default is over-ridden" do
@@ -64,9 +81,33 @@ describe "acts_as_tagger" do
         @tagger.tag(@taggable, :with=>'this, and, that', :on=>:foo_boo, :force=>false) rescue
         @taggable.tag_list_on(:foo_boo).should be_empty
       end
+    end
+    
+    context "when called by multiple tagger's" do
+      before(:each) do
+        @user_x = TaggableUser.create(:name => "User X")
+        @user_y = TaggableUser.create(:name => "User Y")
+        @taggable = TaggableModel.create(:name => 'acts_as_taggable_on', :tag_list => 'plugin')
+        
+        @user_x.tag(@taggable, :with => 'ruby, rails',  :on => :tags)
+        @user_y.tag(@taggable, :with => 'ruby, plugin', :on => :tags)
 
+        @user_y.tag(@taggable, :with => '', :on => :tags)
+        @user_y.tag(@taggable, :with => '', :on => :tags)
+      end
+      
+      it "should delete owned tags" do        
+        @user_y.owned_tags.should == []
+      end
+      
+      it "should not delete other taggers tags" do
+        @user_x.owned_tags.should have(2).items
+      end
+      
+      it "should not delete original tags" do
+        @taggable.all_tags_list_on(:tags).should include('plugin')
+      end
     end
-  
   end
 
 end

data/spec/acts_as_taggable_on/group_helper_spec.rb

@@ -1,6 +1,9 @@
 require File.dirname(__FILE__) + '/../spec_helper'
 
 describe "Group Helper" do
+  before(:each) do
+    clean_database!    
+  end
 
   describe "grouped_column_names_for method" do
     before(:each) do

data/spec/acts_as_taggable_on/tag_list_spec.rb

@@ -20,6 +20,18 @@ describe TagList do
     @tag_list.include?("wicked").should be_true
   end
   
+  it "should be able to add delimited list of words with quoted delimiters" do
+    @tag_list.add("'cool, wicked', \"really cool, really wicked\"", :parse => true)
+    @tag_list.include?("cool, wicked").should be_true
+    @tag_list.include?("really cool, really wicked").should be_true
+  end
+  
+  it "should be able to handle other uses of quotation marks correctly" do
+    @tag_list.add("john's cool car, mary's wicked toy", :parse => true)
+    @tag_list.include?("john's cool car").should be_true
+    @tag_list.include?("mary's wicked toy").should be_true
+  end
+  
   it "should be able to add an array of words" do
     @tag_list.add(["cool", "wicked"], :parse => true)
     @tag_list.include?("cool").should be_true
@@ -49,4 +61,10 @@ describe TagList do
     @tag_list.add("cool","rad,bodacious")
     @tag_list.to_s.should == "awesome, radical, cool, \"rad,bodacious\""
   end
+  
+  it "should be able to call to_s on a frozen tag list" do
+    @tag_list.freeze
+    lambda { @tag_list.add("cool","rad,bodacious") }.should raise_error
+    lambda { @tag_list.to_s }.should_not raise_error
+  end
 end

data/spec/acts_as_taggable_on/tag_spec.rb

@@ -2,25 +2,36 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe Tag do
   before(:each) do
+    clean_database!
     @tag = Tag.new
-    @user = TaggableModel.create(:name => "Pablo")  
-    Tag.delete_all
+    @user = TaggableModel.create(:name => "Pablo")
   end
-  
+
+  describe "named like any" do
+    before(:each) do
+      Tag.create(:name => "awesome")
+      Tag.create(:name => "epic")
+    end
+
+    it "should find both tags" do
+      Tag.named_like_any(["awesome", "epic"]).should have(2).items
+    end
+  end
+
   describe "find or create by name" do
     before(:each) do
       @tag.name = "awesome"
       @tag.save
     end
-    
+
     it "should find by name" do
       Tag.find_or_create_with_like_by_name("awesome").should == @tag
     end
-    
+
     it "should find by name case insensitive" do
       Tag.find_or_create_with_like_by_name("AWESOME").should == @tag
     end
-    
+
     it "should create by name" do
       lambda {
         Tag.find_or_create_with_like_by_name("epic")
@@ -28,35 +39,66 @@ describe Tag do
     end
   end
 
+  describe "find or create all by any name" do
+    before(:each) do
+      @tag.name = "awesome"
+      @tag.save
+    end
+
+    it "should find by name" do
+      Tag.find_or_create_all_with_like_by_name("awesome").should == [@tag]
+    end
+
+    it "should find by name case insensitive" do
+      Tag.find_or_create_all_with_like_by_name("AWESOME").should == [@tag]
+    end
+
+    it "should create by name" do
+      lambda {
+        Tag.find_or_create_all_with_like_by_name("epic")
+      }.should change(Tag, :count).by(1)
+    end
+
+    it "should find or create by name" do
+      lambda {
+        Tag.find_or_create_all_with_like_by_name("awesome", "epic").map(&:name).should == ["awesome", "epic"]
+      }.should change(Tag, :count).by(1)
+    end
+
+    it "should return an empty array if no tags are specified" do
+      Tag.find_or_create_all_with_like_by_name([]).should == []
+    end
+  end
+
   it "should require a name" do
     @tag.valid?
-    @tag.errors.on(:name).should == "can't be blank"
+    @tag.errors[:name].should == ["can't be blank"]
     @tag.name = "something"
     @tag.valid?
-    @tag.errors.on(:name).should be_nil
+    @tag.errors[:name].should == []
   end
-  
+
   it "should equal a tag with the same name" do
     @tag.name = "awesome"
     new_tag = Tag.new(:name => "awesome")
     new_tag.should == @tag
   end
-  
+
   it "should return its name when to_s is called" do
     @tag.name = "cool"
     @tag.to_s.should == "cool"
   end
-  
+
   it "have named_scope named(something)" do
     @tag.name = "cool"
     @tag.save!
     Tag.named('cool').should include(@tag)
   end
-  
+
   it "have named_scope named_like(something)" do
     @tag.name = "cool"
     @tag.save!
     @another_tag = Tag.create!(:name => "coolip")
     Tag.named_like('cool').should include(@tag, @another_tag)
   end
-end
+end