acts-as-taggable-on 2.0.0 → 2.0.6

data/lib/acts_as_taggable_on/tag.rb

@@ -1,65 +1,74 @@
-class Tag < ActiveRecord::Base
-  include ActsAsTaggableOn::ActiveRecord::Backports if ActiveRecord::VERSION::MAJOR < 3
+module ActsAsTaggableOn
+  class Tag < ::ActiveRecord::Base
+    include ActsAsTaggableOn::ActiveRecord::Backports if ::ActiveRecord::VERSION::MAJOR < 3
   
-  attr_accessible :name
+    attr_accessible :name
 
-  ### ASSOCIATIONS:
+    ### ASSOCIATIONS:
 
-  has_many :taggings, :dependent => :destroy
+    has_many :taggings, :dependent => :destroy, :class_name => 'ActsAsTaggableOn::Tagging'
 
-  ### VALIDATIONS:
+    ### VALIDATIONS:
 
-  validates_presence_of :name
-  validates_uniqueness_of :name
+    validates_presence_of :name
+    validates_uniqueness_of :name
 
-  ### SCOPES:
+    ### SCOPES:
 
-  def self.named(name)
-    where(["name LIKE ?", name])
-  end
+    def self.named(name)
+      where(["name #{like_operator} ?", 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} ?", tag.to_s]) }.join(" OR "))
+    end
   
-  def self.named_like(name)
-    where(["name LIKE ?", "%#{name}%"])
-  end
+    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 ?", "%#{tag.to_s}%"]) }.join(" OR "))
-  end
+    def self.named_like_any(list)
+      where(list.map { |tag| sanitize_sql(["name #{like_operator} ?", "%#{tag.to_s}%"]) }.join(" OR "))
+    end
 
-  ### CLASS METHODS:
+    ### 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_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
+    def self.find_or_create_all_with_like_by_name(*list)
+      list = [list].flatten
 
-    return [] if list.empty?
+      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 = 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
+      existing_tags + created_tags
+    end
 
-  ### INSTANCE METHODS:
+    ### INSTANCE METHODS:
 
-  def ==(object)
-    super || (object.is_a?(Tag) && name == object.name)
-  end
+    def ==(object)
+      super || (object.is_a?(Tag) && name == object.name)
+    end
 
-  def to_s
-    name
-  end
+    def to_s
+      name
+    end
 
-  def count
-    read_attribute(:count).to_i
-  end
+    def count
+      read_attribute(:count).to_i
+    end
 
-end
+    class << self
+      private
+        def like_operator
+          connection.adapter_name == 'PostgreSQL' ? 'ILIKE' : 'LIKE'
+        end
+    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/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?
@@ -29,3 +29,4 @@ module ActsAsTaggableOn
     end
   end
 end
+

data/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Acts As Taggable On" do
   before(:each) do
@@ -11,7 +11,9 @@ describe "Acts As Taggable On" do
 
   describe "Taggable Method Generation" do
     before(:each) do
-      [TaggableModel, Tag, Tagging, TaggableUser].each(&:delete_all)
+      clean_database!
+      TaggableModel.write_inheritable_attribute(:tag_types, [])
+      TaggableModel.acts_as_taggable_on(:tags, :languages, :skills, :needs, :offerings)
       @taggable = TaggableModel.new(:name => "Bob Jones")
     end
 

data/spec/acts_as_taggable_on/acts_as_tagger_spec.rb

@@ -1,11 +1,11 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "acts_as_tagger" do
   before(:each) do
     clean_database!
   end
   
-  context "Tagger Method Generation" do
+  describe "Tagger Method Generation" do
     before(:each) do
       @tagger = TaggableUser.new()
     end
@@ -84,7 +84,7 @@ describe "acts_as_tagger" do
       end
     end
     
-    context "when called by multiple tagger's" do
+    describe "when called by multiple tagger's" do
       before(:each) do
         @user_x = TaggableUser.create(:name => "User X")
         @user_y = TaggableUser.create(:name => "User Y")

data/spec/acts_as_taggable_on/tag_list_spec.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
-describe TagList do
+describe ActsAsTaggableOn::TagList do
   before(:each) do
-    @tag_list = TagList.new("awesome","radical")
+    @tag_list = ActsAsTaggableOn::TagList.new("awesome","radical")
   end
   
   it "should be an array" do

data/spec/acts_as_taggable_on/tag_spec.rb

@@ -1,20 +1,20 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
-describe Tag do
+describe ActsAsTaggableOn::Tag do
   before(:each) do
     clean_database!
-    @tag = Tag.new
+    @tag = ActsAsTaggableOn::Tag.new
     @user = TaggableModel.create(:name => "Pablo")
   end
 
   describe "named like any" do
     before(:each) do
-      Tag.create(:name => "awesome")
-      Tag.create(:name => "epic")
+      ActsAsTaggableOn::Tag.create(:name => "awesome")
+      ActsAsTaggableOn::Tag.create(:name => "epic")
     end
 
     it "should find both tags" do
-      Tag.named_like_any(["awesome", "epic"]).should have(2).items
+      ActsAsTaggableOn::Tag.named_like_any(["awesome", "epic"]).should have(2).items
     end
   end
 
@@ -25,17 +25,17 @@ describe Tag do
     end
 
     it "should find by name" do
-      Tag.find_or_create_with_like_by_name("awesome").should == @tag
+      ActsAsTaggableOn::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
+      ActsAsTaggableOn::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")
-      }.should change(Tag, :count).by(1)
+        ActsAsTaggableOn::Tag.find_or_create_with_like_by_name("epic")
+      }.should change(ActsAsTaggableOn::Tag, :count).by(1)
     end
   end
 
@@ -46,27 +46,27 @@ describe Tag do
     end
 
     it "should find by name" do
-      Tag.find_or_create_all_with_like_by_name("awesome").should == [@tag]
+      ActsAsTaggableOn::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]
+      ActsAsTaggableOn::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)
+        ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name("epic")
+      }.should change(ActsAsTaggableOn::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)
+        ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name("awesome", "epic").map(&:name).should == ["awesome", "epic"]
+      }.should change(ActsAsTaggableOn::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 == []
+      ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name([]).should == []
     end
   end
 
@@ -91,7 +91,7 @@ describe Tag do
 
   it "should equal a tag with the same name" do
     @tag.name = "awesome"
-    new_tag = Tag.new(:name => "awesome")
+    new_tag = ActsAsTaggableOn::Tag.new(:name => "awesome")
     new_tag.should == @tag
   end
 
@@ -103,13 +103,13 @@ describe Tag do
   it "have named_scope named(something)" do
     @tag.name = "cool"
     @tag.save!
-    Tag.named('cool').should include(@tag)
+    ActsAsTaggableOn::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)
+    @another_tag = ActsAsTaggableOn::Tag.create!(:name => "coolip")
+    ActsAsTaggableOn::Tag.named_like('cool').should include(@tag, @another_tag)
   end
 end

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Taggable" do
   before(:each) do
@@ -26,11 +26,11 @@ describe "Taggable" do
 
   it "should be able to create tags" do
     @taggable.skill_list = "ruby, rails, css"
-    @taggable.instance_variable_get("@skill_list").instance_of?(TagList).should be_true
+    @taggable.instance_variable_get("@skill_list").instance_of?(ActsAsTaggableOn::TagList).should be_true
     
     lambda {
       @taggable.save
-    }.should change(Tag, :count).by(3)
+    }.should change(ActsAsTaggableOn::Tag, :count).by(3)
     
     @taggable.reload
     @taggable.skill_list.sort.should == %w(ruby rails css).sort
@@ -90,7 +90,7 @@ describe "Taggable" do
     bob = TaggableModel.create(:name => "Bob", :tag_list => "ruby")
     frank = TaggableModel.create(:name => "Frank", :tag_list => "Ruby")
 
-    Tag.find(:all).size.should == 1
+    ActsAsTaggableOn::Tag.find(:all).size.should == 1
     TaggableModel.tagged_with("ruby").to_a.should == TaggableModel.tagged_with("Ruby").to_a
   end
 
@@ -108,7 +108,7 @@ describe "Taggable" do
     charlie = TaggableModel.create(:name => "Charlie", :skill_list => "ruby")
 
     TaggableModel.all_tag_counts.all.should_not be_empty
-    TaggableModel.all_tag_counts.first.count.should == 3 # ruby
+    TaggableModel.all_tag_counts(:order => 'tags.id').first.count.should == 3 # ruby
   end
 
   if ActiveRecord::VERSION::MAJOR >= 3
@@ -132,7 +132,7 @@ describe "Taggable" do
     frank = TaggableModel.create(:name => "Frank", :tag_list => "ruby, rails")
     charlie = TaggableModel.create(:name => "Charlie", :skill_list => "ruby")
 
-    TaggableModel.tagged_with("ruby").tag_counts.first.count.should == 2   # ruby
+    TaggableModel.tagged_with("ruby").tag_counts(:order => 'tags.id').first.count.should == 2   # ruby
     TaggableModel.tagged_with("ruby").skill_counts.first.count.should == 1 # ruby
   end
 
