searchgasm 0.9.3 → 0.9.4

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.9.4. Cleaned up search methods, removed reset! method for base and conditions.
+
 v0.9.3. Changed structure of conditions to have their own class. Making it easier to add your own conditions.
 
 v0.9.2. Enhanced protection

data/README.mdown

@@ -113,6 +113,7 @@ Using the object from above:
 Or do it from your model:
 
     User.count(:conditions => {:first_name_contains => "Ben"})
+    User.sum('id', :conditions => {:first_name_contains => "Ben"})
     # ... all other calcualtions, etc.
 
 ## Different ways to search, take your pick

data/lib/searchgasm/search/base.rb

@@ -19,19 +19,26 @@ module BinaryLogic
           self.options = options
         end
         
+        # Setup methods for all options for finding
         (::ActiveRecord::Base.valid_find_options - [:conditions]).each do |option|
           class_eval <<-end_eval
             def #{option}(sanitize = false); options[:#{option}]; end
             def #{option}=(value); self.options[:#{option}] = value; end
           end_eval
         end
-        
+                
         alias_method :per_page, :limit
         
-        def all
-          klass.all(sanitize)
+        # Setup methods for searching
+        [:all, :average, :calculate, :count, :find, :first, :maximum, :minimum, :sum].each do |method|
+          class_eval <<-end_eval
+            def #{method}(*args)
+              self.options = args.extract_options!
+              args << sanitize
+              klass.#{method}(*args)
+            end
+          end_eval
         end
-        alias_method :search, :all
         
         def conditions=(value)
           case value
@@ -46,18 +53,6 @@ module BinaryLogic
           sanitize ? @conditions.sanitize : @conditions
         end
         
-        def find(target)
-          case target
-          when :all then all
-          when :first then first
-          else raise(ArgumentError, "The argument must be :all or :first")
-          end
-        end
-        
-        def first
-          klass.first(sanitize)
-        end
-        
         def include(sanitize = false)
           includes = [self.options[:include], conditions.includes].flatten.compact
           includes.blank? ? nil : (includes.size == 1 ? includes.first : includes)
@@ -133,11 +128,6 @@ module BinaryLogic
           protect == true
         end
         
-        def reset!
-          conditions.reset!
-          self.options = {}
-        end
-        
         def sanitize
           find_options = {}
           ::ActiveRecord::Base.valid_find_options.each do |find_option|

data/lib/searchgasm/search/conditions.rb

@@ -56,18 +56,6 @@ module BinaryLogic
           protect == true
         end
         
-        def reset!
-          dupped_objects = objects.dup
-          dupped_objects.each do |object|
-            if object.is_a?(self.class)
-              send("reset_#{object.relationship_name}!")
-            else
-              send("reset_#{object.name}!")
-            end
-          end
-          objects
-        end
-        
         def sanitize
           conditions = merge_conditions(*objects.collect { |object| object.sanitize })
           return scope if conditions.blank?
@@ -75,9 +63,6 @@ module BinaryLogic
         end
         
         def value=(values)
-          reset!
-          self.scope = nil
-          
           case values
           when Hash
             assert_valid_values(values)

data/lib/searchgasm/version.rb

@@ -68,7 +68,7 @@ module BinaryLogic
 
       MAJOR = 0
       MINOR = 9
-      TINY  = 3
+      TINY  = 4
 
       # The current version as a Version instance
       CURRENT = new(MAJOR, MINOR, TINY)

data/lib/searchgasm.rb

@@ -26,4 +26,6 @@ require "searchgasm/search/condition_types/tree_condition"
 require "searchgasm/search/condition_types/child_of_condition"
 require "searchgasm/search/condition_types/descendant_of_condition"
 require "searchgasm/search/condition_types/inclusive_descendant_of_condition"
-require "searchgasm/search/condition_types/sibling_of_condition"
+require "searchgasm/search/condition_types/sibling_of_condition"
+
+Searchgasm = BinaryLogic::Searchgasm::Search

