scoped_search 2.3.7 → 2.4.0

data/.travis.yml

@@ -0,0 +1,28 @@
+language: ruby
+script: bundle exec rake
+before_script:
+  - psql -c 'create database scoped_search_test;' -U postgres
+  - mysql -e 'create database scoped_search_test;'
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - ruby-head
+  - ree
+  - jruby-18mode
+  - jruby-19mode
+  - jruby-head
+gemfile:
+ - Gemfile.activerecord2
+ - Gemfile.activerecord3
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+  exclude:
+    - rvm: jruby-18mode
+      gemfile: Gemfile.activerecord2
+    - rvm: jruby-19mode
+      gemfile: Gemfile.activerecord2
+    - rvm: jruby-head
+      gemfile: Gemfile.activerecord2

data/Gemfile

@@ -1,15 +1,16 @@
 source :rubygems
 gemspec
 
-# ScopedSearch is always tested on a sqlite3 memory database.
-# Uncomment the following gems to test scoped search on other RDBMSs.
-# You can specify the databasde connection details in spec/database.yml
+gem 'activerecord'
 
-gem 'mysql2', '~> 0.2.6' # preferred over 'mysql'
-#gem 'mysql'
-# gem 'postgresql'
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'activerecord-jdbcmysql-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter'
+end
 
-# # JDBC connections
-# gem 'activerecord-jdbcsqlite3-adapter'
-# gem 'activerecord-jdbcmysql-adapter'
-# gem 'activerecord-jdbcpostgresql-adapter'
+platforms :ruby do
+  gem 'sqlite3'
+  gem 'mysql2'
+  gem 'pg'
+end

data/Gemfile.activerecord2

@@ -0,0 +1,16 @@
+source :rubygems
+gemspec
+
+gem 'activerecord', '~> 2'
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'activerecord-jdbcmysql-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter'
+end
+
+platforms :ruby do
+  gem 'sqlite3'
+  gem 'mysql2', '~> 0.2.6'
+  gem 'pg'
+end

data/Gemfile.activerecord3

@@ -0,0 +1,16 @@
+source :rubygems
+gemspec
+
+gem 'activerecord', '~> 3'
+
+platforms :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter'
+  gem 'activerecord-jdbcmysql-adapter'
+  gem 'activerecord-jdbcpostgresql-adapter'
+end
+
+platforms :ruby do
+  gem 'sqlite3'
+  gem 'mysql2', '~> 0.3.11'
+  gem 'pg'
+end

data/README.rdoc

@@ -124,6 +124,8 @@ For more info, see the the project wiki: http://github.com/wvanbergen/scoped_sea
 
 == License
 
