Added default per_page option

binarylogic · Sep 7, 2008 · dc35d0e · dc35d0e
1 parent f53b39f
commit dc35d0e
Show file tree

Hide file tree

Showing 56 changed files with 30 additions and 6 deletions.
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -17,4 +17,4 @@
 config.action_mailer.raise_delivery_errors = false
 
 config.plugin_paths += ["../../Ruby Libs"]
-config.plugins = [:calendar_date_select, :searchgasm]
+config.plugins = ["calendar_date_select", "searchgasm-0.9.8"]
diff --git a/config/initializers/searchgasm.rb b/config/initializers/searchgasm.rb
@@ -1,3 +1,8 @@
+# Confugration
+Searchgasm::Config.configure do |config|
+  config.per_page = config.per_page_choices.first # 20
+end
+
 # Actual function for MySQL databases only
 class SoundsLikeCondition < Searchgasm::Condition::Base
   class << self

diff --git a/vendor/plugins/searchgasm-0.9.7/CHANGELOG → vendor/plugins/searchgasm-0.9.8/CHANGELOG b/vendor/plugins/searchgasm-0.9.7/CHANGELOG → vendor/plugins/searchgasm-0.9.8/CHANGELOG
@@ -1,3 +1,5 @@
+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. Fix bug when instantiating with nil options

diff --git a/vendor/plugins/searchgasm-0.9.7/MIT-LICENSE → vendor/plugins/searchgasm-0.9.8/MIT-LICENSE b/vendor/plugins/searchgasm-0.9.7/MIT-LICENSE → vendor/plugins/searchgasm-0.9.8/MIT-LICENSE
diff --git a/vendor/plugins/searchgasm-0.9.7/Manifest → vendor/plugins/searchgasm-0.9.8/Manifest b/vendor/plugins/searchgasm-0.9.7/Manifest → vendor/plugins/searchgasm-0.9.8/Manifest
diff --git a/vendor/plugins/searchgasm-0.9.7/README.rdoc → vendor/plugins/searchgasm-0.9.8/README.rdoc b/vendor/plugins/searchgasm-0.9.7/README.rdoc → vendor/plugins/searchgasm-0.9.8/README.rdoc
@@ -11,7 +11,8 @@ I'm a big fan of understanding what I'm using, so here's a quick explanation: Th
 == Quicklinks
 
 *	<b>Documentation:</b> http://searchgasm.rubyforge.org
-*	<b>Live rails example:</b> http://searchgasm_example.binarylogic.com
+*	<b>Easy pagination, ordering, and searching tutorial:</b> http://www.binarylogic.com/2008/9/7/tutorial-pagination-ordering-and-searching-with-searchgasm
+*	<b>The tutorial above, live:</b> http://searchgasm_example.binarylogic.com
 
 == Install and use
 

diff --git a/vendor/plugins/searchgasm-0.9.7/Rakefile → vendor/plugins/searchgasm-0.9.8/Rakefile b/vendor/plugins/searchgasm-0.9.7/Rakefile → vendor/plugins/searchgasm-0.9.8/Rakefile
diff --git a/...ins/searchgasm-0.9.7/examples/README.rdoc → ...ins/searchgasm-0.9.8/examples/README.rdoc b/...ins/searchgasm-0.9.7/examples/README.rdoc → ...ins/searchgasm-0.9.8/examples/README.rdoc
diff --git a/vendor/plugins/searchgasm-0.9.7/init.rb → vendor/plugins/searchgasm-0.9.8/init.rb b/vendor/plugins/searchgasm-0.9.7/init.rb → vendor/plugins/searchgasm-0.9.8/init.rb
diff --git a/...lugins/searchgasm-0.9.7/lib/searchgasm.rb → ...lugins/searchgasm-0.9.8/lib/searchgasm.rb b/...lugins/searchgasm-0.9.7/lib/searchgasm.rb → ...lugins/searchgasm-0.9.8/lib/searchgasm.rb
diff --git a/.../searchgasm/active_record/associations.rb → .../searchgasm/active_record/associations.rb b/.../searchgasm/active_record/associations.rb → .../searchgasm/active_record/associations.rb
diff --git a/....9.7/lib/searchgasm/active_record/base.rb → ....9.8/lib/searchgasm/active_record/base.rb b/....9.7/lib/searchgasm/active_record/base.rb → ....9.8/lib/searchgasm/active_record/base.rb
diff --git a/...sm-0.9.7/lib/searchgasm/condition/base.rb → ...sm-0.9.8/lib/searchgasm/condition/base.rb b/...sm-0.9.7/lib/searchgasm/condition/base.rb → ...sm-0.9.8/lib/searchgasm/condition/base.rb
diff --git a/...7/lib/searchgasm/condition/begins_with.rb → ...8/lib/searchgasm/condition/begins_with.rb b/...7/lib/searchgasm/condition/begins_with.rb → ...8/lib/searchgasm/condition/begins_with.rb
diff --git a/....9.7/lib/searchgasm/condition/child_of.rb → ....9.8/lib/searchgasm/condition/child_of.rb b/....9.7/lib/searchgasm/condition/child_of.rb → ....9.8/lib/searchgasm/condition/child_of.rb
diff --git a/....9.7/lib/searchgasm/condition/contains.rb → ....9.8/lib/searchgasm/condition/contains.rb b/....9.7/lib/searchgasm/condition/contains.rb → ....9.8/lib/searchgasm/condition/contains.rb
diff --git a/...lib/searchgasm/condition/descendant_of.rb → ...lib/searchgasm/condition/descendant_of.rb b/...lib/searchgasm/condition/descendant_of.rb → ...lib/searchgasm/condition/descendant_of.rb
diff --git a/...ib/searchgasm/condition/does_not_equal.rb → ...ib/searchgasm/condition/does_not_equal.rb b/...ib/searchgasm/condition/does_not_equal.rb → ...ib/searchgasm/condition/does_not_equal.rb
diff --git a/...9.7/lib/searchgasm/condition/ends_with.rb → ...9.8/lib/searchgasm/condition/ends_with.rb b/...9.7/lib/searchgasm/condition/ends_with.rb → ...9.8/lib/searchgasm/condition/ends_with.rb
diff --git a/...-0.9.7/lib/searchgasm/condition/equals.rb → ...-0.9.8/lib/searchgasm/condition/equals.rb b/...-0.9.7/lib/searchgasm/condition/equals.rb → ...-0.9.8/lib/searchgasm/condition/equals.rb
diff --git a/.../lib/searchgasm/condition/greater_than.rb → .../lib/searchgasm/condition/greater_than.rb b/.../lib/searchgasm/condition/greater_than.rb → .../lib/searchgasm/condition/greater_than.rb
diff --git a/...asm/condition/greater_than_or_equal_to.rb → ...asm/condition/greater_than_or_equal_to.rb b/...asm/condition/greater_than_or_equal_to.rb → ...asm/condition/greater_than_or_equal_to.rb
diff --git a/...gasm/condition/inclusive_descendant_of.rb → ...gasm/condition/inclusive_descendant_of.rb b/...gasm/condition/inclusive_descendant_of.rb → ...gasm/condition/inclusive_descendant_of.rb
diff --git a/....9.7/lib/searchgasm/condition/keywords.rb → ....9.8/lib/searchgasm/condition/keywords.rb b/....9.7/lib/searchgasm/condition/keywords.rb → ....9.8/lib/searchgasm/condition/keywords.rb
diff --git a/...9.7/lib/searchgasm/condition/less_than.rb → ...9.8/lib/searchgasm/condition/less_than.rb b/...9.7/lib/searchgasm/condition/less_than.rb → ...9.8/lib/searchgasm/condition/less_than.rb
diff --git a/...chgasm/condition/less_than_or_equal_to.rb → ...chgasm/condition/less_than_or_equal_to.rb b/...chgasm/condition/less_than_or_equal_to.rb → ...chgasm/condition/less_than_or_equal_to.rb
diff --git a/....7/lib/searchgasm/condition/sibling_of.rb → ....8/lib/searchgasm/condition/sibling_of.rb b/....7/lib/searchgasm/condition/sibling_of.rb → ....8/lib/searchgasm/condition/sibling_of.rb
diff --git a/...sm-0.9.7/lib/searchgasm/condition/tree.rb → ...sm-0.9.8/lib/searchgasm/condition/tree.rb b/...sm-0.9.7/lib/searchgasm/condition/tree.rb → ...sm-0.9.8/lib/searchgasm/condition/tree.rb
diff --git a/...m-0.9.7/lib/searchgasm/conditions/base.rb → ...m-0.9.8/lib/searchgasm/conditions/base.rb b/...m-0.9.7/lib/searchgasm/conditions/base.rb → ...m-0.9.8/lib/searchgasm/conditions/base.rb
diff --git a/...7/lib/searchgasm/conditions/protection.rb → ...8/lib/searchgasm/conditions/protection.rb b/...7/lib/searchgasm/conditions/protection.rb → ...8/lib/searchgasm/conditions/protection.rb
diff --git a/...searchgasm-0.9.7/lib/searchgasm/config.rb → ...searchgasm-0.9.8/lib/searchgasm/config.rb b/...searchgasm-0.9.7/lib/searchgasm/config.rb → ...searchgasm-0.9.8/lib/searchgasm/config.rb
@@ -55,6 +55,18 @@ def pages_type=(value)
         @pages_type = value.to_sym
       end
 
+      def per_page # :nodoc:
+        @per_page
+      end
+
+      # The default for per page.
+      #
+      # * <tt>Default:</tt> nil, nil means "show all"
+      # * <tt>Accepts:</tt> Any value in your per_page choices
+      def per_page=(value)
+        @per_page = value
+      end
+
       def per_page_choices # :nodoc:
         @per_page_choices ||= [10, 25, 50, 100, 150, 200, nil]
       end

diff --git a/...9.7/lib/searchgasm/helpers/form_helper.rb → ...9.8/lib/searchgasm/helpers/form_helper.rb b/...9.7/lib/searchgasm/helpers/form_helper.rb → ...9.8/lib/searchgasm/helpers/form_helper.rb
diff --git a/...7/lib/searchgasm/helpers/search_helper.rb → ...8/lib/searchgasm/helpers/search_helper.rb b/...7/lib/searchgasm/helpers/search_helper.rb → ...8/lib/searchgasm/helpers/search_helper.rb
diff --git a/...ib/searchgasm/helpers/utilities_helper.rb → ...ib/searchgasm/helpers/utilities_helper.rb b/...ib/searchgasm/helpers/utilities_helper.rb → ...ib/searchgasm/helpers/utilities_helper.rb
diff --git a/...hgasm-0.9.7/lib/searchgasm/search/base.rb → ...hgasm-0.9.8/lib/searchgasm/search/base.rb b/...hgasm-0.9.7/lib/searchgasm/search/base.rb → ...hgasm-0.9.8/lib/searchgasm/search/base.rb
@@ -49,6 +49,10 @@ def inspect
         "#<#{klass} #{options_as_nice_string}>"
       end
 
+      def limit
+        @limit ||= Config.per_page
+      end
+
       def limit=(value)
         @limit = value.blank? || value == 0 ? nil : value.to_i
       end

diff --git a/...0.9.7/lib/searchgasm/search/conditions.rb → ...0.9.8/lib/searchgasm/search/conditions.rb b/...0.9.7/lib/searchgasm/search/conditions.rb → ...0.9.8/lib/searchgasm/search/conditions.rb
diff --git a/...m-0.9.7/lib/searchgasm/search/ordering.rb → ...m-0.9.8/lib/searchgasm/search/ordering.rb b/...m-0.9.7/lib/searchgasm/search/ordering.rb → ...m-0.9.8/lib/searchgasm/search/ordering.rb
diff --git a/...0.9.7/lib/searchgasm/search/pagination.rb → ...0.9.8/lib/searchgasm/search/pagination.rb b/...0.9.7/lib/searchgasm/search/pagination.rb → ...0.9.8/lib/searchgasm/search/pagination.rb
diff --git a/...0.9.7/lib/searchgasm/search/protection.rb → ...0.9.8/lib/searchgasm/search/protection.rb b/...0.9.7/lib/searchgasm/search/protection.rb → ...0.9.8/lib/searchgasm/search/protection.rb
diff --git a/...rchgasm-0.9.7/lib/searchgasm/utilities.rb → ...rchgasm-0.9.8/lib/searchgasm/utilities.rb b/...rchgasm-0.9.7/lib/searchgasm/utilities.rb → ...rchgasm-0.9.8/lib/searchgasm/utilities.rb
diff --git a/...earchgasm-0.9.7/lib/searchgasm/version.rb → ...earchgasm-0.9.8/lib/searchgasm/version.rb b/...earchgasm-0.9.7/lib/searchgasm/version.rb → ...earchgasm-0.9.8/lib/searchgasm/version.rb
@@ -67,7 +67,7 @@ def to_a
 
     MAJOR = 0
     MINOR = 9
-    TINY  = 7
+    TINY  = 8
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

