searchgasm 1.3.1 → 1.3.2

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+== 1.3.2 released 2008-10-03
+
+* Fixed condition to type cast all values in an array
+* Fixed bug to properly set the type for the type cast column
+* Fixed bug to allow conditions on local columns
+* Apparently ActiveRecord 2.2 doesnt remove duplicates on all joins, need to enforce this for ALL versions of ActiveRecord
+* Fixed bug when passing a symbol as the SQL type for condition return types
+* Moved duplicate removal to only apply when searching or calculating from a search object. Anything done in a normal ActiveRecord method should remain untouched and let ActiveRecord handle it. Just like in ActiveRecord if you do a User.all search and pass some :joins, you might get duplicate records. Searchgasm should not change that behavior, unless called from a searchgasm object.
+* Discard meaningless array values when setting a condition.
+* Delete blank strings from mass assignments on conditions.
+
 == 1.3.1 released 2008-10-02
 
 * Fixed bug when requiring a connection adapter that is not present

data/lib/searchgasm/active_record/base.rb

@@ -11,7 +11,6 @@ module Searchgasm
       def calculate_with_searchgasm(*args)
         options = args.extract_options!
         options = filter_options_with_searchgasm(options, false)
-        args[1] = primary_key if options[:distinct] && [nil, :all].include?(args[1]) # quick fix for adding a column name if distinct is true and no specific column is provided
         args << options
         calculate_without_searchgasm(*args)
       end

data/lib/searchgasm/condition/base.rb

@@ -44,8 +44,8 @@ module Searchgasm
 
         if column_obj
           self.column = column_obj.class < ::ActiveRecord::ConnectionAdapters::Column ? column_obj : klass.columns_hash[column_obj.to_s]
-          column_type ||= column.type
-          self.column_for_type_cast = column.class.new(column.name, column.default.to_s, self.class.value_type.to_s || column_type.to_s, column.null)
+          type = (!self.class.value_type.blank? && self.class.value_type.to_s) || (!column_type.blank? && column_type.to_s) || column.sql_type
+          self.column_for_type_cast = column.class.new(column.name, column.default.to_s, type, column.null)
           self.column_sql = column_sql || "#{klass.connection.quote_table_name(klass.table_name)}.#{klass.connection.quote_column_name(column.name)}"
         end
       end
@@ -60,13 +60,9 @@ module Searchgasm
         @explicitly_set_value == true
       end
       
-      def meaningless_value?
-        !explicitly_set_value? || (self.class.ignore_meaningless_value? && meaningless?(@value))
-      end
-      
       # You should refrain from overwriting this method, it performs various tasks before callign your to_conditions method, allowing you to keep to_conditions simple.
       def sanitize(alt_value = nil) # :nodoc:
-        return if meaningless_value?
+        return if value_is_meaningless?
         v = alt_value || value
         if v.is_a?(Array) && !self.class.handle_array_value?
           merge_conditions(*v.collect { |i| sanitize(i) })
@@ -78,13 +74,7 @@ module Searchgasm
       
       # The value for the condition
       def value
-        return @casted_value if @casted_value
-        
-        if !column_for_type_cast || meaningless_value?
-          @casted_value = @value
-        else
-          @casted_value = @value.is_a?(String) ? column_for_type_cast.type_cast(@value) : @value
-        end
+        @casted_value ||= type_cast_value(@value)
       end
     
       # Sets the value for the condition
@@ -94,10 +84,19 @@ module Searchgasm
         @value = v
       end
       
+      def value_is_meaningless? # :nodoc:
+        meaningless?(@value)
+      end
+      
       private
         def meaningless?(v)
-          return false if v == false
-          v.blank?
+          case v
+          when Array
+            v.each { |i| return false unless meaningless?(i) }
+            true
+          else
+            !explicitly_set_value? || (self.class.ignore_meaningless_value? && v != false && v.blank?)
+          end
         end
 
         def meaningful?(v)
@@ -115,6 +114,17 @@ module Searchgasm
         def quoted_table_name
           quote_table_name(klass.table_name)
         end
+        
+        def type_cast_value(v)
+          case v
+          when Array
+            v.collect { |i| type_cast_value(i) }.compact
+          else
+            return if meaningless?(v)
+            return v if !column_for_type_cast || !v.is_a?(String)
+            column_for_type_cast.type_cast(v)
+          end
+        end
     end
   end
 end

data/lib/searchgasm/condition/blank.rb

@@ -10,7 +10,6 @@ module Searchgasm
       end
       
       def to_conditions(value)
-        # Some databases handle null values differently, let AR handle this
         if value == true
           "#{column_sql} is NULL or #{column_sql} = ''"
         elsif value == false

data/lib/searchgasm/conditions/base.rb

@@ -199,7 +199,22 @@ module Searchgasm
         when Hash
           assert_valid_conditions(value)
           remove_conditions_from_protected_assignement(value).each do |condition, condition_value|
-            send("#{condition}=", condition_value)
+            
+            # delete all blanks from mass assignments, forms submit blanks, blanks are meaningless
+            # equals condition thinks everything is meaningful, and arrays can be pased
+            new_condition_value = nil
+            case condition_value
+            when Array
+              new_condition_value = []
+              condition_value.each { |v| new_condition_value << v unless v == "" }
+              next if new_condition_value.size == 0
+              new_condition_value = new_condition_value.first if new_condition_value.size == 1
+            else
+              next if condition_value == ""
+              new_condition_value = condition_value
+            end
+            
+            send("#{condition}=", new_condition_value)
           end
         else
           reset_objects!
@@ -219,7 +234,7 @@ module Searchgasm
             next if relationship_conditions.blank?
             conditions_hash[object.relationship_name.to_sym] = relationship_conditions
           else
-            next if object.meaningless_value?
+            next if object.value_is_meaningless?
             conditions_hash[name] = object.value
           end
         end
@@ -374,7 +389,7 @@ module Searchgasm
               @conditions = nil
               
               #{name}_object.value = value
-              reset_#{name}! if #{name}_object.meaningless_value?
+              reset_#{name}! if #{name}_object.value_is_meaningless?
               value
             end
             
@@ -395,7 +410,20 @@ module Searchgasm
         
         def assert_valid_conditions(conditions)
           conditions.each do |condition, value|
-            raise(ArgumentError, "The #{condition} condition is not a valid condition") if !(self.class.condition_names + self.class.association_names + ["any"]).include?(condition.to_s) && respond_to?(condition)
+            next if (self.class.condition_names + self.class.association_names + ["any"]).include?(condition.to_s)
+            
+            go_to_next = false
+            self.class.column_details.each do |column_detail|
+              if column_detail[:column].name == condition.to_s || column_detail[:aliases].include?(condition.to_s)
+                go_to_next = true
+                break
+              end
+            end
+            next if go_to_next
+            
+            next unless respond_to?(condition)
+            
+            raise(ArgumentError, "The #{condition} condition is not a valid condition")
           end
         end
         

data/lib/searchgasm/config.rb

@@ -156,7 +156,7 @@ module Searchgasm
       
       def remove_duplicates # :nodoc:
         return @remove_duplicates if @set_remove_duplicates
-        @remove_duplicates ||= ::ActiveRecord::VERSION::MAJOR < 2 || (::ActiveRecord::VERSION::MAJOR == 2 && ::ActiveRecord::VERSION::MINOR < 2)
+        @remove_duplicates ||= true
       end
       
       def remove_duplicates? # :nodoc:

data/lib/searchgasm/core_ext/hash.rb

@@ -19,7 +19,7 @@ module Searchgasm
       def deep_delete_duplicate_keys(hash)
         hash.each do |k, v|
           if v.is_a?(Hash) && self[k]
-            self[k].deep_delete_duplicates(v)
+            self[k].deep_delete_duplicate_keys(v)
             delete(k) if self[k].blank?
           else
             delete(k)

data/lib/searchgasm/search/base.rb

@@ -113,17 +113,6 @@ module Searchgasm #:nodoc:
           find_options[find_option] = value
         end
         
-        if Config.remove_duplicates?
-          unless find_options[:joins].blank?
-            # The following is to return uniq records since we are using joins instead of includes
-            if searching
-              find_options[:group] ||= "#{quote_table_name(klass.table_name)}.#{quote_column_name(klass.primary_key)}"
-            else
-              find_options[:distinct] = true
-            end
-          end
-        end
-        
         find_options
       end
       

data/lib/searchgasm/search/searching.rb

@@ -21,8 +21,15 @@ module Searchgasm
             find_options = {}
             options = args.extract_options! # can't pass options, your options are in the search
             klass.send(:with_scope, :find => scope) do
