acts-as-taggable-on 2.4.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0b7cd2b4e279238a0fb8464721b40c3dbedaacd
-  data.tar.gz: edd07332dcbd884be1daab9e65d9be28b6f3f695
+  metadata.gz: 5b46e80f19a5c7de71ec448bd0700ef672ea9639
+  data.tar.gz: d7c19bc3aec73a2b5d1ff08ad18cb9c85e61225c
 SHA512:
-  metadata.gz: 65f468a535ce620033df88d152bd5e1bff722c01a197d233794da097e682b29ad5f4ebf46b4eb46a18957d2ecda9f6699aad27b42789a2c8ee8d7c4f68e985ba
-  data.tar.gz: 2fd5249aa31f826fd56666dd3d07c4a63df1803722fc7e29c02b39fdbff6f0459316f30a1bb9345c53e885fa5a0edfd30495e211e8e6e90630600d9d60cd69a5
+  metadata.gz: 4ac4317c1fa00caa6f048d4958d830da83bae5a48d8fd2f4018918319069e9e0311b99318cfe337fcd8d23f9c37055484e1c40c1ab0ecda2c256d361315b0848
+  data.tar.gz: 7e29cf71dfce65f2ac65d0a10972c6b26344398278c53b088b9069ec728955e697389f496b25a8f57fd521b6349aaa2ef827caab78bf8a00c7416c9be43c21e5

data/.travis.yml

@@ -1,9 +1,18 @@
-script: "cp spec/database.yml.sample spec/database.yml && bundle install && bundle exec rake"
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
 env:
   - DB=sqlite3
   - DB=mysql
-  - DB=postgresql
+  - DB=postgresql
+gemfile:
+  - gemfiles/rails_3.2.gemfile
+  - gemfiles/rails_4.0.gemfile
+  - gemfiles/rails_4.1.gemfile
+cache: bundler
+script: bundle exec rake
+before_install:
+  - gem install bundler
+bundler_args: '--without local_development'
+matrix:
+  fast_finish: true

data/Appraisals

@@ -1,7 +1,11 @@
-appraise "rails-3" do
-  gem "rails", "3.2.13"
+appraise "rails-3.2" do
+  gem "rails", "~> 3.2"
 end
 
-appraise "rails-4" do
-  gem "rails", "4.0.0.beta1"
+appraise "rails-4.0" do
+  gem "rails", "~> 4.0"
+end
+
+appraise "rails-4.1" do
+  gem "rails", "~> 4.1.0.beta1"
 end

data/CHANGELOG.md

@@ -0,0 +1,47 @@
+Changes are below categorized as `Features, Fixes, or Misc`.
+
+Each change should fall into categories that would affect whether the release is major (breaking changes), minor (new behavior), or patch (bug fix). See [semver](http://semver.org/) and [pessimistic versioning](http://guides.rubygems.org/patterns/#pessimistic_version_constraint)
+
+As such, a _Feature_ would map to either major or minor. A _bug fix_ to a patch.  And _misc_ is either minor or patch, the difference being kind of fuzzy for the purposes of history.  Adding tests would be patch level.
+
+### Master [changes](https://github.com/mbleigh/acts-as-taggable-on/compare/v3.0.0...master)
+
+* Breaking Changes
+* Features
+* Fixes
+* Misc
+
+### [3.0.0 / 2014-01-01](https://github.com/mbleigh/acts-as-taggable-on/compare/v2.4.1...v3.0.0)
+
+* Breaking Changes
+  * No longer supports Ruby 1.8.
+* Features
+  * Supports Rails 4.1.
+* Misc (TODO: expand)
+  * [zquest #359](https://github.com/mbleigh/acts-as-taggable-on/pull/359)
+  * [rsl #367](https://github.com/mbleigh/acts-as-taggable-on/pull/367)
+  * [ktdreyer #383](https://github.com/mbleigh/acts-as-taggable-on/pull/383)
+  * [cwoodcox #346](https://github.com/mbleigh/acts-as-taggable-on/pull/346)
+  * [mrb #421](https://github.com/mbleigh/acts-as-taggable-on/pull/421)
+  * [bf4 #430](https://github.com/mbleigh/acts-as-taggable-on/pull/430)
+  * [sanemat #368](https://github.com/mbleigh/acts-as-taggable-on/pull/368)
+  * [bf4 #343](https://github.com/mbleigh/acts-as-taggable-on/pull/343)
+  * [marclennox #429](https://github.com/mbleigh/acts-as-taggable-on/pull/429)
+  * [shekibobo #403](https://github.com/mbleigh/acts-as-taggable-on/pull/403)
+  * [ches ktdreyer #410](https://github.com/mbleigh/acts-as-taggable-on/pull/410)
+  * [makaroni4 #371](https://github.com/mbleigh/acts-as-taggable-on/pull/371)
+  * [kenzai dstosik awt #431](https://github.com/mbleigh/acts-as-taggable-on/pull/431)
+  * [bf4 joelcogen shekibobo aaronchi #438](https://github.com/mbleigh/acts-as-taggable-on/pull/438)
+  * [seuros #442](https://github.com/mbleigh/acts-as-taggable-on/pull/442)
+  * [bf4 #445](https://github.com/mbleigh/acts-as-taggable-on/pull/445)
+  * [eaglemt #446](https://github.com/mbleigh/acts-as-taggable-on/pull/446)
+
+### 3.0.0.rc2 [changes](https://github.com/mbleigh/acts-as-taggable-on/compare/fork-v3.0.0.rc1...fork-v3.0.0.rc2)
+
+### 3.0.0.rc1 [changes](https://github.com/mbleigh/acts-as-taggable-on/compare/v2.4.1...fork-v3.0.0.rc1)
+
+### [2.4.1 / 2013-05-07](https://github.com/mbleigh/acts-as-taggable-on/compare/v2.4.0...v2.4.1)
+
+* Features
+* Fixes
+* Misc

data/Gemfile

@@ -2,4 +2,10 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'appraisal'
+group :local_development do
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'appraisal'
+  gem 'rake'
+end
+

data/README.md

@@ -1,5 +1,6 @@
 # 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)
 
 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
@@ -20,7 +21,7 @@ Versions 2.x are compatible with Ruby 1.8.7+ and Rails 3.
 
 Versions 2.4.1 and up are compatible with Rails 4 too (thanks to arabonradar and cwoodcox).
 
-Versions 3.x (currently unreleased) are compatible with Ruby 1.9.3+ and Rails 3 and 4.
+Versions 3.x (currently unreleased) are compatible with Ruby 1.9.3+ and Rails 3 and 4.  There is a [release candidate you may try](http://rubygems.org/gems/acts_as_taggable_on).
 
 For an up-to-date roadmap, see https://github.com/mbleigh/acts-as-taggable-on/issues/milestones
 
@@ -41,21 +42,17 @@ bundle
 #### Post Installation
 
 ```shell
+# For the latest versions
+rake railties:install:migrations FROM=acts_as_taggable_on_engine db:migrate
+
+# For versions 2.4.1 and earlier
 rails generate acts_as_taggable_on:migration
 rake db:migrate
 ```
 
-## Testing
+#### Upgrading
 
-Acts As Taggable On uses RSpec for its test coverage. Inside the gem
-directory, you can run the specs with:
-
-```shell
-bundle
-rake spec
-```
-
-If you want, add a `.ruby-version` file in the project root (and use rbenv or RVM) to work on a specific version of Ruby.
+see [UPGRADING](UPGRADING)
 
 ## Usage
 
@@ -298,6 +295,19 @@ We have a long list of valued contributors. [Check them all](https://github.com/
 
 * [Joost Baaij](https://github.com/tilsammans)
 
+## Testing
+
+Acts As Taggable On uses RSpec for its test coverage. Inside the gem
+directory, you can run the specs with:
+
+```shell
+bundle
+rake spec
+```
+
+You can run all the tests across all the Rails versions by running `rake appraise`.  If you'd also like to [run the tests across all rubies and databases as configured for Travis CI, install and run `wwtd`](https://github.com/grosser/wwtd).
+
+
 ## License
 
 See [LICENSE](https://github.com/mbleigh/acts-as-taggable-on/blob/master/LICENSE.md)

data/Rakefile

@@ -1,9 +1,27 @@
 require 'rubygems'
-require 'bundler/setup'
-require 'appraisal'
+begin
+  require 'bundler/setup'
+rescue LoadError
+  STDERR.puts "Bundler not loaded"
+end
+
+desc 'Copy sample spec database.yml over if not exists'
+task :copy_db_config do
+  cp 'spec/database.yml.sample', 'spec/database.yml'
+end
+
+task :spec => [:copy_db_config]
 
 desc 'Default: run specs'
-task :default => :spec  
+task :default => :spec
+
+begin
+  require 'appraisal'
+  desc 'Run tests across gemfiles specified in Appraisals'
+  task :appraise => ['appraisal:cleanup', 'appraisal:install', 'appraisal']
+rescue LoadError
+  puts "appraisal tasks not available"
+end
 
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new do |t|

data/UPGRADING

@@ -0,0 +1,7 @@
+When upgrading
+
+Re-run the migrations generator
+
+    rake railties:install:migrations FROM=acts_as_taggable_on_engine db:migrate
+
+It will create any new migrations and skip existing ones

data/acts-as-taggable-on.gemspec

@@ -24,12 +24,12 @@ Gem::Specification.new do |gem|
 
   gem.add_runtime_dependency 'rails', ['>= 3', '< 5']
 
-  gem.add_development_dependency 'rspec-rails', '2.13.0' # 2.13.1 is broken
-  gem.add_development_dependency 'rspec', '~> 2.6'
-  gem.add_development_dependency 'ammeter'
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'mysql2', '~> 0.3.7'
   gem.add_development_dependency 'pg'
-  gem.add_development_dependency 'guard'
-  gem.add_development_dependency 'guard-rspec'
+
+  gem.add_development_dependency 'rspec-rails', '2.13.0' # 2.13.1 is broken
+  gem.add_development_dependency 'rspec', '~> 2.6'
+  gem.add_development_dependency 'ammeter'
+
 end

data/db/migrate/2_add_missing_unique_indices.rb

@@ -0,0 +1,21 @@
+class AddMissingUniqueIndices < ActiveRecord::Migration
+
+  def self.up
+    add_index :tags, :name, unique: true
+
+    remove_index :taggings, :tag_id
+    remove_index :taggings, [:taggable_id, :taggable_type, :context]
+    add_index :taggings,
+      [:tag_id, :taggable_id, :taggable_type, :context, :tagger_id, :tagger_type],
+      unique: true, name: 'taggings_idx'
+   end
+
+  def self.down
+    remove_index :tags, :name
+
+    remove_index :taggings, name: 'tagging_idx'
+    add_index :taggings, :tag_id
+    add_index :taggings, [:taggable_id, :taggable_type, :context]
+  end
+
+end

data/gemfiles/{rails_3.gemfile → rails_3.2.gemfile}

@@ -2,7 +2,6 @@
 
 source "https://rubygems.org"
 
-gem "appraisal"
-gem "rails", "3.2.13"
+gem "rails", "~> 3.2"
 
 gemspec :path=>"../"

data/gemfiles/rails_4.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.0"
+
+gemspec :path=>"../"

data/gemfiles/rails_4.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 4.1.0.beta1"
+
+gemspec :path=>"../"

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

@@ -1,11 +1,11 @@
 require "active_record"
 require "active_record/version"
+require "active_support/core_ext/module"
 require "action_view"
+require 'active_support/all'
 
 require "digest/sha1"
 
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
 module ActsAsTaggableOn
   mattr_accessor :delimiter
   @@delimiter = ','
@@ -49,17 +49,13 @@ 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'
 
-$LOAD_PATH.shift
-
-
-if defined?(ActiveRecord::Base)
-  ActiveRecord::Base.extend ActsAsTaggableOn::Compatibility
-  ActiveRecord::Base.extend ActsAsTaggableOn::Taggable
-  ActiveRecord::Base.send :include, ActsAsTaggableOn::Tagger
+ActiveSupport.on_load(:active_record) do
+  extend ActsAsTaggableOn::Compatibility
+  extend ActsAsTaggableOn::Taggable
+  include ActsAsTaggableOn::Tagger
 end
-
-if defined?(ActionView::Base)
-  ActionView::Base.send :include, ActsAsTaggableOn::TagsHelper
+ActiveSupport.on_load(:action_view) do
+  include ActsAsTaggableOn::TagsHelper
 end
-

data/lib/acts_as_taggable_on.rb

@@ -0,0 +1,6 @@
+$stderr.puts <<EOF
+You are requiring 'acts_as_taggable_on' in the 'acts-as-taggable-on' gem.
+
+Please change your require to 'acts-as-taggable-on'.
+EOF
+require_relative 'acts-as-taggable-on'

data/lib/acts_as_taggable_on/acts_as_taggable_on/cache.rb

@@ -1,41 +1,69 @@
 module ActsAsTaggableOn::Taggable
   module Cache
     def self.included(base)
-      # 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
-      
-      base.class_eval do
-        before_save :save_cached_tag_list        
+      # When included, conditionally adds tag caching methods when the model
+      #   has any "cached_#{tag_type}_list" column
+      base.instance_eval do
+        # @private
+        def _has_tags_cache_columns?(db_columns)
+          db_column_names = db_columns.map(&:name)
+          tag_types.any? {|context|
+            db_column_names.include?("cached_#{context.to_s.singularize}_list")
+          }
+        end
+
+        # @private
+        def _add_tags_caching_methods
+          send :include, ActsAsTaggableOn::Taggable::Cache::InstanceMethods
+          extend ActsAsTaggableOn::Taggable::Cache::ClassMethods
+
+          before_save :save_cached_tag_list
+
+          initialize_tags_cache
+        end
+
+        # ActiveRecord::Base.columns makes a database connection and caches the calculated
+        #   columns hash for the record as @columns.  Since we don't want to add caching
+        #   methods until we confirm the presence of a caching column, and we don't
+        #   want to force opening a database connection when the class is loaded,
+        #   here we intercept and cache the call to :columns as @acts_as_taggable_on_columns
+        #   to mimic the underlying behavior.  While processing this first call to columns,
+        #   we do the caching column check and dynamically add the class and instance methods
+        def columns
+          @acts_as_taggable_on_columns ||= begin
+            db_columns = super
+            if _has_tags_cache_columns?(db_columns)
+              _add_tags_caching_methods
+            end
+            db_columns
+          end
+        end
+
       end
-      
-      base.initialize_acts_as_taggable_on_cache
     end
-    
+
     module ClassMethods
-      def initialize_acts_as_taggable_on_cache      
+      def initialize_tags_cache
         tag_types.map(&:to_s).each do |tag_type|
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
             def self.caching_#{tag_type.singularize}_list?
               caching_tag_list_on?("#{tag_type}")
-            end        
+            end
           RUBY
-        end        
+        end
       end
-      
+
       def acts_as_taggable_on(*args)
         super(*args)
-        initialize_acts_as_taggable_on_cache
+        initialize_tags_cache
       end
-      
+
       def caching_tag_list_on?(context)
         column_names.include?("cached_#{context.to_s.singularize}_list")
       end
     end
-    
-    module InstanceMethods      
+
+    module InstanceMethods
       def save_cached_tag_list
         tag_types.map(&:to_s).each do |tag_type|
           if self.class.send("caching_#{tag_type.singularize}_list?")
@@ -45,9 +73,10 @@ module ActsAsTaggableOn::Taggable
             end
           end
         end
-        
+
         true
       end
     end
+
   end
 end

data/lib/acts_as_taggable_on/acts_as_taggable_on/collection.rb

@@ -5,7 +5,7 @@ module ActsAsTaggableOn::Taggable
       base.extend ActsAsTaggableOn::Taggable::Collection::ClassMethods
       base.initialize_acts_as_taggable_on_collection
     end
-    
+
     module ClassMethods
       def initialize_acts_as_taggable_on_collection
         tag_types.map(&:to_s).each do |tag_type|
@@ -24,16 +24,16 @@ module ActsAsTaggableOn::Taggable
 
             def self.top_#{tag_type}(limit = 10)
               tag_counts_on('#{tag_type}', :order => 'count desc', :limit => limit.to_i)
-            end        
+            end
           RUBY
-        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
@@ -86,12 +86,13 @@ module ActsAsTaggableOn::Taggable
         group_columns = "#{ActsAsTaggableOn::Tagging.table_name}.tag_id"
 
         # Append the current scope to the scope, because we can't use scope(:find) in RoR 3.0 anymore:
-        ids = select("#{table_name}.#{primary_key}").map(&:id)
-        tagging_scope = tagging_scope.where("#{ActsAsTaggableOn::Tagging.table_name}.taggable_id IN(?)", ids).group(group_columns)
-        
-        tag_scope.joins("JOIN (#{tagging_scope.to_sql}) AS #{ActsAsTaggableOn::Tagging.table_name} ON #{ActsAsTaggableOn::Tagging.table_name}.tag_id = #{ActsAsTaggableOn::Tag.table_name}.id")
+        scoped_select = "#{table_name}.#{primary_key}"
+        tagging_scope = tagging_scope.where("#{ActsAsTaggableOn::Tagging.table_name}.taggable_id IN(#{safe_to_sql(select(scoped_select))})").group(group_columns)
+
+        tag_scope = tag_scope.joins("JOIN (#{safe_to_sql(tagging_scope)}) AS #{ActsAsTaggableOn::Tagging.table_name} ON #{ActsAsTaggableOn::Tagging.table_name}.tag_id = #{ActsAsTaggableOn::Tag.table_name}.id")
+        tag_scope.extending(CalculationMethods)
       end
-      
+
       ##
       # Calculate the tag counts for all tags.
       #
@@ -110,29 +111,29 @@ module ActsAsTaggableOn::Taggable
         scope = {}
 
         ## Generate conditions:
-        options[:conditions] = sanitize_sql(options[:conditions]) if options[:conditions]     
+        options[:conditions] = sanitize_sql(options[:conditions]) if options[:conditions]
 
         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(["#{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]
+        taggable_conditions << sanitize_sql([" AND #{ActsAsTaggableOn::Tagging.table_name}.taggable_id = ?", options[:id]])  if options[:id]
         taggable_conditions << sanitize_sql([" AND #{ActsAsTaggableOn::Tagging.table_name}.context = ?", options.delete(:on).to_s]) if options[:on]
-        
+
         tagging_conditions = [
           taggable_conditions,
           scope[:conditions],
           start_at_conditions,
           end_at_conditions
         ].compact.reverse
-        
+
         tag_conditions = [
-          options[:conditions]        
+          options[:conditions]
         ].compact.reverse
-        
+
         ## Generate joins:
         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      
+        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
 
         tagging_joins = [
           taggable_join,
@@ -144,10 +145,10 @@ module ActsAsTaggableOn::Taggable
 
         ## Generate scope:
         tagging_scope = ActsAsTaggableOn::Tagging.select("#{ActsAsTaggableOn::Tagging.table_name}.tag_id, COUNT(#{ActsAsTaggableOn::Tagging.table_name}.tag_id) AS tags_count")
-        tag_scope = ActsAsTaggableOn::Tag.select("#{ActsAsTaggableOn::Tag.table_name}.*, #{ActsAsTaggableOn::Tagging.table_name}.tags_count AS count").order(options[:order]).limit(options[:limit])   
+        tag_scope = ActsAsTaggableOn::Tag.select("#{ActsAsTaggableOn::Tag.table_name}.*, #{ActsAsTaggableOn::Tagging.table_name}.tags_count AS count").order(options[:order]).limit(options[:limit])
 
         # Joins and conditions
-        tagging_joins.each      { |join|      tagging_scope = tagging_scope.joins(join)      }        
+        tagging_joins.each      { |join|      tagging_scope = tagging_scope.joins(join)      }
         tagging_conditions.each { |condition| tagging_scope = tagging_scope.where(condition) }
 
         tag_joins.each          { |join|      tag_scope     = tag_scope.joins(join)          }
@@ -156,29 +157,38 @@ module ActsAsTaggableOn::Taggable
         # GROUP BY and HAVING clauses:
         at_least  = sanitize_sql(["COUNT(#{ActsAsTaggableOn::Tagging.table_name}.tag_id) >= ?", options.delete(:at_least)]) if options[:at_least]
         at_most   = sanitize_sql(["COUNT(#{ActsAsTaggableOn::Tagging.table_name}.tag_id) <= ?", options.delete(:at_most)]) if options[:at_most]
-        having    = ["COUNT(#{ActsAsTaggableOn::Tagging.table_name}.tag_id) > 0", at_least, at_most].compact.join(' AND ')    
+        having    = ["COUNT(#{ActsAsTaggableOn::Tagging.table_name}.tag_id) > 0", at_least, at_most].compact.join(' AND ')
 
         group_columns = "#{ActsAsTaggableOn::Tagging.table_name}.tag_id"
 
-        # 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}"
-        select_query = "#{select(scoped_select).to_sql}"
-
-        res = ActiveRecord::Base.connection.select_all(select_query).map { |item| item.values }.flatten.compact.join(",")
-        res = "NULL" if res.blank?
+        unless options[:id]
+          # 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}"
+          tagging_scope = tagging_scope.where("#{ActsAsTaggableOn::Tagging.table_name}.taggable_id IN(#{safe_to_sql(select(scoped_select))})")
+        end
 
-        tagging_scope = tagging_scope.where("#{ActsAsTaggableOn::Tagging.table_name}.taggable_id IN(#{res})")
         tagging_scope = tagging_scope.group(group_columns).having(having)
 
-        tag_scope = tag_scope.joins("JOIN (#{tagging_scope.to_sql}) AS #{ActsAsTaggableOn::Tagging.table_name} ON #{ActsAsTaggableOn::Tagging.table_name}.tag_id = #{ActsAsTaggableOn::Tag.table_name}.id")
-        tag_scope
+        tag_scope = tag_scope.joins("JOIN (#{safe_to_sql(tagging_scope)}) AS #{ActsAsTaggableOn::Tagging.table_name} ON #{ActsAsTaggableOn::Tagging.table_name}.tag_id = #{ActsAsTaggableOn::Tag.table_name}.id")
+        tag_scope.extending(CalculationMethods)
+      end
+
+      def safe_to_sql(relation)
+        connection.respond_to?(:unprepared_statement) ? connection.unprepared_statement{relation.to_sql} : relation.to_sql
       end
     end
-    
+
     module InstanceMethods
       def tag_counts_on(context, options={})
         self.class.tag_counts_on(context, options.merge(:id => id))
       end
     end
+
+    module CalculationMethods
+      def count
+        # https://github.com/rails/rails/commit/da9b5d4a8435b744fcf278fffd6d7f1e36d4a4f2
+        super(:all)
+      end
+    end
   end
-end
+end