searchgasm 1.2.2 → 1.3.0

data/lib/searchgasm/modifiers/hour.rb

@@ -0,0 +1,11 @@
+module Searchgasm
+  module Modifiers
+    class Hour < Base
+      class << self
+        def return_type
+          :integer
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/log.rb

@@ -0,0 +1,15 @@
+module Searchgasm
+  module Modifiers
+    class Log < Base
+      class << self
+        def modifier_names
+          super + ["ln"]
+        end
+        
+        def return_type
+          :float
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/log10.rb

@@ -0,0 +1,11 @@
+module Searchgasm
+  module Modifiers
+    class Log10 < Base
+      class << self
+        def return_type
+          :float
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/log2.rb

@@ -0,0 +1,11 @@
+module Searchgasm
+  module Modifiers
+    class Log2 < Base
+      class << self
+        def return_type
+          :float
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/md5.rb

@@ -0,0 +1,11 @@
+module Searchgasm
+  module Modifiers
+    class Md5 < Base
+      class << self
+        def return_type
+          :string
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/microseconds.rb

@@ -0,0 +1,11 @@
+module Searchgasm
+  module Modifiers
+    class Microseconds < Base
+      class << self
+        def return_type
+          :integer
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/milliseconds.rb

@@ -0,0 +1,11 @@
+module Searchgasm
+  module Modifiers
+    class Milliseconds < Base
+      class << self
+        def return_type
+          :integer
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/minute.rb

@@ -0,0 +1,15 @@
+module Searchgasm
+  module Modifiers
+    class Minute < Base
+      class << self
+        def modifier_names
+          super + ["min"]
+        end
+        
+        def return_type
+          :integer
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/month.rb

@@ -0,0 +1,15 @@
+module Searchgasm
+  module Modifiers
+    class Month < Base
+      class << self
+        def modifier_names
+          super + ["mon"]
+        end
+        
+        def return_type
+          :integer
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/octal.rb

@@ -0,0 +1,15 @@
+module Searchgasm
+  module Modifiers
+    class Octal < Base
+      class << self
+        def modifier_names
+          super + ["oct"]
+        end
+        
+        def return_type
+          :float
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/radians.rb

@@ -0,0 +1,11 @@
+module Searchgasm
+  module Modifiers
+    class Radians < Base
+      class << self
+        def return_type
+          :float
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/round.rb

@@ -0,0 +1,11 @@
+module Searchgasm
+  module Modifiers
+    class Round < Base
+      class << self
+        def return_type
+          :integer
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/second.rb

@@ -0,0 +1,15 @@
+module Searchgasm
+  module Modifiers
+    class Second < Base
+      class << self
+        def modifier_names
+          super + ["sec"]
+        end
+        
+        def return_type
+          :integer
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/sign.rb

@@ -0,0 +1,11 @@
+module Searchgasm
+  module Modifiers
+    class Sign < Base
+      class << self
+        def return_type
+          :float
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/sin.rb

@@ -0,0 +1,11 @@
+module Searchgasm
+  module Modifiers
+    class Sin < Base
+      class << self
+        def return_type
+          :float
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/square_root.rb

@@ -0,0 +1,15 @@
+module Searchgasm
+  module Modifiers
+    class SquareRoot < Base
+      class << self
+        def modifier_names
+          super + ["sqrt", "sq_rt"]
+        end
+        
+        def return_type
+          :float
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/tan.rb

@@ -0,0 +1,15 @@
+module Searchgasm
+  module Modifiers
+    class Tan < Base
+      class << self
+        def modifier_names
+          super + ["tangent"]
+        end
+        
+        def return_type
+          :float
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/week.rb

@@ -0,0 +1,11 @@
+module Searchgasm
+  module Modifiers
+    class Week < Base
+      class << self
+        def return_type
+          :integer
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/modifiers/year.rb

@@ -0,0 +1,11 @@
+module Searchgasm
+  module Modifiers
+    class Year < Base
+      class << self
+        def return_type
+          :integer
+        end
+      end
+    end
+  end
+end

data/lib/searchgasm/shared/utilities.rb

@@ -45,16 +45,6 @@ module Searchgasm
           
           new_joins.compact.uniq
         end
-        
-        # "meaningful" is subjective which is why this is not a core extension like .blank?
-        def meaningless?(value)
-          return false if value == false
-          value.blank?
-        end
-        
-        def meaningful?(value)
-          !meaningless?
-        end
     end
   end
 end

data/lib/searchgasm/version.rb

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

data/lib/searchgasm.rb

@@ -2,6 +2,9 @@ $:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) ||
   
 require "active_record"
 require "active_record/version"
+require "active_record/connection_adapters/mysql_adapter"
+require "active_record/connection_adapters/postgresql_adapter"
+require "active_record/connection_adapters/sqlite_adapter"
 require "active_support"
 
 # Core Ext
@@ -18,6 +21,9 @@ require "searchgasm/config"
 # ActiveRecord
 require "searchgasm/active_record/base"
 require "searchgasm/active_record/associations"
+require "searchgasm/active_record/connection_adapters/mysql_adapter"
+require "searchgasm/active_record/connection_adapters/postgresql_adapter"
+require "searchgasm/active_record/connection_adapters/sqlite_adapter"
 
 # Search
 require "searchgasm/search/ordering"
@@ -33,23 +39,14 @@ require "searchgasm/conditions/base"
 
 # Condition
 require "searchgasm/condition/base"
-require "searchgasm/condition/begins_with"
-require "searchgasm/condition/blank"
-require "searchgasm/condition/contains"
-require "searchgasm/condition/does_not_equal"
-require "searchgasm/condition/ends_with"
-require "searchgasm/condition/equals"
-require "searchgasm/condition/greater_than"
-require "searchgasm/condition/greater_than_or_equal_to"
-require "searchgasm/condition/keywords"
-require "searchgasm/condition/less_than"
-require "searchgasm/condition/less_than_or_equal_to"
-require "searchgasm/condition/nil"
 require "searchgasm/condition/tree"
-require "searchgasm/condition/child_of"
-require "searchgasm/condition/descendant_of"
-require "searchgasm/condition/inclusive_descendant_of"
-require "searchgasm/condition/sibling_of"
+SEARCHGASM_CONDITIONS = [:begins_with, :blank, :child_of, :descendant_of, :ends_with, :equals, :greater_than, :greater_than_or_equal_to, :inclusive_descendant_of, :like, :nil, :not_begin_with, :not_end_with, :not_equal, :not_have_keywords, :keywords, :less_than, :less_than_or_equal_to, :sibling_of]
+SEARCHGASM_CONDITIONS.each { |condition| require "searchgasm/condition/#{condition}" }
+
+# Modifiers
+require "searchgasm/modifiers/base"
+SEARCHGASM_MODIFIERS = [:day_of_month, :day_of_week, :day_of_year, :hour, :microseconds, :milliseconds, :minute, :month, :second, :week, :year]
+SEARCHGASM_MODIFIERS.each { |modifier| require "searchgasm/modifiers/#{modifier}" }
 
 # Helpers
 require "searchgasm/helpers/utilities"
@@ -78,9 +75,8 @@ module Searchgasm
       include Protection
     end
     
-    [:begins_with, :blank, :child_of, :contains, :descendant_of, :does_not_equal, :ends_with, :equals, :greater_than, :greater_than_or_equal_to, :inclusive_descendant_of, :nil, :keywords, :less_than, :less_than_or_equal_to, :sibling_of].each do |condition|
-      Base.register_condition("Searchgasm::Condition::#{condition.to_s.camelize}".constantize)
-    end
+    SEARCHGASM_CONDITIONS.each { |condition| Base.register_condition("Searchgasm::Condition::#{condition.to_s.camelize}".constantize) }
+    SEARCHGASM_MODIFIERS.each { |modifier| Base.register_modifier("Searchgasm::Modifiers::#{modifier.to_s.camelize}".constantize) }
   end
   
   # The namespace I put all cached search classes.

data/searchgasm.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Searchgasm-1.2.2
+# Gem::Specification for Searchgasm-1.3.0
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
 autorequire: 
 bindir: bin
 
-date: 2008-09-29 00:00:00 -04:00
+date: 2008-10-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,10 +62,7 @@ extra_rdoc_files:
 - lib/searchgasm/condition/begins_with.rb
 - lib/searchgasm/condition/blank.rb
 - lib/searchgasm/condition/child_of.rb
-- lib/searchgasm/condition/contains.rb
 - lib/searchgasm/condition/descendant_of.rb
-- lib/searchgasm/condition/does_not_equal.rb
-- lib/searchgasm/condition/during_evening.rb
 - lib/searchgasm/condition/ends_with.rb
 - lib/searchgasm/condition/equals.rb
 - lib/searchgasm/condition/greater_than.rb
@@ -74,7 +71,13 @@ extra_rdoc_files:
 - lib/searchgasm/condition/keywords.rb
 - lib/searchgasm/condition/less_than.rb
 - lib/searchgasm/condition/less_than_or_equal_to.rb
+- lib/searchgasm/condition/like.rb
 - lib/searchgasm/condition/nil.rb
+- lib/searchgasm/condition/not_begin_with.rb
+- lib/searchgasm/condition/not_end_with.rb
+- lib/searchgasm/condition/not_equal.rb
+- lib/searchgasm/condition/not_have_keywords.rb
+- lib/searchgasm/condition/not_like.rb
 - lib/searchgasm/condition/sibling_of.rb
 - lib/searchgasm/condition/tree.rb
 - lib/searchgasm/conditions/base.rb
@@ -89,6 +92,41 @@ extra_rdoc_files:
 - lib/searchgasm/helpers/control_types/select.rb
 - lib/searchgasm/helpers/form.rb
 - lib/searchgasm/helpers/utilities.rb
+- lib/searchgasm/modifiers/absolute.rb
+- lib/searchgasm/modifiers/acos.rb
+- lib/searchgasm/modifiers/asin.rb
+- lib/searchgasm/modifiers/atan.rb
+- lib/searchgasm/modifiers/base.rb
+- lib/searchgasm/modifiers/ceil.rb
+- lib/searchgasm/modifiers/char_length.rb
+- lib/searchgasm/modifiers/cos.rb
+- lib/searchgasm/modifiers/cot.rb
+- lib/searchgasm/modifiers/day_of_month.rb
+- lib/searchgasm/modifiers/day_of_week.rb
+- lib/searchgasm/modifiers/day_of_year.rb
+- lib/searchgasm/modifiers/degrees.rb
+- lib/searchgasm/modifiers/exp.rb
+- lib/searchgasm/modifiers/floor.rb
+- lib/searchgasm/modifiers/hex.rb
+- lib/searchgasm/modifiers/hour.rb
+- lib/searchgasm/modifiers/log.rb
+- lib/searchgasm/modifiers/log10.rb
+- lib/searchgasm/modifiers/log2.rb
+- lib/searchgasm/modifiers/md5.rb
+- lib/searchgasm/modifiers/microseconds.rb
+- lib/searchgasm/modifiers/milliseconds.rb
+- lib/searchgasm/modifiers/minute.rb
+- lib/searchgasm/modifiers/month.rb
+- lib/searchgasm/modifiers/octal.rb
+- lib/searchgasm/modifiers/radians.rb
+- lib/searchgasm/modifiers/round.rb
+- lib/searchgasm/modifiers/second.rb
+- lib/searchgasm/modifiers/sign.rb
+- lib/searchgasm/modifiers/sin.rb
+- lib/searchgasm/modifiers/square_root.rb
+- lib/searchgasm/modifiers/tan.rb
+- lib/searchgasm/modifiers/week.rb
+- lib/searchgasm/modifiers/year.rb
 - lib/searchgasm/search/base.rb
 - lib/searchgasm/search/conditions.rb
 - lib/searchgasm/search/ordering.rb
@@ -114,10 +152,7 @@ files:
 - lib/searchgasm/condition/begins_with.rb
 - lib/searchgasm/condition/blank.rb
 - lib/searchgasm/condition/child_of.rb
-- lib/searchgasm/condition/contains.rb
 - lib/searchgasm/condition/descendant_of.rb
-- lib/searchgasm/condition/does_not_equal.rb
-- lib/searchgasm/condition/during_evening.rb
 - lib/searchgasm/condition/ends_with.rb
 - lib/searchgasm/condition/equals.rb
 - lib/searchgasm/condition/greater_than.rb
@@ -126,7 +161,13 @@ files:
 - lib/searchgasm/condition/keywords.rb
 - lib/searchgasm/condition/less_than.rb
 - lib/searchgasm/condition/less_than_or_equal_to.rb
