searchgasm 1.3.2 → 1.3.3

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 1.3.3 released 2008-10-03
+
+* Fixed modifiers being double escaped on equals condition
+* Fixed bug when merging conditions with array substitutions
+* Updated blank condition to check if the values is false or not
+* Fixed type for the year modifier in the mysql adapter
+
 == 1.3.2 released 2008-10-03
 
 * Fixed condition to type cast all values in an array

data/lib/searchgasm/active_record/connection_adapters/mysql_adapter.rb

@@ -44,7 +44,7 @@ module Searchgasm
         end
         
         def year_sql(column_name)
-          "MONTH(#{column_name})"
+          "YEAR(#{column_name})"
         end
         
         # String functions

data/lib/searchgasm/condition/blank.rb

@@ -11,9 +11,9 @@ module Searchgasm
       
       def to_conditions(value)
         if value == true
-          "#{column_sql} is NULL or #{column_sql} = ''"
+          "#{column_sql} is NULL or #{column_sql} = '' or #{column_sql} = false"
         elsif value == false
-          "#{column_sql} is NOT NULL and #{column_sql} != ''"
+          "#{column_sql} is NOT NULL and #{column_sql} != '' and #{column_sql} != false"
         end
       end
     end

data/lib/searchgasm/condition/equals.rb

@@ -12,7 +12,15 @@ module Searchgasm
       
       def to_conditions(value)
         # Let ActiveRecord handle this
-        klass.send(:sanitize_sql_hash_for_conditions, {column.name => value})
+        args = []
+        case value
+        when Range
+          args = [value.first, value.last]
+        else
+          args << value
+        end
+                        
+        ["#{column_sql} #{klass.send(:attribute_condition, value)}", *args]
       end
     end
   end

data/lib/searchgasm/condition/not_equal.rb

@@ -15,12 +15,12 @@ module Searchgasm
         condition = Equals.new(klass, column)
         condition.value = value
         
-        sql = condition.sanitize
-        sql.gsub!(/ IS /, " IS NOT ")
-        sql.gsub!(/ BETWEEN /, " NOT BETWEEN ")
-        sql.gsub!(/ IN /, " NOT IN ")
-        sql.gsub!(/=/, "!=")
-        sql
+        conditions_array = condition.sanitize
+        conditions_array.first.gsub!(/ IS /, " IS NOT ")
+        conditions_array.first.gsub!(/ BETWEEN /, " NOT BETWEEN ")
+        conditions_array.first.gsub!(/ IN /, " NOT IN ")
+        conditions_array.first.gsub!(/=/, "!=")
+        conditions_array
       end
     end
   end

data/lib/searchgasm/helpers/utilities.rb

@@ -1,6 +1,6 @@
 module Searchgasm
   module Helpers #:nodoc:
-    module Utilities # :nodoc:
+    module Utilities
       # Builds a hash of params for creating a url and preserves any existing params. You can pass this into url_for and build your url. Although most rails helpers accept a hash.
       #
       # Let's take the page_link helper. Here is the code behind that helper:

data/lib/searchgasm/shared/utilities.rb

@@ -13,7 +13,7 @@ module Searchgasm
         
           conditions.each do |condition|
             next if condition.blank?
-            arr_condition = [condition].flatten
+            arr_condition = condition.is_a?(Array) ? condition : [condition]
             conditions_strs << arr_condition.first
             conditions_subs += arr_condition[1..-1]
           end

data/lib/searchgasm/version.rb

@@ -67,7 +67,7 @@ module Searchgasm
 
     MAJOR = 1
     MINOR = 3
-    TINY  = 2
+    TINY  = 3
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/searchgasm.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Searchgasm-1.3.2
+# Gem::Specification for Searchgasm-1.3.3
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
 autorequire: 
 bindir: bin
 
-date: 2008-10-03 00:00:00 -04:00
+date: 2008-10-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

data/test/test_condition_types.rb

@@ -8,19 +8,19 @@ class TestConditionTypes < Test::Unit::TestCase
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
     condition.value = "true"
-    assert_equal "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = ''", condition.sanitize
+    assert_equal "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = '' or \"accounts\".\"id\" = false", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
     condition.value = "false"
-    assert_equal "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != ''", condition.sanitize
+    assert_equal "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != '' and \"accounts\".\"id\" != false", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
     condition.value = true