@@ -141,7 +141,22 @@ describe "Taggable" do
     frank = TaggableModel.create(:name => "Frank", :tag_list => "ruby, rails")
     charlie = TaggableModel.create(:name => "Charlie", :skill_list => "ruby")
 
-    TaggableModel.tagged_with("ruby").all_tag_counts.first.count.should == 3 # ruby
+    TaggableModel.tagged_with("ruby").all_tag_counts(:order => 'tags.id').first.count.should == 3 # ruby
+  end
+
+  it 'should only return tag counts for the available scope' do
+    bob = TaggableModel.create(:name => "Bob", :tag_list => "ruby, rails, css")
+    frank = TaggableModel.create(:name => "Frank", :tag_list => "ruby, rails")
+    charlie = TaggableModel.create(:name => "Charlie", :skill_list => "ruby, java")
+ 
+    TaggableModel.tagged_with('rails').all_tag_counts.should have(3).items
+    TaggableModel.tagged_with('rails').all_tag_counts.any? { |tag| tag.name == 'java' }.should be_false
+    
+    # Test specific join syntaxes:
+    frank.untaggable_models.create!
+    TaggableModel.tagged_with('rails').scoped(:joins => :untaggable_models).all_tag_counts.should have(2).items
+    TaggableModel.tagged_with('rails').scoped(:joins => { :untaggable_models => :taggable_model }).all_tag_counts.should have(2).items
+    TaggableModel.tagged_with('rails').scoped(:joins => [:untaggable_models]).all_tag_counts.should have(2).items
   end
 
   it "should be able to set a custom tag context list" do
@@ -162,6 +177,16 @@ describe "Taggable" do
     TaggableModel.tagged_with("ruby, rails", :order => 'taggable_models.name').to_a.should == [bob, frank]
     TaggableModel.tagged_with(["ruby", "rails"], :order => 'taggable_models.name').to_a.should == [bob, frank]
   end
+  
+  it "should be able to find tagged with quotation marks" do
+    bob = TaggableModel.create(:name => "Bob", :tag_list => "fitter, happier, more productive, 'I love the ,comma,'")
+    TaggableModel.tagged_with("'I love the ,comma,'").should include(bob)
+  end
+  
+  it "should be able to find tagged with invalid tags" do
+    bob = TaggableModel.create(:name => "Bob", :tag_list => "fitter, happier, more productive")    
+    TaggableModel.tagged_with("sad, happier").should_not include(bob)    
+  end
 
   it "should be able to find tagged with any tag" do
     bob = TaggableModel.create(:name => "Bob", :tag_list => "fitter, happier, more productive", :skill_list => "ruby, rails, css")
@@ -216,7 +241,7 @@ describe "Taggable" do
       bob.tag_list << "happier"
       bob.tag_list << "happier"
       bob.save
-    }.should change(Tagging, :count).by(1)
+    }.should change(ActsAsTaggableOn::Tagging, :count).by(1)
   end
  
   describe "Associations" do
@@ -233,7 +258,7 @@ describe "Taggable" do
 
   describe "grouped_column_names_for method" do
     it "should return all column names joined for Tag GROUP clause" do
-      @taggable.grouped_column_names_for(Tag).should == "tags.id, tags.name"
+      @taggable.grouped_column_names_for(ActsAsTaggableOn::Tag).should == "tags.id, tags.name"
     end
 
     it "should return all column names joined for TaggableModel GROUP clause" do
@@ -273,9 +298,9 @@ describe "Taggable" do
       @inherited_different.tag_list = "fork, spoon"
       @inherited_different.save!
   
-      InheritingTaggableModel.tag_counts_on(:tags).map(&:name).should == %w(bob kelso)
-      AlteredInheritingTaggableModel.tag_counts_on(:tags).map(&:name).should == %w(fork spoon)
-      TaggableModel.tag_counts_on(:tags).map(&:name).should == %w(bob kelso fork spoon)
+      InheritingTaggableModel.tag_counts_on(:tags, :order => 'tags.id').map(&:name).should == %w(bob kelso)
+      AlteredInheritingTaggableModel.tag_counts_on(:tags, :order => 'tags.id').map(&:name).should == %w(fork spoon)
+      TaggableModel.tag_counts_on(:tags, :order => 'tags.id').map(&:name).should == %w(bob kelso fork spoon)
     end
   
     it 'should store same tag without validation conflict' do