Searching across multiple fields correctly. Cleaned up comments. Read…

…y for merge.

Gemfile

@@ -1,7 +1,6 @@
 source "http://rubygems.org"
 
 gem 'json', '>= 1.5.1'
-gem 'awesome_print'
 
 group :test do 
   gem 'rspec', '>= 2.5.0'

lib/tanker.rb

@@ -1,7 +1,6 @@
 begin
   require "rubygems"
   require "bundler"
-  require "awesome_print"
 
   Bundler.setup :default
 rescue => e
@@ -105,33 +104,9 @@ def search(models, query, options = {})
       options[:snippet] = snippets.join(',') if snippets
 
       search_on_fields = models.map{|model| model.tanker_config.indexes.map{|arr| arr[0]}.uniq}.flatten.uniq.join(":(#{query.to_s}) OR ")
-
-      # original
-      # query = "#{search_on_fields}:(#{query.to_s}) __type:(#{models.map(&:name).map {|name| "\"#{name.split('::').join(' ')}\"" }.join(' OR ')})"
-      # => "name:(hey! location_id:(1) location_id:(2)) OR last_name:(hey! location_id:(1) location_id:(2)) __type:(\"Person\")" 
-
-
-      # fix
-      query = "#{search_on_fields}:(#{query.to_s}) OR __any:(#{query.to_s}) __type:(#{models.map(&:name).map {|name| "\"#{name.split('::').join(' ')}\"" }.join(' OR ')})"
-      # => "name:(hey! location_id:(1) location_id:(2)) OR last_name:(hey! location_id:(1) location_id:(2)) OR __any:(hey! location_id:(1) location_id:(2)) __type:(\"Person\")"
-
-
-      # => "name:(hey! location_id:(1) location_id:(2)) OR last_name:(hey! location_id:(1) location_id:(2)) __type:(\"Person\")" 
-      # => "name:(hey! location_id:(1) location_id:(2)) OR last_name:(hey! location_id:(1) location_id:(2)) OR __any:(hey! location_id:(1) location_id:(2)) __type:(\"Person\")"
-
-
-
 
+      query = "#{search_on_fields}:(#{query.to_s}) OR __any:(#{query.to_s}) __type:(#{models.map(&:name).map {|name| "\"#{name.split('::').join(' ')}\"" }.join(' OR ')})"
       options = { :start => paginate[:per_page] * (paginate[:page] - 1), :len => paginate[:per_page] }.merge(options) if paginate
-
-      puts "!A"*88
-      ap query
-      puts 
-      puts 
-      puts 
-      ap options
-      puts "!B"*88
-
       results = index.search(query, options)
 
       instantiated_results = if (fetch || snippets)

spec/integration_spec.rb

@@ -94,7 +94,7 @@ class Product < ActiveRecord::Base
         (@results - [@catapult, @tnt, @cat]).should be_empty
         @results[0].id.should_not be_nil
       end
-  
+
       it 'should find all catapults' do
         @results = Product.search_tank('catapult')
         (@results - [@catapult]).should be_empty
@@ -105,19 +105,19 @@ class Product < ActiveRecord::Base
         (@results - [@catapult, @cat]).should be_empty
       end
     end
-    
+
     describe 'advanced searching' do
       it 'should search multiple words from the same field' do
         @results = Product.search_tank('Acme catapult')
         @results.should include(@catapult)
       end
-      
+
       it "should search across multiple fields" do
         @results = Product.search_tank('catapult google')
         @results.should include(@catapult)
       end
     end
-    
+
     describe 'filtering dogs' do
 
       before(:all) do