alphabetical_paginate 1.5.0 → 1.6.0

data/lib/alphabetical_paginate/controller_helper.rb

@@ -5,71 +5,80 @@ module AlphabeticalPaginate
     end
 
     def alpha_paginate current_field, params = {enumerate:false, default_field: "a", 
-                                                  paginate_all: false, numbers: true,
-                                                  others: true, pagination_class: "pagination-centered",
-                                                  batch_size: 500, db_mode: false, 
-                                                  db_field: "id",
-                                                  js: true}
+                                                paginate_all: false, numbers: true,
+                                                others: true, pagination_class: "pagination-centered",
+                                                batch_size: 500, db_mode: false, 
+                                                db_field: "id", include_all: true,
+                                                js: true, support_language: :en}
       params[:paginate_all] ||= false
+      params[:support_language] ||= :en
+      params[:language] = AlphabeticalPaginate::Language.new(params[:support_language])
+      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[:js] = true if !params.has_key? :js
       params[:pagination_class] ||= "pagination-centered"
       params[:batch_size] ||= 500
-      params[:default_field] ||= "a"
+      params[:default_field] ||= params[:include_all] ? "all" : params[:language].default_letter
       params[:db_mode] ||= false
-      params[:field] ||= "id"
+      params[:db_field] ||= "id"
 
       output = []
 
       if current_field == nil
         current_field = params[:default_field]
       end
+      all = params[:include_all] && current_field.downcase == "all"
 
       if params[:db_mode]
         if !ActiveRecord::Base.connection.adapter_name.downcase.include? "mysql"
-          raise "You need a mysql database to ues db_mode with alphabetical_paginate"
+          raise "You need a mysql database to use db_mode with alphabetical_paginate"
         end
         params[:paginate_all] = true
         params[:availableLetters] = []
 
-        case current_field[0].downcase
-        when /[a-z]/
-          output = self.where("%s REGEXP '^%s.*'" % [params[:db_field], current_field])
-        when /[0-9]/
-          if params[:enumerate]
-            output = self.where("%s REGEXP '^%s.*'" % [params[:db_field], current_field])
+        if all
+          output = self
+        else
+          case current_field[0].mb_chars.downcase.to_s
+          when params[:language].letters_regexp
+            output = self.where("LOWER(%s) REGEXP '^%s.*'" % [params[:db_field], current_field])
+          when /[0-9]/
+            if params[:enumerate]
+              output = self.where("LOWER(%s) REGEXP '^%s.*'" % [params[:db_field], current_field])
+            else
+              output = self.where("LOWER(%s) REGEXP '^[0-9].*'" % [params[:db_field], current_field])
+            end
           else
-            output = self.where("%s REGEXP '^[0-9].*'" % [params[:db_field], current_field])
+            output = self.where("LOWER(%s) REGEXP '^[^a-z0-9].*'" % [params[:db_field], current_field])
           end
-        else
-          output = self.where("%s REGEXP '^[^a-z0-9].*'" % [params[:db_field], current_field])
         end
-        output.sort! {|x, y| x.send(params[:db_field]) <=> y.send(params[:db_field])}
+        #output.sort! {|x, y| x.send(params[:db_field]) <=> y.send(params[:db_field])}
+        output.order("#{params[:db_field]} ASC")
       else
         availableLetters = {}
         self.find_each({batch_size: params[:batch_size]}) do |x|
           field_val = block_given? ? yield(x).to_s : x.id.to_s
-          field_letter = field_val[0].downcase
+          field_letter = field_val[0].mb_chars.downcase.to_s
           case field_letter
-            when /[a-z]/ 
+            when params[:language].letters_regexp
               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 =~ params[:language].letters_regexp && 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}
-        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) }
       end
       params[:currentField] = current_field
       return output, params

data/lib/alphabetical_paginate/version.rb

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

metadata

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