searchgasm 1.0.0 → 1.0.1

data/lib/searchgasm.rb

@@ -1,6 +1,9 @@
 require "active_record"
 require "active_support"
 
+# Core Ext
+require "searchgasm/core_ext/hash"
+
 # Utilties
 require "searchgasm/version"
 require "searchgasm/config"

data/searchgasm.gemspec

@@ -1,18 +1,18 @@
 
-# Gem::Specification for Searchgasm-1.0.0
+# Gem::Specification for Searchgasm-1.0.1
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
 autorequire: 
 bindir: bin
 
-date: 2008-09-09 00:00:00 -04:00
+date: 2008-09-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,9 +52,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- CHANGELOG
+- CHANGELOG.rdoc
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
+- lib/searchgasm/active_record.rb
 - lib/searchgasm/condition/base.rb
 - lib/searchgasm/condition/begins_with.rb
 - lib/searchgasm/condition/child_of.rb
@@ -74,6 +75,7 @@ extra_rdoc_files:
 - lib/searchgasm/conditions/base.rb
 - lib/searchgasm/conditions/protection.rb
 - lib/searchgasm/config.rb
+- lib/searchgasm/core_ext/hash.rb
 - lib/searchgasm/helpers/control_types/link.rb
 - lib/searchgasm/helpers/control_types/links.rb
 - lib/searchgasm/helpers/control_types/remote_link.rb
@@ -94,11 +96,12 @@ extra_rdoc_files:
 - lib/searchgasm.rb
 - README.rdoc
 files: 
-- CHANGELOG
+- CHANGELOG.rdoc
 - examples/README.rdoc
 - init.rb
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
+- lib/searchgasm/active_record.rb
 - lib/searchgasm/condition/base.rb
 - lib/searchgasm/condition/begins_with.rb
 - lib/searchgasm/condition/child_of.rb
@@ -118,6 +121,7 @@ files:
 - lib/searchgasm/conditions/base.rb
 - lib/searchgasm/conditions/protection.rb
 - lib/searchgasm/config.rb
+- lib/searchgasm/core_ext/hash.rb
 - lib/searchgasm/helpers/control_types/link.rb
 - lib/searchgasm/helpers/control_types/links.rb
 - lib/searchgasm/helpers/control_types/remote_link.rb

data/test/test_condition_base.rb

@@ -58,4 +58,8 @@ class TestConditionBase < Test::Unit::TestCase
   def test_value
     
   end
+  
+  def test_method_creation_in_scope
+    # test ot make sure methods are not created across the board for all models
+  end
 end

data/test/test_conditions_base.rb

@@ -22,7 +22,7 @@ class TestConditionsBase < Test::Unit::TestCase
   end
   
   def test_initialize
-    conditions = Searchgasm::Conditions::Base.new(Account, :name_contains => "Binary")
+    conditions = Account.new_conditions(:name_contains => "Binary")
     assert_equal conditions.klass, Account
     assert_equal conditions.name_contains, "Binary"
   end
@@ -34,7 +34,7 @@ class TestConditionsBase < Test::Unit::TestCase
   def test_setting_conditions
     [Account, User, Order].each do |klass|
       conditions = klass.new_conditions
-      conditions.send(:condition_names).each do |condition_name|
+      conditions.class.condition_names.each do |condition_name|
         conditions.send("#{condition_name}=", 1)
         assert_equal 1, conditions.send(condition_name)
       end
@@ -43,7 +43,7 @@ class TestConditionsBase < Test::Unit::TestCase
   
   def test_accessible_protected_conditions
     #Account.conditions_accessible << :name_contains
-    #conditions = Searchgasm::Conditions::Base.new(Account)
+    #conditions = Account.new_conditions
     #conditions.conditions = {:created_after => Time.now, :name_contains => "Binary"}
     #assert({:name_contains => "Binary"}, conditions.value)
   end
@@ -56,7 +56,7 @@ class TestConditionsBase < Test::Unit::TestCase
   end
   
   def test_setting_associations
-    conditions = Searchgasm::Conditions::Base.new(Account, :users => {:first_name_like => "Ben"})
+    conditions = Account.new_conditions(:users => {:first_name_like => "Ben"})
     assert_equal conditions.users.first_name_like, "Ben"
     
     conditions.users.last_name_begins_with = "Ben"
@@ -64,7 +64,7 @@ class TestConditionsBase < Test::Unit::TestCase
   end
   
   def test_includes
-    conditions = Searchgasm::Conditions::Base.new(Account)
+    conditions = Account.new_conditions
     assert_equal conditions.includes, nil
     
     conditions.name_like = "Binary"
@@ -78,7 +78,7 @@ class TestConditionsBase < Test::Unit::TestCase
   end
   
   def test_objects
-    conditions = Searchgasm::Conditions::Base.new(Account)
+    conditions = Account.new_conditions
     assert_equal conditions.send(:objects), []
     
     conditions.name_contains = "Binary"
@@ -89,7 +89,7 @@ class TestConditionsBase < Test::Unit::TestCase
   end
   
   def test_reset
-    conditions = Searchgasm::Conditions::Base.new(Account)
+    conditions = Account.new_conditions
     
     conditions.name_contains = "Binary"
     assert_equal 1, conditions.send(:objects).size
@@ -115,7 +115,7 @@ class TestConditionsBase < Test::Unit::TestCase
   end
   
   def test_sanitize
-    conditions = Searchgasm::Conditions::Base.new(Account)
+    conditions = Account.new_conditions
     conditions.name_contains = "Binary"
     conditions.id_gt = 5
     now = Time.now
@@ -130,7 +130,7 @@ class TestConditionsBase < Test::Unit::TestCase
   end
   
   def test_conditions
-    conditions = Searchgasm::Conditions::Base.new(Account)
+    conditions = Account.new_conditions!
     now = Time.now
     v = {:name_contains => "Binary", :created_at_greater_than => now}
     conditions.conditions = v
@@ -151,7 +151,7 @@ class TestConditionsBase < Test::Unit::TestCase
   end
   
   def test_searching
-    conditions = Searchgasm::Conditions::Base.new(Account)
+    conditions = Account.new_conditions
     conditions.name_contains = "Binary"
     assert_equal Account.find(1, 3), conditions.all
     assert_equal Account.find(1, 3), conditions.find(:all)

data/test/test_search_base.rb

@@ -21,8 +21,8 @@ class TestSearchBase < Test::Unit::TestCase
   end
 
   def test_initialize
-    assert_nothing_raised { Searchgasm::Search::Base.new(Account) }
-    search = Searchgasm::Search::Base.new(Account, :conditions => {:name_like => "binary"}, :page => 2, :limit => 10, :readonly => true)
+    assert_nothing_raised { Account.new_search }
+    search = Account.new_search!(:conditions => {:name_like => "binary"}, :page => 2, :limit => 10, :readonly => true)
     assert_equal Account, search.klass
     assert_equal "binary", search.conditions.name_like
     assert_equal 2, search.page
@@ -31,7 +31,7 @@ class TestSearchBase < Test::Unit::TestCase
   end
 
   def test_setting_first_level_options
-    search = Searchgasm::Search::Base.new(Account)
+    search = Account.new_search
   
     search.include = :users
     assert_equal :users, search.include
@@ -90,7 +90,7 @@ class TestSearchBase < Test::Unit::TestCase
   end
 
   def test_include
-    search = Searchgasm::Search::Base.new(Account)
+    search = Account.new_search
     assert_equal nil, search.include
     search.conditions.name_contains = "Binary"
     assert_equal nil, search.include
@@ -106,7 +106,7 @@ class TestSearchBase < Test::Unit::TestCase
   end
 
   def test_limit
-    search = Searchgasm::Search::Base.new(Account)
+    search = Account.new_search
     search.limit = 10
     assert_equal 10, search.limit
     search.page = 2
@@ -125,7 +125,7 @@ class TestSearchBase < Test::Unit::TestCase
   end
 
   def test_sanitize
-    search = Searchgasm::Search::Base.new(Account)
+    search = Account.new_search
     search.per_page = 2
     search.conditions.name_like = "Binary"
     search.conditions.users.id_greater_than = 2
@@ -136,7 +136,7 @@ class TestSearchBase < Test::Unit::TestCase
   end
 
   def test_scope
-    search = Searchgasm::Search::Base.new(Account)
+    search = Account.new_search!
     search.conditions = "some scope"
     assert_equal "some scope", search.conditions.scope
     search.conditions = nil
@@ -148,7 +148,7 @@ class TestSearchBase < Test::Unit::TestCase
   end
 
   def test_searching
-    search = Searchgasm::Search::Base.new(Account)
+    search = Account.new_search
     search.conditions.name_like = "Binary"
     assert_equal search.all, [Account.find(1), Account.find(3)]
     assert_equal search.find(:all), [Account.find(1), Account.find(3)]
@@ -174,7 +174,7 @@ class TestSearchBase < Test::Unit::TestCase
   end
 
   def test_calculations
-    search = Searchgasm::Search::Base.new(Account)
+    search = Account.new_search
     search.conditions.name_like = "Binary"
     assert_equal 2, search.average('id')
     assert_equal 2, search.calculate(:avg, 'id')
@@ -184,4 +184,8 @@ class TestSearchBase < Test::Unit::TestCase
     assert_equal 1, search.minimum('id')
     assert_equal 4, search.sum('id')
   end
+  
+  def test_method_creation_in_scope
+    # test ot make sure methods are not created across the board for all models
+  end
 end

data/test/test_search_conditions.rb

@@ -13,14 +13,14 @@ class TestSearchConditions < Test::Unit::TestCase
   end
 
   def test_conditions
-    search = Searchgasm::Search::Base.new(Account)
+    search = Account.new_search
     assert_kind_of Searchgasm::Conditions::Base, search.conditions
     assert_equal search.conditions.klass, Account
   
     search.conditions = {:name_like => "Binary"}
     assert_kind_of Searchgasm::Conditions::Base, search.conditions
   
-    conditions = Searchgasm::Conditions::Base.new(Account, :id_greater_than => 8)
+    conditions = Account.new_conditions(:id_greater_than => 8)
     search.conditions = conditions
     assert_equal conditions, search.conditions
   end

data/test/test_search_ordering.rb

@@ -13,7 +13,7 @@ class TestSearchOrdering < Test::Unit::TestCase
   end
   
   def test_order_as
-    search = Searchgasm::Search::Base.new(Account)
+    search = Account.new_search
     assert_equal nil, search.order
     assert_equal "ASC", search.order_as
     assert search.asc?
@@ -40,7 +40,7 @@ class TestSearchOrdering < Test::Unit::TestCase
   end
   
   def test_order_by
-    search = Searchgasm::Search::Base.new(Account)
+    search = Account.new_search
     assert_equal nil, search.order
     assert_equal "id", search.order_by
     

data/test/test_search_pagination.rb

@@ -13,7 +13,7 @@ class TestSearchPagination < Test::Unit::TestCase
   end
   
   def test_limit
-    search = Searchgasm::Search::Base.new(Account)
+    search = Account.new_search
     search.limit = 10
     assert_equal 10, search.limit
     search.page = 2
@@ -29,7 +29,7 @@ class TestSearchPagination < Test::Unit::TestCase
   end
   
   def test_page
-    search = Searchgasm::Search::Base.new(Account)
+    search = Account.new_search
     search.page = 2
     assert_equal 1, search.page
     search.per_page = 20
@@ -43,7 +43,7 @@ class TestSearchPagination < Test::Unit::TestCase
   end
   
   def test_per_page
-    search = Searchgasm::Search::Base.new(Account)
+    search = Account.new_search
     search.per_page = 10
     assert_equal 10, search.per_page
     search.per_page = ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-09 00:00:00 -04:00
+date: 2008-09-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,9 +49,10 @@ executables: []
 extensions: []
 
 extra_rdoc_files: 
-- CHANGELOG
+- CHANGELOG.rdoc
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
+- lib/searchgasm/active_record.rb
 - lib/searchgasm/condition/base.rb
 - lib/searchgasm/condition/begins_with.rb
 - lib/searchgasm/condition/child_of.rb
@@ -71,6 +72,7 @@ extra_rdoc_files:
 - lib/searchgasm/conditions/base.rb
 - lib/searchgasm/conditions/protection.rb
 - lib/searchgasm/config.rb
+- lib/searchgasm/core_ext/hash.rb
 - lib/searchgasm/helpers/control_types/link.rb
 - lib/searchgasm/helpers/control_types/links.rb
 - lib/searchgasm/helpers/control_types/remote_link.rb
@@ -91,11 +93,12 @@ extra_rdoc_files:
 - lib/searchgasm.rb
 - README.rdoc
 files: 
-- CHANGELOG
+- CHANGELOG.rdoc
 - examples/README.rdoc
 - init.rb
 - lib/searchgasm/active_record/associations.rb
 - lib/searchgasm/active_record/base.rb
+- lib/searchgasm/active_record.rb
 - lib/searchgasm/condition/base.rb
 - lib/searchgasm/condition/begins_with.rb
 - lib/searchgasm/condition/child_of.rb
@@ -115,6 +118,7 @@ files:
 - lib/searchgasm/conditions/base.rb
 - lib/searchgasm/conditions/protection.rb
 - lib/searchgasm/config.rb
+- lib/searchgasm/core_ext/hash.rb
 - lib/searchgasm/helpers/control_types/link.rb
 - lib/searchgasm/helpers/control_types/links.rb
 - lib/searchgasm/helpers/control_types/remote_link.rb

data/CHANGELOG

@@ -1,23 +0,0 @@
-v1.0.0. Major changes in the helpers, they were completely re-engineered. Much nicer and cleaner now. I established a pattern between all helpers giving you complete flexibility as to how they are used. All helpers are called differently now (see documentation).
-
-v0.9.10. Hardened more tests, fixed bug with setting the per_page configuration to only take effect on protected searches, thus staying out of the way of normal searching.
-
-v0.9.9. Fixed setting per_page to nil, false, or ''. This is done to "show all" results.
-
-v0.9.8. Fixed order_by helper bug when determing the text with arrays. Should use the first value instead of last. Added in per_page config option.
-
-v0.9.7. Complete class restructure, much more organized, added in documentation, added in helpers for using searchgasm in a rails app, updated readme with link to documentation as well as a live example, some bug fixes, more tests
-
-v0.9.6. Fixed bug when instantiating with nil options
-
-v0.9.5. Enhanced searching with conditions only. Updated read me to include example on adding your own conditions.
-
-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
-
-v0.9.1. Added aliases for datetime, date, time, and timestamp attrs. You could call created_at_after, mow you can also call created_after.
-
-v0.9.0. First release