alphabetical_paginate 0.2.8 → 0.2.10

data/lib/alphabetical_paginate/array.rb

@@ -2,11 +2,14 @@ class Array
   def alpha_paginate current_field, params = {enumerate:false, default_field: "a", 
                                                 paginate_all: false, numbers: true,
                                                 others: true, pagination_class: "pagination-centered"}
+    params[:paginate_all] ||= false
+    params[:numbers] = true if !params.has_key? :numbers
+    params[:others] = true if !params.has_key? :numbers
+    params[:pagination_class] ||= "pagination-centered"
     output = []
-    params = {}
     availableLetters = {}
     if current_field == nil
-      current_field = default_field
+      current_field = params[:default_field]
     end
     self.each do |x|
       field_val = block_given? ? yield(x).to_s : x.id.to_s
@@ -20,20 +23,16 @@ class Array
             availableLetters[field_letter] = true if !availableLetters.has_key? field_letter
             output << x if current_field =~ /[0-9]/ && field_letter == current_field 
           else
-            availableLetters['numbers'] = true if !availableLetters.has_key? 'numbers'
-            output << x if current_field == "numbers"
+            availableLetters['0'] = true if !availableLetters.has_key? 'numbers'
+            output << x if current_field == "0"
           end
         else
-          availableLetters['other'] = true if !availableLetters.has_key? 'other'
-          output << x if current_field == "other"
+          availableLetters['#'] = true if !availableLetters.has_key? 'other'
+          output << x if current_field == "#"
       end
     end
     params[:availableLetters] = availableLetters.collect{|k,v| k.to_s}
     params[:currentField] = current_field
-    params[:paginate_all] ||= false
-    params[:numbers] ||= true
-    params[:others] ||= true
-    params[:pagination_class] ||= "pagination-centered"
     return output, params
   end
 end

data/lib/alphabetical_paginate/version.rb

@@ -1,3 +1,3 @@
 module AlphabeticalPaginate
-  VERSION = "0.2.8"
+  VERSION = "0.2.10"
 end

data/lib/alphabetical_paginate/view_helpers.rb

@@ -3,6 +3,7 @@ module AlphabeticalPaginate
     def alphabetical_paginate params
 
       output = javascript_include_tag 'alphabetical_paginate' 
+      links = ""
       
       if params[:paginate_all]
         range = ('a'..'z').to_a
@@ -14,16 +15,17 @@ module AlphabeticalPaginate
         elsif params[:numbers]
           range = ["0"] + range
         end
-        range.each.do |l|
+        range.each do |l|
           if l == params[:currentField]
             links += '<li class="active"><a href="#" data-letter="' + l + '">' + l + "</a></li>\n"
-          elsif params[:availableLetters].contains? l
+          elsif params[:availableLetters].include? l
             links += '<li><a href="#" data-letter="' + l + '">' + l + "</a></li>\n"
           else
             links += '<li class="disabled"><a href="#" data-letter="' + l + '">' + l + "</a></li>\n"
           end
+        end
       else
-        params[:availableLetters] -= (0..9).to_a.map{|x| x.to_s} if !params[:numbers]
+        params[:availableLetters] -= (1..9).to_a.map{|x| x.to_s} if !params[:numbers]
         params[:availableLetters] -= ["#"] if !params[:others]
         
         params[:availableLetters].each do |l|
@@ -43,8 +45,8 @@ module AlphabeticalPaginate
       end
       pagination +=
         "<ul>\n" +
-        "<li><a id='paginate-prev' href='#'>Prev</a></li>"
-        "%s" % links +
+        "<li><a id='paginate-prev' href='#'>Prev</a></li>" +
+        links +
         "</ul\n" +
         "<li><a id='paginate-next' href='#'>Next</a></li>" +
         "</div>"

data/spec/alphabetical_paginate_spec.rb

@@ -1,5 +1,16 @@
 require 'alpha_example'
 require 'alphabetical_paginate'
+require_relative '#{File.dirname(__FILE__)}/../../lib/alphabetical_paginate/view_helpers'
+
+# stub methods
+def javascript_include_tag x
+	return ""
+end
+class String
+	def html_safe
+		return self
+	end
+end
 
 module AlphabeticalPaginate
 
@@ -48,6 +59,78 @@ module AlphabeticalPaginate
           expectedParams.to_s
       end
     end
+    include ViewHelpers
+
+      describe "#alphabetical_paginate" do
+        before :each do
+          @list = []
+          (["@!#"] + (0..9).to_a.map{|x| x.to_s} + ("a".."z").to_a).each do |x|
+            ("a".."y").to_a.each do |y|
+              @list << x + y
+            end
+          end
+          @list.map! do |x|
+            AlphaExample.new(x)
+          end
+        end
+
+				it "should have div tags and pagination classes" do
+					index, params = @list.alpha_paginate(nil)
+					pagination = alphabetical_paginate(params)
+					pagination.should include "div", "pagination"
+				end
+
+				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|
+						'data-letter="%s"'%x}).each do |x|
+						pagination.should include x
+					end
+				end
+
+				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|
+						'data-letter="%s"'%x}).each do |x|
+						pagination.should include x
+					end
+				end
+
+				it "should hide values that don't exist" do
+					index, params = @list.alpha_paginate(nil){|x| x.word}
+					pagination = alphabetical_paginate(params)
+					(("a".."y").to_a.map{|x|
+						'data-letter="%s"'%x}).each do |x|
+						pagination.should include x
+					end
+					pagination.should_not include 'data-letter="z"', 'data-letter="#"',
+						'data-letter="0"'
+				end
+
+				it "should enumerate when asked" do
+					index, params = @list.alpha_paginate(nil, {enumerate: true})
+					pagination = alphabetical_paginate(params)
+					(("0".."9").to_a.map{|x|
+						'data-letter="%s"'% x.to_s }).each do |x|
+						pagination.should include x
+					end
+
+				end
+				it "should display all when asked" do
+					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|
+						'data-letter="%s"'%x}).each do |x|
+						pagination.should include x
+					end
+				end
+
+
+
+      end
+    end
 
-  end
 end

data/spec/support/helpers.rb

@@ -1,3 +1,4 @@
 module Helpers
-  include ActionView::Base
+  include ActionView::Base::ViewHelpers
+  include ActionView::Helpers::AssetTagHelper
 end

data/vendor/assets/javascripts/alphabetical_paginate.js

@@ -1 +1,15 @@
-console.log("test");
+$(function() {
+  var text = "<span class='loading'>Loading...</span>"
+
+  $(".pagination a").live("click", function(e) {
+      jQuery.getScript(location.href.replace("(letter=?)", "letter=" + this.data("letter")));
+      jQuery(".pagination").html(text);
+      history.pushState(null, document.title, location.href.replace("(letter=?)", "letter=" + this.data("letter")));
+      e.preventDefault();
+  });
+
+  $(window).bind("popstate", function() {
+      $.getScript(location.href);
+      $(".pagination").html(text);
+  });
+});

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alphabetical_paginate
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.10
   prerelease: 
 platform: ruby
 authors:
@@ -89,6 +89,8 @@ files:
 - Rakefile
 - alphabetical_paginate.gemspec
 - lib/alphabetical_paginate.rb
+- lib/alphabetical_paginate/.array.rb.swo
+- lib/alphabetical_paginate/.view_helpers.rb.swo
 - lib/alphabetical_paginate/array.rb
 - lib/alphabetical_paginate/engine.rb
 - lib/alphabetical_paginate/railtie.rb
@@ -97,6 +99,7 @@ files:
 - spec/alpha_example.rb
 - spec/alphabetical_paginate_spec.rb
 - spec/support/helpers.rb
+- vendor/assets/javascripts/.alphabetical_paginate.js.swp
 - vendor/assets/javascripts/alphabetical_paginate.js
 - vendor/assets/javascripts/index.js
 homepage: http://google.com