alphabetical_paginate 1.2.0 → 1.3.0

data/README.md

@@ -101,6 +101,7 @@ Key | Value | Default |Description
 `:enumerate` | `Boolean` | `false` | Whether you want the number field collapsed (all numbers go into `0`) or separate (`0`, `1`, `2`...).
 `:default_field` | `String` | `"a"` | Which field you want the page to default to on first load (`"0"`, `"a"`. `"*"`).
 `:paginate_all` | `Boolean` | `false` | Whether you want empty fields to still render in pagination.
+`:include_all` | `Boolean` | `true` | Whether you want `all` selector to be included in the pagination.
 `:numbers` | `Boolean` | `true` | Whether you want numbers to be included in the pagination at all, either collapsed, or expanded (depending on `:enumerate`).
 `:others` | `Boolean` | `true` | Whether you want all other characters (non alphanumeric) to be included in the pagination at all.
 `:pagination_class` | `String` | `"pagination-centered"` | All the classes you would like to add to the rendered pagination selector div (for CSS purposes).

data/lib/alphabetical_paginate/array.rb

@@ -1,40 +1,45 @@
 class Array
   def alpha_paginate current_field, params = {enumerate:false, default_field: "a", 
-                                                paginate_all: false, numbers: true,
-                                                others: true, pagination_class: "pagination-centered"}
+                                                paginate_all: false, numbers: true, include_all: true,
+                                                others: true, pagination_class: "pagination-centered",
+                                                js: true}
     params[:paginate_all] ||= false
+    params[:include_all] = true if !params.has_key? :include_all
     params[:numbers] = true if !params.has_key? :numbers
     params[:others] = true if !params.has_key? :others
-    params[:default_field] ||= "a"
+    params[:js] = true if !params.has_key? :js
+    params[:default_field] ||= params[:include_all] ? "all" : "a"
     params[:pagination_class] ||= "pagination-centered"
     output = []
     availableLetters = {}
     if current_field == nil
       current_field = params[:default_field]
     end
+    all = params[:include_all] && current_field.downcase == "all"
     self.each do |x|
       field_val = block_given? ? yield(x).to_s : x.id.to_s
       field_letter = field_val[0].downcase
       case field_letter
-        when /[a-z]/ 
+        when /[a-z]/
           availableLetters[field_letter] = true if !availableLetters.has_key? field_letter
-          output << x if current_field =~ /[a-z]/ && field_letter == current_field
+          output << x if all || (current_field =~ /[a-z]/ && field_letter == current_field)
         when /[0-9]/
           if params[:enumerate]
             availableLetters[field_letter] = true if !availableLetters.has_key? field_letter
-            output << x if current_field =~ /[0-9]/ && field_letter == current_field 
+            output << x if all || (current_field =~ /[0-9]/ && field_letter == current_field)
           else
-            availableLetters['0'] = true if !availableLetters.has_key? 'numbers'
-            output << x if current_field == "0"
+            availableLetters['0-9'] = true if !availableLetters.has_key? 'numbers'
+            output << x if all || current_field == "0-9"
           end
         else
           availableLetters['*'] = true if !availableLetters.has_key? 'other'
-          output << x if current_field == "*"
+          output << x if all || current_field == "*"
       end
     end
     params[:availableLetters] = availableLetters.collect{|k,v| k.to_s}
     params[:currentField] = current_field
-    output.sort! {|x, y| yield(x).to_s <=> yield(y).to_s }
+    output.sort! {|x, y| block_given? ? (yield(x).to_s <=> yield(y).to_s) : (x.id.to_s <=> y.id.to_s) }
     return output, params
   end
 end
+

data/lib/alphabetical_paginate/controller_helper.rb

@@ -8,10 +8,12 @@ module AlphabeticalPaginate
                                                   paginate_all: false, numbers: true,
                                                   others: true, pagination_class: "pagination-centered",
                                                   batch_size: 500, db_mode: false, 
-                                                  db_field: "id"}
+                                                  db_field: "id",
+                                                  js: true}
       params[:paginate_all] ||= false
       params[:numbers] = true if !params.has_key? :numbers
       params[:others] = true if !params.has_key? :others
+      params[:js] = true if !params.has_key? :js
       params[:pagination_class] ||= "pagination-centered"
       params[:batch_size] ||= 500
       params[:default_field] ||= "a"

data/lib/alphabetical_paginate/version.rb

@@ -1,3 +1,3 @@
 module AlphabeticalPaginate
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/alphabetical_paginate/view_helpers.rb

@@ -14,8 +14,9 @@ module AlphabeticalPaginate
         if params[:enumerate] && params[:numbers]
           range = (0..9).to_a.map{|x| x.to_s} + range
         elsif params[:numbers]
-          range = ["0"] + range
+          range = ["0-9"] + range
         end
+        range.unshift "all" if params[:include_all]
         range.each do |l|
           if l == params[:currentField]
             links += '<li class="active"><a href="#" data-letter="' + l + '">' + l + "</a></li>"
@@ -28,6 +29,7 @@ module AlphabeticalPaginate
       else
         params[:availableLetters].sort!
         params[:availableLetters] = params[:availableLetters][1..-1] + ["*"] if params[:availableLetters][0] == "*"
+        params[:availableLetters].unshift "all" if params[:include_all]
         params[:availableLetters] -= (1..9).to_a.map{|x| x.to_s} if !params[:numbers]
         params[:availableLetters] -= ["*"] if !params[:others]
         

data/spec/alphabetical_paginate_spec.rb

@@ -83,7 +83,7 @@ module AlphabeticalPaginate
 				it "should include a numbers and others field" do
 					index, params = @list.alpha_paginate(nil)
 					pagination = alphabetical_paginate(params)
-					(["#"] + ["0"] + ("a".."z").to_a.map{|x|
+					(["*"] + ["0-9"] + ("a".."z").to_a.map{|x|
 						'data-letter="%s"'%x}).each do |x|
 						pagination.should include x
 					end
@@ -92,7 +92,7 @@ module AlphabeticalPaginate
 				it "should default all values when necessary" do
 					index, params = @list.alpha_paginate(nil, {})
 					pagination = alphabetical_paginate(params)
-					(["#"] + ["0"] + ("a".."z").to_a.map{|x|
+					(["*"] + ["0-9"] + ("a".."z").to_a.map{|x|
 						'data-letter="%s"'%x}).each do |x|
 						pagination.should include x
 					end
@@ -105,8 +105,8 @@ module AlphabeticalPaginate
 						'data-letter="%s"'%x}).each do |x|
 						pagination.should include x
 					end
-					pagination.should_not include 'data-letter="z"', 'data-letter="#"',
-						'data-letter="0"'
+					pagination.should_not include 'data-letter="z"', 'data-letter="*"',
+						'data-letter="0-9"'
 				end
 
 				it "should enumerate when asked" do
@@ -123,15 +123,20 @@ module AlphabeticalPaginate
 					index, params = @list.alpha_paginate(nil, {paginate_all: true,
 																							 enumerate: true}){|x| x.word}
 					pagination = alphabetical_paginate(params)
-					(["#"] + (0..9).to_a.map{|x| x.to_s} + ("a".."z").to_a.map{|x|
+					(["*"] + (0..9).to_a.map{|x| x.to_s} + ("a".."z").to_a.map{|x|
 						'data-letter="%s"'%x}).each do |x|
 						pagination.should include x
 					end
 				end
 
-
-
+        it "should include 'all' and '0-9' fields" do
+					index, params = @list.alpha_paginate(nil, { include_all: true })
+					pagination = alphabetical_paginate(params)
+					(["all", "0-9"].map{|x|
+						'data-letter="%s"'%x}).each do |x|
+						pagination.should include x
+					end
+				end
       end
     end
-
 end

data/vendor/assets/javascripts/alphabetical_paginate.js

@@ -9,7 +9,7 @@ $(function() {
       var url = location.href,
           letter = $(this).data("letter");
       if (/letter/.test(url)){
-        url = url.replace(/letter=?./,"letter=" + letter); 
+        url = url.replace(/letter=?.{1,3}/,"letter=" + letter);
       }
       else {
         if (/\?/.test(url)) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alphabetical_paginate
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-06 00:00:00.000000000 Z
+date: 2013-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler