acts-as-taggable-on 2.0.0.pre4 → 2.0.0.pre5

data/Rakefile

@@ -1,4 +1,20 @@
 begin
+  # Rspec 1.3.0
+  require 'spec/rake/spectask'
+
+  desc 'Default: run specs'
+  task :default => :spec
+  Spec::Rake::SpecTask.new do |t|
+    t.spec_files = FileList["spec/**/*_spec.rb"]
+  end
+
+  Spec::Rake::SpecTask.new('rcov') do |t|
+    t.spec_files = FileList["spec/**/*_spec.rb"]
+    t.rcov = true
+    t.rcov_opts = ['--exclude', 'spec']
+  end
+  
+rescue LoadError
   # Rspec 2.0
   require 'rspec/core/rake_task'
 
@@ -12,23 +28,8 @@ begin
     t.pattern = "spec/**/*_spec.rb"
     t.rcov = true
     t.rcov_opts = ['--exclude', 'spec']
-  end  
-  
-rescue LoadError
-  # Rspec 1.3.0
-  require 'spec/rake/spectask'
-
-  desc 'Default: run specs'
-  task :default => :spec
-  Spec::Rake::SpecTask.new do |t|
-    t.spec_files = FileList["spec/**/*_spec.rb"]
   end
 
-  Spec::Rake::SpecTask.new('rcov') do |t|
-    t.spec_files = FileList["spec/**/*_spec.rb"]
-    t.rcov = true
-    t.rcov_opts = ['--exclude', 'spec']
-  end
 rescue LoadError
   puts "Rspec not available. Install it with: gem install rspec"  
 end

data/VERSION

@@ -1 +1 @@
-2.0.0.pre4
+2.0.0.pre5

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

@@ -1,15 +1,13 @@
 require "active_record"
 require "action_view"
 
-if ActiveRecord::VERSION::MAJOR < 3
-  require "acts_as_taggable_on/compatibility/active_record_backports"
-  require "acts_as_taggable_on/compatibility/tag"
-  require "acts_as_taggable_on/compatibility/tagging"
-end
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+
+require "acts_as_taggable_on/compatibility/active_record_backports" if ActiveRecord::VERSION::MAJOR < 3
 
 require "acts_as_taggable_on/acts_as_taggable_on"
 require "acts_as_taggable_on/acts_as_taggable_on/core"
-require "acts_as_taggable_on/acts_as_taggable_on/aggregate"
+require "acts_as_taggable_on/acts_as_taggable_on/collection"
 require "acts_as_taggable_on/acts_as_taggable_on/cache"
 require "acts_as_taggable_on/acts_as_taggable_on/ownership"
 require "acts_as_taggable_on/acts_as_taggable_on/related"
@@ -20,6 +18,8 @@ require "acts_as_taggable_on/tag_list"
 require "acts_as_taggable_on/tags_helper"
 require "acts_as_taggable_on/tagging"
 
+$LOAD_PATH.shift
+
 if defined?(ActiveRecord::Base)
   ActiveRecord::Base.extend ActsAsTaggableOn::Taggable
   ActiveRecord::Base.send :include, ActsAsTaggableOn::Tagger

data/lib/acts_as_taggable_on/acts_as_taggable_on.rb

@@ -17,7 +17,7 @@ module ActsAsTaggableOn
         if ::ActiveRecord::VERSION::MAJOR < 3
           include ActsAsTaggableOn::ActiveRecord::Backports
         end
-      
+
         write_inheritable_attribute(:tag_types, tag_types)
         class_inheritable_reader(:tag_types)
         
@@ -28,14 +28,14 @@ module ActsAsTaggableOn
           def self.taggable?
             true
           end
+        
+          include ActsAsTaggableOn::Taggable::Core
+          include ActsAsTaggableOn::Taggable::Collection
+          include ActsAsTaggableOn::Taggable::Cache
+          include ActsAsTaggableOn::Taggable::Ownership
+          include ActsAsTaggableOn::Taggable::Related
         end
       end
-      
-      include ActsAsTaggableOn::Taggable::Core
-      include ActsAsTaggableOn::Taggable::Aggregate
-      include ActsAsTaggableOn::Taggable::Cache
-      include ActsAsTaggableOn::Taggable::Ownership
-      include ActsAsTaggableOn::Taggable::Related
     end
   end
 end

data/lib/acts_as_taggable_on/acts_as_taggable_on/cache.rb

@@ -11,26 +11,43 @@ module ActsAsTaggableOn::Taggable
         before_save :save_cached_tag_list        
       end
       
-      base.tag_types.map(&:to_s).each do |tag_type|
-        base.class_eval %(
-          def self.caching_#{tag_type.singularize}_list?
-            caching_tag_list_on?("#{tag_type}")
-          end        
-        )
-      end
+      base.intialize_acts_as_taggable_on_cache
     end
     
     module ClassMethods
+      def intialize_acts_as_taggable_on_cache      
+        tag_types.map(&:to_s).each do |tag_type|
+          class_eval %(
+            def self.caching_#{tag_type.singularize}_list?
+              caching_tag_list_on?("#{tag_type}")
+            end        
+          )
+        end        
+      end
+      
+      def acts_as_taggable_on(*args)
+        super(*args)
+        intialize_acts_as_taggable_on_cache
+      end
+      
       def caching_tag_list_on?(context)
         column_names.include?("cached_#{context.to_s.singularize}_list")
       end
     end
     
     module InstanceMethods
+      def tag_list_cache_set_on(context)
+        variable_name = "@#{context.to_s.singularize}_list"
+        !instance_variable_get(variable_name).nil?
+      end
+      
       def save_cached_tag_list
         tag_types.map(&:to_s).each do |tag_type|
           if self.class.send("caching_#{tag_type.singularize}_list?")
-            self["cached_#{tag_type.singularize}_list"] = tag_list_cache_on(tag_type.singularize).to_a.flatten.compact.join(', ')
+            if tag_list_cache_set_on(tag_type)
+              list = tag_list_cache_on(tag_type.singularize).to_a.flatten.compact.join(', ')
+              self["cached_#{tag_type.singularize}_list"] = list
+            end
           end
         end
       end

data/lib/acts_as_taggable_on/acts_as_taggable_on/{aggregate.rb → collection.rb}

@@ -1,35 +1,41 @@
 module ActsAsTaggableOn::Taggable
-  module Aggregate
+  module Collection
     def self.included(base)
-      unless base.ancestors.include?(ActsAsTaggableOn::Taggable::Aggregate::InstanceMethods)
-        base.send :include, ActsAsTaggableOn::Taggable::Aggregate::InstanceMethods
-        base.extend ActsAsTaggableOn::Taggable::Aggregate::ClassMethods
-      end
-      
-      base.tag_types.map(&:to_s).each do |tag_type|
-        base.class_eval %(
-          def #{tag_type.singularize}_counts(options = {})
-            tag_counts_on('#{tag_type}', options)
-          end
-
-          def top_#{tag_type}(limit = 10)
-            tag_counts_on('#{tag_type}', :order => 'count desc', :limit => limit.to_i)
-          end
-
-          def self.top_#{tag_type}(limit = 10)
-            tag_counts_on('#{tag_type}', :order => 'count desc', :limit => limit.to_i)
-          end        
-        )
-      end
+      base.send :include, ActsAsTaggableOn::Taggable::Collection::InstanceMethods
+      base.extend ActsAsTaggableOn::Taggable::Collection::ClassMethods
+      base.initialize_acts_as_taggable_on_collection
     end
     
     module ClassMethods
-      def tag_counts_on(context, options = {})
-        find_for_tag_counts(options.merge({:on => context.to_s}))
-      end
+      def initialize_acts_as_taggable_on_collection
+        tag_types.map(&:to_s).each do |tag_type|
+          class_eval %(
+            def self.#{tag_type.singularize}_counts(options={})
+              tag_counts_on('#{tag_type}', options)
+            end
 
-      def all_tag_counts(options = {})
-        find_for_tag_counts(options)
+            def #{tag_type.singularize}_counts(options = {})
+              tag_counts_on('#{tag_type}', options)
+            end
+
+            def top_#{tag_type}(limit = 10)
+              tag_counts_on('#{tag_type}', :order => 'count desc', :limit => limit.to_i)
+            end
+
+            def self.top_#{tag_type}(limit = 10)
+              tag_counts_on('#{tag_type}', :order => 'count desc', :limit => limit.to_i)
+            end        
+          )
+        end        
+      end
+      
+      def acts_as_taggable_on(*args)
+        super(*args)
+        initialize_acts_as_taggable_on_collection
+      end
+      
+      def tag_counts_on(context, options = {})
+        all_tag_counts(options.merge({:on => context.to_s}))
       end
       
       # Calculate the tag counts for all tags.
@@ -43,7 +49,7 @@ module ActsAsTaggableOn::Taggable
       #  :at_least - Exclude tags with a frequency less than the given value
       #  :at_most - Exclude tags with a frequency greater than the given value
       #  :on - Scope the find to only include a certain context
-      def find_for_tag_counts(options = {})
+      def all_tag_counts(options = {})
         options.assert_valid_keys :start_at, :end_at, :conditions, :at_least, :at_most, :order, :limit, :on, :id
 
         start_at = sanitize_sql(["#{Tagging.table_name}.created_at >= ?", options.delete(:start_at)]) if options[:start_at]
@@ -79,7 +85,6 @@ module ActsAsTaggableOn::Taggable
         group_by << " AND #{having}" unless having.blank?
 
         Tag.select("#{Tag.table_name}.*, COUNT(*) AS count").joins(joins.join(" ")).where(conditions).group(group_by).limit(options[:limit]).order(options[:order])
-
       end
     end
     

data/lib/acts_as_taggable_on/acts_as_taggable_on/core.rb

@@ -6,51 +6,51 @@ module ActsAsTaggableOn::Taggable
 
       base.class_eval do
         attr_writer :custom_contexts
-
         after_save :save_tags
-
-        def self.tagged_with(*args)
-          find_options_for_find_tagged_with(*args)
-        end
       end
       
-      base.tag_types.map(&:to_s).each do |tag_type|
-        context_taggings = "#{tag_type.singularize}_taggings".to_sym
-        context_tags     = tag_type.to_sym
-        
-        base.class_eval do
-          has_many context_taggings, :as => :taggable, :dependent => :destroy, :include => :tag,
-                   :conditions => ['#{Tagging.table_name}.context = ?', tag_type], :class_name => "Tagging"
-          has_many context_tags, :through => context_taggings, :source => :tag
-        end
-        
-        base.class_eval %(
-          def self.#{tag_type.singularize}_counts(options={})
-            tag_counts_on('#{tag_type}', options)
+      base.initialize_acts_as_taggable_on_core
+    end
+    
+    module ClassMethods
+      def initialize_acts_as_taggable_on_core
+        tag_types.map(&:to_s).each do |tag_type|
+          context_taggings = "#{tag_type.singularize}_taggings".to_sym
+          context_tags     = tag_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 = ?', tag_type]
+            has_many context_tags, :through => context_taggings, :source => :tag
           end
 
-          def #{tag_type.singularize}_list
-            tag_list_on('#{tag_type}')
-          end
+          class_eval %(
+            def #{tag_type.singularize}_list
+              tag_list_on('#{tag_type}')
+            end
 
-          def #{tag_type.singularize}_list=(new_tags)
-            set_tag_list_on('#{tag_type}', new_tags)
-          end
-          
-          def all_#{tag_type}_list
-            all_tags_list_on('#{tag_type}')
-          end
-        )
+            def #{tag_type.singularize}_list=(new_tags)
+              set_tag_list_on('#{tag_type}', new_tags)
+            end
+
+            def all_#{tag_type}_list
+              all_tags_list_on('#{tag_type}')
+            end
+          )
+        end        
       end
-    end
-    
-    module ClassMethods
+      
+      def acts_as_taggable_on(*args)
+        super(*args)
+        initialize_acts_as_taggable_on_core
+      end
+      
       # 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
 
-      def find_options_for_find_tagged_with(tags, options = {})
+      def tagged_with(tags, options = {})
         tag_list = TagList.from(tags)
 
         return {} if tag_list.empty?
@@ -98,19 +98,19 @@ module ActsAsTaggableOn::Taggable
           group = "#{grouped_column_names_for(self)} HAVING COUNT(#{taggings_alias}.taggable_id) = #{tags.size}"
         end
 
+
         joins(joins.join(" ")).group(group).where(conditions.join(" AND ")).readonly(false)
       end
 
       def is_taggable?
         true
       end
-
     end    
     
     module InstanceMethods
       # 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(", ")
+        self.class.grouped_column_names_for(object)
       end
 
       def custom_contexts
@@ -156,7 +156,13 @@ module ActsAsTaggableOn::Taggable
       ##
       # 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
+        if respond_to?(context)
+          # If the association is available, use it:
+          send(context).all
+        else
+          # If the association is not available, query it the old fashioned way
+          base_tags.where(["#{Tagging.table_name}.context = ? AND #{Tagging.table_name}.tagger_id IS NULL", context.to_s]).all
+        end
       end
 
       def set_tag_list_on(context, new_list)
@@ -180,7 +186,7 @@ module ActsAsTaggableOn::Taggable
       end
 
       def save_tags
-        transaction do
+        transaction do          
           tagging_contexts.each do |context|
             tag_list = tag_list_cache_on(context).uniq
   
@@ -192,11 +198,13 @@ module ActsAsTaggableOn::Taggable
             new_tags     = tag_list     - current_tags
             
             # Find taggings to remove:
-            old_taggings = Tagging.where(:taggable_id => self.id, :taggable_type => self.class.base_class.to_s,
-                                         :tagger_type => nil, :tagger_id => nil,
-                                         :context => context.to_s, :tag_id => old_tags)
+            old_taggings = taggings.where(:tagger_type => nil, :tagger_id => nil,
+                                          :context => context.to_s, :tag_id => old_tags).all
 
-            Tagging.destroy_all :id => old_taggings.map(&:id)
+            if old_taggings.present?
+              # Destroy old taggings:
+              Tagging.destroy_all :id => old_taggings.map(&:id)
+            end
 
             # Create new taggings:
             new_tags.each do |tag|

data/lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb

@@ -0,0 +1,29 @@
+module ActsAsTaggableOn::Taggable
+  module Dirty
+    def self.included(base)
+      include ActsAsTaggableOn::Taggable::Dirty::InstanceMethods
+
+      base.tag_types.map(&:to_s).each do |tag_type|
+        base.class_eval %(
+          def #{tag_type.singularize}_list_changed?
+            tag_list_changed_on?('#{tag_type}')
+            tag_list_on('#{tag_type}')
+          end
+
+          def #{tag_type.singularize}_list=(new_tags)
+            change_tag_list_on('#{tag_type}', new_tags)
+            super(new_tags)
+          end
+        )
+      end      
+    end
+    
+    module InstanceMethods
+      def tag_list_changed_on?(context)
+      end
+      
+      def change_tag_list_on(context, new_tags)        
+      end
+    end
+  end
+end

data/lib/acts_as_taggable_on/acts_as_taggable_on/ownership.rb

@@ -6,18 +6,26 @@ module ActsAsTaggableOn::Taggable
      
       base.class_eval do
         after_save :save_owned_tags    
-      end     
-      
-      base.tag_types.map(&:to_s).each do |tag_type|
-        base.class_eval %(
-          def #{tag_type}_from(owner)
-            owner_tag_list_on(owner, '#{tag_type}')
-          end      
-        )
       end
+      
+      base.initialize_acts_as_taggable_on_ownership
     end
     
     module ClassMethods
+      def acts_as_taggable_on(*args)
+        initialize_acts_as_taggable_on_ownership
+        super(*args)
+      end
+      
+      def initialize_acts_as_taggable_on_ownership      
+        tag_types.map(&:to_s).each do |tag_type|
+          class_eval %(
+            def #{tag_type}_from(owner)
+              owner_tag_list_on(owner, '#{tag_type}')
+            end      
+          )
+        end        
+      end
     end
     
     module InstanceMethods
@@ -65,16 +73,15 @@ module ActsAsTaggableOn::Taggable
               # Find existing tags or create non-existing tags:
               tag_list = 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
-              new_tags     = tag_list   - owned_tags
+              owned_tags = owner_tags_on(owner, context)              
+              old_tags   = owned_tags - tag_list
+              new_tags   = tag_list   - owned_tags
             
               # 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)
+                                           :tag_id => old_tags, :context => context).all
             
               if old_taggings.present?
                 # Destroy old taggings:

data/lib/acts_as_taggable_on/acts_as_taggable_on/related.rb

@@ -1,75 +1,63 @@
 module ActsAsTaggableOn::Taggable
   module Related
     def self.included(base)
-      unless base.ancestors.include?(ActsAsTaggableOn::Taggable::Related::InstanceMethods)
-        base.send :include, ActsAsTaggableOn::Taggable::Related::InstanceMethods
-        base.extend ActsAsTaggableOn::Taggable::Related::ClassMethods
-      end
-      
-      base.tag_types.map(&:to_s).each do |tag_type|
-        base.class_eval %(
-          def find_related_#{tag_type}(options = {})
-            related_tags_for('#{tag_type}', self.class, options)
-          end
-          alias_method :find_related_on_#{tag_type}, :find_related_#{tag_type}
+      base.send :include, ActsAsTaggableOn::Taggable::Related::InstanceMethods
+      base.extend ActsAsTaggableOn::Taggable::Related::ClassMethods
+    end
+    
+    module ClassMethods
+      def initialize_acts_as_taggable_on_related
+        tag_types.map(&:to_s).each do |tag_type|
+          class_eval %(
+            def find_related_#{tag_type}(options = {})
+              related_tags_for('#{tag_type}', self.class, options)
+            end
+            alias_method :find_related_on_#{tag_type}, :find_related_#{tag_type}
 
-          def find_related_#{tag_type}_for(klass, options = {})
-            related_tags_for('#{tag_type}', klass, options)
-          end
+            def find_related_#{tag_type}_for(klass, options = {})
+              related_tags_for('#{tag_type}', klass, options)
+            end
 
-          def find_matching_contexts(search_context, result_context, options = {})
-            matching_contexts_for(search_context.to_s, result_context.to_s, self.class, options)
-          end
+            def find_matching_contexts(search_context, result_context, options = {})
+              matching_contexts_for(search_context.to_s, result_context.to_s, self.class, options)
+            end
 
-          def find_matching_contexts_for(klass, search_context, result_context, options = {})
-            matching_contexts_for(search_context.to_s, result_context.to_s, klass, options)
-          end
-        )
+            def find_matching_contexts_for(klass, search_context, result_context, options = {})
+              matching_contexts_for(search_context.to_s, result_context.to_s, klass, options)
+            end
+          )
+        end        
+      end
+      
+      def acts_as_taggable_on(*args)
+        super(*args)
+        initialize_acts_as_taggable_on_related
       end
-    end
-    
-    module ClassMethods
     end
     
     module InstanceMethods
       def matching_contexts_for(search_context, result_context, klass, options = {})
-        search_conditions = matching_context_search_options(search_context, result_context, klass, options)
-
-        # klass.select(search_conditions[:select]).from(search_conditions[:from]).where(search_conditions[:conditions]).group(search_conditions[:group]).order(search_conditions[:order])
-        klass.scoped(search_conditions)
-      end
-
-      def matching_context_search_options(search_context, result_context, klass, options = {})
         tags_to_find = tags_on(search_context).collect { |t| t.name }
 
         exclude_self = "#{klass.table_name}.id != #{id} AND" if self.class == klass
-
-        { :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],
-          :group      => grouped_column_names_for(klass),
-          :order      => "count DESC"
-        }.update(options)
+        
+        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],
+                 :group      => grouped_column_names_for(klass),
+                 :order      => "count DESC" }.update(options))
       end
       
       def related_tags_for(context, klass, options = {})
-        search_conditions = related_search_options(context, klass, options)
-
-        # klass.select(search_conditions[:select]).from(search_conditions[:from]).where(search_conditions[:conditions]).group(search_conditions[:group]).order(search_conditions[:order])
-        klass.scoped(search_conditions)
-      end
-
-      def related_search_options(context, klass, options = {})
         tags_to_find = tags_on(context).collect { |t| t.name }
 
         exclude_self = "#{klass.table_name}.id != #{id} AND" if self.class == klass
 
-        { :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],
-          :group      => grouped_column_names_for(klass),
-          :order      => "count DESC"
-        }.update(options)
+        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],
+                 :group      => grouped_column_names_for(klass),
+                 :order      => "count DESC" }.update(options))
       end
     end
   end

data/lib/acts_as_taggable_on/compatibility/active_record_backports.rb

@@ -6,10 +6,10 @@ module ActsAsTaggableOn
           named_scope :where,    lambda { |conditions| { :conditions => conditions } }  
           named_scope :joins,    lambda { |joins|      { :joins => joins } }
           named_scope :group,    lambda { |group|      { :group => group } }
-          named_scope :readonly, lambda { |readonly|   { :readonly => readonly } }
           named_scope :order,    lambda { |order|      { :order => order } }
           named_scope :select,   lambda { |select|     { :select => select } }
-          named_scope :limit,    lambda { |limit|      { :limit => limit } }      
+          named_scope :limit,    lambda { |limit|      { :limit => limit } }
+          named_scope :readonly, lambda { |readonly|   { :readonly => readonly } }   
         end
       end
     end

data/lib/acts_as_taggable_on/tag.rb

@@ -1,5 +1,6 @@
 class Tag < ActiveRecord::Base
-
+  include ActsAsTaggableOn::ActiveRecord::Backports if ActiveRecord::VERSION::MAJOR < 3
+  
   attr_accessible :name
 
   ### ASSOCIATIONS:

data/lib/acts_as_taggable_on/tagging.rb

@@ -1,4 +1,5 @@
 class Tagging < ActiveRecord::Base #:nodoc:
+  include ActsAsTaggableOn::ActiveRecord::Backports if ActiveRecord::VERSION::MAJOR < 3
 
   attr_accessible :tag,
                   :tag_id,

data/spec/acts_as_taggable_on/acts_as_taggable_on_spec.rb

@@ -35,19 +35,10 @@ describe "Acts As Taggable On" do
       @taggable.should respond_to(:tags, :skills, :languages)
     end
 
-    it "should generate a cached column checker for each tag type" do
-     TaggableModel.should respond_to(:caching_tag_list?, :caching_skill_list?, :caching_language_list?)
-    end
-
     it "should add tagged_with and tag_counts to singleton" do
       TaggableModel.should respond_to(:tagged_with, :tag_counts)
     end
 
-    it "should add saving of tag lists and cached tag lists to the instance" do
-      @taggable.should respond_to(:save_cached_tag_list)
-      @taggable.should respond_to(:save_tags)
-    end
-
     it "should generate a tag_list accessor/setter for each tag type" do
       @taggable.should respond_to(:tag_list, :skill_list, :language_list)
       @taggable.should respond_to(:tag_list=, :skill_list=, :language_list=)
@@ -215,5 +206,61 @@ describe "Acts As Taggable On" do
       }.should_not raise_error
     end
   end
+  
+  describe 'Caching' do
+    before(:each) do
+      @taggable = CachedModel.new(:name => "Bob Jones")  
+    end
+    
+    it "should add saving of tag lists and cached tag lists to the instance" do
+      @taggable.should respond_to(:save_cached_tag_list)
+      @taggable.should respond_to(:save_tags)
+    end  
+
+    it "should generate a cached column checker for each tag type" do
+      CachedModel.should respond_to(:caching_tag_list?)
+    end  
+    
+    it 'should not have cached tags' do
+      @taggable.cached_tag_list.should be_blank  
+    end
+    
+    it 'should cache tags' do
+      @taggable.update_attributes(:tag_list => 'awesome, epic')
+      @taggable.cached_tag_list.should == 'awesome, epic'
+    end
+    
+    it 'should keep the cache' do
+      @taggable.update_attributes(:tag_list => 'awesome, epic')
+      @taggable = CachedModel.find(@taggable)  
+      @taggable.save!
+      @taggable.cached_tag_list.should == 'awesome, epic'   
+    end
+    
+    it 'should update the cache' do
+      @taggable.update_attributes(:tag_list => 'awesome, epic')
+      @taggable.update_attributes(:tag_list => 'awesome')
+      @taggable.cached_tag_list.should == 'awesome'      
+    end
+    
+    it 'should remove the cache' do
+      @taggable.update_attributes(:tag_list => 'awesome, epic')
+      @taggable.update_attributes(:tag_list => '')
+      @taggable.cached_tag_list.should be_blank  
+    end
+    
+    it 'should have a tag list' do
+      @taggable.update_attributes(:tag_list => 'awesome, epic')
+      @taggable = CachedModel.find(@taggable.id)
+      @taggable.tag_list.sort.should == %w(awesome epic).sort
+    end
+    
+    it 'should keep the tag list' do
+      @taggable.update_attributes(:tag_list => 'awesome, epic')
+      @taggable = CachedModel.find(@taggable.id)
+      @taggable.save!
+      @taggable.tag_list.sort.should == %w(awesome epic).sort
+    end
+  end
 
 end

data/spec/acts_as_taggable_on/taggable_spec.rb

@@ -88,7 +88,7 @@ describe "Taggable" do
     frank = TaggableModel.create(:name => "Frank", :tag_list => "Ruby")
 
     Tag.find(:all).size.should == 1
-    TaggableModel.tagged_with("ruby").all.should == TaggableModel.tagged_with("Ruby").all
+    TaggableModel.tagged_with("ruby").to_a.should == TaggableModel.tagged_with("Ruby").to_a
   end
 
   it "should be able to get tag counts on model as a whole" do
@@ -108,10 +108,20 @@ describe "Taggable" do
     TaggableModel.all_tag_counts.first.count.should == 3 # ruby
   end
 
-  it "should not return read-only records" do
-    TaggableModel.create(:name => "Bob", :tag_list => "ruby, rails, css")
-
-    TaggableModel.tagged_with("ruby").first.should_not be_readonly
+  if ActiveRecord::VERSION::MAJOR >= 3
+    it "should not return read-only records" do
+      TaggableModel.create(:name => "Bob", :tag_list => "ruby, rails, css")
+      TaggableModel.tagged_with("ruby").first.should_not be_readonly
+    end
+  else
+    xit "should not return read-only records" do
+      # apparantly, there is no way to set readonly to false in a scope if joins are made
+    end
+    
+    it "should be possible to return writable records" do
+      TaggableModel.create(:name => "Bob", :tag_list => "ruby, rails, css")
+      TaggableModel.tagged_with("ruby").first(:readonly => false).should_not be_readonly      
+    end
   end
 
   it "should be able to get scoped tag counts" do
@@ -145,9 +155,9 @@ describe "Taggable" do
     frank = TaggableModel.create(:name => "Frank", :tag_list => "weaker, depressed, inefficient", :skill_list => "ruby, rails, css")
     steve = TaggableModel.create(:name => 'Steve', :tag_list => 'fitter, happier, more productive', :skill_list => 'c++, java, ruby')
 
-    TaggableModel.tagged_with("ruby", :order => 'taggable_models.name').all.should == [bob, frank, steve]
-    TaggableModel.tagged_with("ruby, rails", :order => 'taggable_models.name').all.should == [bob, frank]
-    TaggableModel.tagged_with(["ruby", "rails"], :order => 'taggable_models.name').all.should == [bob, frank]
+    TaggableModel.tagged_with("ruby", :order => 'taggable_models.name').to_a.should == [bob, frank, steve]
+    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 any tag" do
@@ -155,9 +165,9 @@ describe "Taggable" do
     frank = TaggableModel.create(:name => "Frank", :tag_list => "weaker, depressed, inefficient", :skill_list => "ruby, rails, css")
     steve = TaggableModel.create(:name => 'Steve', :tag_list => 'fitter, happier, more productive', :skill_list => 'c++, java, ruby')
 
-    TaggableModel.tagged_with(["ruby", "java"], :order => 'taggable_models.name', :any => true).all.should == [bob, frank, steve]
-    TaggableModel.tagged_with(["c++", "fitter"], :order => 'taggable_models.name', :any => true).all.should == [bob, steve]
-    TaggableModel.tagged_with(["depressed", "css"], :order => 'taggable_models.name', :any => true).all.should == [bob, frank]
+    TaggableModel.tagged_with(["ruby", "java"], :order => 'taggable_models.name', :any => true).to_a.should == [bob, frank, steve]
+    TaggableModel.tagged_with(["c++", "fitter"], :order => 'taggable_models.name', :any => true).to_a.should == [bob, steve]
+    TaggableModel.tagged_with(["depressed", "css"], :order => 'taggable_models.name', :any => true).to_a.should == [bob, frank]
   end
 
   it "should be able to find tagged on a custom tag context" do
