ximate 0.2.4 → 0.3.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 6701f4492e8a2bdfb6172881723dfd260ca05086
+  data.tar.gz: 33d89743a8233d50c137ed750f8501e019760d4b
+SHA512:
+  metadata.gz: b4360ef2a9467614f7bb722fc01c21c0992639a8e464f06180a239a0810c1858d50a4b9a2818f5f79ecb7b9553f75dab939b16d782e499e07904e13a28681bf0
+  data.tar.gz: b3781c4999b35bdabb504d813ad34f993acbfdbe0a8bb2c9f07efb42a06248edb202919ede79b97899430e241179fdddfb75b5f04b55d004edb415cc42b3c6c1

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 .bundle
+.redcar
 Gemfile.lock
 ext/*.bundle
 ext/*.o

data/README.rdoc

@@ -42,13 +42,10 @@ Then you can perform a search
     Post.asearch('Hello world').where(:public => true).limit(5)
 
 +asearch+ method is chainable with the usual activerecord methods.
-You can also order the results by rank (calculate by ximate)
-
-    Post.asearch('Hello world').order('rank DESC').where(:public => true)
 
 The cool stuff is that if you search with
 
-    Post.asearch('Hello worlds').order('rank DESC').where(:public => true)
+    Post.asearch('Hello worlds').where(:public => true)
 
 the results will be the same!
 The error allowed by Ximate can be expressed as a percentage by setting the option <tt>Ximate::OPTIONS[:match_error_percent]</tt>.
@@ -58,9 +55,19 @@ Finally you can set some Ximate options in your initializers.
 
     Ximate::OPTIONS[:match_error_percent] = 20
     Ximate::OPTIONS[:ignore_word_short_than] = 2
+    Ximate::OPTIONS[:async] = false
     Ximate::OPTIONS[:logger] = true
     Ximate::OPTIONS[:debug] = false
 
+=== Ordering
+
+You can order the results by rank (calculate by Ximate)
+
+    Post.asearch('Hello world').order('rank DESC').where(:public => true)
+
+Unfortunately to do this, Ximate use the +FIELD+ function supported only by MySQL.
+So <b>the ordering by rank works only with MySQL</b>.
+
 == Questions or problems?
 
 If you have any issues please add an {issue on

data/ext/extconf.rb

@@ -2,31 +2,27 @@ ENV['RC_ARCHS'] = '' if RUBY_PLATFORM =~ /darwin/
 
 require 'mkmf'
 
-LIBDIR      = Config::CONFIG['libdir']
-INCLUDEDIR  = Config::CONFIG['includedir']
-
-HEADER_DIRS = [
-  # First search /opt/local for macports
+INCLUDE_DIRS = [
+  # Check the ruby install locations
+  RbConfig::CONFIG['includedir'],
+  # First earch /opt/local for macports
   '/opt/local/include',
   # Then search /usr/local for people that installed from source
   '/usr/local/include',
-  # Check the ruby install locations
-  INCLUDEDIR,
   # Finally fall back to /usr
   '/usr/include',
 ]
 
 LIB_DIRS = [
+  # Check the ruby install locations
+  RbConfig::CONFIG['libdir'],
   # First search /opt/local for macports
   '/opt/local/lib',
   # Then search /usr/local for people that installed from source
   '/usr/local/lib',
-  # Check the ruby install locations
-  LIBDIR,
   # Finally fall back to /usr
   '/usr/lib',
 ]
 
-dir_config('fuzzy_search', HEADER_DIRS, LIB_DIRS)
-
-create_makefile('fuzzy_search/fuzzy_search')
+#dir_config('fuzzy_search', HEADER_DIRS, LIB_DIRS)
+create_makefile('fuzzy_search/fuzzy_search')

data/lib/ximate/activerecord/relation.rb

@@ -3,15 +3,10 @@ module ActiveRecord
   class Relation
     attr_accessor :ranks
 
-    alias_method :orig_initialize, :initialize
     alias_method :orig_order, :order
 
-    def initialize(klass, table)
-      @ranks = {}
-      orig_initialize(klass, table)
-    end
-
     def order(*args)
+      @ranks ||= {}
       if args[0] =~ /^rank/i
         unless @ranks.empty?
           tokens = args[0].split(' ')
@@ -29,4 +24,4 @@ module ActiveRecord
 
   end
 
-end
+end

data/lib/ximate/search.rb

@@ -3,6 +3,7 @@ module Ximate
   DATA = {}
   OPTIONS = {:match_error_percent => 20,
              :ignore_word_short_than => 2,
+             :async => false,
              :logger => true,
              :debug => false}
 
@@ -23,11 +24,17 @@ module Ximate
 
         after_save { |proc| proc.update_index(I18n.locale, &block) }
 
-        now = Time.now
-        self.to_s.classify.constantize.all.each do |p|
-          p.update_index(locale, &block)
+        calculate_indices = Proc.new do
+          now = Time.now
+          self.to_s.classify.constantize.find_in_batches(batch_size: 100) do |group|
+            group.each do |p|
+              p.update_index(locale, &block)
+            end
+          end
+          puts "\b\b=> Build XIMATE hash data for '#{table}' in #{Time.now - now}s." if OPTIONS[:logger]
         end
-        puts "\b\b=> Build XIMATE hash data for '#{table}' in #{Time.now - now}s." if OPTIONS[:logger]
+
+        OPTIONS[:async] ? Thread.new{calculate_indices.call} : calculate_indices.call
       end
     end
   end
@@ -55,8 +62,8 @@ module Ximate
           end
         end
       end
-      return where('1 = 0') if matches.empty?
-      rel = scoped
+      return none if matches.empty?
+      rel = all
       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(',')})")
@@ -111,4 +118,4 @@ module Ximate
 
   end
 
-end
+end

data/lib/ximate/version.rb

@@ -1,3 +1,3 @@
 module Ximate
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ximate
 version: !ruby/object:Gem::Version
-  version: 0.2.4
-  prerelease: 
+  version: 0.3.0
 platform: ruby
 authors:
 - Enrico Pilotto
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00.000000000Z
+date: 2017-02-13 00:00:00.000000000 Z
 dependencies: []
 description: Approximate fuzzy search for Ruby on Rails activerecord models.
 email:
@@ -19,7 +18,7 @@ extensions:
 - ext/extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - README.rdoc
 - Rakefile
@@ -35,27 +34,26 @@ files:
 homepage: https://github.com/pioz/ximate
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: ximate
-rubygems_version: 1.8.6
+rubygems_version: 2.6.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Approximate fuzzy search for Ruby on Rails
 test_files: []