acts-as-taggable-on 2.0.4 → 2.0.5

data/Gemfile

@@ -1,6 +1,8 @@
 source :gemcutter
 
 # Rails 3.0
-gem 'rails',        '3.0.0.beta2'
-gem 'rspec',        '2.0.0.beta.5'
-gem 'sqlite3-ruby', '1.2.5',       :require => 'sqlite3'
+gem 'rails',        '3.0.0.beta3'
+gem 'rspec',        '2.0.0.beta.8'
+gem 'sqlite3-ruby', :require => 'sqlite3'
+gem 'jeweler'
+gem 'rcov'

data/README.rdoc

@@ -38,7 +38,7 @@ After that, you can run "rake gems:install" to install the gem if you don't alre
 1. script/generate acts_as_taggable_on_migration
 2. rake db:migrate
 
-== Rails 3.0
+=== Rails 3.0
 
 Acts As Taggable On is now useable in Rails 3.0, thanks to the excellent work of Szymon Nowak
 and Jelle Vandebeeck.
@@ -47,12 +47,12 @@ To use it, add it to your Gemfile:
   
   gem 'acts-as-taggable-on'
 
-=== Post Installation
+==== Post Installation
 
 1. rails generate acts_as_taggable_on:migration
 2. rake db:migrate
 
-= Testing
+== Testing
 
 Acts As Taggable On uses RSpec for its test coverage. Inside the plugin
 directory, you can run the specs for RoR 3.0.0 with:
@@ -68,7 +68,7 @@ If you already have RSpec on your application, the specs will run while using:
 rake spec:plugins
 
 
-= Usage
+== Usage
 
     class User < ActiveRecord::Base
       # Alias for <tt>acts_as_taggable_on :tags</tt>:
@@ -89,7 +89,7 @@ rake spec:plugins
     User.skill_counts # => [<Tag name="joking" count=2>,<Tag name="clowning" count=1>...]
     @frankie.skill_counts
 
-== Finding Tagged Objects
+=== Finding Tagged Objects
 
 Acts As Taggable On utilizes named_scopes to create an association for tags.
 This way you can mix and match to filter down your results, and it also improves
@@ -109,7 +109,7 @@ compatibility with the will_paginate gem:
     # Find a user with any of the tags:
     User.tagged_with(["awesome", "cool"], :any => true)
 
-== Relationships
+=== Relationships
 
 You can find objects of the same type based on similar tags on certain contexts.
 Also, objects will be returned in descending order based on the total number of 
@@ -128,7 +128,7 @@ matched tags.
     @bobby.find_related_skills # => [<User name="Tom">] 
     @frankie.find_related_skills # => [<User name="Tom">] 
 
-== Dynamic Tag Contexts
+=== Dynamic Tag Contexts
 
 In addition to the generated tag contexts in the definition, it is also possible
 to allow for dynamic tag contexts (this could be user generated tag contexts!)
@@ -141,7 +141,7 @@ to allow for dynamic tag contexts (this could be user generated tag contexts!)
     @user.tag_counts_on(:customs)
     User.find_tagged_with("same", :on => :customs) # => [@user]
 
-== Tag Ownership
+=== Tag Ownership
 
 Tags can have owners:
 
@@ -158,7 +158,7 @@ Tags can have owners:
     @some_user.owned_tags
     @some_photo.locations_from(@some_user)
     
-== Tag cloud calculations
+=== Tag cloud calculations
 
 To construct tag clouds, the frequency of each tag needs to be calculated.
 Because we specified +acts_as_taggable_on+ on the <tt>User</tt> class, we can
@@ -198,7 +198,7 @@ CSS:
   .css3 { font-size: 1.4em; }
   .css4 { font-size: 1.6em; }
 
-= Contributors
+== Contributors
 
 * TomEric (i76) - Maintainer
 * Michael Bleigh - Original Author
@@ -208,7 +208,7 @@ CSS:
 * Pradeep Elankumaran - Taggers
 * Sinclair Bain - Patch King
 
-== Patch Contributors
+=== Patch Contributors
 
 * tristanzdunn - Related objects of other classes
 * azabaj - Fixed migrate down

data/VERSION

@@ -1 +1 @@
-2.0.4
+2.0.5

data/lib/acts-as-taggable-on.rb

@@ -26,5 +26,5 @@ if defined?(ActiveRecord::Base)
 end
 
 if defined?(ActionView::Base)
-  ActionView::Base.send :include, TagsHelper
+  ActionView::Base.send :include, ActsAsTaggableOn::TagsHelper
 end

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -34,8 +34,8 @@ module ActsAsTaggableOn
         class_inheritable_reader(:tag_types)
         
         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

data/lib/acts_as_taggable_on/acts_as_taggable_on/cache.rb

@@ -1,8 +1,8 @@
 module ActsAsTaggableOn::Taggable
   module Cache
     def self.included(base)
-      # Skip adding caching capabilities if no cache columns exist
-      return unless base.tag_types.any? { |context| base.column_names.include?("cached_#{context.to_s.singularize}_list") }
+      # Skip adding caching capabilities if table not exists or no cache columns exist
+      return unless base.table_exists? && base.tag_types.any? { |context| base.column_names.include?("cached_#{context.to_s.singularize}_list") }
 
       base.send :include, ActsAsTaggableOn::Taggable::Cache::InstanceMethods
       base.extend ActsAsTaggableOn::Taggable::Cache::ClassMethods
@@ -50,4 +50,4 @@ module ActsAsTaggableOn::Taggable
       end
     end
   end
-end
+end

data/lib/acts_as_taggable_on/acts_as_taggable_on/collection.rb

@@ -62,11 +62,11 @@ module ActsAsTaggableOn::Taggable
         ## Generate conditions:
         options[:conditions] = sanitize_sql(options[:conditions]) if options[:conditions]     
           
-        start_at_conditions = sanitize_sql(["#{Tagging.table_name}.created_at >= ?", options.delete(:start_at)]) if options[:start_at]
-        end_at_conditions   = sanitize_sql(["#{Tagging.table_name}.created_at <= ?", options.delete(:end_at)])   if options[:end_at]
+        start_at_conditions = sanitize_sql(["#{ActsAsTaggableOn::Tagging.table_name}.created_at >= ?", options.delete(:start_at)]) if options[:start_at]
+        end_at_conditions   = sanitize_sql(["#{ActsAsTaggableOn::Tagging.table_name}.created_at <= ?", options.delete(:end_at)])   if options[:end_at]
 
-        taggable_conditions  = sanitize_sql(["#{Tagging.table_name}.taggable_type = ?", base_class.name])
-        taggable_conditions << sanitize_sql([" AND #{Tagging.table_name}.taggable_id = ?", options.delete(:id)]) if options[:id]
+        taggable_conditions  = sanitize_sql(["#{ActsAsTaggableOn::Tagging.table_name}.taggable_type = ?", base_class.name])
+        taggable_conditions << sanitize_sql([" AND #{ActsAsTaggableOn::Tagging.table_name}.taggable_id = ?", options.delete(:id)]) if options[:id]
 
         conditions = [
           taggable_conditions,
@@ -77,10 +77,10 @@ module ActsAsTaggableOn::Taggable
         ].compact.reverse
         
         ## Generate joins:
-        tagging_join  = "LEFT OUTER JOIN #{Tagging.table_name} ON #{Tag.table_name}.id = #{Tagging.table_name}.tag_id"
-        tagging_join << sanitize_sql([" AND #{Tagging.table_name}.context = ?", options.delete(:on).to_s]) if options[:on]
+        tagging_join  = "LEFT OUTER JOIN #{ActsAsTaggableOn::Tagging.table_name} ON #{ActsAsTaggableOn::Tag.table_name}.id = #{ActsAsTaggableOn::Tagging.table_name}.tag_id"
+        tagging_join << sanitize_sql([" AND #{ActsAsTaggableOn::Tagging.table_name}.context = ?", options.delete(:on).to_s]) if options[:on]
 
