searchgasm 1.5.0 → 1.5.1

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+== 1.5.1 released 2008-10-20
+
+* Fixed bug with per_page_links
+* Added "ordering_by" class for per_page_links
+
 == 1.5.0 released 2008-10-20
 
 * Merge array of conditions with or or and where it makes sense. Begins with condition does not make sense to join with and, so instead join with or.

data/lib/searchgasm/config/helpers.rb

@@ -65,6 +65,17 @@ module Searchgasm
         end
         attr_writer :order_by_link_desc_indicator
         
+        # The class name used in order_by_links for the link that it is currently ordering by
+        #
+        # * <tt>Default:</tt> "# The class name for used in the page_link helper
+        #
+        # * <tt>Default:</tt> "page"
+        # * <tt>Accepts:</tt> String
+        def order_by_links_ordering_by_class_name
+          @order_by_links_ordering_by_class_name ||= "ordering_by"
+        end
+        attr_writer :order_by_links_ordering_by_class_name
+        
         # The class name for used in the order_by_select helper
         #
         # * <tt>Default:</tt> "order_by"
@@ -222,7 +233,7 @@ module Searchgasm
         def per_page_select_choices
           return @per_page_select_choices if @per_page_select_choices
           @per_page_select_choices = []
-          [10, 25, 50, 100, 150, 200].each { |choice| @per_page_select_choices << ["#{choice} per page", 25] }
+          [10, 25, 50, 100, 150, 200].each { |choice| @per_page_select_choices << ["#{choice} per page", choice] }
           @per_page_select_choices << ["Show all", nil]
         end
         attr_writer :per_page_select_choices

data/lib/searchgasm/helpers/control_types/links.rb

@@ -72,9 +72,10 @@ module Searchgasm
           links_options.delete(:choices)
           html = ""
           options[:choices].each do |choice|
-            link_options = links_option.deep_dup
+            link_options = links_options.deep_dup
             text, value = option_text_and_value(choice)
             link_options[:text] ||= text
+            searchgasm_add_class!(link_options[:html], Config.helpers.order_by_links_ordering_by_class_name) if link_options[:search_obj].per_page == value
             html += per_page_link(value, link_options)
           end
           html
@@ -177,20 +178,26 @@ module Searchgasm
           def add_per_page_links_defaults!(options)
             add_searchgasm_control_defaults!(options)
             options[:choices] ||= Config.helpers.per_page_links_choices.dup
-            if !options[:search_obj].per_page.blank? && !options[:choices].include?(options[:search_obj].per_page)
-              options[:choices] << options[:search_obj].per_page
-              has_nil = options[:choices].include?(nil)
-              options[:choices].compact!
+            if !options[:search_obj].per_page.blank? && !choices_include?(options[:choices], options[:search_obj].per_page)
+              options[:choices] << ["#{options[:search_obj].per_page} per page", options[:search_obj].per_page]
               options[:choices].sort! do |a, b|
                 a_value = (a.is_a?(Array) ? a.last : a).to_i
+                return -1 if a_value == 0
                 b_value = (b.is_a?(Array) ? b.last : b).to_i
                 a_value <=> b_value
               end
-              options[:choices] << nil if has_nil
             end
             options
           end
           
+          def choices_include?(choices, includes)
+            choices.each do |choice|
+              value = choice.is_a?(Array) ? choice.last : choice
+              return true if value == includes
+            end
+            false
+          end
+          
           def add_page_links_defaults!(options)
             add_searchgasm_control_defaults!(options)
             options[:first_page] ||= 1

data/lib/searchgasm/version.rb

@@ -67,7 +67,7 @@ module Searchgasm
 
     MAJOR = 1
     MINOR = 5
-    TINY  = 0
+    TINY  = 1
 
     # The current version as a Version instance
     CURRENT = new(MAJOR, MINOR, TINY)

data/searchgasm.gemspec

@@ -1,11 +1,11 @@
 
-# Gem::Specification for Searchgasm-1.5.0
+# Gem::Specification for Searchgasm-1.5.1
 # Originally generated by Echoe
 
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: searchgasm
 version: !ruby/object:Gem::Version 
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors: 
 - Ben Johnson of Binary Logic