+- lib/searchgasm/condition/like.rb
 - lib/searchgasm/condition/nil.rb
+- lib/searchgasm/condition/not_begin_with.rb
+- lib/searchgasm/condition/not_end_with.rb
+- lib/searchgasm/condition/not_equal.rb
+- lib/searchgasm/condition/not_have_keywords.rb
+- lib/searchgasm/condition/not_like.rb
 - lib/searchgasm/condition/sibling_of.rb
 - lib/searchgasm/condition/tree.rb
 - lib/searchgasm/conditions/base.rb
@@ -141,6 +182,41 @@ files:
 - lib/searchgasm/helpers/control_types/select.rb
 - lib/searchgasm/helpers/form.rb
 - lib/searchgasm/helpers/utilities.rb
+- lib/searchgasm/modifiers/absolute.rb
+- lib/searchgasm/modifiers/acos.rb
+- lib/searchgasm/modifiers/asin.rb
+- lib/searchgasm/modifiers/atan.rb
+- lib/searchgasm/modifiers/base.rb
+- lib/searchgasm/modifiers/ceil.rb
+- lib/searchgasm/modifiers/char_length.rb
+- lib/searchgasm/modifiers/cos.rb
+- lib/searchgasm/modifiers/cot.rb
+- lib/searchgasm/modifiers/day_of_month.rb
+- lib/searchgasm/modifiers/day_of_week.rb
+- lib/searchgasm/modifiers/day_of_year.rb
+- lib/searchgasm/modifiers/degrees.rb
+- lib/searchgasm/modifiers/exp.rb
+- lib/searchgasm/modifiers/floor.rb
+- lib/searchgasm/modifiers/hex.rb
+- lib/searchgasm/modifiers/hour.rb
+- lib/searchgasm/modifiers/log.rb
+- lib/searchgasm/modifiers/log10.rb
+- lib/searchgasm/modifiers/log2.rb
+- lib/searchgasm/modifiers/md5.rb
+- lib/searchgasm/modifiers/microseconds.rb
+- lib/searchgasm/modifiers/milliseconds.rb
+- lib/searchgasm/modifiers/minute.rb
+- lib/searchgasm/modifiers/month.rb
+- lib/searchgasm/modifiers/octal.rb
+- lib/searchgasm/modifiers/radians.rb
+- lib/searchgasm/modifiers/round.rb
+- lib/searchgasm/modifiers/second.rb
+- lib/searchgasm/modifiers/sign.rb
+- lib/searchgasm/modifiers/sin.rb
+- lib/searchgasm/modifiers/square_root.rb
+- lib/searchgasm/modifiers/tan.rb
+- lib/searchgasm/modifiers/week.rb
+- lib/searchgasm/modifiers/year.rb
 - lib/searchgasm/search/base.rb
 - lib/searchgasm/search/conditions.rb
 - lib/searchgasm/search/ordering.rb
@@ -160,6 +236,7 @@ files:
 - test/fixtures/user_groups.yml
 - test/fixtures/users.yml
 - test/libs/acts_as_tree.rb
+- test/libs/ordered_hash.rb
 - test/libs/rexml_fix.rb
 - test/test_active_record_associations.rb
 - test/test_active_record_base.rb

data/test/libs/ordered_hash.rb

@@ -0,0 +1,9 @@
+class Hash
+  def each(&block)
+    sorted_keys = keys.sort { |a, b| a.to_s <=> b.to_s }
+    sorted_keys.each do |key|
+      yield key, self[key]
+    end
+    self
+  end
+end

data/test/test_condition_base.rb

@@ -1,53 +1,38 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestConditionBase < Test::Unit::TestCase
-  def test_condition_name
-    assert_equal "equals", Searchgasm::Condition::Equals.condition_name
-    assert_equal "keywords", Searchgasm::Condition::Keywords.condition_name
-    assert_equal "greater_than_or_equal_to", Searchgasm::Condition::GreaterThanOrEqualTo.condition_name
+  def test_condition_type_name
+    assert_equal "equals", Searchgasm::Condition::Equals.condition_type_name
+    assert_equal "keywords", Searchgasm::Condition::Keywords.condition_type_name
+    assert_equal "greater_than_or_equal_to", Searchgasm::Condition::GreaterThanOrEqualTo.condition_type_name
   end
   
-  def test_name_for_column
-    assert_equal "id_equals", Searchgasm::Condition::Equals.name_for_column(Account.columns_hash["id"])
-    assert_equal nil, Searchgasm::Condition::Keywords.name_for_column(Account.columns_hash["id"])
+  def test_ignore_meaningless_value?
+    assert !Searchgasm::Condition::Equals.ignore_meaningless_value?
+    assert Searchgasm::Condition::Keywords.ignore_meaningless_value?
+    assert !Searchgasm::Condition::NotEqual.ignore_meaningless_value?
   end
   
-  def test_ignore_meaningless?
-    assert !Searchgasm::Condition::Equals.ignore_meaningless?
-    assert Searchgasm::Condition::Keywords.ignore_meaningless?
-    assert !Searchgasm::Condition::DoesNotEqual.ignore_meaningless?
-  end
-  
-  def test_type_cast_sql_type
-    assert_equal nil, Searchgasm::Condition::Equals.type_cast_sql_type
-    assert_equal nil, Searchgasm::Condition::Keywords.type_cast_sql_type
-    assert_equal "boolean", Searchgasm::Condition::Nil.type_cast_sql_type
-    assert_equal "boolean", Searchgasm::Condition::Blank.type_cast_sql_type
-    assert_equal nil, Searchgasm::Condition::GreaterThan.type_cast_sql_type
-  end
-  
-  def test_string_column
-    assert !Searchgasm::Condition::Base.string_column?(Account.columns_hash["id"])
-    assert Searchgasm::Condition::Base.string_column?(Account.columns_hash["name"])
-    assert !Searchgasm::Condition::Base.string_column?(Account.columns_hash["active"])
-    assert Searchgasm::Condition::Base.string_column?(User.columns_hash["bio"])
-  end
-  
-  def test_comparable_column
-    assert Searchgasm::Condition::Base.comparable_column?(Account.columns_hash["id"])
-    assert !Searchgasm::Condition::Base.comparable_column?(Account.columns_hash["name"])
-    assert !Searchgasm::Condition::Base.comparable_column?(Account.columns_hash["active"])
-    assert !Searchgasm::Condition::Base.comparable_column?(User.columns_hash["bio"])
-    assert Searchgasm::Condition::Base.comparable_column?(Order.columns_hash["total"])
+  def test_value_type
+    assert_equal nil, Searchgasm::Condition::Equals.value_type
+    assert_equal nil, Searchgasm::Condition::Keywords.value_type
+    assert_equal :boolean, Searchgasm::Condition::Nil.value_type
+    assert_equal :boolean, Searchgasm::Condition::Blank.value_type
+    assert_equal nil, Searchgasm::Condition::GreaterThan.value_type
   end
   
   def test_initialize
     condition = Searchgasm::Condition::Keywords.new(Account, Account.columns_hash["name"])
     assert_equal condition.klass, Account
-    assert_equal condition.column, Account.columns_hash["name"]
+    assert_equal Account.columns_hash["name"], condition.column
     
     condition = Searchgasm::Condition::GreaterThan.new(Account, "id")
-    assert_equal condition.column, Account.columns_hash["id"]
+    assert_equal Account.columns_hash["id"], condition.column
+    
+    condition = Searchgasm::Condition::GreaterThan.new(Account, "id", :string, "some sql")
+    assert_equal Account.columns_hash["id"], condition.column
+    condition.value = "awesome"
+    assert_equal ["some sql > ?", "awesome"], condition.sanitize
   end
   
   def test_explicitly_set_value
@@ -57,17 +42,6 @@ class TestConditionBase < Test::Unit::TestCase
     assert condition.explicitly_set_value?
   end
   
-  def test_name
-    condition = Searchgasm::Condition::Keywords.new(Account, Account.columns_hash["name"])
-    assert_equal "name_keywords", condition.name
-    
-    condition = Searchgasm::Condition::DescendantOf.new(User)
-    assert_equal "descendant_of", condition.name
-    
-    condition = Searchgasm::Condition::DescendantOf.new(Account)
-    assert_equal nil, condition.name
-  end
-  
   def test_sanitize
     # This is tested thoroughly in test_condition_types
   end