-        taggable_join = "INNER JOIN #{table_name} ON #{table_name}.#{primary_key} = #{Tagging.table_name}.taggable_id"
+        taggable_join = "INNER JOIN #{table_name} ON #{table_name}.#{primary_key} = #{ActsAsTaggableOn::Tagging.table_name}.taggable_id"
         taggable_join << " AND #{table_name}.#{inheritance_column} = '#{name}'" unless descends_from_active_record? # Current model is STI descendant, so add type checking to the join condition      
 
         joins = [
@@ -91,7 +91,7 @@ module ActsAsTaggableOn::Taggable
 
 
         ## Generate scope:
-        scope = Tag.scoped(:select => "#{Tag.table_name}.*, COUNT(*) AS count").order(options[:order]).limit(options[:limit])   
+        scope = ActsAsTaggableOn::Tag.scoped(:select => "#{ActsAsTaggableOn::Tag.table_name}.*, COUNT(*) AS count").order(options[:order]).limit(options[:limit])   
         
         # Joins and conditions
         joins.each      { |join|      scope = scope.joins(join)      }
@@ -105,14 +105,14 @@ module ActsAsTaggableOn::Taggable
         if ActiveRecord::VERSION::MAJOR >= 3
           # Append the current scope to the scope, because we can't use scope(:find) in RoR 3.0 anymore:
           scoped_select = "#{table_name}.#{primary_key}"
-          scope = scope.where("#{Tagging.table_name}.taggable_id IN(#{select(scoped_select).to_sql})")
+          scope = scope.where("#{ActsAsTaggableOn::Tagging.table_name}.taggable_id IN(#{select(scoped_select).to_sql})")
           
           # We have having() in RoR 3.0 so use it:
           having = having.blank? ? "COUNT(*) > 0" : "COUNT(*) > 0 AND #{having}"
-          scope = scope.group(grouped_column_names_for(Tag)).having(having)
+          scope = scope.group(grouped_column_names_for(ActsAsTaggableOn::Tag)).having(having)
         else
           # Having is not available in 2.3.x:
-          group_by  = "#{grouped_column_names_for(Tag)} HAVING COUNT(*) > 0"
+          group_by  = "#{grouped_column_names_for(ActsAsTaggableOn::Tag)} HAVING COUNT(*) > 0"
           group_by << " AND #{having}" unless having.blank?
           scope = scope.group(group_by)
         end

data/lib/acts_as_taggable_on/acts_as_taggable_on/core.rb

@@ -20,9 +20,9 @@ module ActsAsTaggableOn::Taggable
           context_tags     = tags_type.to_sym
 
           class_eval do
-            has_many context_taggings, :as => :taggable, :dependent => :destroy, :include => :tag, :class_name => "Tagging",
-                     :conditions => ['#{Tagging.table_name}.tagger_id IS NULL AND #{Tagging.table_name}.context = ?', tags_type]
-            has_many context_tags, :through => context_taggings, :source => :tag
+            has_many context_taggings, :as => :taggable, :dependent => :destroy, :include => :tag, :class_name => "ActsAsTaggableOn::Tagging",
+                     :conditions => ["#{ActsAsTaggableOn::Tagging.table_name}.tagger_id IS NULL AND #{ActsAsTaggableOn::Tagging.table_name}.context = ?", tags_type]
+            has_many context_tags, :through => context_taggings, :source => :tag, :class_name => "ActsAsTaggableOn::Tag"
           end
 
           class_eval %(
@@ -66,7 +66,7 @@ module ActsAsTaggableOn::Taggable
       #   User.tagged_with("awesome", "cool", :any => true)       # Users that are tagged with awesome or cool
       #   User.tagged_with("awesome", "cool", :match_all => true) # Users that are tagged with just awesome and cool
       def tagged_with(tags, options = {})
-        tag_list = TagList.from(tags)
+        tag_list = ActsAsTaggableOn::TagList.from(tags)
 
         return {} if tag_list.empty?
 
@@ -76,15 +76,15 @@ module ActsAsTaggableOn::Taggable
         context = options.delete(:on)
 
         if options.delete(:exclude)
-          tags_conditions = tag_list.map { |t| sanitize_sql(["#{Tag.table_name}.name LIKE ?", t]) }.join(" OR ")
-          conditions << "#{table_name}.#{primary_key} NOT IN (SELECT #{Tagging.table_name}.taggable_id FROM #{Tagging.table_name} JOIN #{Tag.table_name} ON #{Tagging.table_name}.tag_id = #{Tag.table_name}.id AND (#{tags_conditions}) WHERE #{Tagging.table_name}.taggable_type = #{quote_value(base_class.name)})"
+          tags_conditions = tag_list.map { |t| sanitize_sql(["#{ActsAsTaggableOn::Tag.table_name}.name LIKE ?", t]) }.join(" OR ")
+          conditions << "#{table_name}.#{primary_key} NOT IN (SELECT #{ActsAsTaggableOn::Tagging.table_name}.taggable_id FROM #{ActsAsTaggableOn::Tagging.table_name} JOIN #{ActsAsTaggableOn::Tag.table_name} ON #{ActsAsTaggableOn::Tagging.table_name}.tag_id = #{ActsAsTaggableOn::Tag.table_name}.id AND (#{tags_conditions}) WHERE #{ActsAsTaggableOn::Tagging.table_name}.taggable_type = #{quote_value(base_class.name)})"
 
         elsif options.delete(:any)
-          tags_conditions = tag_list.map { |t| sanitize_sql(["#{Tag.table_name}.name LIKE ?", t]) }.join(" OR ")
-          conditions << "#{table_name}.#{primary_key} IN (SELECT #{Tagging.table_name}.taggable_id FROM #{Tagging.table_name} JOIN #{Tag.table_name} ON #{Tagging.table_name}.tag_id = #{Tag.table_name}.id AND (#{tags_conditions}) WHERE #{Tagging.table_name}.taggable_type = #{quote_value(base_class.name)})"
+          tags_conditions = tag_list.map { |t| sanitize_sql(["#{ActsAsTaggableOn::Tag.table_name}.name LIKE ?", t]) }.join(" OR ")
+          conditions << "#{table_name}.#{primary_key} IN (SELECT #{ActsAsTaggableOn::Tagging.table_name}.taggable_id FROM #{ActsAsTaggableOn::Tagging.table_name} JOIN #{ActsAsTaggableOn::Tag.table_name} ON #{ActsAsTaggableOn::Tagging.table_name}.tag_id = #{ActsAsTaggableOn::Tag.table_name}.id AND (#{tags_conditions}) WHERE #{ActsAsTaggableOn::Tagging.table_name}.taggable_type = #{quote_value(base_class.name)})"
 
         else
-          tags = Tag.named_any(tag_list)
+          tags = ActsAsTaggableOn::Tag.named_any(tag_list)
           return scoped(:conditions => "1 = 0") unless tags.length == tag_list.length
 
           tags.each do |tag|
@@ -93,7 +93,7 @@ module ActsAsTaggableOn::Taggable
 
             taggings_alias = "#{table_name}_taggings_#{prefix}"
 
-            tagging_join  = "JOIN #{Tagging.table_name} #{taggings_alias}" +
+            tagging_join  = "JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" +
                             "  ON #{taggings_alias}.taggable_id = #{table_name}.#{primary_key}" +
                             " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name)}" +
                             " AND #{taggings_alias}.tag_id = #{tag.id}"
@@ -106,7 +106,7 @@ module ActsAsTaggableOn::Taggable
         taggings_alias, tags_alias = "#{table_name}_taggings_group", "#{table_name}_tags_group"
 
         if options.delete(:match_all)
-          joins << "LEFT OUTER JOIN #{Tagging.table_name} #{taggings_alias}" +
+          joins << "LEFT OUTER JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" +
                    "  ON #{taggings_alias}.taggable_id = #{table_name}.#{primary_key}" +
                    " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name)}"
 
@@ -154,7 +154,7 @@ module ActsAsTaggableOn::Taggable
 
       def tag_list_cache_on(context)
         variable_name = "@#{context.to_s.singularize}_list"
-        instance_variable_get(variable_name) || instance_variable_set(variable_name, TagList.new(tags_on(context).map(&:name)))
+        instance_variable_get(variable_name) || instance_variable_set(variable_name, ActsAsTaggableOn::TagList.new(tags_on(context).map(&:name)))
       end
 
       def tag_list_on(context)
@@ -166,40 +166,40 @@ module ActsAsTaggableOn::Taggable
         variable_name = "@all_#{context.to_s.singularize}_list"
         return instance_variable_get(variable_name) if instance_variable_get(variable_name)
 
-        instance_variable_set(variable_name, TagList.new(all_tags_on(context).map(&:name)).freeze)
+        instance_variable_set(variable_name, ActsAsTaggableOn::TagList.new(all_tags_on(context).map(&:name)).freeze)
       end
 
       ##
       # Returns all tags of a given context
       def all_tags_on(context)
-        opts =  ["#{Tagging.table_name}.context = ?", context.to_s]
-        base_tags.where(opts).order("#{Tagging.table_name}.created_at").group("#{Tagging.table_name}.tag_id").all
+        opts =  ["#{ActsAsTaggableOn::Tagging.table_name}.context = ?", context.to_s]
+        base_tags.where(opts).order("#{ActsAsTaggableOn::Tagging.table_name}.created_at").group("#{ActsAsTaggableOn::Tagging.table_name}.tag_id").all
       end
 
       ##
       # Returns all tags that are not owned of a given context
       def tags_on(context)
-        base_tags.where(["#{Tagging.table_name}.context = ? AND #{Tagging.table_name}.tagger_id IS NULL", context.to_s]).all
+        base_tags.where(["#{ActsAsTaggableOn::Tagging.table_name}.context = ? AND #{ActsAsTaggableOn::Tagging.table_name}.tagger_id IS NULL", context.to_s]).all
       end
 
       def set_tag_list_on(context, new_list)
         add_custom_context(context)
 
         variable_name = "@#{context.to_s.singularize}_list"
-        instance_variable_set(variable_name, TagList.from(new_list))
+        instance_variable_set(variable_name, ActsAsTaggableOn::TagList.from(new_list))
       end
 
       def tagging_contexts
         custom_contexts + self.class.tag_types.map(&:to_s)
       end
 
-      def reload
+      def reload(*args)
         self.class.tag_types.each do |context|
           instance_variable_set("@#{context.to_s.singularize}_list", nil)
           instance_variable_set("@all_#{context.to_s.singularize}_list", nil)
         end
       
-        super
+        super(*args)
       end
 
       def save_tags
@@ -209,7 +209,7 @@ module ActsAsTaggableOn::Taggable
           tag_list = tag_list_cache_on(context).uniq
 
           # Find existing tags or create non-existing tags:
-          tag_list = Tag.find_or_create_all_with_like_by_name(tag_list)
+          tag_list = ActsAsTaggableOn::Tag.find_or_create_all_with_like_by_name(tag_list)
 
           current_tags = tags_on(context)
           old_tags     = current_tags - tag_list
@@ -221,7 +221,7 @@ module ActsAsTaggableOn::Taggable
 
           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/ownership.rb

@@ -30,9 +30,9 @@ 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
+        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
 
       def cached_owned_tag_list_on(context)
@@ -46,7 +46,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 +55,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 +78,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

@@ -42,9 +42,9 @@ 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],
+        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      => grouped_column_names_for(klass),
                        :order      => "count DESC" }.update(options))
       end
@@ -54,9 +54,9 @@ 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],
+        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      => grouped_column_names_for(klass),
                        :order      => "count DESC" }.update(options))
       end

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/tag.rb

@@ -1,65 +1,67 @@
-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 ?", 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 ?", tag.to_s]) }.join(" OR "))
+    end
   
-  def self.named_like(name)
-    where(["name LIKE ?", "%#{name}%"])
-  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
+    def self.named_like_any(list)
+      where(list.map { |tag| sanitize_sql(["name LIKE ?", "%#{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
+  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,7 @@ describe "Acts As Taggable On" do
 
   describe "Taggable Method Generation" do
     before(:each) do
-      [TaggableModel, Tag, Tagging, TaggableUser].each(&:delete_all)
+      clean_database!
       @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
 
@@ -178,6 +178,11 @@ describe "Taggable" do
     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)    
@@ -236,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
@@ -253,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

data/spec/acts_as_taggable_on/tagger_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
 describe "Tagger" do
   before(:each) do
@@ -22,7 +22,7 @@ describe "Tagger" do
     lambda{
       @user.tag(@taggable, :with => 'ruby, scheme', :on => :tags)
       @user2.tag(@taggable, :with => 'java, python, lisp, ruby', :on => :tags)
-    }.should change(Tagging, :count).by(6)
+    }.should change(ActsAsTaggableOn::Tagging, :count).by(6)
 
     [@user, @user2, @taggable].each(&:reload)
 
@@ -43,7 +43,7 @@ describe "Tagger" do
     
     lambda {
       @user2.tag(@taggable, :with => 'java, python, lisp', :on => :tags)
-    }.should change(Tagging, :count).by(-1)
+    }.should change(ActsAsTaggableOn::Tagging, :count).by(-1)
 
     [@user, @user2, @taggable].each(&:reload)
     
@@ -62,7 +62,7 @@ describe "Tagger" do
 
     lambda {
       @user2.tag(@taggable, :with => 'epic', :on => :tags)
-    }.should change(Tagging, :count).by(-1)
+    }.should change(ActsAsTaggableOn::Tagging, :count).by(-1)
 
     @taggable.reload  
     @taggable.all_tags_list.should include('awesome')
@@ -79,7 +79,7 @@ describe "Tagger" do
     
     lambda {
       @taggable.update_attributes(:tag_list => "")
-    }.should change(Tagging, :count).by(-1)
+    }.should change(ActsAsTaggableOn::Tagging, :count).by(-1)
     
     @taggable.tag_list.should == []
     @taggable.all_tags_list.sort.should == %w(ruby scheme).sort

data/spec/acts_as_taggable_on/tagging_spec.rb

@@ -1,14 +1,14 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
-describe Tagging do
+describe ActsAsTaggableOn::Tagging do
   before(:each) do
     clean_database!
-    @tagging = Tagging.new
+    @tagging = ActsAsTaggableOn::Tagging.new
   end
 
   it "should not be valid with a invalid tag" do
     @tagging.taggable = TaggableModel.create(:name => "Bob Jones")
-    @tagging.tag = Tag.new(:name => "")
+    @tagging.tag = ActsAsTaggableOn::Tag.new(:name => "")
     @tagging.context = "tags"
 
     @tagging.should_not be_valid
@@ -22,10 +22,10 @@ describe Tagging do
 
   it "should not create duplicate taggings" do
     @taggable = TaggableModel.create(:name => "Bob Jones")
-    @tag = Tag.create(:name => "awesome")
+    @tag = ActsAsTaggableOn::Tag.create(:name => "awesome")
 
     lambda {
-      2.times { Tagging.create(:taggable => @taggable, :tag => @tag, :context => 'tags') }
-    }.should change(Tagging, :count).by(1)
+      2.times { ActsAsTaggableOn::Tagging.create(:taggable => @taggable, :tag => @tag, :context => 'tags') }
+    }.should change(ActsAsTaggableOn::Tagging, :count).by(1)
   end
 end

data/spec/acts_as_taggable_on/tags_helper_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.expand_path('../../spec_helper', __FILE__)
 
-describe TagsHelper do
+describe ActsAsTaggableOn::TagsHelper do
   before(:each) do
     clean_database!
     
@@ -9,7 +9,7 @@ describe TagsHelper do
     @eve = TaggableModel.create(:name => "Eve Nodd",   :language_list => "ruby, c++")
     
     @helper = class Helper
-      include TagsHelper
+      include ActsAsTaggableOn::TagsHelper
     end.new
   end
   

data/spec/spec_helper.rb

@@ -1,27 +1,31 @@
+$LOAD_PATH << "." unless $LOAD_PATH.include?(".")
+
 begin
-  # Try to require the preresolved locked set of gems.
-  require File.expand_path("../.bundle/environment", __FILE__)
-rescue LoadError
-  # Fall back on doing an unlocked resolve at runtime.
-  require "rubygems" unless RUBY_VERSION >= "1.9"
+  require "rubygems"
   require "bundler"
+
+  if Gem::Version.new(Bundler::VERSION) <= Gem::Version.new("0.9.5")
+    raise RuntimeError, "Your bundler version is too old." +
+     "Run `gem install bundler` to upgrade."
+  end
+
+  # Set up load paths for all bundled gems
   Bundler.setup
+rescue Bundler::GemNotFound
+  raise RuntimeError, "Bundler couldn't find some gems." +
+    "Did you run `bundle install`?"
 end
 
 Bundler.require
 require File.expand_path('../../lib/acts-as-taggable-on', __FILE__)
 
-if defined?(Rspec::Core::ExampleGroupSubject)
-  module Rspec::Core::ExampleGroupSubject
-    alias :context :describe
-  end
-end
-
-class Array
-  def freq
-    k=Hash.new(0)
-    each {|e| k[e]+=1}
-    k
+unless [].respond_to?(:freq)
+  class Array
+    def freq
+      k=Hash.new(0)
+      each {|e| k[e]+=1}
+      k
+    end
   end
 end
 
@@ -43,10 +47,10 @@ ActiveRecord::Base.silence do
 end
 
 def clean_database!
-  models = [Tag, Tagging, TaggableModel, OtherTaggableModel, InheritingTaggableModel,
+  models = [ActsAsTaggableOn::Tag, ActsAsTaggableOn::Tagging, TaggableModel, OtherTaggableModel, InheritingTaggableModel,
             AlteredInheritingTaggableModel, TaggableUser, UntaggableModel]
   models.each do |model|
-    model.destroy_all
+    ActiveRecord::Base.connection.execute "DELETE FROM #{model.table_name}"
   end
 end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 4
-  version: 2.0.4
+  - 5
+  version: 2.0.5
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-05 00:00:00 +02:00
+date: 2010-04-30 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -63,7 +63,6 @@ files:
 - spec/bm.rb
 - spec/models.rb
 - spec/schema.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/mbleigh/acts-as-taggable-on

data/spec/spec.opts

@@ -1,2 +0,0 @@
---colour
---backtrace