scoped_search 2.3.5 → 2.3.6

data/lib/scoped_search.rb

@@ -14,7 +14,7 @@ module ScopedSearch
 
   # The current scoped_search version. Do not change thisvalue by hand,
   # because it will be updated automatically by the gem release script.
-  VERSION = "2.3.5"
+  VERSION = "2.3.6"
 
   # The ClassMethods module will be included into the ActiveRecord::Base class
   # to add the <tt>ActiveRecord::Base.scoped_search</tt> method and the

data/lib/scoped_search/auto_complete_builder.rb

@@ -130,10 +130,11 @@ module ScopedSearch
       return [] if (suggestions.blank?)
 
       q=query
-      unless q =~ /(\s|\)|,)$/
+      unless q =~ /(\s|\)|,)$/ || last_token_is(COMPARISON_OPERATORS)
         val = Regexp.escape(tokens.last.to_s).gsub('\*', '.*')
         suggestions = suggestions.map {|s| s if s.to_s =~ /^"?#{val}"?/i}.compact
-        q.chomp!(/("?#{Regexp.escape(tokens.last.to_s)}"?)$/.match(q)[1])
+        quoted = /("?#{Regexp.escape(tokens.last.to_s)}"?)$/.match(q)
+        q.chomp!(quoted[1]) if quoted
       end
 
       # for doted field names compact the suggestions list to be one suggestion

data/lib/scoped_search/query_builder.rb

@@ -74,7 +74,7 @@ module ScopedSearch
           else raise ScopedSearch::QueryNotSupported, "Cannot handle #{notification.inspect}: #{value.inspect}"
         end
       end
-      sql = (keyconditions + (sql.nil? ? [] : [sql]) ).map {|c| "(#{c})"}.join(" AND ")
+      sql = (keyconditions + (sql.blank? ? [] : [sql]) ).map {|c| "(#{c})"}.join(" AND ")
       # Build hash for ActiveRecord::Base#find for the named scope
       find_attributes = {}
       find_attributes[:conditions] = [sql] + keyparameters + parameters unless sql.blank?

data/scoped_search.gemspec

@@ -3,8 +3,8 @@ Gem::Specification.new do |s|
   
   # Do not change the version and date fields by hand. This will be done
   # automatically by the gem release script.
-  s.version = "2.3.5"
-  s.date    = "2011-10-18"
+  s.version = "2.3.6"
+  s.date    = "2011-11-13"
 
   s.summary = "Easily search you ActiveRecord models with a simple query language using a named scope."
   s.description = <<-EOS

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scoped_search
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 2
   - 3
-  - 5
-  version: 2.3.5
+  - 6
+  version: 2.3.6
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 +02:00
+date: 2011-11-13 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency