effective_bootstrap 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fb933178be2c7995252f146a2b8229b705f076fdda00f1bab4c439c398a18fb
-  data.tar.gz: caa3cf323586a4779bc974b4f0a7020bedd5edd3bd18fc9c37a9b6782d7258e0
+  metadata.gz: f1aa3384fb3e09bfd5b1f7f14d03ca6e60ff3ee366252274f3ecb4f41b4779a6
+  data.tar.gz: 4c59087f46a59835461df12bf436e81a002627765f1242c402861c03f5885d90
 SHA512:
-  metadata.gz: c9bc6b00310c306747ef40e6129427a4ba25f55da882c1375970350d191843580528a8311627cfea89e8fa555cde0ea41ef62dcb63e32150dd585723d4dba62e
-  data.tar.gz: 6394f4f90fe49863073e047d8eff18b1cb2d3c8066795788491cb1ecf34fd61276437cec3327b0e9604080484acd68bf384923a5376b8d48dab4f91de09bf806
+  metadata.gz: f5cfd9ee7e3e46bb6303c2d387d06758c32e275d51f69fb56f1b6839e41c88911ff661c9d8273482fe1b68fcb2fbaf7de0a1c8ddb6d34ddaeafcfd1ff312b573
+  data.tar.gz: 968230fcf3f09272b941f84707451398741d3654e293d5fbbafac619815106210b08b71eb47cf071c921dd4cd033233194b16dc796e6019b0ae4fedd4b2b73f5

data/app/helpers/effective_bootstrap_helper.rb

@@ -197,35 +197,77 @@ module EffectiveBootstrapHelper
   # Add this to your view
   # %nav= paginate(@posts, per_page: 10)
   #
-  def bootstrap_paginate(collection, per_page:, url: nil)
+  def bootstrap_paginate(collection, per_page:, url: nil, count: nil, window: 2)
     raise 'expected an ActiveRecord::Relation' unless collection.respond_to?(:limit) && collection.respond_to?(:offset)
 
-    count = collection.limit(nil).offset(nil).count
+    count ||= collection.limit(nil).offset(nil).count # You can pass the total count, or not.
 
     page = (params[:page] || 1).to_i
     last = (count.to_f / per_page).ceil
 
     return unless last > 1 # If there's only 1 page, don't render a pagination at all.
 
+    # Build URL
     uri = URI(url || request.fullpath)
     params = Rack::Utils.parse_nested_query(uri.query)
     url = uri.path + '?'
 
+    # Pagination Tags
+    prev_tag = content_tag(:li, class: ['page-item', ('disabled' if page <= 1)].compact.join(' ')) do
+      link_to(content_tag(:span, 'Previous'.html_safe), (page <= 1 ? '#' : url + params.merge('page' => page - 1).to_query),
+        class: 'page-link', 'aria-label': 'Previous', title: 'Previous', 'aria-disabled': ('true' if page <= 1), 'tabindex': ('-1' if page <= 1)
+      )
+    end
+
+    next_tag = content_tag(:li, class: ['page-item', ('disabled' if page >= last)].compact.join(' ')) do
+      link_to(content_tag(:span, 'Next'.html_safe), (page >= last ? '#' : url + params.merge('page' => page + 1).to_query),
+        class: 'page-link', 'aria-label': 'Next', title: 'Next', 'aria-disabled': ('true' if page >= last), 'tabindex': ('-1' if page >= last)
+      )
+    end
+
+    dots_tag = content_tag(:li, class: 'page-item disabled') do
+      link_to('...', '#', class: 'page-link', 'aria-label': '...', 'aria-disabled': true, tabindex: '-1')
+    end
+
+    # Calculate Windows
+    left = 1.upto(last).to_a.first(1 + (window * 2))
+    middle = ([1, 1 + page - window].max).upto([page + window - 1, last].min).to_a
+    right = 1.upto(last).to_a.last(1 + (window * 2))
+
+    if left.include?(page + 1)
+      left = left - right
+      middle = []
+      right = [last]
+    elsif right.include?(page - 1)
+      left = [1]
+      middle = []
+      right = right - left
+    elsif middle.include?(page)
+      left = [1]
+      middle = middle - left - right
+      right = [last]
+    end
+
+    left_dots = (dots_tag if left == [1] && last > (window * 2 + 1))
+    right_dots = (dots_tag if right == [last] && last > (window * 2 + 1))
+
+    # Render the pagination
     content_tag(:ul, class: 'pagination') do
-      content_tag(:li, class: ['page-item', ('disabled' if page <= 1)].compact.join(' ')) do
-        link_to((page <= 1 ? '#' : url + params.merge('page' => page - 1).to_query), class: 'page-link', 'aria-label': 'Previous', title: 'Previous', 'aria-disabled': ('true' if page <= 1), 'tabindex': ('-1' if page <= 1)) do
-          content_tag(:span, '&laquo;'.html_safe, 'aria-hidden': true) + content_tag(:span, 'Previous', class: 'sr-only')
-        end
-      end + (1..last).map do |index|
-        content_tag(:li, class: ['page-item', ('active' if index == page)].compact.join(' '), title: "Page #{index}") do
-          link_to(index, (url + params.merge('page' => index).to_query), class: 'page-link')
-        end
-      end.join.html_safe +
-      content_tag(:li, class: ['page-item', ('disabled' if page >= last)].compact.join(' ')) do
-        link_to((page >= last ? '#' : url + params.merge('page' => page + 1).to_query), class: 'page-link', 'aria-label': 'Next', title: 'Next', 'aria-disabled': ('true' if page >= last), 'tabindex': ('-1' if page >= last)) do
-          content_tag(:span, '&raquo;'.html_safe, 'aria-hidden': true) + content_tag(:span, 'Next', class: 'sr-only')
-        end
-      end
+      [
+        prev_tag,
+        (left || []).map { |index| bootstrap_paginate_tag(index, page, url, params) },
+        left_dots,
+        (middle || []).compact.map { |index| bootstrap_paginate_tag(index, page, url, params) },
+        right_dots,
+        (right || []).map { |index| bootstrap_paginate_tag(index, page, url, params) },
+        next_tag
+      ].flatten.join.html_safe
+    end
+  end
+
+  def bootstrap_paginate_tag(index, page, url, params)
+    content_tag(:li, class: ['page-item', ('active' if index == page)].compact.join(' '), title: "Page #{index}") do
+      link_to(index, (url + params.merge('page' => index).to_query), class: 'page-link')
     end
   end
 

data/app/helpers/effective_form_builder_helper.rb

@@ -14,9 +14,9 @@ module EffectiveFormBuilderHelper
     end
 
     options[:class] = [
-      options[:class], 
-      'needs-validation', 
-      ('form-inline' if options[:layout] == :inline), 
+      options[:class],
+      'needs-validation',
+      ('form-inline' if options[:layout] == :inline),
       ('with-errors' if subject.respond_to?(:errors) && subject.errors.present?)
     ].compact.join(' ')
 

data/lib/effective_bootstrap/version.rb

@@ -1,3 +1,3 @@
 module EffectiveBootstrap
-  VERSION = '0.6.4'.freeze
+  VERSION = '0.6.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_bootstrap
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.6.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails