searchlogic 1.5.4 → 1.5.6

data/test/test_helper.rb

@@ -49,6 +49,13 @@ ActiveRecord::Schema.define(:version => 1) do
     t.binary    :receipt
   end
   
+  create_table :line_items do |t|
+    t.datetime  :created_at      
+    t.datetime  :updated_at
+    t.integer   :order_id
+    t.string      :name
+  end
+  
   create_table :animals do |t|
     t.datetime  :created_at      
     t.datetime  :updated_at
@@ -81,6 +88,11 @@ end
 
 class Order < ActiveRecord::Base
   belongs_to :user
+  has_many :line_items
+end
+
+class LineItem < ActiveRecord::Base
+  belongs_to :order
 end
 
 # STI
@@ -99,32 +111,4 @@ class Test::Unit::TestCase
   self.use_instantiated_fixtures  = false
   self.pre_loaded_fixtures = true
   fixtures :all
-  
-  private
-    def assert_equal_find_options(find_options, result)
-      find_options_conditions = find_options.delete(:conditions)
-      result_conditions = result.delete(:conditions)
-      
-      assert_equal find_options, result
-      if find_options_conditions.blank? || result_conditions.blank?
-        assert_equal find_options_conditions, result_conditions
-      else
-        assert_equal_sql find_options_conditions, result_conditions
-      end
-    end
-    
-    def assert_equal_sql(sql, result)
-      sql_parts = breakdown_sql(sql)
-      result_parts = breakdown_sql(sql)
-      
-      assert_equal sql_parts.size, result_parts.size
-      sql_parts.each { |part| assert result_parts.include?(part) }
-    end
-    
-    def breakdown_sql(sql)
-      sanitized_sql = ActiveRecord::Base.send(:sanitize_sql, sql)
-      sanitized_sql.gsub!(/(\(|\))/, "")
-      sql_parts = sanitized_sql.split(/or/i)
-      sql_parts.collect { |part| part.split(/ and /i) }.flatten
-    end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchlogic
 version: !ruby/object:Gem::Version 
-  version: 1.5.4
+  version: 1.5.6
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-16 00:00:00 -05:00
+date: 2008-11-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,10 @@ extra_rdoc_files:
 - lib/searchlogic/condition/not_nil.rb
 - lib/searchlogic/condition/sibling_of.rb
 - lib/searchlogic/condition/tree.rb
+- lib/searchlogic/conditions/any_or_all.rb
 - lib/searchlogic/conditions/base.rb
+- lib/searchlogic/conditions/groups.rb
+- lib/searchlogic/conditions/magic_methods.rb
 - lib/searchlogic/conditions/protection.rb
 - lib/searchlogic/config/helpers.rb
 - lib/searchlogic/config/search.rb
@@ -177,7 +180,10 @@ files:
 - lib/searchlogic/condition/not_nil.rb
 - lib/searchlogic/condition/sibling_of.rb
 - lib/searchlogic/condition/tree.rb
+- lib/searchlogic/conditions/any_or_all.rb
 - lib/searchlogic/conditions/base.rb
+- lib/searchlogic/conditions/groups.rb
+- lib/searchlogic/conditions/magic_methods.rb
 - lib/searchlogic/conditions/protection.rb
 - lib/searchlogic/config/helpers.rb
 - lib/searchlogic/config/search.rb
@@ -257,7 +263,7 @@ files:
 - test/condition_tests/greater_than_or_equal_to_test.rb
 - test/condition_tests/greater_than_test.rb
 - test/condition_tests/inclusive_descendant_of_test.rb
-- test/condition_tests/keyswords_test.rb
+- test/condition_tests/keywords_test.rb
 - test/condition_tests/less_than_or_equal_to_test.rb
 - test/condition_tests/less_than_test.rb
 - test/condition_tests/like_test.rb
@@ -270,7 +276,10 @@ files:
 - test/condition_tests/not_like_test.rb
 - test/condition_tests/not_nil_test.rb
 - test/condition_tests/sibling_of_test.rb
+- test/conditions_tests/any_or_all_test.rb
 - test/conditions_tests/base_test.rb
+- test/conditions_tests/groups_test.rb
+- test/conditions_tests/magic_methods_test.rb
 - test/conditions_tests/protection_test.rb
 - test/config_test.rb
 - test/fixtures/accounts.yml
@@ -316,7 +325,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: searchlogic
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Object based ActiveRecord searching, ordering, pagination, and more!
@@ -333,7 +342,7 @@ test_files:
 - test/condition_tests/greater_than_or_equal_to_test.rb
 - test/condition_tests/greater_than_test.rb
 - test/condition_tests/inclusive_descendant_of_test.rb
-- test/condition_tests/keyswords_test.rb
+- test/condition_tests/keywords_test.rb
 - test/condition_tests/less_than_or_equal_to_test.rb
 - test/condition_tests/less_than_test.rb
 - test/condition_tests/like_test.rb
@@ -346,7 +355,10 @@ test_files:
 - test/condition_tests/not_like_test.rb
 - test/condition_tests/not_nil_test.rb
 - test/condition_tests/sibling_of_test.rb
+- test/conditions_tests/any_or_all_test.rb
 - test/conditions_tests/base_test.rb
+- test/conditions_tests/groups_test.rb
+- test/conditions_tests/magic_methods_test.rb
 - test/conditions_tests/protection_test.rb
 - test/config_test.rb
 - test/modifier_tests/day_of_month_test.rb