Merge pull request #49 from savef/do-not-raise-on-missing-objects

Fix AR::RecordNotFound being raised with missing objects.

lib/fuzzily/searchable.rb

@@ -51,12 +51,17 @@ 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] }.compact
       end
 
       def _load_for_ids(ids)
         {}.tap do |result|
-          find(ids).each { |_r| result[_r.id] = _r }
+          results = if respond_to? :where
+            where(:id => ids)
+          else
+            find(:all, ids)
+          end
+          results.each { |_r| result[_r.id] = _r }
         end
       end
 
@@ -136,7 +141,7 @@ def make_field_fuzzily_searchable(field, options={})
 
         after_save do |record|
           next unless record.send("#{field}_changed?".to_sym)
-          
+
           record.send(_o.update_trigrams_method)
         end
 

spec/fuzzily/searchable_spec.rb

@@ -12,7 +12,7 @@
   before(:each) { prepare_trigrams_table }
   before(:each) { prepare_owners_table   }
 
-  subject do 
+  subject do
     silence_warnings do
       Stuff = Class.new(ActiveRecord::Base)
     end
@@ -73,7 +73,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)
@@ -171,6 +171,20 @@ def Stuff.name ; 'Stuff' ; end
         3.times { subject.create!(:name => 'Paris') }
         subject.find_by_fuzzy_name('Paris', :offset => 2).length.should == 1
       end
+
+      it 'does not raise on missing objects' do
+        subject.fuzzily_searchable :name
+        belgium = subject.create(:name => 'Belgium')
+        belgium.delete
+        subject.find_by_fuzzy_name('Belgium')
+      end
+
+      it 'finds others alongside missing' do
+        subject.fuzzily_searchable :name
+        belgium1, belgium2 = 2.times.map { subject.create(:name => 'Belgium') }
+        belgium1.delete
+        subject.find_by_fuzzy_name('Belgium').should ==  [belgium2]
+      end
     end
   end