refactor

app/logical/post_query_builder.rb

@@ -0,0 +1,237 @@
+class PostQueryBuilder
+  attr_accessor :q, :has_constraints
+  
+  def initialize(q)
+    @q = q
+    @has_constraint = false
+  end
+  
+  def has_constraints?
+    @has_constraints
+  end
+  
+  def has_constraints!
+    @has_constraints = true
+  end
+  
+  def add_range_relation(arr, field, relation)
+    return relation if arr.nil?
+    
+    has_constraints!
+    
+    case arr[0]
+    when :eq
+      relation.where(["#{field} = ?", arr[1]])
+
+    when :gt
+      relation.where(["#{field} > ?", arr[1]])
+
+    when :gte
+      relation.where(["#{field} >= ?", arr[1]])
+
+    when :lt
+      relation.where(["#{field} < ?", arr[1]])
+
+    when :lte
+      relation.where(["#{field} <= ?", arr[1]])
+
+    when :between
+      relation.where(["#{field} BETWEEN ? AND ?", arr[1], arr[2]])
+
+    else
+      relation
+    end
+  end
+
+  def escape_string_for_tsquery(array)
+    array.map do |token|
+      escaped_token = token.gsub(/\\|'/, '\0\0\0\0').gsub("?", "\\\\77").gsub("%", "\\\\37")
+      "''" + escaped_token + "''"
+    end
+  end
+  
+  def add_tag_string_search_relation(tags, relation)
+    tag_query_sql = []
+
+    if tags[:include].any?
+      raise SearchError.new("You cannot search for more than #{Danbooru.config.tag_query_limit} tags at a time") if tags[:include].size > Danbooru.config.tag_query_limit
+      tag_query_sql << "(" + escape_string_for_tsquery(tags[:include]).join(" | ") + ")"
+      has_constraints!
+    end
+
+    if tags[:related].any?
+      raise SearchError.new("You cannot search for more than #{Danbooru.config.tag_query_limit} tags at a time") if tags[:related].size > Danbooru.config.tag_query_limit
+      tag_query_sql << "(" + escape_string_for_tsquery(tags[:related]).join(" & ") + ")"
+      has_constraints!
+    end
+
+    if tags[:exclude].any?
+      raise SearchError.new("You cannot search for more than #{Danbooru.config.tag_query_limit} tags at a time") if tags[:exclude].size > Danbooru.config.tag_query_limit
+      raise SearchError.new("You cannot search for only excluded tags") unless has_constraints?
+
+      tag_query_sql << "!(" + escape_string_for_tsquery(tags[:exclude]).join(" | ") + ")"
+    end
+
+    if tag_query_sql.any?
+      relation = relation.where("posts.tag_index @@ to_tsquery('danbooru', E'" + tag_query_sql.join(" & ") + "')")
+    end
+    
+    relation
+  end
+  
+  def add_tag_subscription_relation(subscriptions, relation)
+    subscriptions.each do |subscription|
+      if subscription =~ /^(.+?):(.+)$/
+        user_name = $1
+        subscription_name = $2
+        user = User.find_by_name(user_name)
+        return relation if user.nil?
+        post_ids = TagSubscription.find_post_ids(user.id, subscription_name)
+      else
+        user = User.find_by_name(subscription)
+        return relation if user.nil?
+        post_ids = TagSubscription.find_post_ids(user.id)
+      end
+      
+      post_ids = [0] if post_ids.empty?
+      relation = relation.where(["posts.id IN (?)", post_ids])
+    end
+    
+    relation
+  end
+  
+  def build
+    unless q.is_a?(Hash)
+      q = Tag.parse_query(q)
+    end
+    
+    relation = Post.scoped
+    
+    relation = add_range_relation(q[:post_id], "posts.id", relation)
+    relation = add_range_relation(q[:mpixels], "posts.width * posts.height / 1000000.0", relation)
+    relation = add_range_relation(q[:width], "posts.image_width", relation)
+    relation = add_range_relation(q[:height], "posts.image_height", relation)
+    relation = add_range_relation(q[:score], "posts.score", relation)
+    relation = add_range_relation(q[:filesize], "posts.file_size", relation)
+    relation = add_range_relation(q[:date], "date(posts.created_at)", relation)
+    relation = add_range_relation(q[:general_tag_count], "posts.tag_count_general", relation)
+    relation = add_range_relation(q[:artist_tag_count], "posts.tag_count_artist", relation)
+    relation = add_range_relation(q[:copyright_tag_count], "posts.tag_count_copyright", relation)
+    relation = add_range_relation(q[:character_tag_count], "posts.tag_count_character", relation)
+    relation = add_range_relation(q[:tag_count], "posts.tag_count", relation)      
+
+    if q[:md5]
+      relation = relation.where(["posts.md5 IN (?)", q[:md5]])
+      has_constraints!
+    end
+    
+    if q[:status] == "pending"
+      relation = relation.where("posts.is_pending = TRUE")
+    elsif q[:status] == "flagged"
+      relation = relation.where("posts.is_flagged = TRUE")
+    elsif q[:status] == "deleted"
+      relation = relation.where("posts.is_deleted = TRUE")
+    elsif q[:status] == "all" || q[:status] == "any"
+      # do nothing
+    else
+      relation = relation.where("posts.is_deleted <> TRUE")
+    end
+
+    if q[:source]
+      relation = relation.where("posts.source LIKE ? ESCAPE E'\\\\'", q[:source])
+      has_constraints!
+    end
+
+    if q[:subscriptions]
+      relation = add_tag_subscription_relation(q[:subscriptions], relation)
+      has_constraints!
+    end
+
+    if q[:uploader_id_neg]
+      relation = relation.where("posts.uploader_id not in (?)", q[:uploader_id_neg])
+    end
+    
+    if q[:uploader_id]
+      relation = relation.where("posts.uploader_id = ?", q[:uploader_id])
+      has_constraints!
+    end
+    
+    if q[:approver_id_neg]
+      relation = relation.where("posts.approver_id not in (?)", q[:approver_id_neg])
+    end
+    
+    if q[:approver_id]
+      relation = relation.where("posts.approver_id = ?", q[:approver_id])
+      has_constraints!
+    end
+    
+    if q[:parent_id]
+      relation = relation.where("(posts.id = ? or posts.parent_id = ?)", q[:parent_id], q[:parent_id])
+      has_constraints!
+    end
+    
+    if q[:rating] =~ /^q/
+      relation = relation.where("posts.rating = 'q'")
+    elsif q[:rating] =~ /^s/
+      relation = relation.where("posts.rating = 's'")
+    elsif q[:rating] =~ /^e/
+      relation = relation.where("posts.rating = 'e'")
+    end
+
+    if q[:rating_negated] =~ /^q/
+      relation = relation.where("posts.rating <> 'q'")
+    elsif q[:rating_negated] =~ /^s/
+      relation = relation.where("posts.rating <> 's'")
+    elsif q[:rating_negated] =~ /^e/
+      relation = relation.where("posts.rating <> 'e'")
+    end
+    
+    relation = add_tag_string_search_relation(q[:tags], relation)
+    
+    if q[:order] == "rank"
+      relation = relation.where("posts.score > 0 and posts.created_at >= ?", 2.days.ago)
+    end
+    
+    case q[:order]
+    when "id", "id_asc"
+      relation = relation.order("posts.id")
+
+    when "id_desc"
+      relation = relation.order("posts.id DESC")
+
+    when "score", "score_desc"
+      relation = relation.order("posts.score DESC, posts.id DESC")
+
+    when "score_asc"
+      relation = relation.order("posts.score, posts.id DESC")
+
+    when "mpixels", "mpixels_desc"
+      # Use "w*h/1000000", even though "w*h" would give the same result, so this can use
+      # the posts_mpixels index.
+      relation = relation.order("posts.image_width * posts.image_height / 1000000.0 DESC, posts.id DESC")
+
+    when "mpixels_asc"
+      relation = relation.order("posts.image_width * posts.image_height / 1000000.0, posts.id DESC")
+
+    when "portrait"
+      relation = relation.order("1.0 * posts.image_width / GREATEST(1, posts.image_height), posts.id DESC")
+
+    when "landscape"
+      relation = relation.order("1.0 * posts.image_width / GREATEST(1, posts.image_height) DESC, posts.id DESC")
+
+    when "filesize", "filesize_desc"
+      relation = relation.order("posts.file_size DESC")
+
+    when "filesize_asc"
+      relation = relation.order("posts.file_size")
+
+	  when "rank"
+	    relation = relation.order("log(3, posts.score) + (extract(epoch from posts.created_at) - extract(epoch from timestamp '2005-05-24')) / 45000 DESC")
+
+    else
+      relation = relation.order("posts.id DESC")
+    end
+
+    relation
+  end
+end

app/models/post.rb

@@ -3,7 +3,7 @@ class Post < ActiveRecord::Base
   class DisapprovalError < Exception ; end
   class SearchError < Exception ; end
   
-  attr_accessor :old_tag_string, :old_parent_id
+  attr_accessor :old_tag_string, :old_parent_id, :has_constraints
   after_destroy :delete_files
   after_destroy :delete_remote_files
   after_save :create_version
@@ -44,7 +44,6 @@ class Post < ActiveRecord::Base
   scope :available_for_moderation, lambda {|hidden| hidden.present? ? where(["id IN (SELECT pd.post_id FROM post_disapprovals pd WHERE pd.user_id = ?)", CurrentUser.id]) : where(["id NOT IN (SELECT pd.post_id FROM post_disapprovals pd WHERE pd.user_id = ?)", CurrentUser.id])}
   scope :hidden_from_moderation, lambda {where(["id IN (SELECT pd.post_id FROM post_disapprovals pd WHERE pd.user_id = ?)", CurrentUser.id])}
   scope :tag_match, lambda {|query| Post.tag_match_helper(query)}
-  scope :exact_tag_match, lambda {|query| Post.exact_tag_match_helper(query)}
   scope :positive, where("score > 1")
   scope :negative, where("score < -1")
   search_methods :tag_match
@@ -570,220 +569,9 @@ class Post < ActiveRecord::Base
   end
   
   module SearchMethods
-    def add_range_relation(arr, field, relation)
-      return relation if arr.nil?
-      
-      case arr[0]
-      when :eq
-        relation.where(["#{field} = ?", arr[1]])
-
-      when :gt
-        relation.where(["#{field} > ?", arr[1]])
-
-      when :gte
-        relation.where(["#{field} >= ?", arr[1]])
-
-      when :lt
-        relation.where(["#{field} < ?", arr[1]])
-
-      when :lte
-        relation.where(["#{field} <= ?", arr[1]])
-
-      when :between
-        relation.where(["#{field} BETWEEN ? AND ?", arr[1], arr[2]])
-
-      else
-        relation
-      end
-    end
-
-    def escape_string_for_tsquery(array)
-      array.map do |token|
-        escaped_token = token.gsub(/\\|'/, '\0\0\0\0').gsub("?", "\\\\77").gsub("%", "\\\\37")
-        "''" + escaped_token + "''"
-      end
-    end
-    
-    def add_tag_string_search_relation(tags, relation)
-      tag_query_sql = []
-
-      if tags[:include].any?
-        raise SearchError.new("You cannot search for more than #{Danbooru.config.tag_query_limit} tags at a time") if tags[:include].size > Danbooru.config.tag_query_limit
-        tag_query_sql << "(" + escape_string_for_tsquery(tags[:include]).join(" | ") + ")"
-      end
-  
-      if tags[:related].any?
-        raise SearchError.new("You cannot search for more than #{Danbooru.config.tag_query_limit} tags at a time") if tags[:related].size > Danbooru.config.tag_query_limit
-        tag_query_sql << "(" + escape_string_for_tsquery(tags[:related]).join(" & ") + ")"
-      end
-
-      if tags[:exclude].any?
-        raise SearchError.new("You cannot search for more than #{Danbooru.config.tag_query_limit} tags at a time") if tags[:exclude].size > Danbooru.config.tag_query_limit
-
-        tag_query_sql << "!(" + escape_string_for_tsquery(tags[:exclude]).join(" | ") + ")"
-      end
-
-      if tag_query_sql.any?
-        relation = relation.where("posts.tag_index @@ to_tsquery('danbooru', E'" + tag_query_sql.join(" & ") + "')")
-      end
-      
-      relation
-    end
-    
-    def add_tag_subscription_relation(subscriptions, relation)
-      subscriptions.each do |subscription|
-        if subscription =~ /^(.+?):(.+)$/
-          user_name = $1
-          subscription_name = $2
-          user = User.find_by_name(user_name)
-          return relation if user.nil?
-          post_ids = TagSubscription.find_post_ids(user.id, subscription_name)
-        else
-          user = User.find_by_name(subscription)
-          return relation if user.nil?
-          post_ids = TagSubscription.find_post_ids(user.id)
-        end
-        
-        post_ids = [0] if post_ids.empty?
-        relation = relation.where(["posts.id IN (?)", post_ids])
-      end
-      
-      relation
-    end
-    
-    def exact_tag_match_helper(q)
-      arel = Post.scoped
-      add_tag_string_search_relation({:related => [q].flatten, :include => [], :exclude => []}, arel)
-    end
-
     def tag_match_helper(q)
-      unless q.is_a?(Hash)
+      builder = PostQueryBuilder.new(q)
-        q = Tag.parse_query(q)
+      builder.build
-      end
-      
-      constraint = false
-      relation = Post.scoped
-      
-      relation = add_range_relation(q[:post_id], "posts.id", relation)
-      relation = add_range_relation(q[:mpixels], "posts.width * posts.height / 1000000.0", relation)
-      relation = add_range_relation(q[:width], "posts.image_width", relation)
-      relation = add_range_relation(q[:height], "posts.image_height", relation)
-      relation = add_range_relation(q[:score], "posts.score", relation)
-      relation = add_range_relation(q[:filesize], "posts.file_size", relation)
-      relation = add_range_relation(q[:date], "date(posts.created_at)", relation)
-      relation = add_range_relation(q[:general_tag_count], "posts.tag_count_general", relation)
-      relation = add_range_relation(q[:artist_tag_count], "posts.tag_count_artist", relation)
-      relation = add_range_relation(q[:copyright_tag_count], "posts.tag_count_copyright", relation)
-      relation = add_range_relation(q[:character_tag_count], "posts.tag_count_character", relation)
-      relation = add_range_relation(q[:tag_count], "posts.tag_count", relation)      
-
-      if q[:md5]
-        relation = relation.where(["posts.md5 IN (?)", q[:md5]])
-      end
-      
-      if q[:status] == "pending"
-        relation = relation.where("posts.is_pending = TRUE")
-      elsif q[:status] == "flagged"
-        relation = relation.where("posts.is_flagged = TRUE")
-      elsif q[:status] == "deleted"
-        relation = relation.where("posts.is_deleted = TRUE")
-      elsif q[:status] == "all" || q[:status] == "any"
-        # do nothing
-      else
-        relation = relation.where("posts.is_deleted <> TRUE")
-      end
-
-      if q[:source]
-        relation = relation.where(["posts.source LIKE ? ESCAPE E'\\\\'", q[:source]])
-      end
-
-      if q[:subscriptions]
-        relation = add_tag_subscription_relation(q[:subscriptions], relation)
-      end
-
-      relation = add_tag_string_search_relation(q[:tags], relation)
-      
-      if q[:uploader_id_neg]
-        relation = relation.where("posts.uploader_id not in (?)", q[:uploader_id_neg])
-      end
-      
-      if q[:uploader_id]
-        relation = relation.where("posts.uploader_id = ?", q[:uploader_id])
-      end
-      
-      if q[:approver_id_neg]
-        relation = relation.where("posts.approver_id not in (?)", q[:approver_id_neg])
-      end
-      
-      if q[:approver_id]
-        relation = relation.where("posts.approver_id = ?", q[:approver_id])
-      end
-      
-      if q[:parent_id]
-        relation = relation.where("(posts.id = ? or posts.parent_id = ?)", q[:parent_id], q[:parent_id])
-      end
-      
-      if q[:rating] =~ /^q/
-        relation = relation.where("posts.rating = 'q'")
-      elsif q[:rating] =~ /^s/
-        relation = relation.where("posts.rating = 's'")
-      elsif q[:rating] =~ /^e/
-        relation = relation.where("posts.rating = 'e'")
-      end
-
-      if q[:rating_negated] =~ /^q/
-        relation = relation.where("posts.rating <> 'q'")
-      elsif q[:rating_negated] =~ /^s/
-        relation = relation.where("posts.rating <> 's'")
-      elsif q[:rating_negated] =~ /^e/
-        relation = relation.where("posts.rating <> 'e'")
-      end
-      
-      if q[:order] == "rank"
-        relation = relation.where("posts.score > 0 and posts.created_at >= ?", 3.days.ago)
-      end
-      
-      case q[:order]
-      when "id", "id_asc"
-        relation = relation.order("posts.id")
-
-      when "id_desc"
-        relation = relation.order("posts.id DESC")
-
-      when "score", "score_desc"
-        relation = relation.order("posts.score DESC, posts.id DESC")
-
-      when "score_asc"
-        relation = relation.order("posts.score, posts.id DESC")
-
-      when "mpixels", "mpixels_desc"
-        # Use "w*h/1000000", even though "w*h" would give the same result, so this can use
-        # the posts_mpixels index.
-        relation = relation.order("posts.image_width * posts.image_height / 1000000.0 DESC, posts.id DESC")
-
-      when "mpixels_asc"
-        relation = relation.order("posts.image_width * posts.image_height / 1000000.0, posts.id DESC")
-
-      when "portrait"
-        relation = relation.order("1.0 * posts.image_width / GREATEST(1, posts.image_height), posts.id DESC")
-
-      when "landscape"
-        relation = relation.order("1.0 * posts.image_width / GREATEST(1, posts.image_height) DESC, posts.id DESC")
-
-      when "filesize", "filesize_desc"
-        relation = relation.order("posts.file_size DESC")
-
-      when "filesize_asc"
-        relation = relation.order("posts.file_size")
-
-  	  when "rank"
-  	    relation = relation.order("log(3, posts.score) + (extract(epoch from posts.created_at) - extract(epoch from timestamp '2005-05-24')) / 45000 DESC")
-
-      else
-        relation = relation.order("posts.id DESC")
-      end
-
-      relation
     end
   end
   

app/models/tag_alias.rb

@@ -80,7 +80,7 @@ class TagAlias < ActiveRecord::Base
   end
   
   def update_posts
-    Post.exact_tag_match(antecedent_name).find_each do |post|
+    Post.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
       

app/models/tag_implication.rb

@@ -95,7 +95,7 @@ class TagImplication < ActiveRecord::Base
   end
   
   def update_posts
-    Post.exact_tag_match(antecedent_name).find_each do |post|
+    Post.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| )/, " #{antecedent_name} #{descendant_names} ").strip
       CurrentUser.scoped(creator, creator_ip_addr) do