scoped_search 2.3.0 → 2.3.1

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.0"
+  VERSION = "2.3.1"
 
   # 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

@@ -144,7 +144,7 @@ module ScopedSearch
         }
       end
 
-      suggestions.uniq.map {|m| "#{q} #{m}".gsub(/\s+/," ")}
+      suggestions.uniq.map {|m| "#{q} #{m}"}
     end
 
     # suggest all searchable field names.
@@ -230,7 +230,7 @@ module ScopedSearch
       else
         opts.merge!(key_opts)
       end
-      return field.klass.all(opts.merge(:limit => 20)).map(&field.field)
+      return field.klass.all(opts.merge(:limit => 20)).map(&field.field).compact.map{|v| v.to_s =~ /\s+/ ? "\"#{v}\"" : v}
     end
 
     #this method returns conditions for selecting completion from partial value

data/lib/scoped_search/query_builder.rb

@@ -104,9 +104,15 @@ module ScopedSearch
     # By default, it will simply look up the correct SQL operator in the SQL_OPERATORS
     # hash, but this can be overridden by a database adapter.
     def sql_operator(operator, field)
+      raise ScopedSearch::QueryNotSupported, "the operator '#{operator}' is not supported for field type '#{field.type}'" if [:like, :unlike].include?(operator) and !field.textual?
       SQL_OPERATORS[operator]
     end
 
+    # Returns a NOT (...)  SQL fragment that negates the current AST node's children
+    def to_not_sql(rhs, definition, &block)
+      "NOT COALESCE(#{rhs.to_sql(self, definition, &block)}, 0)"
+    end
+
     # Perform a comparison between a field and a Date(Time) value.
     #
     # This function makes sure the date is valid and adjust the comparison in
@@ -129,7 +135,8 @@ module ScopedSearch
       # but the field is of datetime type. Change the comparison to return
       # more logical results.
       if field.datetime?
-        span = (timestamp.day_fraction == 0) ? 1.day :  1.hour
+        span = 1.minute if(value =~ /\A\s*\d+\s+\bminutes?\b\s+\bago\b\s*\z/i)
+        span ||= (timestamp.day_fraction == 0) ? 1.day :  1.hour
         if [:eq, :ne].include?(operator)
           # Instead of looking for an exact (non-)match, look for dates that
           # fall inside/outside the range of timestamps of that day.
@@ -187,12 +194,11 @@ module ScopedSearch
     # <tt>operator</tt>:: The operator used for comparison.
     # <tt>value</tt>:: The value to compare the field with.
     def sql_test(field, operator, value, lhs, &block) # :yields: finder_option_type, value
-      if field.key_field
-        yield(:parameter, lhs.sub(/^.*\./,''))
-      end
-      if field.ext_method
-        return field.to_ext_method_sql(lhs, sql_operator(operator, field), value, &block)
-      elsif [:like, :unlike].include?(operator)
+      return field.to_ext_method_sql(lhs, sql_operator(operator, field), value, &block) if field.ext_method
+
+      yield(:parameter, lhs.sub(/^.*\./,'')) if field.key_field
+
+      if [:like, :unlike].include?(operator)
         yield(:parameter, (value !~ /^\%|\*/ && value !~ /\%|\*$/) ? "%#{value}%" : value.tr_s('%*', '%'))
         return "#{field.to_sql(operator, &block)} #{self.sql_operator(operator, field)} ?"
       elsif field.temporal?
@@ -339,11 +345,6 @@ module ScopedSearch
       # Defines the to_sql method for AST operator nodes
       module OperatorNode
 
-        # Returns a NOT (...)  SQL fragment that negates the current AST node's children
-        def to_not_sql(builder, definition, &block)
-          "NOT COALESCE(#{rhs.to_sql(builder, definition, &block)}, 0)"
-        end
-
         # Returns an IS (NOT) NULL SQL fragment
         def to_null_sql(builder, definition, &block)
           field = definition.field_by_name(rhs.value)
@@ -387,7 +388,7 @@ module ScopedSearch
         # Convert this AST node to an SQL fragment.
         def to_sql(builder, definition, &block)
           if operator == :not && children.length == 1
-            to_not_sql(builder, definition, &block)
+            builder.to_not_sql(rhs, definition, &block)
           elsif [:null, :notnull].include?(operator)
             to_null_sql(builder, definition, &block)
           elsif children.length == 1
@@ -447,12 +448,18 @@ module ScopedSearch
       # Switches out the default LIKE operator for ILIKE in the default
       # <tt>sql_operator</tt> method.
       def sql_operator(operator, field)
+        raise ScopedSearch::QueryNotSupported, "the operator '#{operator}' is not supported for field type '#{field.type}'" if [:like, :unlike].include?(operator) and !field.textual?
         case operator
-        when :like   then 'ILIKE'
-        when :unlike then 'NOT ILIKE'
-        else super(operator, field)
+          when :like   then 'ILIKE'
+          when :unlike then 'NOT ILIKE'
+          else super(operator, field)
         end
       end
+
+      # Returns a NOT (...)  SQL fragment that negates the current AST node's children
+      def to_not_sql(rhs, definition, &block)
+        "NOT COALESCE(#{rhs.to_sql(self, definition, &block)}, false)"
+      end
     end
 
     # The Oracle adapter also requires some tweaks to make the case insensitive LIKE work.

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.0"
-  s.date    = "2011-05-16"
+  s.version = "2.3.1"
+  s.date    = "2011-06-22"
 
   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

@@ -34,7 +34,6 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
 
     after(:all) do
       ScopedSearch::RSpec::Database.drop_model(Foo)
-      ScopedSearch::RSpec::Database.drop_model(Bar)
       ScopedSearch::RSpec::Database.close_connection
     end
 
@@ -48,15 +47,15 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should complete the string comparators" do
-        Foo.complete_for('string ').should =~ (["string != ", "string !~ ", "string = ", "string ~ "])
+        Foo.complete_for('string ').should =~ (["string  != ", "string  !~ ", "string  = ", "string  ~ "])
       end
 
       it "should complete the numerical comparators" do
-        Foo.complete_for('int ').should =~ (["int != ", "int < ", "int <= ", "int = ", "int > ", "int >= "])
+        Foo.complete_for('int ').should =~ (["int  != ", "int  < ", "int  <= ", "int  = ", "int  > ", "int  >= "])
       end
 
       it "should complete the temporal (date) comparators" do
-        Foo.complete_for('date ').should =~ (["date = ", "date < ", "date > "])
+        Foo.complete_for('date ').should =~ (["date  = ", "date  < ", "date  > "])
       end
 
       it "should raise error for unindexed field" do
@@ -68,11 +67,11 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should complete logical comparators" do
-        Foo.complete_for('string ~ fo ').should contain("string ~ fo and", "string ~ fo or")
+        Foo.complete_for('string ~ fo ').should contain("string ~ fo  and", "string ~ fo  or")
       end
 
       it "should complete prefix operators" do
-        Foo.complete_for(' ').should contain(" has", " not")
+        Foo.complete_for(' ').should contain("  has", "  not")
       end
 
       it "should not complete logical infix operators" do
@@ -96,7 +95,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
 
       it "should complete values should contain baz" do
-        Foo.complete_for('explicit = ').should contain('explicit = baz')
+        Foo.complete_for('explicit = ').should contain('explicit =  baz')
       end
     end
 
@@ -113,19 +112,19 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
     context 'using null prefix operators queries' do
 
       it "should complete has operator" do
-        Foo.complete_for('has strin').should eql(['has string '])
+        Foo.complete_for('has strin').should eql(['has  string '])
       end
 
       it "should complete null? operator" do
-        Foo.complete_for('null? st').should eql(['null? string '])
+        Foo.complete_for('null? st').should eql(['null?  string '])
       end
 
       it "should complete set? operator" do
-        Foo.complete_for('set? exp').should eql(['set? explicit '])
+        Foo.complete_for('set? exp').should eql(['set?  explicit '])
       end
 
       it "should complete null? operator for explicit field" do
-        Foo.complete_for('null? explici').should eql(['null? explicit '])
+        Foo.complete_for('null? explici').should eql(['null?  explicit '])
       end
 
       it "should not complete comparators after prefix statement" do

data/spec/integration/ordinal_querying_spec.rb

@@ -222,7 +222,6 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
 
       after(:all) do
         ScopedSearch::RSpec::Database.drop_model(@foo)
-        @record.destroy
       end
 
       it "should not find any record because first equal = 2" do

data/spec/lib/database.rb

@@ -17,7 +17,7 @@ module ScopedSearch::RSpec::Database
   end
   
   def self.test_databases
-    test_databases_configuration.keys
+    test_databases_configuration.keys.sort
   end
 
   def self.establish_named_connection(name)

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: scoped_search
 version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
+  prerelease: false
   segments: 
   - 2
   - 3
-  - 0
-  version: 2.3.0
+  - 1
+  version: 2.3.1
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -16,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-16 00:00:00 -04:00
+date: 2011-06-22 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -27,7 +26,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 2
         - 1
@@ -43,7 +41,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 2
         - 0
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -131,7 +127,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -140,14 +135,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Easily search you ActiveRecord models with a simple query language using a named scope.