Merge branch 'master' of https://github.com/r888888888/danbooru

app/models/note.rb

@@ -7,6 +7,7 @@ class Note < ActiveRecord::Base
   before_validation :initialize_updater
   before_validation :blank_body
   validates_presence_of :post_id, :creator_id, :updater_id, :x, :y, :width, :height
+  validate :coordinates_in_range, :message => "must be inside the image"
   has_many :versions, :class_name => "NoteVersion", :order => "note_versions.id ASC"
   after_save :update_post
   after_save :create_version
@@ -95,6 +96,13 @@ class Note < ActiveRecord::Base
     self.updater_ip_addr = CurrentUser.ip_addr
   end
 
+  def coordinates_in_range
+    if x < 0 || y < 0 || (x > post.image_width) || (y > post.image_height)
+      self.errors.add(:coordinates, "must be inside the image")
+      return false
+    end
+  end
+
   def post_must_not_be_note_locked
     if is_locked?
       errors.add :post, "is note locked"

app/models/post.rb

@@ -324,8 +324,6 @@ class Post < ActiveRecord::Base
     def update_tag_post_counts
       decrement_tags = tag_array_was - tag_array
       increment_tags = tag_array - tag_array_was
-      Post.execute_sql("UPDATE tags SET post_count = post_count - 1 WHERE name IN (?)", decrement_tags) if decrement_tags.any?
-      Post.execute_sql("UPDATE tags SET post_count = post_count + 1 WHERE name IN (?)", increment_tags) if increment_tags.any?
       Post.expire_cache_for_all(decrement_tags) if decrement_tags.any?
       Post.expire_cache_for_all(increment_tags) if increment_tags.any?
       Post.expire_cache_for_all([""]) if new_record? || id <= 100_000
@@ -338,7 +336,7 @@ class Post < ActiveRecord::Base
       self.tag_count_copyright = 0
       self.tag_count_character = 0
 
-      categories = Tag.categories_for(tag_array)
+      categories = Tag.categories_for(tag_array, :disable_caching => true)
       categories.each_value do |category|
         self.tag_count += 1
 

app/models/tag.rb

@@ -66,20 +66,21 @@ class Tag < ActiveRecord::Base
         select_value_sql("SELECT category FROM tags WHERE name = ?", tag_name).to_i
       end
 
-      def category_for(tag_name)
-        Cache.get("tc:#{Cache.sanitize(tag_name)}") do
+      def category_for(tag_name, options = {})
+        if options[:disable_caching]
           select_category_for(tag_name)
+        else
+          Cache.get("tc:#{Cache.sanitize(tag_name)}") do
+            select_category_for(tag_name)
+          end
         end
       end
 
-      def categories_for(tag_names)
+      def categories_for(tag_names, options)
         Array(tag_names).inject({}) do |hash, tag_name|
-          hash[tag_name] = category_for(tag_name)
+          hash[tag_name] = category_for(tag_name, options)
           hash
         end
-        # Cache.get_multi(tag_names, "tc") do |name|
-        #   select_category_for(name)
-        # end
       end
     end
 
@@ -104,11 +105,7 @@ class Tag < ActiveRecord::Base
         Post.raw_tag_match(name).find_each do |post|
           post.reload
           post.set_tag_counts
-          post.update_column(:tag_count, post.tag_count)
-          post.update_column(:tag_count_general, post.tag_count_general)
-          post.update_column(:tag_count_artist, post.tag_count_artist)
-          post.update_column(:tag_count_copyright, post.tag_count_copyright)
-          post.update_column(:tag_count_character, post.tag_count_character)
+          Post.update_all({:tag_count => post.tag_count, :tag_count_general => post.tag_count_general, :tag_count_artist => post.tag_count_artist, :tag_count_copyright => post.tag_count_copyright, :tag_count_character => post.tag_count_character}, {:id => post.id})
         end
       end
     end

script/fixes/013.rb

@@ -23,16 +23,6 @@ Artist.where("is_banned = true").find_each do |artist|
   artist.versions.last.update_column(:is_banned, true)
 end ; true
 
-User.find_each do |user|
-  puts "updating user #{user.id}"
-  user.update_column(:favorite_count, Favorite.for_user(user).where("user_id = ?", user.id).count)
-end ; true
-
-Post.find_each do |post|
-  puts "updating post #{post.id}"
-  post.update_column(:fav_count, Favorite.where("post_id = #{post.id}").count)
-end ; true
-
 danbooru_conn = PGconn.connect(dbname: 'danbooru')
 danbooru2_conn = PGconn.connect(dbname: "danbooru2")
 danbooru_conn.exec("set statement_timeout = 0")
@@ -42,9 +32,3 @@ danbooru_conn.exec( "SELECT * FROM comments WHERE id < 29130" ) do |result|
     danbooru2_conn.exec "insert into comments (id, created_at, updated_at, post_id, creator_id, body, ip_addr, score, updater_id, updater_ip_addr) values ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10)", [row["id"], row["created_at"], row["created_at"], row["post_id"], row["user_id"], row["body"], row["ip_addr"], row["score"], row["user_id"], row["ip_addr"]] 
   end
 end
-
-
-# Post.select("id, score, up_score, down_score, fav_count").find_each do |post|
-#   post.update_column(:score, post.up_score + post.down_score)
-# end ; true
-

script/fixes/014_note_ranges.rb

@@ -0,0 +1,15 @@
+#!/usr/bin/env ruby
+
+require File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'config', 'environment'))
+
+ActiveRecord::Base.connection.execute("set statement_timeout = 0")
+
+Note.update_all("x = 0", "x < 0")
+Note.update_all("y = 0", "y < 0")
+Note.update_all("x = 0", "x > (select _.image_width from posts _ where _.id = notes.id limit 1)")
+Note.update_all("y = 0", "y > (select _.image_height from posts _ where _.id = notes.id limit 1)")
+
+Post.where("created_at >= '2013-02-01'").select("id, score, up_score, down_score").find_each do |post|
+  fav_count = 
+  post.update_column(:score, post.up_score + post.down_score)
+end ; true

test/unit/note_test.rb

@@ -34,7 +34,13 @@ class NoteTest < ActiveSupport::TestCase
 
     context "creating a note" do
       setup do
-        @post = FactoryGirl.create(:post)
+        @post = FactoryGirl.create(:post, :image_width => 1000, :image_height => 1000)
+      end
+
+      should "not validate if the note is outside the image" do
+        @note = FactoryGirl.build(:note, :x => 1001, :y => 500, :post => @post)
+        @note.save
+        assert_equal(["Coordinates must be inside the image"], @note.errors.full_messages)
       end
 
       should "create a version" do
@@ -72,7 +78,7 @@ class NoteTest < ActiveSupport::TestCase
 
     context "updating a note" do
       setup do
-        @post = FactoryGirl.create(:post)
+        @post = FactoryGirl.create(:post, :image_width => 1000, :image_height => 1000)
         @note = FactoryGirl.create(:note, :post => @post)
       end
 
@@ -84,7 +90,7 @@ class NoteTest < ActiveSupport::TestCase
 
       should "update the post's last_noted_at field" do
         assert_nil(@post.last_noted_at)
-        @note.update_attributes(:x => 1000)
+        @note.update_attributes(:x => 500)
         @post.reload
         assert_equal(@post.last_noted_at.to_i, @note.updated_at.to_i)
       end
@@ -105,7 +111,7 @@ class NoteTest < ActiveSupport::TestCase
         end
 
         should "fail" do
-          @note.update_attributes(:x => 1000)
+          @note.update_attributes(:x => 500)
           assert_equal(["Post is note locked"], @note.errors.full_messages)
         end
       end