search_scope 0.1.5 → 0.1.6

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('search_scope', '0.1.5') do |p|
+Echoe.new('search_scope', '0.1.6') do |p|
   p.description    = "Simplify searching a model by defining custom named_scopes."
   p.project        = 'search-scope'
   p.url            = "http://rubyforge.org/projects/search-scope"

data/lib/search_scope.rb

@@ -72,12 +72,18 @@ module SearchScope
 
   def search_scopes(options={})
     scopes = []
+    options = options.clone
+    split_terms = options.delete :split_terms
     search_scope_keys.each do |key|
       
       #if the scope key isn't in the params, don't include it
       next unless options[key]
-      # add the scope once for each term passed in (space delimited). this allows a search for 'star wars' to return only items where both terms match
-      terms = options[key].split.compact
+      if split_terms
+        # add the scope once for each term passed in (space delimited). this allows a search for 'star wars' to return only items where both terms match
+        terms = options[key].split.compact
+      else
+        terms = [options[key]]
+      end
       terms.each do |term|
         scopes << [key, term]
       end
@@ -90,18 +96,19 @@ module SearchScope
     scope = object.send(scope_name, *args)
   end
   
-  #this gets all of the options from the quick_search named scopes and builds a quick_search from them
-  #the quick_search is one that matches any of the named scopes, not all of them.
-  #TODO look into better ways of doing this, and figure out the proper name.
-  def quick_search_scope_options(quick_search_terms)
+  def quick_search_scope_options(quick_search_terms, split_terms)
     conditions = []
     includes = []
     aggregate_scope = self
     
-    quick_search_scopes.each do |scope|
-      term_conditions = []
+    if split_terms
       terms = quick_search_terms.split.compact
-      terms.each_with_index do |term,index|
+    else
+      terms = [quick_search_terms]
+    end
+    terms.each_with_index do |term,index|
+      term_conditions = []
+      quick_search_scopes.each do |scope|
         # quick_search_scope = self.send(scope, term)
         quick_search_scope = get_search_scope_from_object(self, scope, term)
         query_options = quick_search_scope.proxy_options
@@ -116,12 +123,13 @@ module SearchScope
       conditions << term_conditions.collect{|c|"(#{c})"}.join(' OR ')     #ORing makes sure any of the terms exist somewhere in any of the fields. I think this is what we actually need, plus "relevance" (does that mean sphinx?)
       # conditions << term_conditions.collect{|c|"(#{c})"}.join(' AND ')  #ANDing this will make it so that all the terms MUST appear in one field, eg author first and last name
     end
-    conditions_sql = conditions.collect{|c|"(#{c})"}.join(' OR ')
+    conditions_sql = conditions.collect{|c|"(#{c})"}.join(' AND ')
     {:conditions => conditions_sql, :include => includes}
   end
   
   #this searches by chaining all of the named_scopes (search_scopes) that were included in the params
   def search(params={})
+    params.reverse_merge! :split_terms => true
     paginate = params.delete :paginate
     aggregate_scope = self
     search_scopes(params).each do |scope|
@@ -136,7 +144,7 @@ module SearchScope
       end
     end
     unless params[:quick_search].blank?
-      aggregate_scope = aggregate_scope.scoped quick_search_scope_options(params[:quick_search])
+      aggregate_scope = aggregate_scope.scoped quick_search_scope_options(params[:quick_search], params[:split_terms])
     end
 
     params[:sort_by] ||= default_sort_choice

data/search_scope.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{search_scope}
-  s.version = "0.1.5"
+  s.version = "0.1.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Owens"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: search_scope
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
 - Ryan Owens