ximate 0.1.3 → 0.2.0

data/README.rdoc

@@ -4,7 +4,7 @@ ApproXIMATE fuzzy search for Ruby on Rails activerecord models.
 
 == Requirements
 
-* Rails >= 3.0.0
+* Rails >= 3.0.1
 
 
 == Installation
@@ -17,15 +17,22 @@ In your model puts some like this:
 
     class Post < ActiveRecord::Base
       define_index(:en) do
-        add_text title
-        add_text keywords.join(' ')
+        add_text title, 3
+        add_text keywords.join(' '), 2
         add_text body(:en)
       end
     end
 
+In this case we can perform an appoximate search on title, keywords and body fields of posts
+where title is most important than keywords than body (title have priority 3, keywords 2 and body 1).
+
 Then you can perform a search
 
-    Post.asearch('Economy').where(:public => true).limit(5)
+    Post.asearch('Hello world').where(:public => true).limit(5)
+
+You can also order the results by rank (calculate by ximate)
+
+    Post.asearch('Hello world').order('rank DESC').where(:public => true).limit(5)
 
 == Questions or problems?
 

data/lib/ximate/activerecord/relation.rb

@@ -3,20 +3,33 @@ module ActiveRecord
   class Relation
     attr_accessor :ranks
 
-    alias_method :orig_to_a, :to_a
     alias_method :orig_initialize, :initialize
+    alias_method :orig_order, :order
+    # alias_method :orig_to_a, :to_a
 
     def initialize(klass, table)
       @ranks = {}
       orig_initialize(klass, table)
     end
 
-    def to_a
-      return orig_to_a if @ranks.empty?
-      orig_to_a.sort do |x, y|
-        @ranks[y.id] <=> @ranks[x.id]
+    def order(*args)
+      if !@ranks.empty? && args[0] =~ /^rank/i
+        tokens = args[0].split(' ')
+        verse = tokens[1] if tokens[1] =~ /^(asc|desc)$/i
+        verse ||= 'ASC'
+        id_ordered = @ranks.keys.sort{|x,y| @ranks[x] <=> @ranks[y]}
+        orig_order("FIELD(id,#{id_ordered.join(',')}) #{verse}")
+      else
+        orig_order(args)
       end
     end
+
+    # def to_a
+    #   return orig_to_a if @ranks.empty?
+    #   orig_to_a.sort do |x, y|
+    #     @ranks[y.id] <=> @ranks[x.id]
+    #   end
+    # end
   end
 
 end

data/lib/ximate/search.rb

@@ -3,7 +3,6 @@ module Ximate
   DATA = {}
   OPTIONS = {:match_error_percent => 20,
              :ignore_word_short_than => 2,
-             #:order_by_rank => true,
              :logger => true,
              :debug => false}
 
@@ -54,25 +53,26 @@ module Ximate
           end
         end
       end
-      return select('*, 0 AS RANK').where('1 = 0') if matches.empty?
-      #rel = scoped
-      #rel.ranks = matches if OPTIONS[:order_by_rank]
-      #rel.where("#{table}.id IN (#{matches.keys.join(',')})")
-      select("*, #{gen_if_select(matches)} AS RANK").where("#{table}.id IN (#{matches.keys.join(',')})")
+      #return select('*, 0 AS RANK').where('1 = 0') if matches.empty?
+      return where('1 = 0') if matches.empty?
+      rel = scoped
+      rel.ranks = matches
+      rel.where("#{table}.id IN (#{matches.keys.join(',')})")
+      # select("*, #{gen_if_select(matches)} AS RANK").where("#{table}.id IN (#{matches.keys.join(',')})")
     end
 
-    private
-
-    def gen_if_select(matches)
-      tmp = 'IF(id=myid,myrank,if)'
-      str = 'IF(id=myid,myrank,if)'
-      matches.each do |id, rank|
-        str.gsub!('myid', id.to_s)
-        str.gsub!('myrank', rank.to_s)
-        str.gsub!('if', tmp)
-      end
-      return str.gsub(tmp, '0')
-    end
+    # private
+    #
+    # def gen_if_select(matches)
+    #   tmp = 'IF(id=myid,myrank,if)'
+    #   str = 'IF(id=myid,myrank,if)'
+    #   matches.each do |id, rank|
+    #     str.gsub!('myid', id.to_s)
+    #     str.gsub!('myrank', rank.to_s)
+    #     str.gsub!('if', tmp)
+    #   end
+    #   return str.gsub(tmp, '0')
+    # end
 
   end
 

data/lib/ximate/version.rb

@@ -1,3 +1,3 @@
 module Ximate
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/ximate.rb

@@ -1,5 +1,5 @@
 require File.join(File.dirname(__FILE__), 'ximate/search')
-#require File.join(File.dirname(__FILE__), 'ximate/activerecord/relation')
+require File.join(File.dirname(__FILE__), 'ximate/activerecord/relation')
 require File.join(File.dirname(__FILE__), '../ext/fuzzy_search')
 
 ActiveRecord::Base.send(:include, Ximate)

metadata

@@ -2,7 +2,7 @@
 name: ximate
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Enrico Pilotto
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-11 00:00:00 +02:00
+date: 2011-05-13 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -62,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ximate
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Approximate fuzzy search for Ruby on Rails