-This plugin is released under the MIT license. Please contact weshays
-(http://github.com/weshays) or wvanbergen (http://github.com/wvanbergen) for any
-questions.
+This plugin is released under the MIT license (see LICENSE).
+
+This plugin was originally developed for Floorplanner.com by Willem van Bergen 
+(https://github.com/wvanbergen) with help from Wes Hays (https://github.com/weshays). 
+The current maintainer is Amos Benari (https://github.com/abenari).

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

@@ -168,9 +168,12 @@ module ScopedSearch
       return ["#{name}."] if !val || !val.is_a?(String) || !(val.include?('.'))
       val = val.sub(/.*\./,'')
 
-      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 )
+      connection    = definition.klass.connection
+      quoted_table  = field.key_klass.connection.quote_table_name(field.key_klass.table_name)
+      quoted_field  = field.key_klass.connection.quote_column_name(field.key_field)
+      field_name    = "#{quoted_table}.#{quoted_field}"
+      select_clause = "DISTINCT #{field_name}"
+      opts =  value_conditions(field_name, val).merge(:select => select_clause, :limit => 20)
 
       field.key_klass.all(opts).map(&field.key_field).compact.map{ |f| "#{name}.#{f} "}
     end

data/lib/scoped_search/definition.rb

@@ -15,12 +15,49 @@ module ScopedSearch
     # class, so you should not create instances of this class yourself.
     class Field
 
-      attr_reader :definition, :field, :only_explicit, :relation, :key_relation,
+      attr_reader :definition, :field, :only_explicit, :relation, :key_relation, :full_text_search,
                   :key_field, :complete_value, :offset, :word_size, :ext_method, :operators
 
+      # Initializes a Field instance given the definition passed to the
+      # scoped_search call on the ActiveRecord-based model class.
+      def initialize(definition, options = {})
+        @definition = definition
+        @definition.profile = options[:profile] if options[:profile]
+        @definition.default_order ||= default_order(options)
+
+        case options
+        when Symbol, String
+          @field = field.to_sym
+        when Hash
+          @field = options.delete(:on)
+
+          # Set attributes from options hash
+          @complete_value   = options[:complete_value]
+          @relation         = options[:in]
+          @key_relation     = options[:in_key]
+          @key_field        = options[:on_key]
+          @offset           = options[:offset]
+          @word_size        = options[:word_size] || 1
+          @ext_method       = options[:ext_method]
+          @operators        = options[:operators]
+          @only_explicit    = !!options[:only_explicit]
+          @full_text_search = options[:full_text_search]
+          @default_operator = options[:default_operator] if options.has_key?(:default_operator)
+        end
+
+        # Store this field is the field array
+        definition.fields[@field]                  ||= self unless options[:rename]
+        definition.fields[options[:rename].to_sym] ||= self if     options[:rename]
+        definition.unique_fields                   << self
+
+        # Store definition for alias / aliases as well
+        definition.fields[options[:alias].to_sym]                  ||= self   if options[:alias]
+        options[:aliases].each { |al| definition.fields[al.to_sym] ||= self } if options[:aliases]
+      end
+
       # The ActiveRecord-based class that belongs to this field.
       def klass
-        if relation
+        @klass ||= if relation
           related = definition.klass.reflections[relation]
           raise ScopedSearch::QueryNotSupported, "relation '#{relation}' not one of #{definition.klass.reflections.keys.join(', ')} " if related.nil?
           related.klass
@@ -28,9 +65,10 @@ module ScopedSearch
           definition.klass
         end
       end
+
       # The ActiveRecord-based class that belongs the key field in a key-value pair.
       def key_klass
-         if key_relation
+        @key_klass ||= if key_relation
           definition.klass.reflections[key_relation].klass
         elsif relation
           definition.klass.reflections[relation].klass
@@ -41,12 +79,18 @@ module ScopedSearch
 
       # Returns the ActiveRecord column definition that corresponds to this field.
       def column
-        klass.columns_hash[field.to_s]
+        @column ||= begin
+          if klass.columns_hash.has_key?(field.to_s)
+            klass.columns_hash[field.to_s]
+          else
+            raise ActiveRecord::UnknownAttributeError, "#{klass.inspect} doesn't have column #{field.inspect}."
+          end
+        end
       end
 
       # Returns the column type of this field.
       def type
-        column.type
+        @type ||= column.type
       end
 
       # Returns true if this field is a datetime-like column
@@ -95,41 +139,6 @@ module ScopedSearch
         order = (options[:default_order].to_s.downcase.include?('desc')) ? "DESC" : "ASC"
         return "#{field_name} #{order}"
       end
-      # Initializes a Field instance given the definition passed to the
-      # scoped_search call on the ActiveRecord-based model class.
-      def initialize(definition, options = {})
-        @definition = definition
-        @definition.profile = options[:profile] if options[:profile]
-        @definition.default_order ||= default_order(options)
-
-        case options
-        when Symbol, String
-          @field = field.to_sym
-        when Hash
-          @field = options.delete(:on)
-
-          # Set attributes from options hash
-          @complete_value   = options[:complete_value]
-          @relation         = options[:in]
-          @key_relation     = options[:in_key]
-          @key_field        = options[:on_key]
-          @offset           = options[:offset]
-          @word_size        = options[:word_size] || 1
-          @ext_method       = options[:ext_method]
-          @operators        = options[:operators]
-          @only_explicit    = !!options[:only_explicit]
-          @default_operator = options[:default_operator] if options.has_key?(:default_operator)
-        end
-
-        # Store this field is the field array
-        definition.fields[@field]                  ||= self unless options[:rename]
-        definition.fields[options[:rename].to_sym] ||= self if     options[:rename]
-        definition.unique_fields                   << self
-
-        # Store definition for alias / aliases as well
-        definition.fields[options[:alias].to_sym]                  ||= self   if options[:alias]
-        options[:aliases].each { |al| definition.fields[al.to_sym] ||= self } if options[:aliases]
-      end
     end
 
     attr_reader :klass
@@ -185,13 +194,15 @@ module ScopedSearch
     end
 
     NUMERICAL_REGXP = /^\-?\d+(\.\d+)?$/
+    INTEGER_REGXP = /^\-?\d+$/
 
     # Returns a list of appropriate fields to search in given a search keyword and operator.
     def default_fields_for(value, operator = nil)
 
       column_types  = []
       column_types += [:string, :text]                      if [nil, :like, :unlike, :ne, :eq].include?(operator)
-      column_types += [:integer, :double, :float, :decimal] if value =~ NUMERICAL_REGXP
+      column_types += [:double, :float, :decimal] if value =~ NUMERICAL_REGXP
+      column_types += [:integer] if value =~ INTEGER_REGXP
       column_types += [:datetime, :date, :timestamp]        if (parse_temporal(value))
 
       default_fields.select { |field| column_types.include?(field.type) && !field.set? }
@@ -236,8 +247,7 @@ module ScopedSearch
             search_scope = search_scope.where(find_options[:conditions]) if find_options[:conditions]
             search_scope = search_scope.includes(find_options[:include]) if find_options[:include]
             search_scope = search_scope.joins(find_options[:joins]) if find_options[:joins]
-            search_scope = search_scope.order(find_options[:order]) if find_options[:order]
-            search_scope = search_scope.group(find_options[:group]) if find_options[:group]
+            search_scope = search_scope.reorder(find_options[:order]) if find_options[:order]
             search_scope
           })
         else
@@ -247,15 +257,14 @@ module ScopedSearch
         raise "Currently, only ActiveRecord 2.1 or higher is supported!"
       end
     end
-  end
-end
 
-# Registers the complete_for method within the class that is used for searching.
- def register_complete_for! # :nodoc
-@klass.class_eval do
-  def self.complete_for (query, options = {})
-    search_options = ScopedSearch::AutoCompleteBuilder.auto_complete(@scoped_search , query, options)
-    search_options
+    # Registers the complete_for method within the class that is used for searching.
+    def register_complete_for! # :nodoc
+      @klass.class_eval do
+        def self.complete_for(query, options = {})
+          ScopedSearch::AutoCompleteBuilder.auto_complete(@scoped_search , query, options)
+        end
+      end
     end
   end
- end
+end

data/lib/scoped_search/query_builder.rb

@@ -81,7 +81,6 @@ module ScopedSearch
       find_attributes[:include]    = includes.uniq      unless includes.empty?
       find_attributes[:joins]      = joins.uniq         unless joins.empty?
       find_attributes[:order]      = order              unless order.nil?
-      find_attributes[:group]      = options[:group]    unless options[:group].nil?
 
       # p find_attributes # Uncomment for debugging
       return find_attributes
@@ -89,13 +88,13 @@ module ScopedSearch
 
     def order_by(order, &block)
       order ||= definition.default_order
-      if order
-        field = definition.field_by_name(order.to_s.split(' ')[0])
-        raise ScopedSearch::QueryNotSupported, "the field '#{order.to_s.split(' ')[0]}' in the order statement is not valid field for search" unless field
-        sql = field.to_sql(&block)
-        direction = (order.to_s.downcase.include?('desc')) ? " DESC" : " ASC"
-        order = sql + direction
-      end
+      return nil if order.blank?
+      field = definition.field_by_name(order.to_s.split(' ')[0])
+      raise ScopedSearch::QueryNotSupported, "the field '#{order.to_s.split(' ')[0]}' in the order statement is not valid field for search" unless field
+      sql = field.to_sql(&block)
+      direction = (order.to_s.downcase.include?('desc')) ? " DESC" : " ASC"
+      order = sql + direction
+
       return order
     end
 
@@ -461,10 +460,25 @@ module ScopedSearch
     # <tt>ILIKE operator</tt> instead of <tt>LIKE</tt>.
     class PostgreSQLAdapter < ScopedSearch::QueryBuilder
 
-      # Switches out the default LIKE operator for ILIKE in the default
-      # <tt>sql_operator</tt> method.
+      # Switches out the default query generation of the <tt>sql_test</tt>
+      # method if full text searching is enabled and a text search is being
+      # performed.
+      def sql_test(field, operator, value, lhs, &block)
+        if [:like, :unlike].include?(operator) and field.full_text_search
+          yield(:parameter, value)
+          negation = (operator == :unlike) ? "NOT " : ""
+          locale = (field.full_text_search == true) ? 'english' : field.full_text_search
+          return "#{negation}to_tsvector('#{locale}', #{field.to_sql(operator, &block)}) #{self.sql_operator(operator, field)} to_tsquery('#{locale}', ?)"
+        else
+          super
+        end
+      end
+
+      # Switches out the default LIKE operator in the default <tt>sql_operator</tt> 
+      # method for ILIKE or @@ if full text searching is enabled.
       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?
+        return '@@' if [:like, :unlike].include?(operator) and field.full_text_search
         case operator
           when :like   then 'ILIKE'
           when :unlike then 'NOT ILIKE'
@@ -476,6 +490,12 @@ module ScopedSearch
       def to_not_sql(rhs, definition, &block)
         "NOT COALESCE(#{rhs.to_sql(self, definition, &block)}, false)"
       end
+
+      def order_by(order, &block)
+        sql = super(order, &block)
+        sql += sql.include?('DESC') ? ' NULLS LAST ' : ' NULLS FIRST ' if sql
+        sql
+      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.7"
-  s.date    = "2012-04-30"
+  s.version = "2.4.0"
+  s.date    = "2012-09-11"
 
   s.summary = "Easily search you ActiveRecord models with a simple query language using a named scope."
   s.description = <<-EOS
@@ -20,21 +20,19 @@ Gem::Specification.new do |s|
     it may not be the best choice if it is going to be used on very large datasets or by a large user base.
   EOS
 
-  s.authors  = ['Willem van Bergen', 'Wes Hays']
-  s.email    = ['willem@railsdoctors.com', 'weshays@gbdev.com']
+  s.authors  = ['Amos Benari', 'Willem van Bergen', 'Wes Hays']
+  s.email    = ['abenari@redhat.com', 'willem@railsdoctors.com', 'weshays@gbdev.com']
   s.homepage = 'http://github.com/wvanbergen/scoped_search/wiki'
 
   s.add_runtime_dependency('activerecord', '>= 2.1.0')
   s.add_development_dependency('rspec', '~> 2.0')
   s.add_development_dependency('rake')
-  
-  s.add_development_dependency('sqlite3-ruby')  
 
   s.rdoc_options << '--title' << s.name << '--main' << 'README.rdoc' << '--line-numbers' << '--inline-source'
   s.extra_rdoc_files = ['README.rdoc']
 
   # Do not change the files and test_files fields by hand. This will be done
   # automatically by the gem release script.
-  s.files      = %w(.gitignore .infinity_test Gemfile LICENSE README.rdoc Rakefile init.rb lib/scoped_search.rb lib/scoped_search/auto_complete_builder.rb lib/scoped_search/definition.rb lib/scoped_search/query_builder.rb lib/scoped_search/query_language.rb lib/scoped_search/query_language/ast.rb lib/scoped_search/query_language/parser.rb lib/scoped_search/query_language/tokenizer.rb lib/scoped_search/rails_helper.rb scoped_search.gemspec spec/database.yml spec/integration/api_spec.rb spec/integration/auto_complete_spec.rb spec/integration/key_value_querying_spec.rb spec/integration/ordinal_querying_spec.rb spec/integration/profile_querying_spec.rb spec/integration/relation_querying_spec.rb spec/integration/set_query_spec.rb spec/integration/string_querying_spec.rb spec/lib/database.rb spec/lib/matchers.rb spec/lib/mocks.rb spec/spec_helper.rb spec/unit/ast_spec.rb spec/unit/auto_complete_builder_spec.rb spec/unit/definition_spec.rb spec/unit/parser_spec.rb spec/unit/query_builder_spec.rb spec/unit/tokenizer_spec.rb tasks/github-gem.rake)
+  s.files      = %w(.gitignore .infinity_test .travis.yml Gemfile Gemfile.activerecord2 Gemfile.activerecord3 LICENSE README.rdoc Rakefile init.rb lib/scoped_search.rb lib/scoped_search/auto_complete_builder.rb lib/scoped_search/definition.rb lib/scoped_search/query_builder.rb lib/scoped_search/query_language.rb lib/scoped_search/query_language/ast.rb lib/scoped_search/query_language/parser.rb lib/scoped_search/query_language/tokenizer.rb lib/scoped_search/rails_helper.rb scoped_search.gemspec spec/database.jruby.yml spec/database.ruby.yml spec/integration/api_spec.rb spec/integration/auto_complete_spec.rb spec/integration/key_value_querying_spec.rb spec/integration/ordinal_querying_spec.rb spec/integration/profile_querying_spec.rb spec/integration/relation_querying_spec.rb spec/integration/set_query_spec.rb spec/integration/string_querying_spec.rb spec/lib/database.rb spec/lib/matchers.rb spec/lib/mocks.rb spec/spec_helper.rb spec/unit/ast_spec.rb spec/unit/auto_complete_builder_spec.rb spec/unit/definition_spec.rb spec/unit/parser_spec.rb spec/unit/query_builder_spec.rb spec/unit/tokenizer_spec.rb tasks/github-gem.rake)
   s.test_files = %w(spec/integration/api_spec.rb spec/integration/auto_complete_spec.rb spec/integration/key_value_querying_spec.rb spec/integration/ordinal_querying_spec.rb spec/integration/profile_querying_spec.rb spec/integration/relation_querying_spec.rb spec/integration/set_query_spec.rb spec/integration/string_querying_spec.rb spec/unit/ast_spec.rb spec/unit/auto_complete_builder_spec.rb spec/unit/definition_spec.rb spec/unit/parser_spec.rb spec/unit/query_builder_spec.rb spec/unit/tokenizer_spec.rb)
 end

data/spec/database.jruby.yml

@@ -0,0 +1,15 @@
+sqlite:
+  adapter: "jdbcsqlite3"
+  database: ":memory:"
+
+mysql:
+  adapter: "jdbcmysql"
+  host: "localhost"
+  username: "root"
+  database: "scoped_search_test"
+
+postgresql:
+  adapter: "jdbcpostgresql"
+  host: "localhost"
+  username: "postgres"
+  database: "scoped_search_test"