-    assert_equal "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = ''", condition.sanitize
+    assert_equal "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = '' or \"accounts\".\"id\" = false", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
     condition.value = false
-    assert_equal "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != ''", condition.sanitize
+    assert_equal "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != '' and \"accounts\".\"id\" != false", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
     condition.value = nil
@@ -48,15 +48,15 @@ class TestConditionTypes < Test::Unit::TestCase
     
     condition = Searchgasm::Condition::Equals.new(Account, Account.columns_hash["id"])
     condition.value = 12
-    assert_equal "\"accounts\".\"id\" = 12", condition.sanitize
+    assert_equal ["\"accounts\".\"id\" = ?", 12], condition.sanitize
     
     condition = Searchgasm::Condition::Equals.new(Account, Account.columns_hash["id"])
     condition.value = [1,2,3,4]
-    assert_equal "\"accounts\".\"id\" IN (1,2,3,4)", condition.sanitize
+    assert_equal ["\"accounts\".\"id\" IN (?)", [1, 2, 3, 4]], condition.sanitize
     
     condition = Searchgasm::Condition::Equals.new(Account, Account.columns_hash["id"])
     condition.value = (1..10)
-    assert_equal "\"accounts\".\"id\" BETWEEN 1 AND 10", condition.sanitize
+    assert_equal ["\"accounts\".\"id\" BETWEEN ? AND ?", 1, 10], condition.sanitize
     
     condition = Searchgasm::Condition::GreaterThan.new(Account, Account.columns_hash["id"])
     condition.value = 2
@@ -100,15 +100,15 @@ class TestConditionTypes < Test::Unit::TestCase
     
     condition = Searchgasm::Condition::NotEqual.new(Account, Account.columns_hash["id"])
     condition.value = 12
-    assert_equal "\"accounts\".\"id\" != 12", condition.sanitize
+    assert_equal ["\"accounts\".\"id\" != ?", 12], condition.sanitize
     
     condition = Searchgasm::Condition::NotEqual.new(Account, Account.columns_hash["id"])
     condition.value = [1,2,3,4]
-    assert_equal "\"accounts\".\"id\" NOT IN (1,2,3,4)", condition.sanitize
+    assert_equal ["\"accounts\".\"id\" NOT IN (?)", [1, 2, 3, 4]], condition.sanitize
     
     condition = Searchgasm::Condition::NotEqual.new(Account, Account.columns_hash["id"])
     condition.value = (1..10)
-    assert_equal "\"accounts\".\"id\" NOT BETWEEN 1 AND 10", condition.sanitize
+    assert_equal ["\"accounts\".\"id\" NOT BETWEEN ? AND ?", 1, 10], condition.sanitize
     
     condition = Searchgasm::Condition::Keywords.new(Account, Account.columns_hash["name"])
     condition.value = "freedom yeah, freedom YEAH right"

data/test/test_conditions_base.rb

@@ -44,11 +44,11 @@ class TestConditionsBase < Test::Unit::TestCase
     conditions.name_contains = "Binary"
     assert_equal ["\"accounts\".\"name\" LIKE ?", "%Binary%"], conditions.sanitize
     conditions.id = 1
-    assert_equal ["(\"accounts\".\"id\" = 1) AND (\"accounts\".\"name\" LIKE ?)", "%Binary%"], conditions.sanitize
+    assert_equal ["(\"accounts\".\"id\" = ?) AND (\"accounts\".\"name\" LIKE ?)", 1, "%Binary%"], conditions.sanitize
     conditions.any = true
-    assert_equal ["(\"accounts\".\"id\" = 1) OR (\"accounts\".\"name\" LIKE ?)", "%Binary%"], conditions.sanitize
+    assert_equal ["(\"accounts\".\"id\" = ?) OR (\"accounts\".\"name\" LIKE ?)", 1, "%Binary%"], conditions.sanitize
     conditions.any = false
-    assert_equal ["(\"accounts\".\"id\" = 1) AND (\"accounts\".\"name\" LIKE ?)", "%Binary%"], conditions.sanitize
+    assert_equal ["(\"accounts\".\"id\" = ?) AND (\"accounts\".\"name\" LIKE ?)", 1, "%Binary%"], conditions.sanitize
   end
   
   def test_auto_joins

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-03 00:00:00 -04:00
+date: 2008-10-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency