scoped_search 2.3.3 → 2.3.4

data/lib/scoped_search/auto_complete_builder.rb

@@ -191,7 +191,8 @@ module ScopedSearch
       return complete_key_value(field, token, val) if field.key_field
 
       opts = value_conditions(field.field, val)
-      opts.merge!(:limit => 20, :select => "DISTINCT #{field.field}")
+      table = field.klass.connection.quote_table_name(field.klass.table_name)
+      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}
     end

data/lib/scoped_search/definition.rb

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

data/lib/scoped_search/query_builder.rb

@@ -44,6 +44,8 @@ module ScopedSearch
     # Actually builds the find parameters hash that should be used in the search_for
     # named scope.
     def build_find_params(options)
+      keyconditions = []
+      keyparameters = []
       parameters = []
       includes   = []
       joins   = []
@@ -55,6 +57,8 @@ module ScopedSearch
         # Store the parameters, includes, etc so that they can be added to
         # the find-hash later on.
         case notification
+          when :keycondition then keyconditions << value
+          when :keyparameter then keyparameters << value
           when :parameter then parameters << value
           when :include   then includes   << value
           when :joins   then joins   << value
@@ -70,10 +74,10 @@ module ScopedSearch
           else raise ScopedSearch::QueryNotSupported, "Cannot handle #{notification.inspect}: #{value.inspect}"
         end
       end
-
+      sql = (keyconditions + (sql.nil? ? [] : [sql]) ).map {|c| "(#{c})"}.join(" AND ")
       # Build hash for ActiveRecord::Base#find for the named scope
       find_attributes = {}
-      find_attributes[:conditions] = [sql] + parameters unless sql.nil?
+      find_attributes[:conditions] = [sql] + keyparameters + parameters unless sql.blank?
       find_attributes[:include]    = includes.uniq      unless includes.empty?
       find_attributes[:joins]      = joins.uniq         unless joins.empty?
       find_attributes[:order]      = order              unless order.nil?
@@ -196,7 +200,7 @@ module ScopedSearch
     def sql_test(field, operator, value, lhs, &block) # :yields: finder_option_type, value
       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
+      yield(:keyparameter, lhs.sub(/^.*\./,'')) if field.key_field
 
       if [:like, :unlike].include?(operator)
         yield(:parameter, (value !~ /^\%|\*/ && value !~ /\%|\*$/) ? "%#{value}%" : value.tr_s('%*', '%'))
@@ -227,14 +231,14 @@ module ScopedSearch
         connection = klass.connection
         if key_relation
           yield(:joins, construct_join_sql(key_relation, num) )
+          yield(:keycondition, "#{key_klass.table_name}_#{num}.#{connection.quote_column_name(key_field.to_s)} = ?")
           klass_table_name = relation ? "#{klass.table_name}_#{num}" : connection.quote_table_name(klass.table_name)
-          return "#{key_klass.table_name}_#{num}.#{connection.quote_column_name(key_field.to_s)} = ? AND " +
-                 "#{klass_table_name}.#{connection.quote_column_name(field.to_s)}"
+          return "#{klass_table_name}.#{connection.quote_column_name(field.to_s)}"
         elsif key_field
           yield(:joins, construct_simple_join_sql(num))
+          yield(:keycondition, "#{key_klass.table_name}_#{num}.#{connection.quote_column_name(key_field.to_s)} = ?")
           klass_table_name = relation ? "#{klass.table_name}_#{num}" : connection.quote_table_name(klass.table_name)
-          return "#{key_klass.table_name}_#{num}.#{connection.quote_column_name(key_field.to_s)} = ? AND " +
-                 "#{klass_table_name}.#{connection.quote_column_name(field.to_s)}"
+          return "#{klass_table_name}.#{connection.quote_column_name(field.to_s)}"
         elsif relation
           yield(:include, relation)
         end

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.3"
+  VERSION = "2.3.4"
 
   # The ClassMethods module will be included into the ActiveRecord::Base class
   # to add the <tt>ActiveRecord::Base.scoped_search</tt> method and the

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

data/spec/integration/key_value_querying_spec.rb

@@ -56,6 +56,10 @@ require "#{File.dirname(__FILE__)}/../spec_helper"
           Bar.search_for('facts.color = green').should have(1).items
         end
 
+         it "should find all bars with a fact name color and fact value gold" do
+          Bar.search_for('facts.color = gold').first.name.should eql('barbary')
+        end
+
         it "should find all bars with a fact name size and fact value 5" do
             Bar.search_for('facts.size = 5').should have(1).items
         end
@@ -64,6 +68,10 @@ require "#{File.dirname(__FILE__)}/../spec_helper"
           Bar.search_for('facts.color = green and facts.size = 5').should have(1).items
         end
 
+        it "should find all bars with a fact color gold or green" do
+                  Bar.search_for('facts.color = gold or facts.color = green').should have(2).items
+        end
+
         it "should find all bars that has size value" do
           Bar.search_for('has facts.size').should have(1).items
         end

metadata

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