searchgasm 1.3.5 → 1.4.0

data/test/test_search_base.rb

@@ -30,7 +30,7 @@ class TestSearchBase < Test::Unit::TestCase
   def test_setting_first_level_options
     search = Account.new_search!(:include => :users, :joins => :users, :offset => 5, :limit => 20, :order => "name ASC", :select => "name", :readonly => true, :group => "name", :from => "accounts", :lock => true)
     assert_equal :users, search.include
-    assert_equal " LEFT OUTER JOIN \"users\" ON users.account_id = accounts.id ", search.joins
+    assert_equal :users, search.joins
     assert_equal 5, search.offset
     assert_equal 20, search.limit
     assert_equal "name ASC", search.order
@@ -98,7 +98,7 @@ class TestSearchBase < Test::Unit::TestCase
     search.lock = true
     assert_equal search.lock, true
   end
-
+=begin
   def test_auto_joins
     search = Account.new_search
     assert_equal nil, search.auto_joins
@@ -114,7 +114,7 @@ class TestSearchBase < Test::Unit::TestCase
     search.conditions.reset_users!
     assert_equal nil, search.auto_joins
   end
-
+=end
   def test_limit
     search = Account.new_search
     search.limit = 10
@@ -141,7 +141,7 @@ class TestSearchBase < Test::Unit::TestCase
     search.conditions.users.id_greater_than = 2
     search.page = 3
     search.readonly = true
-    assert_equal({:joins => " LEFT OUTER JOIN \"users\" ON users.account_id = 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
@@ -186,7 +186,10 @@ class TestSearchBase < Test::Unit::TestCase
     search.select = "id, name"
     assert_equal Account.all, search.all
     
-    assert_equal [Account.find(1)], Account.scope1.new_search(:conditions => {:users => {:first_name_starts_with => "Ben"}}).all
+    search = Account.scope1.new_search!(:conditions => {:users => {:first_name_starts_with => "Ben"}})
+    assert_equal [Account.find(1)], search.all
+    search2 = search.dup
+    assert_equal [Account.find(1)], search2.all
   end
 
   def test_calculations
@@ -213,22 +216,12 @@ class TestSearchBase < Test::Unit::TestCase
     assert_equal 1, search.count
   end
   
-  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
+  
+  def test_sti
+    
+  end
 end

data/test/test_search_conditions.rb

@@ -12,17 +12,7 @@ class TestSearchConditions < Test::Unit::TestCase
     search = Account.new_search(:conditions => {:name_like => "Ben"})
     assert_equal({:name_like => "Ben"}, search.conditions.conditions)
   end
-  
-  def test_auto_joins
-    search = Account.new_search
-    search.conditions = {:name_like => "Binary"}
-    assert_equal nil, search.auto_joins
-    search.conditions.users.first_name_like = "Ben"
-    assert_equal :users, search.auto_joins
-    search.conditions.reset_users!
-    assert_equal nil, search.auto_joins
-  end
-  
+
   def test_sanitize
     # This is tested in test_search_base
   end

data/test/test_search_ordering.rb

@@ -99,7 +99,7 @@ class TestSearchOrdering < Test::Unit::TestCase
     
     assert_raise(ArgumentError) { search.order_as = "awesome" }
   end
-  
+
   def test_order_by_auto_joins
     search = Account.new_search
     assert_equal nil, search.order_by_auto_joins
@@ -113,9 +113,8 @@ class TestSearchOrdering < Test::Unit::TestCase
     assert_equal [:users, :orders, {:users => :user_groups}], search.order_by_auto_joins
     search.priority_order_by = {:users => {:orders => :total}}
     assert_equal({:users => :orders}, search.priority_order_by_auto_joins)
-    assert_equal [:users, :orders, {:users => :user_groups}, {:users => :orders}], search.auto_joins
   end
-  
+
   def test_priority_order_by
     search = Account.new_search
     assert_equal nil, search.priority_order
@@ -159,7 +158,7 @@ class TestSearchOrdering < Test::Unit::TestCase
   end
   
   def test_ordering_includes_blank
-    search = User.new_search
+    search = User.new_search!
     search.order_by = {:account => :name}
     assert_equal 4, search.count
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.3.5
+  version: 1.4.0
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-08 00:00:00 -04:00
+date: 2008-10-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,10 +71,12 @@ extra_rdoc_files:
 - lib/searchgasm/condition/like.rb
 - lib/searchgasm/condition/nil.rb
 - lib/searchgasm/condition/not_begin_with.rb
+- lib/searchgasm/condition/not_blank.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/not_nil.rb
 - lib/searchgasm/condition/sibling_of.rb
 - lib/searchgasm/condition/tree.rb
 - lib/searchgasm/conditions/base.rb
@@ -109,6 +111,8 @@ extra_rdoc_files:
 - lib/searchgasm/modifiers/log.rb
 - lib/searchgasm/modifiers/log10.rb
 - lib/searchgasm/modifiers/log2.rb
+- lib/searchgasm/modifiers/lower.rb
+- lib/searchgasm/modifiers/ltrim.rb
 - lib/searchgasm/modifiers/md5.rb
 - lib/searchgasm/modifiers/microseconds.rb
 - lib/searchgasm/modifiers/milliseconds.rb
@@ -117,11 +121,14 @@ extra_rdoc_files:
 - lib/searchgasm/modifiers/octal.rb
 - lib/searchgasm/modifiers/radians.rb
 - lib/searchgasm/modifiers/round.rb
+- lib/searchgasm/modifiers/rtrim.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/trim.rb
+- lib/searchgasm/modifiers/upper.rb
 - lib/searchgasm/modifiers/week.rb
 - lib/searchgasm/modifiers/year.rb
 - lib/searchgasm/search/base.rb
@@ -161,10 +168,12 @@ files:
 - lib/searchgasm/condition/like.rb
 - lib/searchgasm/condition/nil.rb
 - lib/searchgasm/condition/not_begin_with.rb
+- lib/searchgasm/condition/not_blank.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/not_nil.rb
 - lib/searchgasm/condition/sibling_of.rb
 - lib/searchgasm/condition/tree.rb
 - lib/searchgasm/conditions/base.rb
@@ -199,6 +208,8 @@ files:
 - lib/searchgasm/modifiers/log.rb
 - lib/searchgasm/modifiers/log10.rb
 - lib/searchgasm/modifiers/log2.rb
+- lib/searchgasm/modifiers/lower.rb
+- lib/searchgasm/modifiers/ltrim.rb
 - lib/searchgasm/modifiers/md5.rb
 - lib/searchgasm/modifiers/microseconds.rb
 - lib/searchgasm/modifiers/milliseconds.rb
@@ -207,11 +218,14 @@ files:
 - lib/searchgasm/modifiers/octal.rb
 - lib/searchgasm/modifiers/radians.rb
 - lib/searchgasm/modifiers/round.rb
+- lib/searchgasm/modifiers/rtrim.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/trim.rb
+- lib/searchgasm/modifiers/upper.rb
 - lib/searchgasm/modifiers/week.rb
 - lib/searchgasm/modifiers/year.rb
 - lib/searchgasm/search/base.rb
@@ -229,12 +243,11 @@ files:
 - Rakefile
 - README.rdoc
 - test/fixtures/accounts.yml
+- test/fixtures/cats.yml
+- test/fixtures/dogs.yml
 - test/fixtures/orders.yml
 - 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
 - test/test_condition_base.rb
@@ -248,6 +261,9 @@ files:
 - test/test_search_ordering.rb
 - test/test_search_pagination.rb
 - test/test_search_protection.rb
+- test_libs/acts_as_tree.rb
+- test_libs/ordered_hash.rb
+- test_libs/rexml_fix.rb
 - TODO.rdoc
 - searchgasm.gemspec
 has_rdoc: true