data/spec/database.ruby.yml

@@ -0,0 +1,15 @@
+sqlite:
+  adapter: "sqlite3"
+  database: ":memory:"
+
+mysql:
+  adapter: "mysql2"
+  host: "localhost"
+  username: "root"
+  database: "scoped_search_test"
+
+postgresql:
+  adapter: "postgresql"
+  host: "localhost"
+  username: "postgres"
+  database: "scoped_search_test"

data/spec/integration/api_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require "spec_helper"
 
 describe ScopedSearch, "API" do
 

data/spec/integration/auto_complete_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require "spec_helper"
 
 # These specs will run on all databases that are defined in the spec/database.yml file.
 # Comment out any databases that you do not have available for testing purposes if needed.
@@ -9,31 +9,48 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
     before(:all) do
       ScopedSearch::RSpec::Database.establish_named_connection(db)
 
-      ## The related class
-      ActiveRecord::Migration.drop_table(:bars) rescue nil
-      ActiveRecord::Migration.create_table(:bars) { |t| t.string :related; t.integer :foo_id }
-      class ::Bar < ActiveRecord::Base; belongs_to :foo; end
+      ActiveRecord::Migration.create_table(:bars, :force => true) do |t| 
+        t.integer :foo_id
+        t.string :related
+      end
 
-      ::Foo = ScopedSearch::RSpec::Database.create_model(:string => :string, :another => :string, :explicit => :string, :int => :integer, :date => :date, :unindexed => :integer) do |klass|
-        klass.has_many :bars
-        
-        klass.scoped_search :on => [:string, :int, :date]
-        klass.scoped_search :on => :another,  :default_operator => :eq, :alias => :alias
-        klass.scoped_search :on => :explicit, :only_explicit => true, :complete_value => true
-        klass.scoped_search :on => :related, :in => :bars, :rename => 'bars.related'.to_sym
+      ActiveRecord::Migration.create_table(:foos, :force => true) do |t| 
+        t.string  :string
+        t.string  :another
+        t.string  :explicit
+        t.integer :int
+        t.date    :date 
+        t.integer :unindexed
+      end
+
+      class ::Bar < ActiveRecord::Base
+        belongs_to :foo
+      end
+      
+      class ::Foo < ActiveRecord::Base
+        has_many :bars
         
+        scoped_search :on => [:string, :int, :date]
+        scoped_search :on => :another,  :default_operator => :eq, :alias => :alias
+        scoped_search :on => :explicit, :only_explicit => true, :complete_value => true
+        scoped_search :on => :related, :in => :bars, :rename => 'bars.related'.to_sym
       end
 
-      @foo_1 = Foo.create!(:string => 'foo', :another => 'temp 1', :explicit => 'baz', :int => 9  , :date => 'February 8, 20011' , :unindexed => 10)
-      Foo.create!(:string => 'bar', :another => 'temp 2', :explicit => 'baz', :int => 9  , :date => 'February 10, 20011', :unindexed => 10)
+      @foo_1 = Foo.create!(:string => 'foo', :another => 'temp 1', :explicit => 'baz', :int => 9  , :date => 'February 8, 2011' , :unindexed => 10)
+      Foo.create!(:string => 'bar', :another => 'temp 2', :explicit => 'baz', :int => 9  , :date => 'February 10, 2011', :unindexed => 10)
       Foo.create!(:string => 'baz', :another => nil,      :explicit => nil  , :int => nil, :date => nil                 , :unindexed => nil)
 
       Bar.create!(:related => 'lala',         :foo => @foo_1)
-      Bar.create!(:related => 'another lala', :foo => @foo_1)
+      Bar.create!(:related => 'another lala', :foo => @foo_1)      
     end
 
     after(:all) do
-      ScopedSearch::RSpec::Database.drop_model(Foo)
+      ActiveRecord::Migration.drop_table(:foos)
+      ActiveRecord::Migration.drop_table(:bars)
+      
+      Object.send :remove_const, :Foo
+      Object.send :remove_const, :Bar
+
       ScopedSearch::RSpec::Database.close_connection
     end
 
@@ -136,7 +153,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
       end
     end
 
-     context 'exceptional search strings' do
+    context 'exceptional search strings' do
 
       it "query that starts with 'or'" do
         Foo.complete_for('or ').should have(9).items

data/spec/integration/key_value_querying_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require "spec_helper"
 
   # These specs will run on all databases that are defined in the spec/database.yml file.
   # Comment out any databases that you do not have available for testing purposes if needed.
@@ -20,72 +20,73 @@ require "#{File.dirname(__FILE__)}/../spec_helper"
           ActiveRecord::Migration.create_table(:keys) { |t| t.string :name }
           class ::Key < ActiveRecord::Base; has_many :facts; end
 
