wvanbergen-scoped_search 0.6.0 → 0.7.0

data/TODO

@@ -2,14 +2,6 @@ TODO items for named_scope
 ==========================
 Contact willem AT vanbergen DOT org if you want to help out
 
-0.6.0
-- Add test for Postgres
-- Add test for MySQL
-
-
-0.7.0
-
-
 0.8.0
 
 
@@ -17,7 +9,7 @@ Contact willem AT vanbergen DOT org if you want to help out
 
 
 1.0.0
-
+- Extensive testing
 
 Documentation & testing:
 - Add rdoc en comments to code

data/lib/scoped_search/query_conditions_builder.rb

@@ -1,6 +1,7 @@
 module ScopedSearch
   
   class QueryConditionsBuilder
+    ## ActiveRecord::Base.connection.adapter_name
 
     # Build the query
     def self.build_query(search_conditions, query_fields)
@@ -10,6 +11,12 @@ module ScopedSearch
     def initialize
       @query_fields = nil 
       @query_params = {}
+      
+      @sql_like = 'LIKE'
+      
+      if ActiveRecord::Base.connected? and ActiveRecord::Base.connection.adapter_name.downcase == 'postgresql'
+        @sql_like = 'ILIKE'
+      end
     end 
 
 
@@ -66,7 +73,7 @@ module ScopedSearch
       retVal = []
       @query_fields.each do |field, field_type|  #|key,value| 
         if field_type == :string or field_type == :text
-          retVal << "#{field} LIKE :#{keyword_name.to_s}"
+          retVal << "#{field} #{@sql_like} :#{keyword_name.to_s}"
         end
       end
       "(#{retVal.join(' OR ')})"
@@ -77,7 +84,7 @@ module ScopedSearch
       retVal = []
       @query_fields.each do |field, field_type|  #|key,value| 
         if field_type == :string or field_type == :text
-          retVal << "(#{field} NOT LIKE :#{keyword_name.to_s} OR #{field} IS NULL)"
+          retVal << "(#{field} NOT #{@sql_like} :#{keyword_name.to_s} OR #{field} IS NULL)"
         end
       end
       "(#{retVal.join(' AND ')})"
@@ -92,7 +99,7 @@ module ScopedSearch
       @query_params[keyword_name_b] = "%#{word2}%"      
       @query_fields.each do |field, field_type|  #|key,value| 
         if field_type == :string or field_type == :text
-          retVal << "(#{field} LIKE :#{keyword_name_a.to_s} OR #{field} LIKE :#{keyword_name_b.to_s})"
+          retVal << "(#{field} #{@sql_like} :#{keyword_name_a.to_s} OR #{field} #{@sql_like} :#{keyword_name_b.to_s})"
         end
       end 
       "(#{retVal.join(' OR ')})"     
@@ -127,7 +134,7 @@ module ScopedSearch
       @query_params[keyword_name_b] = "%#{value}%"
       @query_fields.each do |field, field_type|  #|key,value| 
         if field_type == :string or field_type == :text
-          retVal << "#{field} LIKE :#{keyword_name_b.to_s}"
+          retVal << "#{field} #{@sql_like} :#{keyword_name_b.to_s}"
         end
       end
 

data/test/search_for_test.rb

@@ -3,7 +3,15 @@ require File.dirname(__FILE__) + '/test_helper'
 class ScopedSearchTest < Test::Unit::TestCase
 
   def setup
-    setup_db
+    case ENV['DATABASE']
+      when 'mysql'
+        create_mysql_connection
+      when 'postgresql' 
+        create_postgresql_connection
+      else 'sqlite3'     
+        create_sqlite3_connection
+    end
+    InitialSchema.up
     SearchTestModel.create_corpus!
     Group.create_corpus!
     Location.create_corpus!
@@ -15,14 +23,14 @@ class ScopedSearchTest < Test::Unit::TestCase
   end
 
   def teardown
-    teardown_db
+    InitialSchema.down
   end
   
   def test_enabling
     assert !SearchTestModel.respond_to?(:search_for)
     SearchTestModel.searchable_on :string_field, :text_field, :date_field
     assert SearchTestModel.respond_to?(:search_for)
-  
+      
     assert_equal ActiveRecord::NamedScope::Scope, SearchTestModel.search_for('test').class
   end  
   
@@ -110,7 +118,7 @@ class ScopedSearchTest < Test::Unit::TestCase
   
   def test_search_has_many_association
     User.searchable_on :first_name, :last_name, :notes_title, :notes_content
-
+  
     assert_equal User.count, User.search_for('').count        
     assert_equal 2, User.search_for('Router').count     
     assert_equal 1, User.search_for('milk').count

data/test/tasks.rake

@@ -5,4 +5,9 @@ Rake::TestTask.new(:test) do |t|
   t.pattern = 'test/**/*_test.rb'
   t.verbose = true
   t.libs << 'test'
+  
+  # options are sqlite3, mysql or postgresql.  The default
+  # is sqlite3 if not specified or if the parameter is invalid.
+  # If DATABASE is mysql then the MYSQLSOCKET can also be set if needed.
+  ENV['DATABASE'] = ENV['DATABASE'].nil? ? 'sqlite3' : ENV['DATABASE'].downcase
 end

data/test/test_helper.rb

@@ -5,9 +5,9 @@ require 'ruby-debug'
 
 require "#{File.dirname(__FILE__)}/../lib/scoped_search"
 
-def setup_db
-  ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :dbfile => ":memory:")
-  ActiveRecord::Schema.define(:version => 1) do
+class InitialSchema < ActiveRecord::Migration
+
+  def self.up
     create_table :search_test_models do |t|
       t.string :string_field
       t.text :text_field
@@ -52,14 +52,55 @@ def setup_db
     
     create_table :addresses do |t|
       t.string :street, :city, :state, :postal_code
-    end  
+    end    
+  end
+
+  def self.down
+    drop_table :search_test_models    
+    drop_table :users     
+    drop_table :clients     
+    drop_table :offices     
+    drop_table :groups     
+    drop_table :locations     
+    drop_table :locations_users    
+    drop_table :notes     
+    drop_table :addresses
   end
+
 end
 
-def teardown_db
-  ActiveRecord::Base.connection.tables.each { |table| ActiveRecord::Base.connection.drop_table(table) }
+
+def create_sqlite3_connection
+  ActiveRecord::Base.establish_connection(
+    :adapter => "sqlite3", 
+    :dbfile => ":memory:"
+  )
 end
 
+def create_postgresql_connection
+  ActiveRecord::Base.establish_connection(
+    :adapter  => "postgresql",
+    :host     => "localhost",
+    :username => "sstest",
+    :password => "sstest",
+    :database => "scoped_search_test"
+  )    
+end
+
+def create_mysql_connection
+  # '/tmp/mysql.sock' is the default location and file rails looks for.
+  mysql_socket = ENV['MYSQLSOCKET'].nil? ? '/tmp/mysql.sock' : ENV['MYSQLSOCKET']
+  ActiveRecord::Base.establish_connection(
+    :adapter  => "mysql",
+    :host     => "localhost",
+    :username => "sstest",
+    :password => "sstest",
+    :database => "scoped_search_test",
+    :socket   => mysql_socket
+  )    
+end
+
+
 class SearchTestModel < ActiveRecord::Base
   def self.create_corpus!
     create!(:string_field => "Programmer 123", :text_field => nil,              :ignored_field => "123456",  :date_field => '2000-01-01')    

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wvanbergen-scoped_search
 version: !ruby/object:Gem::Version 
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-23 00:00:00 -07:00
+date: 2008-10-11 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -27,7 +27,7 @@ extra_rdoc_files: []
 files: 
 - CHANGELOG
 - LICENSE
-- README.rdoc
+- README.textile
 - Rakefile
 - TODO
 - init.rb