alphabetical_paginate 1.0.3 → 1.1.0

data/lib/alphabetical_paginate/array.rb

@@ -4,7 +4,8 @@ class Array
                                                 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[:others] = true if !params.has_key? :others
+    params[:default_field] ||= "a"
     params[:pagination_class] ||= "pagination-centered"
     output = []
     availableLetters = {}
@@ -33,6 +34,7 @@ class Array
     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 }
     return output, params
   end
 end

data/lib/alphabetical_paginate/controller_helper.rb

@@ -0,0 +1,76 @@
+module AlphabeticalPaginate
+  module ControllerHelpers
+    def self.included(base)
+      base.extend(self)
+    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"}
+      params[:paginate_all] ||= false
+      params[:numbers] = true if !params.has_key? :numbers
+      params[:others] = true if !params.has_key? :others
+      params[:pagination_class] ||= "pagination-centered"
+      params[:batch_size] ||= 500
+      params[:default_field] ||= "a"
+      params[:db_mode] ||= false
+      params[:field] ||= "id"
+
+      output = []
+
+      if current_field == nil
+        current_field = params[:default_field]
+      end
+
+      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"
+        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])
+          else
+            output = self.where("%s REGEXP '^[0-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])}
+      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
+          case field_letter
+            when /[a-z]/ 
+              availableLetters[field_letter] = true if !availableLetters.has_key? field_letter
+              output << x if 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 
+              else
+                availableLetters['0'] = true if !availableLetters.has_key? 'numbers'
+                output << x if current_field == "0"
+              end
+            else
+              availableLetters['*'] = true if !availableLetters.has_key? 'other'
+              output << x if 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 }
+      end
+      params[:currentField] = current_field
+      return output, params
+    end
+  end
+end

data/lib/alphabetical_paginate/railtie.rb

@@ -1,4 +1,5 @@
 require 'alphabetical_paginate/view_helpers'
+require 'alphabetical_paginate/controller_helper'
 module AlphabeticalPaginate
   class Railtie < Rails::Railtie
     initializer "alphabetical_paginate.view_helpers" do
@@ -6,6 +7,7 @@ module AlphabeticalPaginate
     end
     initializer "alphabetical_paginate.controller_helpers" do
       ActiveRecord::Relation.send :include, ControllerHelpers
+      ActiveRecord::Base.send :include, ControllerHelpers
     end
   end
 end

data/lib/alphabetical_paginate/version.rb

@@ -1,3 +1,3 @@
 module AlphabeticalPaginate
-  VERSION = "1.0.3"
+  VERSION = "1.1.0"
 end

data/lib/alphabetical_paginate/view_helpers.rb

@@ -18,10 +18,10 @@ module AlphabeticalPaginate
         range.each do |l|
           if l == params[:currentField]
             links += '<li class="active"><a href="#" data-letter="' + l + '">' + l + "</a></li>"
-          elsif params[:availableLetters].include? l
-            links += '<li><a href="?letter=" data-letter="' + l + '">' + l + "</a></li>"
+          elsif params[:db_mode] or params[:availableLetters].include? l
+            links += '<li><a href="?letter=' + l + '" data-letter="' + l + '">' + l + "</a></li>"
           else
-            links += '<li class="disabled"><a href="?letter=" data-letter="' + l + '">' + l + "</a></li>"
+            links += '<li class="disabled"><a href="?letter="' + l + ' data-letter="' + l + '">' + l + "</a></li>"
           end
         end
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alphabetical_paginate
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -90,7 +90,7 @@ files:
 - alphabetical_paginate.gemspec
 - lib/alphabetical_paginate.rb
 - lib/alphabetical_paginate/array.rb
-- lib/alphabetical_paginate/controller.rb
+- lib/alphabetical_paginate/controller_helper.rb
 - lib/alphabetical_paginate/engine.rb
 - lib/alphabetical_paginate/railtie.rb
 - lib/alphabetical_paginate/version.rb

data/lib/alphabetical_paginate/controller.rb

@@ -1,72 +0,0 @@
-module AlphabeticalPaginate
-  module ControllerHelpers
-    class Relation
-      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"}
-        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"
-        params[:batch_size] ||= 500
-        params[:db_mode] ||= false
-        params[:field] ||= "id"
-
-        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"
-          end
-          params[:paginate_all] = true
-        end
-
-        output = []
-
-        if current_field == nil
-          current_field = params[:default_field]
-        end
-
-        if params[:db_mode]
-          case field_letter
-          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])
-            else
-              output = self.where("%s REGEXP '^[0-9].*'" % [params[:db_field], current_field])
-            end
-          else
-            output = self.where("%s REGEXP '^[a-z0-9].*'" % [params[:db_field], current_field])
-          end
-        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
-            case field_letter
-              when /[a-z]/ 
-                availableLetters[field_letter] = true if !availableLetters.has_key? field_letter
-                output << x if 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 
-                else
-                  availableLetters['0'] = true if !availableLetters.has_key? 'numbers'
-                  output << x if current_field == "0"
-                end
-              else
-                availableLetters['*'] = true if !availableLetters.has_key? 'other'
-                output << x if current_field == "*"
-            end
-          end
-          params[:availableLetters] = availableLetters.collect{|k,v| k.to_s}
-        end
-        params[:currentField] = current_field
-        return output, params
-      end
-    end
-  end
-end