data/searchgasm.gemspec

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

data/test/test_searchgasm_base.rb

@@ -102,10 +102,6 @@ class TestSearchgasmBase < Test::Unit::TestCase
     
   end
   
-  def test_reset
-    
-  end
-  
   def test_sanitize
     search = BinaryLogic::Searchgasm::Search::Base.new(Account)
     search.per_page = 2
@@ -146,6 +142,18 @@ class TestSearchgasmBase < Test::Unit::TestCase
     assert_equal search.find(:first), Account.find(1)
   end
   
+  def test_calculations
+    search = BinaryLogic::Searchgasm::Search::Base.new(Account)
+    search.conditions.name_like = "Binary"
+    assert_equal 2, search.average('id')
+    assert_equal 2, search.calculate(:avg, 'id')
+    assert_equal 3, search.calculate(:max, 'id')
+    assert_equal 2, search.count
+    assert_equal 3, search.maximum('id')
+    assert_equal 1, search.minimum('id')
+    assert_equal 4, search.sum('id')
+  end
+  
   def test_protection
     assert_raise(ArgumentError) { Account.build_search(:conditions => "(DELETE FROM users)", :page => 2, :per_page => 15) }
     BinaryLogic::Searchgasm::Search::Base::VULNERABLE_OPTIONS.each { |option| assert_raise(ArgumentError) { Account.build_search(option => "(DELETE FROM users)") } }

data/test/test_searchgasm_conditions.rb

@@ -82,22 +82,26 @@ class TestSearchgasmConditions < Test::Unit::TestCase
     conditions = BinaryLogic::Searchgasm::Search::Conditions.new(Account)
     
     conditions.name_contains = "Binary"
-    assert_equal conditions.objects.size, 1
+    assert_equal 1, conditions.objects.size
     
     conditions.reset_name_contains!
-    assert_equal conditions.objects, []
+    assert_equal [], conditions.objects
     
     conditions.users.first_name_like = "Ben"
-    assert_equal conditions.objects.size, 1
+    assert_equal 1, conditions.objects.size
     
     conditions.reset_users!
-    assert_equal conditions.objects, []
+    assert_equal [], conditions.objects
     
     conditions.name_begins_with ="Binary"
     conditions.users.orders.total_gt = 200
-    conditions.users.first_name_keywords = "Silly name"
-    conditions.reset!
-    assert_equal conditions.objects, []
+    assert_equal 2, conditions.objects.size
+    
+    conditions.reset_name_begins_with!
+    assert_equal 1, conditions.objects.size
+    
+    conditions.reset_users!
+    assert_equal [], conditions.objects
   end
   
   def test_sanitize
@@ -118,12 +122,22 @@ class TestSearchgasmConditions < Test::Unit::TestCase
   def test_value
     conditions = BinaryLogic::Searchgasm::Search::Conditions.new(Account)
     now = Time.now
-    conditions.value = {:name_like => "Binary", :created_at_after => now}
-    assert_equal conditions.value, {:name_contains => "Binary", :created_at_greater_than => now}
-    
-    conditions.value = "id in (1,2,3,4)"
-    assert_equal conditions.value, {}
-    assert_equal conditions.scope, "id in (1,2,3,4)"
+    v = {:name_contains => "Binary", :created_at_greater_than => now}
+    conditions.value = v
+    assert_equal v, conditions.value
+    
+    scope = "id in (1,2,3,4)"
+    conditions.value = scope
+    assert_equal v, conditions.value, v
+    assert_equal scope, conditions.scope
+    
+    v2 = {:id_less_than => 5, :name_begins_with => "Beginning of string"}
+    conditions.value = v2
+    assert_equal v.merge(v2), conditions.value
+    
+    scope2 = "id > 5 and name = 'Test'"
+    conditions.value = scope2
+    assert_equal scope2, conditions.scope
   end
   
   def test_protection

metadata

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