acts-as-taggable-on 3.2.3 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 755e4d829ddc31ccd6ffb8385594ed8c5c64971f
-  data.tar.gz: 1ce12972b7d9d436484d619843a7bdf316a5c3b7
+  metadata.gz: 5c20928991764b079db87d3d1ba32846d0a3e01f
+  data.tar.gz: 94cae20632e6d61d21cd55921cb7ee284cb6f766
 SHA512:
-  metadata.gz: c8f129a07903598bcb765b260bd14db168b4a6fbf6989cef816157ae6350cadd733f75ca6cc0169e00fa8c19b59710198b868f52044f07efca451c44aa9a046c
-  data.tar.gz: 578b3d36b654b9343a36df3a7086b40b3ef32f6b43973d92c0f31251ea095405b692d2ef131ba74086366d117eef0fcd2334b51ce8f7ce3c0266481819a0a2a1
+  metadata.gz: 29cfdac7542aed8bb4f8f55a0c7d33f592739ae1f887a5399e0bd34fd686a5824b3e5335f5037a0ada5928001b4a8b3ca124d21771d5af648fc6f55735bf31da
+  data.tar.gz: 535aa2433b00889491d6aaf7f488b372ebc1ac2e60f8d9cd2337ae07a19ce2ce1bce3438a1f2db48c77b52a3a57c56648c8c31ddf1b4f0c2447bebae27d67fe0

data/.travis.yml

@@ -25,18 +25,19 @@ matrix:
   allow_failures:
       - gemfile: gemfiles/activerecord_edge.gemfile
       - rvm: rbx-2
+      - rvm: ruby-head
   exclude:
       - rvm: 1.9.3
-        gemfile: ci/Gemfile.activerecord-4.0.x
+        gemfile: gemfiles/activerecord_4.0.gemfile
       - rvm: 1.9.3
-        gemfile: ci/Gemfile.activerecord-4.1.x
+        gemfile: gemfiles/activerecord_4.1.gemfile
       - rvm: 1.9.3
-        gemfile: ci/Gemfile.activerecord-edge
+        gemfile: gemfiles/activerecord_edge.gemfile
       - rvm: rbx-2
-        gemfile: ci/Gemfile.activerecord-3.2.x
+        gemfile: gemfiles/activerecord_3.2.gemfile
       - rvm: ruby-head
-        gemfile: ci/Gemfile.activerecord-3.2.x
+        gemfile: gemfiles/activerecord_3.2.gemfile
       - rvm: ruby-head
-        gemfile: ci/Gemfile.activerecord-4.0.x
+        gemfile: gemfiles/activerecord_4.0.gemfile
       - rvm: ruby-head
-        gemfile: ci/Gemfile.activerecord-4.1.x
+        gemfile: gemfiles/activerecord_4.1.gemfile

data/Appraisals

@@ -1,20 +1,16 @@
 appraise "activerecord-3.2" do
   gem "activerecord", "~> 3.2"
-  gem "actionpack", "~> 3.2"
 end
 
 appraise "activerecord-4.0" do
   gem "activerecord", "~> 4.0"
-  gem "actionpack", "~> 4.0"
 end
 
 appraise "activerecord-4.1" do
   gem "activerecord", "~> 4.1"
-  gem "actionpack", "~> 4.1"
 end
 
 appraise "activerecord-edge" do
   gem "activerecord", github: "rails/rails"
-  gem "actionpack", github: "rails/rails"
   gem 'arel', github: 'rails/arel'
 end

data/Gemfile

@@ -7,5 +7,4 @@ group :local_development do
   gem 'guard-rspec'
   gem 'appraisal'
   gem 'rake'
-  gem 'byebug'
 end

data/README.md

@@ -1,7 +1,7 @@
 # ActsAsTaggableOn
 [![Build Status](https://secure.travis-ci.org/mbleigh/acts-as-taggable-on.png)](http://travis-ci.org/mbleigh/acts-as-taggable-on)
 [![Code Climate](https://codeclimate.com/github/mbleigh/acts-as-taggable-on.png)](https://codeclimate.com/github/mbleigh/acts-as-taggable-on)
-[![Inline docs](http://inch-pages.github.io/github/mbleigh/acts-as-taggable-on.png)](http://inch-pages.github.io/github/mbleigh/acts-as-taggable-on)
+[![Inline docs](http://inch-ci.org/github/mbleigh/acts-as-taggable-on.png)](http://inch-ci.org/github/mbleigh/acts-as-taggable-on)
 
 This plugin was originally based on Acts as Taggable on Steroids by Jonathan Viney.
 It has evolved substantially since that point, but all credit goes to him for the

data/acts-as-taggable-on.gemspec

@@ -23,16 +23,14 @@ Gem::Specification.new do |gem|
   end
 
   gem.add_runtime_dependency 'activerecord',  ['>= 3', '< 5']
-  gem.add_runtime_dependency 'actionpack',    ['>= 3', '< 5']
 
   gem.add_development_dependency 'sqlite3'
-  gem.add_development_dependency 'mysql2'
+  gem.add_development_dependency 'mysql2', '~> 0.3.7'
   gem.add_development_dependency 'pg'
 
-  gem.add_development_dependency 'rspec-rails'  , '~> 3.0.0.beta1'
-  gem.add_development_dependency 'rspec-its', '~> 1.0'
-  gem.add_development_dependency 'rspec', '3.0.0.beta2'
-  gem.add_development_dependency 'ammeter', '~> 1.0'
-  gem.add_development_dependency 'barrier', '~> 1.0'
-  gem.add_development_dependency 'database_cleaner', '~> 1.2'
+  gem.add_development_dependency 'rspec-rails'  , '~> 3.0.0.beta'
+  gem.add_development_dependency 'rspec-its'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'barrier'
+  gem.add_development_dependency 'database_cleaner'
 end

data/db/migrate/4_add_missing_taggable_index.rb

@@ -0,0 +1,9 @@
+class AddMissingTaggableIndex < ActiveRecord::Migration
+  def self.up
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+  def self.down
+    remove_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+end

data/gemfiles/activerecord_3.2.gemfile

@@ -3,14 +3,12 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 3.2"
-gem "actionpack", "~> 3.2"
 
 group :local_development do
   gem "guard"
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
-  gem "byebug"
 end
 
 gemspec :path => "../"

data/gemfiles/activerecord_4.0.gemfile

@@ -3,14 +3,12 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 4.0"
-gem "actionpack", "~> 4.0"
 
 group :local_development do
   gem "guard"
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
-  gem "byebug"
 end
 
 gemspec :path => "../"

data/gemfiles/activerecord_4.1.gemfile

@@ -3,14 +3,12 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 4.1"
-gem "actionpack", "~> 4.1"
 
 group :local_development do
   gem "guard"
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
-  gem "byebug"
 end
 
 gemspec :path => "../"

data/gemfiles/activerecord_edge.gemfile

@@ -3,7 +3,6 @@
 source "https://rubygems.org"
 
 gem "activerecord", :github => "rails/rails"
-gem "actionpack", :github => "rails/rails"
 gem "arel", :github => "rails/arel"
 
 group :local_development do
@@ -11,7 +10,6 @@ group :local_development do
   gem "guard-rspec"
   gem "appraisal"
   gem "rake"
-  gem "byebug"
 end
 
 gemspec :path => "../"

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

@@ -3,9 +3,35 @@ require 'active_record/version'
 require 'active_support/core_ext/module'
 require 'action_view'
 
+require_relative 'acts_as_taggable_on/engine'  if defined?(Rails)
+
 require 'digest/sha1'
 
 module ActsAsTaggableOn
+  extend ActiveSupport::Autoload
+
+  autoload :Tag
+  autoload :TagList
+  autoload :TagListParser
+  autoload :Taggable
+  autoload :Tagger
+  autoload :Tagging
+  autoload :TagsHelper
+  autoload :VERSION
+
+  autoload_under 'taggable' do
+    autoload :Cache
+    autoload :Collection
+    autoload :Core
+    autoload :Dirty
+    autoload :Ownership
+    autoload :Related
+  end
+
+  autoload :Utils
+  autoload :Compatibility
+
+
   class DuplicateTagError < StandardError
   end
 
@@ -16,7 +42,7 @@ module ActsAsTaggableOn
 
   def self.method_missing(method_name, *args, &block)
     @configuration.respond_to?(method_name) ?
-      @configuration.send(method_name, *args, &block) : super
+        @configuration.send(method_name, *args, &block) : super
   end
 
   def self.respond_to?(method_name, include_private=false)
@@ -31,7 +57,7 @@ module ActsAsTaggableOn
 
   class Configuration
     attr_accessor :delimiter, :force_lowercase, :force_parameterize,
-      :strict_case_match, :remove_unused_tags
+                  :strict_case_match, :remove_unused_tags
 
     def initialize
       @delimiter = ','
@@ -45,24 +71,6 @@ module ActsAsTaggableOn
   setup
 end
 
-require 'acts_as_taggable_on/utils'
-
-require 'acts_as_taggable_on/taggable'
-require 'acts_as_taggable_on/acts_as_taggable_on/compatibility'
-require 'acts_as_taggable_on/acts_as_taggable_on/core'
-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'
-require 'acts_as_taggable_on/acts_as_taggable_on/dirty'
-
-require 'acts_as_taggable_on/tagger'
-require 'acts_as_taggable_on/tag'
-require 'acts_as_taggable_on/tag_list'
-require 'acts_as_taggable_on/tags_helper'
-require 'acts_as_taggable_on/tagging'
-require 'acts_as_taggable_on/engine'
-
 ActiveSupport.on_load(:active_record) do
   extend ActsAsTaggableOn::Compatibility
   extend ActsAsTaggableOn::Taggable

data/lib/acts_as_taggable_on/tag_list.rb

@@ -1,3 +1,4 @@
+
 require 'active_support/core_ext/module/delegation'
 
 module ActsAsTaggableOn
@@ -8,82 +9,6 @@ module ActsAsTaggableOn
       add(*args)
     end
 
-    class << self
-      ##
-      # Returns a new TagList using the given tag string.
-      #
-      # Example:
-      #   tag_list = ActsAsTaggableOn::TagList.from("One , Two,  Three")
-      #   tag_list # ["One", "Two", "Three"]
-      def from(string)
-        string = string.join(ActsAsTaggableOn.glue) if string.respond_to?(:join)
-
-        new.tap do |tag_list|
-          string = string.to_s.dup
-
-
-          string.gsub!(double_quote_pattern) {
-            # Append the matched tag to the tag list
-            tag_list << Regexp.last_match[2]
-            # Return the matched delimiter ($3) to replace the matched items
-            ''
-          }
-
-          string.gsub!(single_quote_pattern) {
-            # Append the matched tag ($2) to the tag list
-            tag_list << Regexp.last_match[2]
-            # Return an empty string to replace the matched items
-            ''
-          }
-
-          # split the string by the delimiter
-          # and add to the tag_list
-          tag_list.add(string.split(Regexp.new delimiter))
-        end
-      end
-
-      def delimiter
-        # Parse the quoted tags
-        d = ActsAsTaggableOn.delimiter
-        # Separate multiple delimiters by bitwise operator
-        d = d.join('|') if d.kind_of?(Array)
-
-        d
-      end
-
-      def single_quote_pattern
-        %r{
-          (             # Tag start delimiter ($1)
-            \A       |  # Either string start or
-            #{delimiter}        # a delimiter
-          )
-          \s*'          # quote (') optionally preceded by whitespace
-          (.*?)         # Tag ($2)
-          '\s*          # quote (') optionally followed by whitespace
-          (?=           # Tag end delimiter (not consumed; is zero-length lookahead)
-            #{delimiter}\s*  |  # Either a delimiter optionally followed by whitespace or
-            \z          # string end
-          )
-      }x
-      end
-
-      def double_quote_pattern
-        %r{
-          (             # Tag start delimiter ($1)
-            \A       |  # Either string start or
-            #{delimiter}        # a delimiter
-          )
-          \s*"          # quote (") optionally preceded by whitespace
-          (.*?)         # Tag ($2)
-          "\s*          # quote (") optionally followed by whitespace
-          (?=           # Tag end delimiter (not consumed; is zero-length lookahead)
-            #{delimiter}\s*  |  # Either a delimiter optionally followed by whitespace or
-            \z          # string end
-          )
-      }x
-      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.
@@ -165,12 +90,23 @@ module ActsAsTaggableOn
       options = args.last.is_a?(Hash) ? args.pop : {}
       options.assert_valid_keys :parse
 
-      args.map! { |a| self.class.from(a) } if options[:parse]
+      args.map! { |a| TagListParser.parse(a) } if options[:parse]
 
       args.flatten!
     end
 
 
+    ## DEPRECATED
+    def self.from(string)
+      ActiveRecord::Base.logger.warn <<WARNING
+ActsAsTaggableOn::TagList.from is deprecated \
+and will be removed from v4.0+, use  \
+ActsAsTaggableOn::TagListParser.parse instead
+WARNING
+      TagListParser.parse(string)
+    end
+
+
   end
 end
 

data/lib/acts_as_taggable_on/tag_list_parser.rb

@@ -0,0 +1,78 @@
+module ActsAsTaggableOn
+  ##
+  # Returns a new TagList using the given tag string.
+  #
+  # Example:
+  #   tag_list = ActsAsTaggableOn::TagListParser.parse("One , Two,  Three")
+  #   tag_list # ["One", "Two", "Three"]
+  module TagListParser
+    class << self
+      def parse(string)
+        string = string.join(ActsAsTaggableOn.glue) if string.respond_to?(:join)
+        TagList.new.tap do |tag_list|
+          string = string.to_s.dup
+
+
+          string.gsub!(double_quote_pattern) {
+            # Append the matched tag to the tag list
+            tag_list << Regexp.last_match[2]
+            # Return the matched delimiter ($3) to replace the matched items
+            ''
+          }
+
+          string.gsub!(single_quote_pattern) {
+            # Append the matched tag ($2) to the tag list
+            tag_list << Regexp.last_match[2]
+            # Return an empty string to replace the matched items
+            ''
+          }
+
+          # split the string by the delimiter
+          # and add to the tag_list
+          tag_list.add(string.split(Regexp.new delimiter))
+        end
+      end
+
+
+      # private
+      def delimiter
+        # Parse the quoted tags
+        d = ActsAsTaggableOn.delimiter
+        # Separate multiple delimiters by bitwise operator
+        d = d.join('|') if d.kind_of?(Array)
+        d
+      end
+
+      # (             # Tag start delimiter ($1)
+      # \A       |  # Either string start or
+      # #{delimiter}        # a delimiter
+      # )
+      # \s*"          # quote (") optionally preceded by whitespace
+      # (.*?)         # Tag ($2)
+      # "\s*          # quote (") optionally followed by whitespace
+      # (?=           # Tag end delimiter (not consumed; is zero-length lookahead)
+      # #{delimiter}\s*  |  # Either a delimiter optionally followed by whitespace or
+      # \z          # string end
+      # )
+      def double_quote_pattern
+        /(\A|#{delimiter})\s*"(.*?)"\s*(?=#{delimiter}\s*|\z)/
+      end
+
+      # (             # Tag start delimiter ($1)
+      # \A       |  # Either string start or
+      # #{delimiter}        # a delimiter
+      # )
+      # \s*'          # quote (') optionally preceded by whitespace
+      # (.*?)         # Tag ($2)
+      # '\s*          # quote (') optionally followed by whitespace
+      # (?=           # Tag end delimiter (not consumed; is zero-length lookahead)
+      # #{delimiter}\s*  | d # Either a delimiter optionally followed by whitespace or
+      # \z          # string end
+      # )
+      def single_quote_pattern
+        /(\A|#{delimiter})\s*'(.*?)'\s*(?=#{delimiter}\s*|\z)/
+      end
+
+    end
+  end
+end

data/lib/acts_as_taggable_on/{acts_as_taggable_on → taggable}/core.rb

@@ -73,6 +73,8 @@ module ActsAsTaggableOn::Taggable
       #                       * <tt>:order_by_matching_tag_count</tt> - if set to true and used with :any, sort by objects matching the most tags, descending
       #                       * <tt>:match_all</tt> - if set to true, return objects that are *ONLY* tagged with the specified tags
       #                       * <tt>:owned_by</tt> - return objects that are *ONLY* owned by the owner
+      #                       * <tt>:start_at</tt> - Restrict the tags to those created after a certain time
+      #                       * <tt>:end_at</tt> - Restrict the tags to those created before a certain time
       #
       # Example:
       #   User.tagged_with("awesome", "cool")                     # Users that are tagged with awesome and cool
@@ -81,8 +83,9 @@ module ActsAsTaggableOn::Taggable
       #   User.tagged_with("awesome", "cool", :any => true, :order_by_matching_tag_count => true)  # Sort by users who match the most tags, descending
       #   User.tagged_with("awesome", "cool", :match_all => true) # Users that are tagged with just awesome and cool
       #   User.tagged_with("awesome", "cool", :owned_by => foo ) # Users that are tagged with just awesome and cool by 'foo'
+      #   User.tagged_with("awesome", "cool", :owned_by => foo, :start_at => Date.today ) # Users that are tagged with just awesome, cool by 'foo' and starting today
       def tagged_with(tags, options = {})
-        tag_list = ActsAsTaggableOn::TagList.from(tags)
+        tag_list = ActsAsTaggableOn::TagListParser.parse(tags)
         options = options.dup
         empty_result = where('1 = 0')
 
@@ -109,14 +112,17 @@ module ActsAsTaggableOn::Taggable
           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}.#{ActsAsTaggableOn::Tag.primary_key} AND (#{tags_conditions}) WHERE #{ActsAsTaggableOn::Tagging.table_name}.taggable_type = #{quote_value(base_class.name, nil)})"
 
           if owned_by
-            joins << "JOIN #{ActsAsTaggableOn::Tagging.table_name}" \
-                "  ON #{ActsAsTaggableOn::Tagging.table_name}.taggable_id = #{quote}#{table_name}#{quote}.#{primary_key}" \
-                " AND #{ActsAsTaggableOn::Tagging.table_name}.taggable_type = #{quote_value(base_class.name, nil)}" \
-                " AND #{ActsAsTaggableOn::Tagging.table_name}.tagger_id = #{quote_value(owned_by.id, nil)}" \
-                " AND #{ActsAsTaggableOn::Tagging.table_name}.tagger_type = #{quote_value(owned_by.class.base_class.to_s, nil)}"
+            joins <<  "JOIN #{ActsAsTaggableOn::Tagging.table_name}" +
+                      "  ON #{ActsAsTaggableOn::Tagging.table_name}.taggable_id = #{quote}#{table_name}#{quote}.#{primary_key}" +
+                      " AND #{ActsAsTaggableOn::Tagging.table_name}.taggable_type = #{quote_value(base_class.name, nil)}" +
+                      " AND #{ActsAsTaggableOn::Tagging.table_name}.tagger_id = #{quote_value(owned_by.id, nil)}" +
+                      " AND #{ActsAsTaggableOn::Tagging.table_name}.tagger_type = #{quote_value(owned_by.class.base_class.to_s, nil)}"
+            
+            joins << " AND " + sanitize_sql(["#{ActsAsTaggableOn::Tagging.table_name}.created_at >= ?", options.delete(:start_at)]) if options[:start_at]
+            joins << " AND " + sanitize_sql(["#{ActsAsTaggableOn::Tagging.table_name}.created_at <= ?", options.delete(:end_at)])   if options[:end_at]
           end
 
-        elsif options.delete(:any)
+        elsif any = options.delete(:any)
           # get tags, drop out if nothing returned (we need at least one)
           tags = if options.delete(:wild)
                    ActsAsTaggableOn::Tag.named_like_any(tag_list)
@@ -134,14 +140,18 @@ module ActsAsTaggableOn::Taggable
               "#{alias_base_name[0..4]}#{taggings_context[0..6]}_taggings_#{ActsAsTaggableOn::Utils.sha_prefix(tags.map(&:name).join('_'))}"
           )
 
-          tagging_join = "JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" \
-              "  ON #{taggings_alias}.taggable_id = #{quote}#{table_name}#{quote}.#{primary_key}" \
-              " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name, nil)}"
-          tagging_join << ' AND ' + sanitize_sql(["#{taggings_alias}.context = ?", context.to_s]) if context
+          tagging_join = "JOIN #{ActsAsTaggableOn::Tagging.table_name} #{taggings_alias}" +
+                          "  ON #{taggings_alias}.taggable_id = #{quote}#{table_name}#{quote}.#{primary_key}" +
+                          " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name, nil)}"
+
+          tagging_join << " AND " + sanitize_sql(["#{taggings_alias}.created_at >= ?", options.delete(:start_at)]) if options[:start_at]
+          tagging_join << " AND " + sanitize_sql(["#{taggings_alias}.created_at <= ?", options.delete(:end_at)])   if options[:end_at]
+
+          tagging_join << " AND " + sanitize_sql(["#{taggings_alias}.context = ?", context.to_s]) if context
 
           # don't need to sanitize sql, map all ids and join with OR logic
           conditions << tags.map { |t| "#{taggings_alias}.tag_id = #{quote_value(t.id, nil)}" }.join(' OR ')
-          select_clause = " #{table_name}.*" unless context and tag_types.one?
+          select_clause << " #{table_name}.*" unless context and tag_types.one?
 
           if owned_by
             tagging_join << ' AND ' +
@@ -153,7 +163,10 @@ module ActsAsTaggableOn::Taggable
           end
 
           joins << tagging_join
-          group = "#{table_name}.#{primary_key}"
+          unless any == 'distinct' # Fix issue #544
+            group = "#{table_name}.#{primary_key}"
+            select_clause << group
+          end
         else
           tags = ActsAsTaggableOn::Tag.named_any(tag_list)
 
@@ -166,7 +179,10 @@ module ActsAsTaggableOn::Taggable
                 " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name, nil)}" +
                 " AND #{taggings_alias}.tag_id = #{quote_value(tag.id, nil)}"
 
-            tagging_join << ' AND ' + sanitize_sql(["#{taggings_alias}.context = ?", context.to_s]) if context
+            tagging_join << " AND " + sanitize_sql(["#{taggings_alias}.created_at >= ?", options.delete(:start_at)]) if options[:start_at]
+            tagging_join << " AND " + sanitize_sql(["#{taggings_alias}.created_at <= ?", options.delete(:end_at)])   if options[:end_at]
+
+            tagging_join << " AND " + sanitize_sql(["#{taggings_alias}.context = ?", context.to_s]) if context
 
             if owned_by
               tagging_join << ' AND ' +
@@ -183,7 +199,7 @@ module ActsAsTaggableOn::Taggable
 
         group ||= [] # Rails interprets this as a no-op in the group() call below
         if options.delete(:order_by_matching_tag_count)
-          select_clause = "#{table_name}.*, COUNT(#{taggings_alias}.tag_id) AS #{taggings_alias}_count"
+          select_clause << "#{table_name}.*, COUNT(#{taggings_alias}.tag_id) AS #{taggings_alias}_count"
           group_columns = ActsAsTaggableOn::Utils.using_postgresql? ? grouped_column_names_for(self) : "#{table_name}.#{primary_key}"
           group = group_columns
           order_by << "#{taggings_alias}_count DESC"
@@ -194,7 +210,9 @@ module ActsAsTaggableOn::Taggable
               "  ON #{taggings_alias}.taggable_id = #{quote}#{table_name}#{quote}.#{primary_key}" \
               " AND #{taggings_alias}.taggable_type = #{quote_value(base_class.name, nil)}"
 
-          joins << ' AND ' + sanitize_sql(["#{taggings_alias}.context = ?", context.to_s]) if context
+          joins << " AND " + sanitize_sql(["#{taggings_alias}.context = ?", context.to_s]) if context
+          joins << " AND " + sanitize_sql(["#{ActsAsTaggableOn::Tagging.table_name}.created_at >= ?", options.delete(:start_at)]) if options[:start_at]
+          joins << " AND " + sanitize_sql(["#{ActsAsTaggableOn::Tagging.table_name}.created_at <= ?", options.delete(:end_at)])   if options[:end_at]
 
           group_columns = ActsAsTaggableOn::Utils.using_postgresql? ? grouped_column_names_for(self) : "#{table_name}.#{primary_key}"
           group = group_columns
@@ -203,8 +221,9 @@ module ActsAsTaggableOn::Taggable
 
         order_by << options[:order] if options[:order].present?
 
-        select(select_clause)
-        .joins(joins.join(' '))
+        query = self
+        query = self.select(select_clause.join(',')) unless select_clause.empty?
+        query.joins(joins.join(' '))
         .where(conditions.join(' AND '))
         .group(group)
         .having(having)
@@ -259,7 +278,7 @@ module ActsAsTaggableOn::Taggable
       if instance_variable_get(variable_name)
         instance_variable_get(variable_name)
       elsif cached_tag_list_on(context) && self.class.caching_tag_list_on?(context)
-        instance_variable_set(variable_name, ActsAsTaggableOn::TagList.from(cached_tag_list_on(context)))
+        instance_variable_set(variable_name, ActsAsTaggableOn::TagListParser.parse(cached_tag_list_on(context)))
       else
         instance_variable_set(variable_name, ActsAsTaggableOn::TagList.new(tags_on(context).map(&:name)))
       end
@@ -309,7 +328,7 @@ module ActsAsTaggableOn::Taggable
       variable_name = "@#{context.to_s.singularize}_list"
       process_dirty_object(context, new_list) unless custom_contexts.include?(context.to_s)
 
-      instance_variable_set(variable_name, ActsAsTaggableOn::TagList.from(new_list))
+      instance_variable_set(variable_name, ActsAsTaggableOn::TagListParser.parse(new_list))
     end
 
     def tagging_contexts
@@ -325,8 +344,12 @@ module ActsAsTaggableOn::Taggable
         old = changed_attributes[attrib]
         changed_attributes.delete(attrib) if old.to_s == value.to_s
       else
-        old = tag_list_on(context).to_s
-        changed_attributes[attrib] = old if old.to_s != value.to_s
+        old = tag_list_on(context)
+        if self.class.preserve_tag_order
+          changed_attributes[attrib] = old if old.to_s != value.to_s
+        else
+          changed_attributes[attrib] = old.to_s if old.sort != ActsAsTaggableOn::TagListParser.parse(value).sort
+        end
       end
     end
 
@@ -383,7 +406,7 @@ module ActsAsTaggableOn::Taggable
 
         # Destroy old taggings:
         if old_tags.present?
-          self.taggings.not_owned.by_context(context).destroy_all(tag_id: old_tags)
+          taggings.not_owned.by_context(context).destroy_all(tag_id: old_tags)
         end
 
         # Create new taggings:

data/lib/acts_as_taggable_on/{acts_as_taggable_on → taggable}/ownership.rb

@@ -63,7 +63,7 @@ module ActsAsTaggableOn::Taggable
 
       cache = cached_owned_tag_list_on(context)
 
-      cache[owner] = ActsAsTaggableOn::TagList.from(new_list)
+      cache[owner] = ActsAsTaggableOn::TagListParser.parse(new_list)
     end
 
     def reload(*args)

data/lib/acts_as_taggable_on/taggable.rb

@@ -1,5 +1,6 @@
 module ActsAsTaggableOn
   module Taggable
+
     def taggable?
       false
     end
@@ -90,12 +91,12 @@ module ActsAsTaggableOn
 
       # each of these add context-specific methods and must be
       # called on each call of taggable_on
-      include ActsAsTaggableOn::Taggable::Core
-      include ActsAsTaggableOn::Taggable::Collection
-      include ActsAsTaggableOn::Taggable::Cache
-      include ActsAsTaggableOn::Taggable::Ownership
-      include ActsAsTaggableOn::Taggable::Related
-      include ActsAsTaggableOn::Taggable::Dirty
+      include Core
+      include Collection
+      include Cache
+      include Ownership
+      include Related
+      include Dirty
     end
   end
 end

data/lib/acts_as_taggable_on/tagging.rb

@@ -32,7 +32,7 @@ module ActsAsTaggableOn
 
     def remove_unused_tags
       if ActsAsTaggableOn.remove_unused_tags
-        tag.destroy if tag.taggings_count.zero?
+        tag.destroy if tag.reload.taggings_count.zero?
       end
     end
   end