-          ActiveRecord::Migration.create_table(:facts) { |t| t.string :value; t.integer :key_id; t.integer :bar_id }
-          class ::Fact < ActiveRecord::Base; belongs_to :key; belongs_to :bar; end
+          ActiveRecord::Migration.create_table(:facts) { |t| t.string :value; t.integer :key_id; t.integer :key_value_id }
+          class ::Fact < ActiveRecord::Base; belongs_to :key; belongs_to :key_value; end
 
           # The class that will run the queries
-          ::Bar = ScopedSearch::RSpec::Database.create_model(:name => :string) do |klass|
-            klass.has_many :facts
-            klass.has_many :keys, :through => :facts
-            klass.scoped_search :in => :facts, :on => :value, :rename => :facts, :in_key => :keys, :on_key => :name, :complete_value => true
+          ActiveRecord::Migration.create_table(:key_values) { |t| t.string :name }
+          class ::KeyValue < ActiveRecord::Base
+            has_many :facts
+            has_many :keys, :through => :facts
+            
+            scoped_search :in => :facts, :on => :value, :rename => :facts, :in_key => :keys, :on_key => :name, :complete_value => true
           end
 
           @key1 = Key.create!(:name => 'color')
           @key2 = Key.create!(:name => 'size')
 
+          @kv1 = KeyValue.create!(:name => 'bar')
+          @kv2 = KeyValue.create!(:name => 'barbary')
 
-          @bar1 = Bar.create!(:name => 'bar')
-          @bar2 = Bar.create!(:name => 'barbary')
-
-          Fact.create!(:value => 'green', :key => @key1, :bar => @bar1)
-          Fact.create!(:value => 'gold' , :key => @key1, :bar => @bar2)
-          Fact.create!(:value => '5'    , :key => @key2, :bar => @bar1)
+          Fact.create!(:value => 'green', :key => @key1, :key_value => @kv1)
+          Fact.create!(:value => 'gold' , :key => @key1, :key_value => @kv2)
+          Fact.create!(:value => '5'    , :key => @key2, :key_value => @kv1)
 
         end
 
         after(:all) do
-          ScopedSearch::RSpec::Database.drop_model(Bar)
+          ScopedSearch::RSpec::Database.drop_model(KeyValue)
           ScopedSearch::RSpec::Database.drop_model(Fact)
           ScopedSearch::RSpec::Database.drop_model(Key)
           Object.send :remove_const, :Fact
           Object.send :remove_const, :Key
-          Object.send :remove_const, :Bar
+          Object.send :remove_const, :KeyValue
         end
 
         it "should find all bars with a fact name color and fact value green" do
-          Bar.search_for('facts.color = green').should have(1).items
+          KeyValue.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')
+          KeyValue.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
+          KeyValue.search_for('facts.size = 5').should have(1).items
         end
 
         it "should find all bars with a fact color green and fact size 5" do
-          Bar.search_for('facts.color = green and facts.size = 5').should have(1).items
+          KeyValue.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
+          KeyValue.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
+          KeyValue.search_for('has facts.size').should have(1).items
         end
 
         it "should find all bars that has color value" do
-          Bar.search_for('has facts.color').should have(2).items
+          KeyValue.search_for('has facts.color').should have(2).items
         end
 
         it "should complete facts names" do
-          Bar.complete_for('facts.').should have(2).items
+          KeyValue.complete_for('facts.').should have(2).items
         end
 
          it "should complete values for fact name = color" do
-          Bar.complete_for('facts.color = ').should have(2).items
+          KeyValue.complete_for('facts.color = ').should have(2).items
         end
 
       end

data/spec/integration/ordinal_querying_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require "spec_helper"
 
 # These specs will run on all databases that are defined in the spec/database.yml file.
 # Comment out any databases that you do not have available for testing purposes if needed.

data/spec/integration/profile_querying_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require "spec_helper"
 
 # These specs will run on all databases that are defined in the spec/database.yml file.
 # Comment out any databases that you do not have available for testing purposes if needed.

data/spec/integration/relation_querying_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require "spec_helper"
 
 # These specs will run on all databases that are defined in the spec/database.yml file.
 # Comment out any databases that you do not have available for testing purposes if needed.

data/spec/integration/set_query_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require "spec_helper"
 
 # These specs will run on all databases that are defined in the spec/database.yml file.
 # Comment out any databases that you do not have available for testing purposes if needed.

data/spec/integration/string_querying_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require "spec_helper"
 
 # These specs will run on all databases that are defined in the spec/database.yml file.
 # Comment out any databases that you do not have available for testing purposes if needed.
@@ -192,6 +192,7 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         @class.search_for('null? explicit').should have(1).items
       end
     end
+
     context 'using order' do
       it "sort by string ASC" do
         @class.search_for('',:order => 'string ASC').first.string.should eql('bar')
@@ -205,8 +206,14 @@ ScopedSearch::RSpec::Database.test_databases.each do |db|
         @class.search_for('').first.string.should eql('bar')
       end
 
-       it "group by explicit" do
-        @class.search_for('',:group => 'explicit').should have(2).items
+      it "resetting order when selecting distinct values" do
+        distinct_search = if ActiveRecord::VERSION::MAJOR == 2
+          @class.search_for('', :order => '').all(:select => 'DISTINCT(explicit)')
+        else
+          @class.search_for('', :order => '').select(:explicit).uniq
+        end
+
+        Set.new(distinct_search.map(&:explicit)).should == Set['baz', nil]
       end
     end
   end

data/spec/lib/database.rb

@@ -12,12 +12,22 @@ module ScopedSearch::RSpec::Database
   end
 
   def self.test_databases_configuration
-    file = File.expand_path("../database.yml", File.dirname(__FILE__))
-    @database_connections ||= YAML.load(ERB.new(File.read(file)).result)
+    file = if RUBY_PLATFORM == 'java'
+      File.expand_path("../database.jruby.yml", File.dirname(__FILE__))
+    else
+      File.expand_path("../database.ruby.yml", File.dirname(__FILE__))
+    end
+
+    @database_connections ||= YAML.load(File.read(file))
   end
   
   def self.test_databases
-    test_databases_configuration.keys.sort
+    database_names = test_databases_configuration.keys.sort
+    if ENV['EXCLUDE_DATABASE'].present?
+      exclude_databases = ENV['EXCLUDE_DATABASE'].split(',')
+      database_names -= exclude_databases
+    end
+    return database_names
   end
 
   def self.establish_named_connection(name)
@@ -34,7 +44,7 @@ module ScopedSearch::RSpec::Database
   end
 
   def self.create_model(fields)
-    table_name = "model_#{rand}".gsub(/\./, '')
+    table_name = "model_#{rand}".gsub(/\W/, '')
     ActiveRecord::Migration.create_table(table_name) do |t|
       fields.each do |name, field_type|
         options = (field_type == :decimal) ? { :scale => 2, :precision => 10 } : {}
@@ -42,8 +52,8 @@ module ScopedSearch::RSpec::Database
       end
     end
 
-    klass = Class.new(ActiveRecord::Base)
-    klass.set_table_name(table_name)
+    klass = ScopedSearch::RSpec::Database.const_set(table_name.classify, Class.new(ActiveRecord::Base))
+    klass.table_name = table_name
     yield(klass) if block_given?
     return klass
   end

data/spec/lib/mocks.rb

@@ -10,6 +10,7 @@ module ScopedSearch::RSpec::Mocks
     ar_mock.stub!(:scope).with(:search_for, anything)
     ar_mock.stub!(:connection).and_return(mock_database_connection)
     ar_mock.stub!(:ancestors).and_return([ActiveRecord::Base])
+    ar_mock.stub!(:columns_hash).and_return({'existing' => mock('column')})
     return ar_mock
   end
 

data/spec/unit/ast_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require "spec_helper"
 
 describe ScopedSearch::QueryLanguage::AST do
 

data/spec/unit/auto_complete_builder_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require "spec_helper"
 
 describe ScopedSearch::AutoCompleteBuilder do
 

data/spec/unit/definition_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require "spec_helper"
 
 describe ScopedSearch::Definition do
 
@@ -8,6 +8,21 @@ describe ScopedSearch::Definition do
     @definition.stub!(:setup_adapter)
   end
 
+  describe ScopedSearch::Definition::Field do
+    describe '#column' do
+      it "should raise an exception when using an unknown field" do
+        lambda {
+          @definition.define(:on => 'nonexisting').column
+        }.should raise_error(ActiveRecord::UnknownAttributeError)
+      end
+
+      it "should not raise an exception when using an unknown field" do
+        lambda {
+          @definition.define(:on => 'existing').column
+        }.should_not raise_error(ActiveRecord::UnknownAttributeError)
+      end
+    end
+  end
 
   describe '#initialize' do
 

data/spec/unit/parser_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require "spec_helper"
 
 describe ScopedSearch::QueryLanguage::Parser do
 

data/spec/unit/query_builder_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require "spec_helper"
 
 describe ScopedSearch::QueryBuilder do
 

data/spec/unit/tokenizer_spec.rb

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../spec_helper"
+require "spec_helper"
 
 describe ScopedSearch::QueryLanguage::Tokenizer do
 

data/tasks/github-gem.rake

@@ -13,8 +13,8 @@ module GithubGem
 
   # Detects the main include file of this project using heuristics
   def self.detect_main_include
-    if detect_gemspec_file =~ /^(\.*)\.gemspec$/ && File.exist?("lib/#{$1}.rb")
-      "lib/#{$1}.rb"
+    if File.exist?(File.expand_path("../lib/#{File.basename(detect_gemspec_file, '.gemspec').gsub(/-/, '/')}.rb", detect_gemspec_file))
+      "lib/#{File.basename(detect_gemspec_file, '.gemspec').gsub(/-/, '/')}.rb"
     elsif FileList['lib/*.rb'].length == 1
       FileList['lib/*.rb'].first
     else
@@ -24,6 +24,8 @@ module GithubGem
 
   class RakeTasks
 
+    include Rake::DSL if Rake.const_defined?('DSL')
+
     attr_reader   :gemspec, :modified_files
     attr_accessor :gemspec_file, :task_namespace, :main_include, :root_dir, :spec_pattern, :test_pattern, :remote, :remote_branch, :local_branch
 
@@ -342,7 +344,7 @@ module GithubGem
       require 'net/https'
       require 'uri'
       
-      uri = URI.parse('https://github.com/wvanbergen/github-gem/raw/master/tasks/github-gem.rake')
+      uri = URI.parse('https://raw.github.com/wvanbergen/github-gem/master/tasks/github-gem.rake')
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = true
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE

metadata

@@ -1,97 +1,77 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: scoped_search
-version: !ruby/object:Gem::Version 
-  hash: 13
-  prerelease: false
-  segments: 
-  - 2
-  - 3
-  - 7
-  version: 2.3.7
+version: !ruby/object:Gem::Version
+  version: 2.4.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
+- Amos Benari
 - Willem van Bergen
 - Wes Hays
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-04-30 00:00:00 +03:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-09-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70188989608520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.0
   type: :runtime
-  name: activerecord
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70188989608520
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70188989607800 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  name: rspec
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
+  version_requirements: *70188989607800
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70188989607000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: sqlite3-ruby
   prerelease: false
-  version_requirements: *id004
-description: "    Scoped search makes it easy to search your ActiveRecord-based models.\n    \n    It will create a named scope :search_for that can be called with a query string. It will build an SQL query using\n    the provided query string and a definition that specifies on what fields to search. Because the functionality is\n    built on named_scope, the result of the search_for call can be used like any other named_scope, so it can be\n    chained with another scope or combined with will_paginate.\n    \n    Because it uses standard SQL, it does not require any setup, indexers or daemons. This makes scoped_search\n    suitable to quickly add basic search functionality to your application with little hassle. On the other hand,\n    it may not be the best choice if it is going to be used on very large datasets or by a large user base.\n"
-email: 
+  version_requirements: *70188989607000
+description: ! "    Scoped search makes it easy to search your ActiveRecord-based
+  models.\n    \n    It will create a named scope :search_for that can be called with
+  a query string. It will build an SQL query using\n    the provided query string
+  and a definition that specifies on what fields to search. Because the functionality
+  is\n    built on named_scope, the result of the search_for call can be used like
+  any other named_scope, so it can be\n    chained with another scope or combined
+  with will_paginate.\n    \n    Because it uses standard SQL, it does not require
+  any setup, indexers or daemons. This makes scoped_search\n    suitable to quickly
+  add basic search functionality to your application with little hassle. On the other
+  hand,\n    it may not be the best choice if it is going to be used on very large
+  datasets or by a large user base.\n"
+email:
+- abenari@redhat.com
 - willem@railsdoctors.com
 - weshays@gbdev.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .gitignore
 - .infinity_test
+- .travis.yml
 - Gemfile
+- Gemfile.activerecord2
+- Gemfile.activerecord3
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -106,7 +86,8 @@ files:
 - lib/scoped_search/query_language/tokenizer.rb
 - lib/scoped_search/rails_helper.rb
 - scoped_search.gemspec
-- spec/database.yml
+- spec/database.jruby.yml
+- spec/database.ruby.yml
 - spec/integration/api_spec.rb
 - spec/integration/auto_complete_spec.rb
 - spec/integration/key_value_querying_spec.rb
@@ -126,46 +107,38 @@ files:
 - spec/unit/query_builder_spec.rb
 - spec/unit/tokenizer_spec.rb
 - tasks/github-gem.rake
-has_rdoc: true
 homepage: http://github.com/wvanbergen/scoped_search/wiki
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - scoped_search
 - --main
 - README.rdoc
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.16
 signing_key: 
 specification_version: 3
-summary: Easily search you ActiveRecord models with a simple query language using a named scope.
-test_files: 
+summary: Easily search you ActiveRecord models with a simple query language using
+  a named scope.
+test_files:
 - spec/integration/api_spec.rb
 - spec/integration/auto_complete_spec.rb
 - spec/integration/key_value_querying_spec.rb