diff --git a/...ugins/searchgasm-0.9.7/searchgasm.gemspec → ...ugins/searchgasm-0.9.8/searchgasm.gemspec b/...ugins/searchgasm-0.9.7/searchgasm.gemspec → ...ugins/searchgasm-0.9.8/searchgasm.gemspec
@@ -1,18 +1,18 @@
 
-# Gem::Specification for Searchgasm-0.9.7
+# Gem::Specification for Searchgasm-0.9.8
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic
 autorequire: 
 bindir: bin
 
-date: 2008-09-06 00:00:00 -04:00
+date: 2008-09-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 

diff --git a/...archgasm-0.9.7/test/fixtures/accounts.yml → ...archgasm-0.9.8/test/fixtures/accounts.yml b/...archgasm-0.9.7/test/fixtures/accounts.yml → ...archgasm-0.9.8/test/fixtures/accounts.yml
diff --git a/...searchgasm-0.9.7/test/fixtures/orders.yml → ...searchgasm-0.9.8/test/fixtures/orders.yml b/...searchgasm-0.9.7/test/fixtures/orders.yml → ...searchgasm-0.9.8/test/fixtures/orders.yml
diff --git a/.../searchgasm-0.9.7/test/fixtures/users.yml → .../searchgasm-0.9.8/test/fixtures/users.yml b/.../searchgasm-0.9.7/test/fixtures/users.yml → .../searchgasm-0.9.8/test/fixtures/users.yml
diff --git a/...earchgasm-0.9.7/test/libs/acts_as_tree.rb → ...earchgasm-0.9.8/test/libs/acts_as_tree.rb b/...earchgasm-0.9.7/test/libs/acts_as_tree.rb → ...earchgasm-0.9.8/test/libs/acts_as_tree.rb
diff --git a/...s/searchgasm-0.9.7/test/libs/rexml_fix.rb → ...s/searchgasm-0.9.8/test/libs/rexml_fix.rb b/...s/searchgasm-0.9.7/test/libs/rexml_fix.rb → ...s/searchgasm-0.9.8/test/libs/rexml_fix.rb
diff --git a/...7/test/test_active_record_associations.rb → ...8/test/test_active_record_associations.rb b/...7/test/test_active_record_associations.rb → ...8/test/test_active_record_associations.rb
diff --git a/...asm-0.9.7/test/test_active_record_base.rb → ...asm-0.9.8/test/test_active_record_base.rb b/...asm-0.9.7/test/test_active_record_base.rb → ...asm-0.9.8/test/test_active_record_base.rb
diff --git a/...s/searchgasm-0.9.7/test/test_condition.rb → ...s/searchgasm-0.9.8/test/test_condition.rb b/...s/searchgasm-0.9.7/test/test_condition.rb → ...s/searchgasm-0.9.8/test/test_condition.rb
diff --git a/...chgasm-0.9.7/test/test_conditions_base.rb → ...chgasm-0.9.8/test/test_conditions_base.rb b/...chgasm-0.9.7/test/test_conditions_base.rb → ...chgasm-0.9.8/test/test_conditions_base.rb
diff --git a/...gins/searchgasm-0.9.7/test/test_helper.rb → ...gins/searchgasm-0.9.8/test/test_helper.rb b/...gins/searchgasm-0.9.7/test/test_helper.rb → ...gins/searchgasm-0.9.8/test/test_helper.rb
diff --git a/...searchgasm-0.9.7/test/test_search_base.rb → ...searchgasm-0.9.8/test/test_search_base.rb b/...searchgasm-0.9.7/test/test_search_base.rb → ...searchgasm-0.9.8/test/test_search_base.rb
diff --git a/...chgasm-0.9.7/test/test_search_ordering.rb → ...chgasm-0.9.8/test/test_search_ordering.rb b/...chgasm-0.9.7/test/test_search_ordering.rb → ...chgasm-0.9.8/test/test_search_ordering.rb
diff --git a/...gasm-0.9.7/test/test_search_pagination.rb → ...gasm-0.9.8/test/test_search_pagination.rb b/...gasm-0.9.7/test/test_search_pagination.rb → ...gasm-0.9.8/test/test_search_pagination.rb
diff --git a/...gasm-0.9.7/test/test_search_protection.rb → ...gasm-0.9.8/test/test_search_protection.rb b/...gasm-0.9.7/test/test_search_protection.rb → ...gasm-0.9.8/test/test_search_protection.rb