quest_search 0.0.5 → 0.0.6

data/lib/quest_search/quest_search_on.rb

@@ -1,95 +1,105 @@
 module QuestSearch
-	module QuestSearchOn
-		extend ActiveSupport::Concern
+  module QuestSearchOn
+    extend ActiveSupport::Concern
     
-		module ClassMethods
-			def quest_search_on(*fields)
-				if fields.size.zero?
-					raise "No arguments given, please specify which fields should be indexed and searched."
-				end
-
-				options = fields.extract_options!
-
-				@order = options[:order] || "id desc"
-
-				cattr_accessor :quest_search_fields
-
-				self.quest_search_fields = fields
-			end
-
-			def quest_search_for(query, page_no = 1, page_size = 2**32)
-				words = query.to_s.split " "
-				conditions = words.map do |w|
-					self.quest_search_fields.map do |f|
-						replace_bind_variables("#{f} like ?", ["%#{w}%"])
-					end.join " OR "
-				end.join " OR "
-
-				offset = (page_no * page_size) - page_size
-				offset_ends = offset + page_size
-
-				results = self.where(conditions).order(@order).sort do |a, b|
-					b.points_for(query) <=> a.points_for(query)
-				end
-
-				end_results = []
-
-				results.each_with_index do |r, index|
-					if index == offset_ends
-						break
-					end
-
-					if index >= offset
-						end_results.push r
-					end
-				end
-
-				end_results
-			end
-		end
-
-		def points_for(query)
-			query = query.to_s.downcase
-			@quest_search_relevance ||= {}
-			return @quest_search_relevance[query] if @quest_search_relevance[query]
-			words = query.split " "
-
-			self.search_word_matches = []
-			self.search_word_matches_count = 0
-			self.search_word_total_matches_count = 0
-
-			points = words.map do |w|
-				matches = 0
-
-				points = self.quest_search_fields.map do |field|
-					content = self.send(field).to_s.downcase
-
-					matches = content.scan(w).size
-
-					# one point for partial word matches
-					(content.scan(w).size +
-					# one point for partial query matches
-					content.scan(query).size +
-					# two points for exact word match
-					(content == w ? 2 : 0) +
-					# two points for exact query match
-					(content == query ? 2 : 0))
-				end.sum
-
-				if matches != 0
-					self.search_word_matches.push [ 'word' => w, 'count' => matches ]
-					self.search_word_matches_count += 1
-					self.search_word_total_matches_count += matches
-				end
-
-				points
-			end.sum
-
-			self.relevance = points
-
-			@quest_search_relevance[query] = points
-		end
-	end
+    module ClassMethods
+      def quest_search_on(*fields)
+        if fields.size.zero?
+          raise "No arguments given, please specify which fields should be indexed and searched."
+        end
+
+        options = fields.extract_options!
+
+        @order = options[:order] || "id desc"
+
+        cattr_accessor :quest_search_fields
+
+        self.quest_search_fields = fields
+      end
+
+      def quest_search_for(query, page_no = 1, page_size = 2**32, sort = nil)
+        words = query.to_s.split " "
+        conditions = words.map do |w|
+          self.quest_search_fields.map do |f|
+            replace_bind_variables("#{f} like ?", ["%#{w}%"])
+          end.join " OR "
+        end.join " OR "
+
+        offset = (page_no * page_size) - page_size
+        offset_ends = offset + page_size
+
+        @order = sort || @order
+
+        results = self.where(conditions).order(@order)
+
+        if !sort
+          results.sort do |a, b|
+            b.points_for(query) <=> a.points_for(query)
+          end
+        else
+          results.each do |r|
+            r.points_for(query)
+          end
+        end
+
+        end_results = []
+
+        results.each_with_index do |r, index|
+          if index == offset_ends
+            break
+          end
+
+          if index >= offset
+            end_results.push r
+          end
+        end
+
+        end_results
+      end
+    end
+
+    def points_for(query)
+      query = query.to_s.downcase
+      @quest_search_relevance ||= {}
+      return @quest_search_relevance[query] if @quest_search_relevance[query]
+      words = query.split " "
+
+      self.search_word_matches = []
+      self.search_word_matches_count = 0
+      self.search_word_total_matches_count = 0
+
+      points = words.map do |w|
+        matches = 0
+
+        points = self.quest_search_fields.map do |field|
+          content = self.send(field).to_s.downcase
+
+          matches = content.scan(w).size
+
+          # one point for partial word matches
+          (content.scan(w).size +
+          # one point for partial query matches
+          content.scan(query).size +
+          # two points for exact word match
+          (content == w ? 2 : 0) +
+          # two points for exact query match
+          (content == query ? 2 : 0))
+        end.sum
+
+        if matches != 0
+          self.search_word_matches.push [ 'word' => w, 'count' => matches ]
+          self.search_word_matches_count += 1
+          self.search_word_total_matches_count += matches
+        end
+
+        points
+      end.sum
+
+      self.relevance = points
+
+      @quest_search_relevance[query] = points
+    end
+  end
 end
 
 ActiveRecord::Base.send :include, QuestSearch::QuestSearchOn

data/lib/quest_search/version.rb

@@ -1,3 +1,3 @@
 module QuestSearch
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quest_search
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-22 00:00:00.000000000 Z
+date: 2011-11-29 00:00:00.000000000 Z
 dependencies: []
 description: Quest is a gem that lets you search your model in a simple and intuitive
   way.
@@ -47,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: quest_search
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Extremely naive full text search implementation for ActiveRecord based on