@@ -166,7 +176,7 @@ describe "Taggable" do
     bob.tag_list_on(:rotors).should == ["spinning","jumping"]
     bob.save
 
-    TaggableModel.tagged_with("spinning", :on => :rotors).all.should == [bob]
+    TaggableModel.tagged_with("spinning", :on => :rotors).to_a.should == [bob]
   end
 
   it "should be able to use named scopes to chain tag finds" do
@@ -175,10 +185,10 @@ describe "Taggable" do
     steve = TaggableModel.create(:name => 'Steve', :tag_list => 'fitter, happier, more productive', :skill_list => 'c++, java, python')
 
     # Let's only find those productive Rails developers
-    TaggableModel.tagged_with('rails', :on => :skills, :order => 'taggable_models.name').all.should == [bob, frank]
-    TaggableModel.tagged_with('happier', :on => :tags, :order => 'taggable_models.name').all.should == [bob, steve]
-    TaggableModel.tagged_with('rails', :on => :skills).tagged_with('happier', :on => :tags).all.should == [bob]
-    TaggableModel.tagged_with('rails').tagged_with('happier', :on => :tags).all.should == [bob]
+    TaggableModel.tagged_with('rails', :on => :skills, :order => 'taggable_models.name').to_a.should == [bob, frank]
+    TaggableModel.tagged_with('happier', :on => :tags, :order => 'taggable_models.name').to_a.should == [bob, steve]
+    TaggableModel.tagged_with('rails', :on => :skills).tagged_with('happier', :on => :tags).to_a.should == [bob]
+    TaggableModel.tagged_with('rails').tagged_with('happier', :on => :tags).to_a.should == [bob]
   end
 
   it "should be able to find tagged with only the matching tags" do
@@ -186,7 +196,7 @@ describe "Taggable" do
     frank = TaggableModel.create(:name => "Frank", :tag_list => "fitter, happier, inefficient")
     steve = TaggableModel.create(:name => 'Steve', :tag_list => "fitter, happier")
 
-    TaggableModel.tagged_with("fitter, happier", :match_all => true).all.should == [steve]
+    TaggableModel.tagged_with("fitter, happier", :match_all => true).to_a.should == [steve]
   end
 
   it "should be able to find tagged with some excluded tags" do
@@ -194,7 +204,7 @@ describe "Taggable" do
     frank = TaggableModel.create(:name => "Frank", :tag_list => "happier")
     steve = TaggableModel.create(:name => 'Steve', :tag_list => "happier")
 
-    TaggableModel.tagged_with("lazy", :exclude => true).all.should == [frank, steve]
+    TaggableModel.tagged_with("lazy", :exclude => true).to_a.should == [frank, steve]
   end
 
   it "should not create duplicate taggings" do
@@ -212,7 +222,7 @@ describe "Taggable" 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
 

data/spec/bm.rb

@@ -0,0 +1,52 @@
+require 'active_record'
+require 'action_view'
+require File.expand_path('../../lib/acts-as-taggable-on', __FILE__)
+
+if defined?(ActiveRecord::Acts::TaggableOn)
+  ActiveRecord::Base.send :include, ActiveRecord::Acts::TaggableOn
+  ActiveRecord::Base.send :include, ActiveRecord::Acts::Tagger
+  ActionView::Base.send :include, TagsHelper if defined?(ActionView::Base)
+end
+
+TEST_DATABASE_FILE = File.join(File.dirname(__FILE__), '..', 'test.sqlite3')
+File.unlink(TEST_DATABASE_FILE) if File.exist?(TEST_DATABASE_FILE)
+ActiveRecord::Base.establish_connection :adapter => 'sqlite3', :database => TEST_DATABASE_FILE
+
+ActiveRecord::Base.silence do
+  ActiveRecord::Migration.verbose = false
+  ActiveRecord::Schema.define :version => 0 do
+    create_table "taggings", :force => true do |t|
+      t.integer  "tag_id",        :limit => 11
+      t.integer  "taggable_id",   :limit => 11
+      t.string   "taggable_type"
+      t.string   "context"
+      t.datetime "created_at"
+      t.integer  "tagger_id",     :limit => 11
+      t.string   "tagger_type"
+    end
+
+    add_index "taggings", ["tag_id"], :name => "index_taggings_on_tag_id"
+    add_index "taggings", ["taggable_id", "taggable_type", "context"], :name => "index_taggings_on_taggable_id_and_taggable_type_and_context"
+
+    create_table "tags", :force => true do |t|
+      t.string "name"
+    end
+
+    create_table :taggable_models, :force => true do |t|
+      t.column :name, :string
+      t.column :type, :string
+      t.column :cached_tag_list, :string
+    end
+  end
+
+  class TaggableModel < ActiveRecord::Base
+    acts_as_taggable
+    acts_as_taggable_on :languages
+    acts_as_taggable_on :skills
+    acts_as_taggable_on :needs, :offerings
+  end
+end
+
+puts Benchmark.measure {
+  1000.times { TaggableModel.create :tag_list => "awesome, epic, neat" }
+}

data/spec/models.rb

@@ -5,6 +5,10 @@ class TaggableModel < ActiveRecord::Base
   acts_as_taggable_on :needs, :offerings
 end
 
+class CachedModel < ActiveRecord::Base
+  acts_as_taggable
+end
+
 class OtherTaggableModel < ActiveRecord::Base
   acts_as_taggable_on :tags, :languages
   acts_as_taggable_on :needs, :offerings
@@ -24,9 +28,9 @@ end
 class UntaggableModel < ActiveRecord::Base
 end
 
-if ActiveRecord::VERSION::MAJOR < 3
-  [TaggableModel, OtherTaggableModel, InheritingTaggableModel,
-   AlteredInheritingTaggableModel, TaggableUser, UntaggableModel].each do |klass|
-    klass.send(:include, ActsAsTaggableOn::ActiveRecord::Backports)
-  end
-end
+# if ActiveRecord::VERSION::MAJOR < 3
+#   [TaggableModel, CachedModel, OtherTaggableModel, InheritingTaggableModel,
+#    AlteredInheritingTaggableModel, TaggableUser, UntaggableModel].each do |klass|
+#     klass.send(:include, ActsAsTaggableOn::ActiveRecord::Backports)
+#   end
+# end

data/spec/schema.rb

@@ -19,6 +19,11 @@ ActiveRecord::Schema.define :version => 0 do
   create_table :taggable_models, :force => true do |t|
     t.column :name, :string
     t.column :type, :string
+  end
+  
+  create_table :cached_models, :force => true do |t|
+    t.column :name, :string
+    t.column :type, :string
     t.column :cached_tag_list, :string
   end
   
@@ -29,7 +34,6 @@ ActiveRecord::Schema.define :version => 0 do
   create_table :other_taggable_models, :force => true do |t|
     t.column :name, :string
     t.column :type, :string
-    #t.column :cached_tag_list, :string
   end
   
   create_table :untaggable_models, :force => true do |t|

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: acts-as-taggable-on
 version: !ruby/object:Gem::Version 
-  version: 2.0.0.pre4
+  prerelease: true
+  segments: 
+  - 2
+  - 0
+  - 0
+  - pre5
+  version: 2.0.0.pre5
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-22 00:00:00 +01:00
+date: 2010-03-25 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -30,16 +36,15 @@ files:
 - VERSION
 - lib/acts-as-taggable-on.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on.rb
-- lib/acts_as_taggable_on/acts_as_taggable_on/aggregate.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/cache.rb
+- lib/acts_as_taggable_on/acts_as_taggable_on/collection.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/core.rb
+- lib/acts_as_taggable_on/acts_as_taggable_on/dirty.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/ownership.rb
 - lib/acts_as_taggable_on/acts_as_taggable_on/related.rb
 - lib/acts_as_taggable_on/acts_as_tagger.rb
 - lib/acts_as_taggable_on/compatibility/Gemfile
 - lib/acts_as_taggable_on/compatibility/active_record_backports.rb
-- lib/acts_as_taggable_on/compatibility/tag.rb
-- lib/acts_as_taggable_on/compatibility/tagging.rb
 - lib/acts_as_taggable_on/tag.rb
 - lib/acts_as_taggable_on/tag_list.rb
 - lib/acts_as_taggable_on/tagging.rb
@@ -55,6 +60,7 @@ files:
 - spec/acts_as_taggable_on/tagger_spec.rb
 - spec/acts_as_taggable_on/tagging_spec.rb
 - spec/acts_as_taggable_on/tags_helper_spec.rb
+- spec/bm.rb
 - spec/models.rb
 - spec/schema.rb
 - spec/spec.opts
@@ -72,18 +78,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: ActsAsTaggableOn is a tagging plugin for Rails that provides multiple tagging contexts on a single model.
@@ -96,6 +106,7 @@ test_files:
 - spec/acts_as_taggable_on/tagger_spec.rb
 - spec/acts_as_taggable_on/tagging_spec.rb
 - spec/acts_as_taggable_on/tags_helper_spec.rb
+- spec/bm.rb
 - spec/models.rb
 - spec/schema.rb
 - spec/spec_helper.rb

data/lib/acts_as_taggable_on/compatibility/tag.rb

@@ -1,3 +0,0 @@
-class Tag < ActiveRecord::Base
-  include ActsAsTaggableOn::ActiveRecord::Backports
-end

data/lib/acts_as_taggable_on/compatibility/tagging.rb

@@ -1,3 +0,0 @@
-class Tagging < ActiveRecord::Base
-  include ActsAsTaggableOn::ActiveRecord::Backports
-end