fuzzily 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7405e2a5492b3d3ebc3a3af29130fe2b105d9d00
-  data.tar.gz: cff5f7936cdd377ba57975341457e1a9c3941038
+  metadata.gz: c6b37d6f8b23347b04d0efb6d069c41654def4e5
+  data.tar.gz: 30c2b6d4362466e5cb63a9ae14496bd92e26ac54
 SHA512:
-  metadata.gz: b42bc03dbc0e11415ba757ee9e5dd56e99055def2a368d82968ec7fcb30a3eab90c9f0065b4b0ad5e10bbc0176b31c4998a0dcd976e10809a45bb2e4e0e069cd
-  data.tar.gz: bc411000aedc0213f1b884080406fb8d611bb24169d10a852d04f29015051e150230e49277be2885cf0248211e95eda7ec8afeffe9db52a17636b49b3c80741a
+  metadata.gz: b65ff29d86fb3822ee426f1f7731d4f254f5cc180c5b4b0cf8f5489d2c492d02341ca3747a349f60291bb035783d617d333a72c55c7e80e794b5198860423348
+  data.tar.gz: f2993001f8f9189101644ff8ce52d243832e2479f6cc1b567632d6f2d7d2ffe4c6be5cef87a9082eaf62bd50fe482907065dec22a24e561244a8a118e989a4d6

data/.travis.yml

@@ -10,14 +10,20 @@ gemfile:
   - gemfiles/rails32.gemfile
   - gemfiles/rails32_pg.gemfile
   - gemfiles/rails32_mysql.gemfile
+  - gemfiles/rails40.gemfile
 before_install: bundle install
 bundler_args:
 matrix:
   exclude:
     - rvm: 2.0.0
       gemfile: gemfiles/rails23.gemfile
-      env: TRAVIS=TRUE
+    - rvm: 1.8.7
+      gemfile: gemfiles/rails40.gemfile
+    - rvm: 1.9.2
+      gemfile: gemfiles/rails40.gemfile
 before_script:
   - psql -c 'create database fuzzily_test;' -U postgres
   - mysql -e 'create database fuzzily_test;'
-env: TRAVIS=TRUE
+env:
+  global:
+    - TRAVIS=TRUE

data/Appraisals

@@ -21,3 +21,7 @@ end
 appraise "rails32-mysql" do
   gem "activerecord", "~> 3.2.0"
 end
+
+appraise "rails40" do
+  gem "activerecord", "~> 4.0.0"
+end

data/Gemfile

@@ -1,4 +1,7 @@
 source ENV.fetch('GEM_SOURCE','https://rubygems.org')
 
+gem "activerecord", "~> 3.2.1"
+
 # Specify your gem's dependencies in fuzzily.gemspec
 gemspec
+

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    fuzzily (0.2.4)
+    fuzzily (0.3.0)
       activerecord (>= 2.3.17)
 
 GEM
-  remote: http://yarp.dev/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.2.14)
       activesupport (= 3.2.14)
@@ -33,12 +33,12 @@ GEM
       thor
     diff-lcs (1.2.4)
     i18n (0.6.5)
-    method_source (0.8.1)
-    mime-types (1.23)
+    method_source (0.8.2)
+    mime-types (1.25)
     multi_json (1.7.9)
-    mysql2 (0.3.11)
-    pg (0.15.1)
-    pry (0.9.12.1)
+    mysql2 (0.3.13)
+    pg (0.16.0)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
@@ -47,20 +47,20 @@ GEM
     rake (10.1.0)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.13.0)
-      rspec-core (~> 2.13.0)
-      rspec-expectations (~> 2.13.0)
-      rspec-mocks (~> 2.13.0)
-    rspec-core (2.13.1)
-    rspec-expectations (2.13.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.13.1)
+    rspec-mocks (2.14.3)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (3.4.4)
-    sqlite3 (1.3.7)
+    slop (3.4.6)
+    sqlite3 (1.3.8)
     thor (0.18.1)
     tzinfo (0.3.37)
 
@@ -68,6 +68,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (~> 3.2.1)
   appraisal
   coveralls
   fuzzily!

data/README.md

@@ -15,7 +15,7 @@ Blurrily finds misspelled, prefix, or partial needles in a haystack of
 strings. It's a fast, [trigram](http://en.wikipedia.org/wiki/N-gram)-based, database-backed [fuzzy](http://en.wikipedia.org/wiki/Approximate_string_matching) string search/match engine for Rails.
 Loosely inspired from an [old blog post](http://unirec.blogspot.co.uk/2007/12/live-fuzzy-search-using-n-grams-in.html).
 
-Tested with ActiveRecord (2.3, 3.0, 3.1, 3.2) on various Rubies (1.8.7, 1.9.2, 1.9.3, 2.0.0) and the most common adapters (SQLite3, MySQL, and PostgreSQL).
+Tested with ActiveRecord (2.3, 3.0, 3.1, 3.2, 4.0) on various Rubies (1.8.7, 1.9.2, 1.9.3, 2.0.0) and the most common adapters (SQLite3, MySQL, and PostgreSQL).
 
 If your dateset is big, if you need yet more speed, or do not use ActiveRecord,
 check out [blurrily](http://github.com/mezis/blurrily), another gem (backed with a C extension)
@@ -71,7 +71,9 @@ Search!
     MyStuff.find_by_fuzzy_name('Some Name', :limit => 10)
     # => records
 
+You can force an update on a specific record with
 
+    MyStuff.find(123).update_fuzzy_name!
 
 ## Indexing more than one field
 
@@ -131,4 +133,5 @@ Copyright (c) 2013 HouseTrip Ltd.
 5. Create a new Pull Request
 
 
-Thanks to @bclennox and @fdegiuli for helping fix compatibility issues.
+Thanks to @bclennox, @fdegiuli, @nickbender, @Shanison for pointing out
+and/or helping on various issues.

data/gemfiles/rails23.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.2.4)
+    fuzzily (0.3.0)
       activerecord (>= 2.3.17)
 
 GEM
@@ -48,8 +48,8 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
-    slop (3.4.4)
-    sqlite3 (1.3.7)
+    slop (3.4.6)
+    sqlite3 (1.3.8)
     thor (0.18.1)
 
 PLATFORMS

data/gemfiles/rails30.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.2.4)
+    fuzzily (0.3.0)
       activerecord (>= 2.3.17)
 
 GEM

data/gemfiles/rails31.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.2.4)
+    fuzzily (0.3.0)
       activerecord (>= 2.3.17)
 
 GEM

data/gemfiles/rails32.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.2.4)
+    fuzzily (0.3.0)
       activerecord (>= 2.3.17)
 
 GEM

data/gemfiles/rails32_mysql.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.2.4)
+    fuzzily (0.3.0)
       activerecord (>= 2.3.17)
 
 GEM

data/gemfiles/rails32_pg.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/mezis/Dropbox/Development/fuzzily
   specs:
-    fuzzily (0.2.4)
+    fuzzily (0.3.0)
       activerecord (>= 2.3.17)
 
 GEM

data/gemfiles/rails40.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.0.0"
+
+gemspec :path=>"../"

data/gemfiles/rails40.gemfile.lock

@@ -0,0 +1,89 @@
+PATH
+  remote: /Users/mezis/Dropbox/Development/fuzzily
+  specs:
+    fuzzily (0.3.0)
+      activerecord (>= 2.3.17)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
+      builder (~> 3.1.0)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
+      activerecord-deprecated_finders (~> 1.0.2)
+      activesupport (= 4.0.0)
+      arel (~> 4.0.0)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    appraisal (0.5.2)
+      bundler
+      rake
+    arel (4.0.0)
+    atomic (1.1.13)
+    builder (3.1.4)
+    coderay (1.0.9)
+    colorize (0.5.8)
+    coveralls (0.6.7)
+      colorize
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      thor
+    diff-lcs (1.2.4)
+    i18n (0.6.5)
+    method_source (0.8.2)
+    mime-types (1.25)
+    minitest (4.7.5)
+    multi_json (1.7.9)
+    mysql2 (0.3.13)
+    pg (0.16.0)
+    pry (0.9.12.2)
+      coderay (~> 1.0.5)
+      method_source (~> 0.8)
+      slop (~> 3.4)
+    pry-nav (0.2.3)
+      pry (~> 0.9.10)
+    rake (10.1.0)
+    rest-client (1.6.7)
+      mime-types (>= 1.16)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.5)
+    rspec-expectations (2.14.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    slop (3.4.6)
+    sqlite3 (1.3.8)
+    thor (0.18.1)
+    thread_safe (0.1.2)
+      atomic
+    tzinfo (0.3.37)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (~> 4.0.0)
+  appraisal
+  coveralls
+  fuzzily!
+  mysql2
+  pg
+  pry
+  pry-nav
+  rake
+  rspec
+  sqlite3

data/lib/fuzzily.rb

@@ -4,4 +4,4 @@ require "fuzzily/migration"
 require "fuzzily/model"
 require "active_record"
 
-ActiveRecord::Base.extend(Fuzzily::Searchable)
+ActiveRecord::Base.send :include, Fuzzily::Searchable

data/lib/fuzzily/model.rb

@@ -5,8 +5,7 @@ module Fuzzily
 
     def self.included(by)
       by.ancestors.include?(ActiveRecord::Base) or raise 'Not included in an ActiveRecord subclass'
-
-      scope_method = ActiveRecord::VERSION::MAJOR == 2 ? :named_scope : :scope
+      by.extend(ClassMethods)
 
       by.class_eval do
         return if class_variable_defined?(:@@fuzzily_trigram_model)
@@ -18,31 +17,65 @@ module Fuzzily
         validates_presence_of     :score
         validates_presence_of     :fuzzy_field
 
-        send scope_method, :for_model,  lambda { |model| { 
-          :conditions => { :owner_type => model.kind_of?(Class) ? model.name : model  } 
-        }}
-        send scope_method, :for_field,  lambda { |field_name| {
-          :conditions => { :fuzzy_field => field_name }
-        }}
-        send scope_method, :with_trigram, lambda { |trigrams| {
-          :conditions => { :trigram => trigrams }
-        }}
-
+        _add_fuzzy_scopes
         class_variable_set(:@@fuzzily_trigram_model, true)
       end
-
-      by.extend(ClassMethods)
     end
 
     module ClassMethods
       def matches_for(text)
-        trigrams = Fuzzily::String.new(text).trigrams
-        self.
-          scoped(:select => 'owner_id, owner_type, count(*) AS matches, MAX(score) AS score').
-          scoped(:group => 'owner_id, owner_type').
-          scoped(:order => 'matches DESC, score ASC').
-          with_trigram(trigrams).
-          map(&:owner)
+        _matches_for_trigrams Fuzzily::String.new(text).trigrams
+      end
+
+      private
+
+      module Rails2
+        def _matches_for_trigrams(trigrams)
+          self.
+            scoped(:select => 'owner_id, owner_type, count(*) AS matches, MAX(score) AS score').
+            scoped(:group => 'owner_id, owner_type').
+            scoped(:order => 'matches DESC, score ASC').
+            with_trigram(trigrams).
+            map(&:owner)
+        end
+
+        def _add_fuzzy_scopes
+          named_scope :for_model,  lambda { |model| { 
+            :conditions => { :owner_type => model.kind_of?(Class) ? model.name : model  } 
+          }}
+          named_scope :for_field,  lambda { |field_name| {
+            :conditions => { :fuzzy_field => field_name }
+          }}
+          named_scope :with_trigram, lambda { |trigrams| {
+            :conditions => { :trigram => trigrams }
+          }}
+          named_scope :limit, lambda { |count| { :limit => count }}
+        end
+      end
+
+      module Rails3
+        def _matches_for_trigrams(trigrams)
+          self.
+            select('owner_id, owner_type, count(*) AS matches, MAX(score) AS score').
+            group('owner_id, owner_type').
+            order('matches DESC, score ASC').
+            with_trigram(trigrams).
+            map(&:owner)
+        end
+
+        def _add_fuzzy_scopes
+          scope :for_model,  lambda { |model|
+            where(:owner_type => model.kind_of?(Class) ? model.name : model)
+          }
+          scope :for_field,  lambda { |field_name| where(:fuzzy_field => field_name) }
+          scope :with_trigram, lambda { |trigrams| where(:trigram => trigrams) }
+        end
+      end
+
+      if ActiveRecord::VERSION::MAJOR == 2
+        include Rails2
+      else
+        include Rails3
       end
     end
   end

data/lib/fuzzily/searchable.rb

@@ -1,61 +1,62 @@
 require 'fuzzily/trigram'
+require 'ostruct'
 
 module Fuzzily
   module Searchable
-    # fuzzily_searchable <field> [, <field>...] [, <options>]
-    def fuzzily_searchable(*fields)
-      options = fields.last.kind_of?(Hash) ? fields.pop : {}
 
-      fields.each do |field|
-        make_field_fuzzily_searchable(field, options)
+    def self.included(by)
+      case ActiveRecord::VERSION::MAJOR
+      when 2 then by.extend Rails2ClassMethods
+      when 3 then by.extend Rails3ClassMethods
+      when 4 then by.extend Rails4ClassMethods
       end
     end
 
     private
 
-    def make_field_fuzzily_searchable(field, options={})
-      class_variable_defined?(:"@@fuzzily_searchable_#{field}") and return
-
-      trigram_class_name     = options.fetch(:class_name, 'Trigram')
-      trigram_association    = "trigrams_for_#{field}".to_sym
-      update_trigrams_method = "update_fuzzy_#{field}!".to_sym
-
-      supports_bulk_inserts  =
-        connection.class.name !~ /sqlite/i ||
-        connection.send(:sqlite_version) >= '3.7.11'
-
-      has_many trigram_association,
-        :class_name => trigram_class_name,
-        :as => :owner,
-        :conditions => { :fuzzy_field => field.to_s },
-        :dependent => :destroy,
-        :autosave => true
-
-      singleton_class.send(:define_method,"find_by_fuzzy_#{field}".to_sym) do |*args|
-        case args.size
-          when 1 then pattern = args.first ; options = {}
-          when 2 then pattern, options = args
-          else        raise 'Wrong # of arguments'
+    def _update_fuzzy!(_o)
+      self.send(_o.trigram_association).delete_all
+      String.new(self.send(_o.field)).scored_trigrams.each do |trigram, score|
+        self.send(_o.trigram_association).create!(:score => score, :trigram => trigram, :owner_type => self.class.name)
+      end
+    end
+
+
+    module ClassMethods
+      # fuzzily_searchable <field> [, <field>...] [, <options>]
+      def fuzzily_searchable(*fields)
+        options = fields.last.kind_of?(Hash) ? fields.pop : {}
+
+        fields.each do |field|
+          make_field_fuzzily_searchable(field, options)
         end
+      end
 
+      private
+
+      def _find_by_fuzzy(_o, pattern, options={})
         options[:limit] ||= 10
 
-        trigram_class_name.constantize.
-          scoped(options).
+        _o.trigram_class_name.constantize.
+          limit(options[:limit]).
           for_model(self.name).
-          for_field(field.to_s).
+          for_field(_o.field.to_s).
           matches_for(pattern)
       end
 
-      singleton_class.send(:define_method,"bulk_update_fuzzy_#{field}".to_sym) do
-        trigram_class = trigram_class_name.constantize
+      def _bulk_update_fuzzy(_o)
+        trigram_class = _o.trigram_class_name.constantize
+
+        supports_bulk_inserts  =
+          connection.class.name !~ /sqlite/i ||
+          connection.send(:sqlite_version) >= '3.7.11'
 
-        self.scoped(:include => trigram_association).find_in_batches(:batch_size => 100) do |batch|
+        _with_included_trigrams(_o).find_in_batches(:batch_size => 100) do |batch|
           inserts = []
           batch.each do |record|
-            data = Fuzzily::String.new(record.send(field))
+            data = Fuzzily::String.new(record.send(_o.field))
             data.scored_trigrams.each do |trigram, score|
-              inserts << sanitize_sql_array(['(?,?,?,?,?)', self.name, record.id, field.to_s, score, trigram])
+              inserts << sanitize_sql_array(['(?,?,?,?,?)', self.name, record.id, _o.field.to_s, score, trigram])
             end
           end
 
@@ -74,7 +75,7 @@ module Fuzzily
           ]
 
           trigram_class.transaction do
-            batch.each { |record| record.send(trigram_association).delete_all }
+            batch.each { |record| record.send(_o.trigram_association).delete_all }
             break if inserts.empty?
 
             if supports_bulk_inserts
@@ -88,20 +89,79 @@ module Fuzzily
         end
       end
 
-      define_method update_trigrams_method do
-        self.send(trigram_association).delete_all
-        String.new(self.send(field)).scored_trigrams.each do |trigram, score|
-          self.send(trigram_association).create!(:score => score, :trigram => trigram, :owner_type => self.class.name)
+      def make_field_fuzzily_searchable(field, options={})
+        class_variable_defined?(:"@@fuzzily_searchable_#{field}") and return
+
+        _o = OpenStruct.new(
+          :field                  => field,
+          :trigram_class_name     => options.fetch(:class_name, 'Trigram'),
+          :trigram_association    => "trigrams_for_#{field}".to_sym,
+          :update_trigrams_method => "update_fuzzy_#{field}!".to_sym
+        )
+
+        _add_trigram_association(_o)
+
+        singleton_class.send(:define_method,"find_by_fuzzy_#{field}".to_sym) do |*args|
+          _find_by_fuzzy(_o, *args)
+        end
+
+        singleton_class.send(:define_method,"bulk_update_fuzzy_#{field}".to_sym) do
+          _bulk_update_fuzzy(_o)
+        end
+
+        define_method _o.update_trigrams_method do
+          _update_fuzzy!(_o)
         end
+
+        after_save do |record|
+          next unless record.send("#{field}_changed?".to_sym)
+          record.send(_o.update_trigrams_method)
+        end
+
+        class_variable_set(:"@@fuzzily_searchable_#{field}", true)
+        self
       end
+    end
+
+    module Rails2ClassMethods
+      include ClassMethods
 
-      after_save do |record|
-        next unless record.send("#{field}_changed?".to_sym)
-        record.send(update_trigrams_method)
+      private
+
+      def _add_trigram_association(_o)
+        has_many _o.trigram_association,
+          :class_name => _o.trigram_class_name,
+          :as         => :owner,
+          :conditions => { :fuzzy_field => _o.field.to_s },
+          :dependent  => :destroy,
+          :autosave   => true
       end
 
-      class_variable_set(:"@@fuzzily_searchable_#{field}", true)
-      self
+      def _with_included_trigrams(_o)
+        self.scoped(:include => _o.trigram_association)
+      end
     end
+
+    Rails3ClassMethods = Rails2ClassMethods
+
+    module Rails4ClassMethods
+      include ClassMethods
+
+      private
+
+      def _add_trigram_association(_o)
+        has_many _o.trigram_association,
+          lambda { where(:fuzzy_field => _o.field.to_s) },
+          :class_name => _o.trigram_class_name,
+          :as         => :owner,
+          :dependent  => :delete_all,
+          :autosave   => true
+      end
+
+      def _with_included_trigrams(_o)
+        self.includes(_o.trigram_association)
+      end
+    end
+
   end
-end
+end

data/lib/fuzzily/version.rb

@@ -1,3 +1,3 @@
 module Fuzzily
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/spec/fuzzily/searchable_spec.rb

@@ -43,22 +43,27 @@ describe Fuzzily::Searchable do
     before { subject.fuzzily_searchable :name }
 
     it 'generates trigram records on creation' do
-      subject.create(:name => 'Paris')
+      subject.create!(:name => 'Paris')
       subject.last.trigrams_for_name.should_not be_empty
     end
 
     it 'generates the correct trigrams' do
-      record = subject.create(:name => 'FOO')
+      record = subject.create!(:name => 'FOO')
       Trigram.first.trigram.should    == '**f'
       Trigram.first.owner_id.should   == record.id
       Trigram.first.owner_type.should == 'Stuff'
     end
 
     it 'updates all trigram records on save' do
-      subject.create(:name => 'Paris')
+      subject.create!(:name => 'Paris')
       subject.first.update_attribute :name, 'Rome'
       Trigram.all.map(&:trigram).should =~ %w(**r *ro rom ome me*)
     end
+
+    it 'deletes all trigrams on destroy' do
+      subject.create!(:name => 'Paris').destroy
+      Trigram.all.should be_empty
+    end
   end
 
   describe '#update_fuzzy_<field>!' do
@@ -67,14 +72,14 @@ describe Fuzzily::Searchable do
     end
     
     it 're-creates trigrams' do
-      subject.create(:name => 'Paris')
+      subject.create!(:name => 'Paris')
       old_ids = Trigram.all.map(&:id)
       subject.last.update_fuzzy_name!
       (old_ids & Trigram.all.map(&:id)).should be_empty
     end
 
     it 'ignores nil values' do
-      subject.create(:name => nil)
+      subject.create!(:name => nil)
       subject.last.update_fuzzy_name!
       Trigram.all.should be_empty
     end
@@ -84,14 +89,14 @@ describe Fuzzily::Searchable do
     before { subject.fuzzily_searchable :name }
 
     it 'creates all trigrams' do
-      subject.create(:name => 'Paris')
+      subject.create!(:name => 'Paris')
       Trigram.delete_all
       subject.bulk_update_fuzzy_name
       Trigram.all.should_not be_empty
     end
 
     it 'ignores nil values' do
-      subject.create(:name => nil)
+      subject.create!(:name => nil)
       Trigram.delete_all
       subject.bulk_update_fuzzy_name
       Trigram.all.should be_empty
@@ -102,9 +107,9 @@ describe Fuzzily::Searchable do
     describe '#find_by_fuzzy_<field>' do
       it 'returns records' do
         subject.fuzzily_searchable :name
-        @paris =   subject.create(:name => 'Paris')
-        @palma =   subject.create(:name => 'Palma de Majorca')
-        @palmyre = subject.create(:name => 'La Palmyre')
+        @paris =   subject.create!(:name => 'Paris')
+        @palma =   subject.create!(:name => 'Palma de Majorca')
+        @palmyre = subject.create!(:name => 'La Palmyre')
 
         subject.find_by_fuzzy_name('Piris').should_not be_empty
         subject.find_by_fuzzy_name('Piris').should =~ [@paris, @palma]
@@ -113,10 +118,10 @@ describe Fuzzily::Searchable do
 
       it 'favours exact matches' do
         subject.fuzzily_searchable :name
-        @new_york   = subject.create(:name => 'New York')
-        @yorkshire  = subject.create(:name => 'Yorkshire')
-        @york       = subject.create(:name => 'York')
-        @yorkisthan = subject.create(:name => 'Yorkisthan')
+        @new_york   = subject.create!(:name => 'New York')
+        @yorkshire  = subject.create!(:name => 'Yorkshire')
+        @york       = subject.create!(:name => 'York')
+        @yorkisthan = subject.create!(:name => 'Yorkisthan')
 
         subject.find_by_fuzzy_name('York').should      == [@york, @new_york, @yorkshire, @yorkisthan]
         subject.find_by_fuzzy_name('Yorkshire').should == [@yorkshire, @york, @yorkisthan, @new_york]
@@ -124,11 +129,17 @@ describe Fuzzily::Searchable do
 
       it 'does not favour short words' do
         subject.fuzzily_searchable :name
-        @lo     = subject.create(:name => 'Lo')      # **l *lo lo*
-        @london = subject.create(:name => 'London')  # **l *lo lon ond ndo don on*
+        @lo     = subject.create!(:name => 'Lo')      # **l *lo lo*
+        @london = subject.create!(:name => 'London')  # **l *lo lon ond ndo don on*
                                                      # **l *lo lon
         subject.find_by_fuzzy_name('Lon').should == [@london, @lo]
       end
+
+      it 'honours limie option' do
+        subject.fuzzily_searchable :name
+        3.times { subject.create!(:name => 'Paris') }
+        subject.find_by_fuzzy_name('Paris', :limit => 2).length.should == 2
+      end
     end
   end
 

data/spec/spec_helper.rb

@@ -27,7 +27,7 @@ def get_connection_hash
       :adapter  => 'mysql2',
       :database => 'fuzzily_test',
       :host     => 'localhost',
-      :user     => ENV['FUZZILY_DB_USER']
+      :username => ENV['FUZZILY_DB_USER']
     }
   when 'sqlite3'
     {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fuzzily
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Julien Letessier
@@ -180,6 +180,8 @@ files:
 - gemfiles/rails32_mysql.gemfile.lock
 - gemfiles/rails32_pg.gemfile
 - gemfiles/rails32_pg.gemfile.lock
+- gemfiles/rails40.gemfile
+- gemfiles/rails40.gemfile.lock
 - lib/fuzzily.rb
 - lib/fuzzily/migration.rb
 - lib/fuzzily/model.rb