Merge d0e02d8 into 50cf95b

Gemfile.lock

@@ -5,7 +5,7 @@ PATH
       activerecord (>= 2.3.17)
 
 GEM
-  remote: http://yarp.dev/
+  remote: https://rubygems.org/
   specs:
     activemodel (3.2.14)
       activesupport (= 3.2.14)

lib/fuzzily/searchable.rb

@@ -51,12 +51,12 @@ def _find_by_fuzzy(_o, pattern, options={})
           matches_for(pattern)
         records = _load_for_ids(trigrams.map(&:owner_id))
         # order records as per trigram query (no portable way to do this in SQL)
-        trigrams.map { |t| records[t.owner_id] }
+        trigrams.map { |t| records[t.owner_id] }.select { |r| r != nil }
       end
 
       def _load_for_ids(ids)
         {}.tap do |result|
-          find(ids).each { |_r| result[_r.id] = _r }
+          where(:id => ids).each { |_r| result[_r.id] = _r }
         end
       end
 

spec/fuzzily/searchable_spec.rb

@@ -12,11 +12,12 @@
   before(:each) { prepare_trigrams_table }
   before(:each) { prepare_owners_table   }
 
-  subject do 
+  subject do
     silence_warnings do
       Stuff = Class.new(ActiveRecord::Base)
     end
     def Stuff.name ; 'Stuff' ; end
+    def Stuff.flag ; false ; end
     Stuff
   end
 
@@ -73,7 +74,7 @@ def Stuff.name ; 'Stuff' ; end
     before do
       subject.fuzzily_searchable :name
     end
-    
+
     it 're-creates trigrams' do
       subject.create!(:name => 'Paris')
       old_ids = Trigram.all.map(&:id)
@@ -159,6 +160,24 @@ def Stuff.name ; 'Stuff' ; end
         3.times { subject.create!(:name => 'Paris') }
         subject.find_by_fuzzy_name('Paris', :offset => 2).length.should == 1
       end
+
+      it 'doesnt die on scopes' do
+        subject.fuzzily_searchable :name
+        @new_york = subject.create!(:name => 'New York', :flag => true)
+        @yorkshire = subject.create!(:name => 'Yorkshire', :flag => false)
+
+        expect {
+          subject.where(:flag => true).find_by_fuzzy_name('York')
+        }.to_not raise_error
+      end
+
+      it 'doesnt return nils' do
+        subject.fuzzily_searchable :name
+        @new_yokr = subject.create!(:name => 'New York', :flag => true)
+
+        results = subject.where(:flag => false).find_by_fuzzy_name('York')
+        results.any?{ |r| r == nil }.should be_false
+      end
     end
   end
 

spec/spec_helper.rb

@@ -44,6 +44,7 @@ def self.up
     create_table :stuffs do |t|
       t.string :name
       t.string :data
+      t.boolean :flag
       t.timestamps
     end
   end
@@ -79,4 +80,4 @@ def prepare_owners_table
   config.after(:each) do
     DATABASE.delete if DATABASE.exist?
   end
-end
+end