alphabetical_paginate 1.6.0 → 1.6.1

data/lib/alphabetical_paginate/array.rb

@@ -1,9 +1,9 @@
 # coding: utf-8
 class Array
   def alpha_paginate current_field, params = {enumerate:false, default_field: "a", 
-                                                paginate_all: false, numbers: true, include_all: true,
-                                                others: true, pagination_class: "pagination-centered",
-                                                js: true, support_language: :en}
+                                              paginate_all: false, numbers: true, include_all: true,
+                                              others: true, pagination_class: "pagination-centered",
+                                              js: true, support_language: :en}
     params[:paginate_all] ||= false
     params[:support_language] ||= :en
     params[:language] = AlphabeticalPaginate::Language.new(params[:support_language])
@@ -18,7 +18,8 @@ class Array
     if current_field == nil
       current_field = params[:default_field]
     end
-    all = params[:include_all] && current_field.downcase == "all"
+    current_field = current_field.mb_chars.downcase.to_s
+    all = params[:include_all] && current_field == "all"
 
     self.each do |x|
       field_val = block_given? ? yield(x).to_s : x.id.to_s
@@ -41,8 +42,8 @@ class Array
       end
     end
 
-    params[:availableLetters] = availableLetters.collect{|k,v| k.to_s}
-    params[:currentField] = current_field
+    params[:availableLetters] = availableLetters.collect{ |k,v| k.mb_chars.capitalize.to_s }
+    params[:currentField] = current_field.mb_chars.capitalize.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

data/lib/alphabetical_paginate/controller_helper.rb

@@ -28,7 +28,8 @@ module AlphabeticalPaginate
       if current_field == nil
         current_field = params[:default_field]
       end
-      all = params[:include_all] && current_field.downcase == "all"
+      current_field = current_field.mb_chars.downcase.to_s
+      all = params[:include_all] && current_field == "all"
 
       if params[:db_mode]
         if !ActiveRecord::Base.connection.adapter_name.downcase.include? "mysql"
@@ -40,7 +41,7 @@ module AlphabeticalPaginate
         if all
           output = self
         else
-          case current_field[0].mb_chars.downcase.to_s
+          case current_field
           when params[:language].letters_regexp
             output = self.where("LOWER(%s) REGEXP '^%s.*'" % [params[:db_field], current_field])
           when /[0-9]/
@@ -77,10 +78,10 @@ module AlphabeticalPaginate
               output << x if all || current_field == "*"
           end
         end
-        params[:availableLetters] = availableLetters.collect{|k,v| k.to_s}
+        params[:availableLetters] = availableLetters.collect{ |k,v| k.mb_chars.capitalize.to_s }
         output.sort! {|x, y| block_given? ? (yield(x).to_s <=> yield(y).to_s) : (x.id.to_s <=> y.id.to_s) }
       end
-      params[:currentField] = current_field
+      params[:currentField] = current_field.mb_chars.capitalize.to_s
       return output, params
     end
   end

data/lib/alphabetical_paginate/language.rb

@@ -12,34 +12,32 @@ module AlphabeticalPaginate
     end
 
     def letters_regexp
-      russian? ? /[#{russian_letters}]/ : /[a-z]/
+      russian? ? /[а-яА-Я]/ : /[a-zA-Z]/
     end
 
+    def default_letter
+      russian? ? "а" : "a" # First 'a' is russian, second - english
+    end
+
+    # used in view_helper
     def letters_range
       if russian?
         letters = []
-        russian_letters.each_char{ |x| letters << x }
+        "АБВГДЕЖЗИКЛМНОПРСТУФХЦЧШЭЮЯ".each_char{ |x| letters << x }
         letters
       else
-        ('a'..'z').to_a
+        ('A'..'Z').to_a
       end
     end
 
+    # used in view_helper
     def output_letter(l)
-      (l == "all") ? all_field : l
+      (l == "All") ? all_field : l
     end
 
+    # used in view_helper
     def all_field
-      russian? ? 'все' : "all"
-    end
-
-    def default_letter
-      russian? ? "а" : "a" # First 'a' is russian, second - english
+      russian? ? 'Все' : "All"
     end
-
-    private
-      def russian_letters
-        "абвгдежзиклмнопрстуфхцчшэюя"
-      end
   end
 end

data/lib/alphabetical_paginate/version.rb

@@ -1,3 +1,3 @@
 module AlphabeticalPaginate
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/lib/alphabetical_paginate/view_helpers.rb

@@ -17,7 +17,7 @@ module AlphabeticalPaginate
         elsif params[:numbers]
           range = ["0-9"] + range
         end
-        range.unshift "all" if params[:include_all]
+        range.unshift "All" if params[:include_all]
         range.each do |l|
           value = params[:language].output_letter(l)
           if l == params[:currentField]
@@ -31,7 +31,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].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

@@ -109,8 +109,8 @@ module AlphabeticalPaginate
     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|
+        (["@!#"] + (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
@@ -128,7 +128,7 @@ module AlphabeticalPaginate
       it "should include a numbers and others field" do
         index, params = @list.alpha_paginate(nil)
         pagination = alphabetical_paginate(params)
-        (["*"] + ["0-9"] + ("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
@@ -137,7 +137,7 @@ module AlphabeticalPaginate
       it "should default all values when necessary" do
         index, params = @list.alpha_paginate(nil, {})
         pagination = alphabetical_paginate(params)
-        (["*"] + ["0-9"] + ("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
@@ -146,11 +146,11 @@ module AlphabeticalPaginate
       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|
+        (("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="*"',
+        pagination.should_not include 'data-letter="Z"', 'data-letter="*"',
           'data-letter="0-9"'
       end
 
@@ -168,7 +168,7 @@ 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
@@ -177,7 +177,7 @@ module AlphabeticalPaginate
       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|
+        (["All", "0-9"].map{|x|
           'data-letter="%s"'%x}).each do |x|
           pagination.should include x
         end
@@ -187,8 +187,8 @@ module AlphabeticalPaginate
     describe "#alphabetical_paginate in russian characters" do
       before :each do
         @list = []
-        ("а".."я").to_a.each do |x|
-          ("а".."т").to_a.each do |y|
+        ("А".."Я").to_a.each do |x|
+          ("А".."Т").to_a.each do |y|
             @list << x + y
           end
         end
@@ -196,7 +196,7 @@ module AlphabeticalPaginate
           AlphaExample.new(x)
         end
         @russian_array = []
-        "абвгдежзиклмнопрстуфхцчшэюя".each_char{ |x| @russian_array << x }
+        "АБВГДЕЖЗИКЛМНОПРСТУФХЦЧШЭЮЯ".each_char{ |x| @russian_array << x }
       end
 
       it "should display russian characters through additional attribute(language)" do

data/spec/language_spec.rb

@@ -1,26 +1,28 @@
 # coding: utf-8
+require 'alphabetical_paginate'
 
 module AlphabeticalPaginate
   describe Language do
     context "English language" do
       before(:all) do
-        @language = AlphabeticalPaginate::Language.new(:en)
+        I18n.locale = :en
+        @language = AlphabeticalPaginate::Language.new(I18n.locale)
       end
 
       it "should return false on russian? method" do
         @language.russian?.should be_false
       end
 
-      it "should return /[a-z]/ regexp" do
-        @language.letters_regexp.should eq(/[a-z]/)
+      it "should return /[a-zA-Z]/ regexp" do
+        @language.letters_regexp.should eq(/[a-zA-Z]/)
       end
 
       it "should return array of english letters" do
-        @language.letters_range.should eq(("a".."z").to_a)
+        @language.letters_range.should eq(("A".."Z").to_a)
       end
 
-      it "should return english representation of 'all' field and other english letters (for view helper)" do
-        (["all"] + ("a".."z").to_a).map do |l|
+      it "should return english representation of 'All' field and other english letters (for view helper)" do
+        (["All"] + ("A".."Z").to_a).map do |l|
           @language.output_letter(l).should eq(l)
         end
       end
@@ -32,8 +34,9 @@ module AlphabeticalPaginate
 
     context "Russian language" do
       before(:all) do
-        @language = AlphabeticalPaginate::Language.new(:ru)
-        @russian_string = "абвгдежзиклмнопрстуфхцчшэюя"
+        I18n.locale = :ru
+        @language = AlphabeticalPaginate::Language.new(I18n.locale)
+        @russian_string = "АБВГДЕЖЗИКЛМНОПРСТУФХЦЧШЭЮЯ"
         @russian_array = []
         @russian_string.each_char{ |x| @russian_array << x }
       end
@@ -42,21 +45,21 @@ module AlphabeticalPaginate
         @language.russian?.should be_true
       end
 
-      it "should return /[абвгдежзиклмнопрстуфхцчшэюя]/ regexp" do
-        @language.letters_regexp.should eq(/[#{@russian_string}]/)
+      it "should return /[а-яА-Я]/ regexp" do
+        @language.letters_regexp.should eq(/[а-яА-Я]/)
       end
 
       it "should return array of russian letters" do
         @language.letters_range.should eq(@russian_array)
       end
 
-      it "should return russian representation of 'all' field and other russian letters (for view helper)" do
-        (["все"] + @russian_array).map do |l|
+      it "should return russian representation of 'All' field and other russian letters (for view helper)" do
+        (["Все"] + @russian_array).map do |l|
           @language.output_letter(l).should eq(l)
         end
       end
 
-      it "should return russian representation of 'a' letter" do
+      it "should return russian representation of 'а' letter" do
         @language.default_letter.should eq("а")
       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=?.{1,3}/,"letter=" + letter);
+        url = url.replace(/letter=[^&]*/,"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.6.0
+  version: 1.6.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-14 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler