scoped_search 2.3.4 → 2.3.5

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.4"
+  VERSION = "2.3.5"
 
   # 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

@@ -89,7 +89,7 @@ module ScopedSearch
     end
 
     def is_left_hand(node)
-      field = definition.field_by_name(node.value)
+      field = definition.field_by_name(node.value) if node.respond_to?(:value)
       lh = field.nil? || field.key_field && !(query.end_with?(' '))
       lh = lh || last_token_is(NULL_PREFIX_OPERATORS, 2)
       lh = lh && !is_right_hand
@@ -132,8 +132,8 @@ module ScopedSearch
       q=query
       unless q =~ /(\s|\)|,)$/
         val = Regexp.escape(tokens.last.to_s).gsub('\*', '.*')
-        suggestions = suggestions.map {|s| s if s.to_s =~ /^#{val}/i}.compact
-        q.chomp!(tokens.last.to_s)
+        suggestions = suggestions.map {|s| s if s.to_s =~ /^"?#{val}"?/i}.compact
+        q.chomp!(/("?#{Regexp.escape(tokens.last.to_s)}"?)$/.match(q)[1])
       end
 
       # for doted field names compact the suggestions list to be one suggestion
@@ -167,10 +167,11 @@ module ScopedSearch
       return ["#{name}."] if !val || !val.is_a?(String) || !(val.include?('.'))
       val = val.sub(/.*\./,'')
 
-      field_name = field.key_field
-      opts =  value_conditions(field.key_field, val).merge(:limit => 20, :select => field_name, :group => field_name )
+      table = field.key_klass.connection.quote_table_name(field.key_klass.table_name)
+      field_name = "#{table}.#{field.key_field}"
+      opts =  value_conditions(field_name, val).merge(:limit => 20, :select => field_name, :group => field_name )
 
-      field.key_klass.all(opts).map(&field_name).compact.map{ |f| "#{name}.#{f} "}
+      field.key_klass.all(opts).map(&field.key_field).compact.map{ |f| "#{name}.#{f} "}
     end
 
     # this method auto-completes values of fields that have a :complete_value marker 
@@ -190,8 +191,8 @@ module ScopedSearch
       return complete_date_value if field.temporal?
       return complete_key_value(field, token, val) if field.key_field
 
-      opts = value_conditions(field.field, val)
       table = field.klass.connection.quote_table_name(field.klass.table_name)
+      opts = value_conditions("#{table}.#{field.field}", val)
       opts.merge!(:limit => 20, :select => "DISTINCT #{table}.#{field.field}")
 
       return completer_scope(field.klass).all(opts).map(&field.field).compact.map{|v| v.to_s =~ /\s+/ ? "\"#{v}\"" : v}
@@ -243,7 +244,7 @@ module ScopedSearch
 
     #this method returns conditions for selecting completion from partial value
     def value_conditions(field_name, val)
-      return val.blank? ? {} : {:conditions => "#{field_name} LIKE '#{val}%'".tr_s('%*', '%')}
+      return val.blank? ? {} : {:conditions => "#{field_name} LIKE '#{val.gsub("'","''")}%'".tr_s('%*', '%')}
     end
 
     # This method complete infix operators by field type

data/lib/scoped_search/definition.rb

@@ -164,7 +164,7 @@ module ScopedSearch
 
     # this method return definitions::field object from string
     def field_by_name(name)
-      field = fields[name.to_sym]
+      field = fields[name.to_sym] unless name.blank?
       if field.nil?
         dotted = name.to_s.split('.')[0]
         field = fields[dotted.to_sym] unless dotted.nil?

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.4"
-  s.date    = "2011-10-03"
+  s.version = "2.3.5"
+  s.date    = "2011-10-18"
 
   s.summary = "Easily search you ActiveRecord models with a simple query language using a named scope."
   s.description = <<-EOS

data/spec/integration/auto_complete_spec.rb

@@ -135,5 +135,24 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         Foo.complete_for('has string ').should_not contain('has string = ')
       end
     end
+
+     context 'exceptional search strings' do
+
+      it "query that starts with 'or'" do
+        Foo.complete_for('or ').should have(9).items
+      end
+
+      it "value completion with quotes" do
+        Foo.complete_for('string = "').should eql([])
+      end
+
+      it "value completion with single quote" do
+        Foo.complete_for("string = this is a 'valid' query").should eql([])
+      end
+
+      it "value auto completer for related tables" do
+        Foo.complete_for('bars.related = ').should eql([])
+      end
+    end
   end
 end

metadata

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