ximate 0.1.0 → 0.1.1

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)

data/lib/ximate/search.rb

@@ -1,9 +1,9 @@
 module Ximate
 
   DATA = {}
-  OPTIONS = {:order_by_rank => true,
-             :match_error_percent => 20,
+  OPTIONS = {:match_error_percent => 20,
              :ignore_word_short_than => 2,
+             #:order_by_rank => true,
              :logger => true,
              :debug => false}
 
@@ -27,7 +27,7 @@ module Ximate
       self.to_s.classify.constantize.all.each do |p|
         p.update_index(locale, &block)
       end
-      puts "\b\b=> Build XIMATE hash data for '#{table}' in #{Time.now - now}." if OPTIONS[:logger]
+      puts "\b\b=> Build XIMATE hash data for '#{table}' in #{Time.now - now}s." if OPTIONS[:logger]
     end
   end
 
@@ -55,9 +55,23 @@ module Ximate
         end
       end
       return where('1 = 0') if matches.empty?
-      rel = scoped
-      rel.ranks = matches if OPTIONS[:order_by_rank]
-      rel.where("#{table}.id IN (#{matches.keys.join(',')})")
+      #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(',')})")
+    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.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: ximate
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Enrico Pilotto
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 +02:00
+date: 2011-05-09 00:00:00 +02:00
 default_executable: 
 dependencies: []