reverted post version tag change for danbooru2

app/models/post.rb

@@ -934,40 +934,24 @@ class Post < ActiveRecord::Base
         versions.create(
           :rating => rating,
           :source => source,
-          :add_tags => tag_string,
+          :tags => tag_string,
           :parent_id => parent_id
         )
       elsif rating_changed? || source_changed? || parent_id_changed? || tag_string_changed?
         versions.create(
-          :rating => rating_changed? ? rating : nil,
-          :source => source_changed? ? source : nil,
-          :add_tags => (tag_array - tag_array_was).join(" "),
-          :del_tags => (tag_array_was - tag_array).join(" "),
-          :parent_id => parent_id_changed? ? parent_id : nil
+          :rating => rating,
+          :source => source,
+          :tags => tag_string,
+          :parent_id => parent_id
         )
       end
     end
     
     def revert_to(target)
-      base_tags = []
-      base_rating = "q"
-      base_source = nil
-      base_parent_id = nil
-      
-      versions.each do |version|
-        if version.id <= target.id
-          base_tags += version.add_tag_array
-          base_tags -= version.del_tag_array
-          base_rating = version.rating if version.rating
-          base_source = version.source if version.source
-          base_parent_id = version.parent_id if version.parent_id
-        end
-      end
-      
-      self.tag_string = base_tags.sort.join(" ")
-      self.rating = base_rating
-      self.source = base_source
-      self.parent_id = base_parent_id
+      self.tag_string = target.tags
+      self.rating = target.rating
+      self.source = target.source
+      self.parent_id = target.parent_id
     end
     
     def revert_to!(target)

app/models/post_version.rb

@@ -17,12 +17,8 @@ class PostVersion < ActiveRecord::Base
     self.updater_ip_addr = CurrentUser.ip_addr
   end
   
-  def add_tag_array
-    @add_tag_array ||= add_tags.scan(/\S+/)
-  end
-  
-  def del_tag_array
-    @del_tag_array ||= del_tags.scan(/\S+/)
+  def tag_array
+    @tag_array ||= tags.scan(/\S+/)
   end
   
   def presenter
@@ -30,8 +26,45 @@ class PostVersion < ActiveRecord::Base
   end
   
   def reload
-    @add_tag_array = nil
-    @del_tag_array = nil
+    @tag_array = nil
     super
   end
+
+  def sequence_for_post
+    versions = PostVersion.where(:post_id => post_id).order("id desc").all
+    diffs = []
+    versions.each_index do |i|
+      if i < versions.size - 1
+        diffs << versions[i].diff(versions[i + 1])
+      end
+    end
+    return diffs
+  end
+  
+  def diff(version)
+    latest_tags = post.tag_array
+    new_tags = tag_array
+    new_tags << "rating:#{rating}" if rating.present?
+    new_tags << "parent:#{parent_id}" if parent_id.present?
+    new_tags << "source:#{source}" if source.present?
+    old_tags = version.present? ? version.tag_array : []
+    if version.present?
+      old_tags << "rating:#{version.rating}" if version.rating.present?
+      old_tags << "parent:#{version.parent_id}" if version.parent_id.present?
+      old_tags << "source:#{version.source}" if version.source.present?
+    end
+
+    return {
+      :added_tags => new_tags - old_tags,
+      :removed_tags => old_tags - new_tags,
+      :unchanged_tags => new_tags & old_tags,
+      :obsolete_added_tags => new_tags - latest_tags,
+      :obsolete_removed_tags => old_tags & latest_tags,
+    }
+  end
+  
+  def previous
+    PostVersion.where("post_id = ? and id < ?", post_id, id).order("id desc").first
+  end
+  
 end