-              args << sanitize(#{SEARCH_METHODS.include?(method)})
-              klass.#{method}(*args)
+              options = sanitize(#{SEARCH_METHODS.include?(method)})
+              if #{CALCULATION_METHODS.include?(method)}
+                options[:distinct] = true
+                args[0] = klass.primary_key if [nil, :all].include?(args[0])
+              end
+              args << options
+              result = klass.#{method}(*args)
+              result.uniq! if result.is_a?(Array) && Config.remove_duplicates?
+              result
             end
           end
         end_eval

data/lib/searchgasm/version.rb

@@ -67,7 +67,7 @@ module Searchgasm
 
     MAJOR = 1
     MINOR = 3
-    TINY  = 1
+    TINY  = 2
 
     # 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.1
+# Gem::Specification for Searchgasm-1.3.2
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
 autorequire: 
 bindir: bin
 
-date: 2008-10-02 00:00:00 -04:00
+date: 2008-10-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

data/test/test_active_record_associations.rb

@@ -65,7 +65,7 @@ class TestActiveRecordAssociations < Test::Unit::TestCase
     assert_equal 2, search.count
     
     search.conditions.first_name_contains = "Ben"
-        
+
     assert_equal [User.find(1)], search.all
     assert_equal User.find(1), search.first
     assert_equal 1, search.average("id")

data/test/test_condition_types.rb

@@ -7,19 +7,19 @@ class TestConditionTypes < Test::Unit::TestCase
     assert_equal ["\"accounts\".\"name\" LIKE ?", "Binary%"], condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
-    condition.value = true
+    condition.value = "true"
     assert_equal "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = ''", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
-    condition.value = false
+    condition.value = "false"
     assert_equal "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != ''", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
-    condition.value = "true"
+    condition.value = true
     assert_equal "\"accounts\".\"id\" is NULL or \"accounts\".\"id\" = ''", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])
-    condition.value = "false"
+    condition.value = false
     assert_equal "\"accounts\".\"id\" is NOT NULL and \"accounts\".\"id\" != ''", condition.sanitize
     
     condition = Searchgasm::Condition::Blank.new(Account, Account.columns_hash["id"])

data/test/test_conditions_base.rb

@@ -117,8 +117,9 @@ class TestConditionsBase < Test::Unit::TestCase
     conditions.name_contains = "awesome"
     assert_equal({:name_like => "awesome"}, conditions.conditions)
     
-    conditions.conditions = {:id_gt => "", :name_starts_with => "Ben"}
-    assert_equal({:name_like => "awesome", :name_begins_with => "Ben"}, conditions.conditions)
+    now = Time.now
+    conditions.conditions = {:id_gt => "", :id => "", :name => ["", "", ""], :created_at => ["", now], :name_starts_with => "Ben"}
+    assert_equal({:name_like => "awesome", :name_begins_with => "Ben", :created_at_equals => now}, conditions.conditions)
   end
   
   # Other general usage tests, need to clean these up

data/test/test_search_base.rb

@@ -140,7 +140,7 @@ class TestSearchBase < Test::Unit::TestCase
     search.conditions.users.id_greater_than = 2
     search.page = 3
     search.readonly = true
-    assert_equal({:joins => :users, :group => "\"accounts\".\"id\"", :offset => 4, :readonly => true, :conditions => ["(\"accounts\".\"name\" LIKE ?) AND (\"users\".\"id\" > ?)", "%Binary%", 2], :limit => 2 }, search.sanitize)
+    assert_equal({:joins => :users, :offset => 4, :readonly => true, :conditions => ["(\"accounts\".\"name\" LIKE ?) AND (\"users\".\"id\" > ?)", "%Binary%", 2], :limit => 2 }, search.sanitize)
   end
 
   def test_scope
@@ -199,6 +199,15 @@ class TestSearchBase < Test::Unit::TestCase
     
     search.readonly = true
     assert_equal 4, search.sum('id')
+    
+    search = Account.new_search(:conditions => {:users => {:orders => {:id_gt => 1}}})
+    assert_equal 1, search.count
+    
+    search = Order.new_search(:conditions => {:user => {:account => {:id_gt => 1}}})
+    assert_equal 1, search.count
+    
+    search = UserGroup.new_search(:conditions => {:users => {:orders => {:id_gt => 1}}})
+    assert_equal 1, search.count
   end
   
   def test_method_creation_in_scope

metadata

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