searchgasm 1.1.2 → 1.1.3

data/CHANGELOG.rdoc

@@ -1,3 +1,10 @@
+== 1.1.3 released 2008-09-22
+
+* Setting a condition to nil removes it if the condition is set to ignore blanks
+* Setting search.conditions = "some sql" will reset ALL conditions. Alternatively search.conditions => {:first_name_contains => "Ben"} will overwrite "some sql". The same goes with search.conditions.first_name_contains = "Ben".
+* Fixed bug with inspect
+* Other small performance enhancements with memoized attributes
+
 == 1.1.2 released 2008-09-22
 
 * Fixed bug with select control types not using :search_obj to determine its select values.

data/lib/searchgasm/condition/base.rb

@@ -8,7 +8,6 @@ module Searchgasm
       include Shared::Utilities
       
       attr_accessor :column, :klass
-      attr_reader :value
       class_inheritable_accessor :ignore_blanks, :type_cast_value
       self.ignore_blanks = true
       self.type_cast_value = true
@@ -116,20 +115,14 @@ module Searchgasm
           to_conditions(v)
         end
       end
-      
-      # Should the value be automatically type casted
-      def type_cast_value?
-        true
-      end
     
       # The value for the condition
       def value
         self.class.type_cast_value? && @value.is_a?(String) ? column.type_cast(@value) : @value
       end
     
-      # Sets the value for the condition, will ignore place if ignore_blanks?
+      # Sets the value for the condition
       def value=(v)
-        return if self.class.ignore_blanks? && v.blank?
         self.explicitly_set_value = true
         @value = v
       end

data/lib/searchgasm/conditions/base.rb

@@ -9,7 +9,7 @@ module Searchgasm
       include Shared::Searching
       include Shared::VirtualClasses
       
-      attr_accessor :any, :relationship_name, :sql
+      attr_accessor :any, :relationship_name
       
       class << self
         attr_accessor :added_klass_conditions, :added_column_conditions, :added_associations
@@ -116,36 +116,35 @@ module Searchgasm
       end
       
       def inspect
-        conditions_hash = conditions
-        conditions_hash[:sql] = sql if sql
-        conditions_hash[:protected] = true if protected?
-        conditions_hash.inspect
+        "#<#{klass}Conditions#{conditions.blank? ? "" : " #{conditions.inspect}"}>"
       end
       
       # Sanitizes the conditions down into conditions that ActiveRecord::Base.find can understand.
       def sanitize
-        conditions = merge_conditions(*(objects.collect { |object| object.sanitize } << {:any => any}))
-        return sql if conditions.blank?
-        merged_conditions = merge_conditions(conditions, sql, :any => any)
-        merged_conditions
+        return @conditions if @conditions
+        merge_conditions(*(objects.collect { |object| object.sanitize } << {:any => any}))
       end
       
       # Allows you to set the conditions via a hash.
-      def conditions=(conditions)
-        case conditions
-        when Hash
-          assert_valid_conditions(conditions)
-          remove_conditions_from_protected_assignement(conditions).each do |condition, value|
-            next if value.blank? # ignore blanks on mass assignments
-            send("#{condition}=", value)
+      def conditions=(value)
+        case value
+        when Hash          
+          assert_valid_conditions(value)
+          remove_conditions_from_protected_assignement(value).each do |condition, condition_value|
+            next if condition_value.blank? # ignore blanks on mass assignments
+            send("#{condition}=", condition_value)
           end
         else
-          self.sql = conditions
+          reset_objects!
+          @conditions = value
         end
       end
       
       # All of the active conditions (conditions that have been set)
       def conditions
+        return @conditions if @conditions
+        return if objects.blank?
+        
         conditions_hash = {}
         objects.each do |object|
           if object.class < Searchgasm::Conditions::Base
@@ -178,7 +177,7 @@ module Searchgasm
                 @#{association.name}
               end
             
-              def #{association.name}=(conditions); #{association.name}.conditions = conditions; end
+              def #{association.name}=(conditions); @conditions = nil; #{association.name}.conditions = conditions; end
               def reset_#{association.name}!; objects.delete(#{association.name}); @#{association.name} = nil; end
             end_eval
           end
@@ -214,7 +213,16 @@ module Searchgasm
             end
 
             def #{name}; #{name}_object.value; end
-            def #{name}=(value); #{name}_object.value = value; end
+            
+            def #{name}=(value)
+              if value.blank? && #{name}_object.class.ignore_blanks?
+                reset_#{name}!
+              else
+                @conditions = nil
+                #{name}_object.value = value
+              end
+            end
+            
             def reset_#{name}!; objects.delete(#{name}_object); @#{name} = nil; end
           end_eval
         end
@@ -253,6 +261,11 @@ module Searchgasm
           @objects ||= []
         end
         
+        def reset_objects!
+          objects.each { |object| eval("@#{object.name} = nil") }
+          objects.clear
+        end
+        
         def remove_conditions_from_protected_assignement(conditions)
           return conditions if klass.accessible_conditions.nil? && klass.protected_conditions.nil?
           if klass.accessible_conditions

data/lib/searchgasm/search/base.rb

@@ -55,19 +55,25 @@ module Searchgasm #:nodoc:
       # Makes using searchgasm in the console less annoying and keeps the output meaningful and useful
       def inspect
         current_find_options = {}
-        AR_OPTIONS.each do |option|
+        (AR_OPTIONS - [:conditions]).each do |option|
           value = send(option)
           next if value.nil?
           current_find_options[option] = value
         end
+        conditions_value = conditions.conditions
+        current_find_options[:conditions] = conditions_value unless conditions_value.blank?
         current_find_options[:scope] = scope unless scope.blank?
         "#<#{klass}Search #{current_find_options.inspect}>"
       end
       
-      # need to remote any duplicate joins that are specified in includes
-      #def joins
-      #  # If includes are specified, remove the joins
-      #end
+      def joins=(value)
+        @memoized_joins = nil
+        @joins = value
+      end
+      
+      def joins
+        @memoized_joins ||= @joins
+      end
       
       def limit=(value)
         @set_limit = true

data/lib/searchgasm/search/conditions.rb

@@ -9,6 +9,7 @@ module Searchgasm
         klass.class_eval do
           alias_method_chain :initialize, :conditions
           alias_method_chain :conditions=, :conditions
+          alias_method_chain :conditions, :conditions
           alias_method_chain :joins, :conditions
           alias_method_chain :sanitize, :conditions
         end
@@ -33,6 +34,7 @@ module Searchgasm
       # now you can create the rest of your search and your "scope" will get merged into your final SQL.
       # What this does is determine if the value a hash or a conditions object, if not it sets it up as a scope.
       def conditions_with_conditions=(values)
+        @memoized_joins = nil
         case values
         when Searchgasm::Conditions::Base
           @conditions = values
@@ -41,12 +43,17 @@ module Searchgasm
         end
       end
       
+      def conditions_with_conditions
+        @memoized_joins = nil # have to assume they are calling a condition on a relationship
+        conditions_without_conditions
+      end
+      
       # Tells searchgasm what relationships to join during the search. This is based on what conditions you set.
       #
       # <b>Be careful!</b>
       # ActiveRecord associations can be an SQL train wreck. Make sure you think about what you are searching and that you aren't joining a table with a million records.
       def joins_with_conditions
-        merge_joins(joins_without_conditions, conditions.joins)
+        @memoized_joins ||= merge_joins(joins_without_conditions, conditions.joins)
       end
       
       def sanitize_with_conditions(searching = true) # :nodoc:

data/lib/searchgasm/search/ordering.rb

@@ -24,13 +24,14 @@ module Searchgasm
       end
       
       def joins_with_ordering # :nodoc:
-        merge_joins(joins_without_ordering, order_by_joins)
+        @memoized_joins ||= merge_joins(joins_without_ordering, order_by_joins)
       end
       
       def order_with_ordering=(value) # :nodoc
         @order_by = nil
         @order_as = nil
         self.order_by_joins.clear
+        @memoized_joins = nil
         self.order_without_ordering = value
       end
       
@@ -101,6 +102,7 @@ module Searchgasm
       #   order_by = [:id, {:user_group => :name}] # => users.id ASC, user_groups.name ASC
       def order_by=(value)  
         self.order_by_joins.clear
+        @memoized_joins = nil
         @order_by = get_order_by_value(value)
         @order = order_by_to_order(@order_by, order_as)
         @order_by

data/lib/searchgasm/version.rb

@@ -67,7 +67,7 @@ module Searchgasm
 
     MAJOR = 1
     MINOR = 1
-    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.1.2
+# Gem::Specification for Searchgasm-1.1.3
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
 autorequire: 
 bindir: bin
 
-date: 2008-09-22 00:00:00 -04:00
+date: 2008-09-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

data/test/test_condition_base.rb

@@ -35,18 +35,6 @@ class TestConditionBase < Test::Unit::TestCase
     assert_equal condition.column, Account.columns_hash["id"]
   end
   
-  def test_explicitly_set_value
-    condition = Searchgasm::Condition::Equals.new(Account, Account.columns_hash["name"])
-    assert !condition.explicitly_set_value?
-    condition.value = nil
-    assert condition.explicitly_set_value?
-    
-    condition = Searchgasm::Condition::Keywords.new(Account, Account.columns_hash["name"])
-    assert !condition.explicitly_set_value?
-    condition.value = nil
-    assert !condition.explicitly_set_value?
-  end
-  
   def test_ignore_blanks?
     condition = Searchgasm::Condition::Equals.new(Account, Account.columns_hash["id"])
     assert !condition.class.ignore_blanks?

data/test/test_conditions_base.rb

@@ -146,16 +146,22 @@ class TestConditionsBase < Test::Unit::TestCase
     
     sql = "id in (1,2,3,4)"
     conditions.conditions = sql
-    assert_equal v, conditions.conditions
-    assert_equal sql, conditions.sql
+    assert_equal sql, conditions.conditions
     
     v2 = {:id_less_than => 5, :name_begins_with => "Beginning of string"}
     conditions.conditions = v2
-    assert_equal v.merge(v2), conditions.conditions
+    assert_equal v2, conditions.conditions
+    
+    v = {:name_contains => "Binary", :created_at_greater_than => now}
+    conditions.conditions = v
+    assert_equal v2.merge(v), conditions.conditions
     
     sql2 = "id > 5 and name = 'Test'"
     conditions.conditions = sql2
-    assert_equal sql2, conditions.sql
+    assert_equal sql2, conditions.conditions
+    
+    conditions.name_contains = "awesome"
+    assert_equal({:name_contains => "awesome"}, conditions.conditions)
   end
   
   def test_searching
@@ -188,10 +194,15 @@ class TestConditionsBase < Test::Unit::TestCase
   
   def test_ignoring_blanks
     conditions = Account.new_conditions(:name => "", :created_after => nil)
-    assert_equal({}, conditions.conditions)
+    assert_equal(nil, conditions.conditions)
     conditions.name = ""
     assert_equal({:name_equals => ""}, conditions.conditions)
     conditions.created_after = ""
     assert_equal({:name_equals => ""}, conditions.conditions)
   end
+  
+  def test_inspect
+    conditions = Account.new_conditions
+    assert_nothing_raised { conditions.inspect }
+  end
 end

data/test/test_search_base.rb

@@ -157,13 +157,14 @@ class TestSearchBase < Test::Unit::TestCase
   def test_scope
     search = Account.new_search!
     search.conditions = "some sql"
-    assert_equal "some sql", search.conditions.sql
+    conditions = search.conditions
+    assert_equal "some sql", search.conditions.conditions
     search.conditions = nil
-    assert_equal nil, search.conditions.sql
+    assert_equal nil, search.conditions.conditions
     search.conditions = "some sql"
-    assert_equal "some sql", search.conditions.sql
+    assert_equal "some sql", search.conditions.conditions
     search.conditions = "some sql"
-    assert_equal "some sql", search.conditions.sql
+    assert_equal "some sql", search.conditions.conditions
   end
 
   def test_searching
@@ -210,4 +211,19 @@ class TestSearchBase < Test::Unit::TestCase
   def test_method_creation_in_scope
     # test ot make sure methods are not created across the board for all models
   end
+  
+=begin
+  # AR desont handle this problem either
+  def test_specifying_includes
+    search = Account.new_search
+    search.include = :users
+    search.conditions.users.first_name_like = "Ben"
+    assert_nothing_raised { search.all }
+  end
+=end
+  
+  def test_inspect
+    search = Account.new_search
+    assert_nothing_raised { search.inspect }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-22 00:00:00 -04:00
+date: 2008-09-23 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency