fixes #749, fixes tag alias related regressions

app/models/tag.rb

@@ -34,6 +34,8 @@ class Tag < ActiveRecord::Base
   end
   
   module CountMethods
+    extend ActiveSupport::Concern
+    
     module ClassMethods
       def counts_for(tag_names)
         select_all_sql("SELECT name, post_count FROM tags WHERE name IN (?)", tag_names)
@@ -102,45 +104,39 @@ class Tag < ActiveRecord::Base
   end
   
   module NameMethods
-    module ClassMethods
-      def normalize_name(name)
-        name.downcase.tr(" ", "_").gsub(/\A[-~]+/, "").gsub(/\*/, "")
-      end
-
-      def find_or_create_by_name(name, options = {})
-        name = normalize_name(name)
-        category = nil
-
-        if name =~ /\A(#{categories.regexp}):(.+)\Z/
-          category = $1
-          name = $2
-        end
-
-        tag = find_by_name(name)
-
-        if tag
-          if category
-            category_id = categories.value_for(category)
-            
-            if category_id != tag.category
-              tag.update_column(:category, category_id)
-              tag.update_category_cache_for_all
-            end
-          end
-
-          tag
-        else
-          Tag.new.tap do |t|
-            t.name = name
-            t.category = categories.value_for(category)
-            t.save
-          end
-        end
-      end
+    def normalize_name(name)
+      name.downcase.tr(" ", "_").gsub(/\A[-~]+/, "").gsub(/\*/, "")
     end
-    
-    def self.included(m)
-      m.extend(ClassMethods)
+
+    def find_or_create_by_name(name, options = {})
+      name = normalize_name(name)
+      category = nil
+
+      if name =~ /\A(#{categories.regexp}):(.+)\Z/
+        category = $1
+        name = $2
+      end
+
+      tag = find_by_name(name)
+
+      if tag
+        if category
+          category_id = categories.value_for(category)
+          
+          if category_id != tag.category
+            tag.update_column(:category, category_id)
+            tag.update_category_cache_for_all
+          end
+        end
+
+        tag
+      else
+        Tag.new.tap do |t|
+          t.name = name
+          t.category = categories.value_for(category)
+          t.save
+        end
+      end
     end
   end
 
@@ -468,7 +464,7 @@ class Tag < ActiveRecord::Base
   extend ViewCountMethods
   include CategoryMethods
   extend StatisticsMethods
-  include NameMethods
+  extend NameMethods
   extend ParseMethods
   include RelationMethods
   extend SuggestionMethods

app/models/tag_alias.rb

@@ -1,6 +1,7 @@
 class TagAlias < ActiveRecord::Base
   after_save :clear_all_cache
   after_save :update_cache
+  after_save :ensure_category_consistency
   after_destroy :clear_all_cache
   before_validation :initialize_creator, :on => :create
   validates_presence_of :creator_id
@@ -86,6 +87,14 @@ class TagAlias < ActiveRecord::Base
     end
   end
   
+  def ensure_category_consistency
+    if antecedent_tag && consequent_tag && antecedent_tag.category != consequent_tag.category
+      consequent_tag.update_attribute(:category, antecedent_tag.category)
+    end
+    
+    true
+  end
+  
   def clear_all_cache
     Danbooru.config.all_server_hosts.each do |host|
       delay(:queue => host).clear_cache(host)
@@ -103,8 +112,14 @@ class TagAlias < ActiveRecord::Base
   end
   
   def update_posts
-    Post.raw_tag_match(antecedent_name).each do |post|
-      post.save
+    Post.raw_tag_match(antecedent_name).find_each do |post|
+      escaped_antecedent_name = Regexp.escape(antecedent_name)
+      fixed_tags = post.tag_string.sub(/(?:\A| )#{escaped_antecedent_name}(?:\Z| )/, " #{consequent_name} ").strip
+      CurrentUser.scoped(creator, creator_ip_addr) do
+        post.update_attributes(
+          :tag_string => fixed_tags
+        )
+      end
     end
   end
 end