Merge pull request #4978 from jhass/bump_acts_as_taggable_on

Bump acts-as-taggable-on

Gemfile

@@ -89,7 +89,7 @@ gem 'omniauth-wordpress','0.2.1'
 
 # Tags
 
-gem 'acts-as-taggable-on', '2.4.1'
+gem 'acts-as-taggable-on', '3.2.6'
 
 # URIs and HTTP
 

Gemfile.lock

@@ -30,8 +30,8 @@ GEM
     activesupport (3.2.19)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
-    acts-as-taggable-on (2.4.1)
+    acts-as-taggable-on (3.2.6)
-      rails (>= 3, < 5)
+      activerecord (>= 3, < 5)
     acts_as_api (0.4.2)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -470,7 +470,7 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord-import (= 0.3.1)
-  acts-as-taggable-on (= 2.4.1)
+  acts-as-taggable-on (= 3.2.6)
   acts_as_api (= 0.4.2)
   addressable (= 2.3.6)
   asset_sync (= 1.0.0)

app/models/acts_as_taggable_on-tag.rb

@@ -0,0 +1,23 @@
+module ActsAsTaggableOn
+  class Tag
+
+    self.include_root_in_json = false
+
+    def self.tag_text_regexp
+      @@tag_text_regexp ||= "[[:alnum:]]_-"
+    end
+
+    def self.autocomplete(name)
+      where("name LIKE ?", "#{name.downcase}%")
+    end
+
+    def self.normalize(name)
+      if name =~ /^#?<3/
+        # Special case for love, because the world needs more love.
+        '<3'
+      elsif name
+        name.gsub(/[^#{self.tag_text_regexp}]/, '').downcase
+      end
+    end
+  end
+end

app/models/acts_as_taggable_on/tag.rb

@@ -1,21 +0,0 @@
-class ActsAsTaggableOn::Tag
-
-  self.include_root_in_json = false
-
-  def self.tag_text_regexp
-    @@tag_text_regexp ||= "[[:alnum:]]_-"
-  end
-
-  def self.autocomplete(name)
-    where("name LIKE ?", "#{name.downcase}%")
-  end
-
-  def self.normalize(name)
-    if name =~ /^#?<3/
-      # Special case for love, because the world needs more love.
-      '<3'
-    elsif name
-      name.gsub(/[^#{self.tag_text_regexp}]/, '').downcase
-    end
-  end
-end

config/initializers/acts_as_taggable_on.rb

@@ -1,2 +1,2 @@
-require 'models/acts_as_taggable_on/tag'
+require 'models/acts_as_taggable_on-tag'
 ActsAsTaggableOn.force_lowercase = true

db/migrate/20140601102543_add_taggings_counter_cache_to_tags.acts_as_taggable_on_engine.rb

@@ -0,0 +1,15 @@
+# This migration comes from acts_as_taggable_on_engine (originally 3)
+class AddTaggingsCounterCacheToTags < ActiveRecord::Migration
+  def self.up
+    add_column :tags, :taggings_count, :integer, default: 0
+
+    ActsAsTaggableOn::Tag.reset_column_information
+    ActsAsTaggableOn::Tag.find_each do |tag|
+      ActsAsTaggableOn::Tag.reset_counters(tag.id, :taggings)
+    end
+  end
+
+  def self.down
+    remove_column :tags, :taggings_count
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20140422134627) do
+ActiveRecord::Schema.define(:version => 20140601102543) do
 
   create_table "account_deletions", :force => true do |t|
     t.string  "diaspora_handle"
@@ -483,6 +483,7 @@ ActiveRecord::Schema.define(:version => 20140422134627) do
 
   create_table "tags", :force => true do |t|
     t.string  "name"
+    t.integer "taggings_count", :default => 0
   end
 
   add_index "tags", ["name"], :name => "index_tags_on_name", :unique => true