effective_bootstrap 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1aa3384fb3e09bfd5b1f7f14d03ca6e60ff3ee366252274f3ecb4f41b4779a6
-  data.tar.gz: 4c59087f46a59835461df12bf436e81a002627765f1242c402861c03f5885d90
+  metadata.gz: b4522b40a141a3ea3b72005b21e9f2dfc69c4ac0098fb9fcae41582f0f273278
+  data.tar.gz: eaa49061b18dadb536b6bc1a738a4605b7271320e27e78d109901cd98dfdfe3b
 SHA512:
-  metadata.gz: f5cfd9ee7e3e46bb6303c2d387d06758c32e275d51f69fb56f1b6839e41c88911ff661c9d8273482fe1b68fcb2fbaf7de0a1c8ddb6d34ddaeafcfd1ff312b573
-  data.tar.gz: 968230fcf3f09272b941f84707451398741d3654e293d5fbbafac619815106210b08b71eb47cf071c921dd4cd033233194b16dc796e6019b0ae4fedd4b2b73f5
+  metadata.gz: 9a502e5e55ec541dd7376735fe9dc32f0bee314e3f9e7a7b0f60f66aa1287eb4fc5ea874ff750dc8f6738a44ef204394bb123bdcd39fca450edc0f220cb61384
+  data.tar.gz: 4ca777f00efe441d239f4c1cef3679a6b9052593ca5622d032ffe764d9130679f5f7725f400aeef8356e96ded6781e3c600ac892c6e5ac81c47bf4b94cc09a63

data/app/helpers/effective_bootstrap_helper.rb

@@ -197,15 +197,15 @@ module EffectiveBootstrapHelper
   # Add this to your view
   # %nav= paginate(@posts, per_page: 10)
   #
-  def bootstrap_paginate(collection, per_page:, url: nil, count: nil, window: 2)
+  def bootstrap_paginate(collection, per_page:, url: nil, window: 2, collection_count: nil, render_single_page: false)
     raise 'expected an ActiveRecord::Relation' unless collection.respond_to?(:limit) && collection.respond_to?(:offset)
 
-    count ||= collection.limit(nil).offset(nil).count # You can pass the total count, or not.
+    collection_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
+    last = (collection_count.to_f / per_page).ceil
 
-    return unless last > 1 # If there's only 1 page, don't render a pagination at all.
+    return unless (last > 1 || render_single_page) # If there's only 1 page, don't render a pagination at all.
 
     # Build URL
     uri = URI(url || request.fullpath)
@@ -230,36 +230,35 @@ module EffectiveBootstrapHelper
     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))
+    length = 1 + (window * 2)
+    left = 1.upto(last).to_a.first(length)
+    right = 1.upto(last).to_a.last(length)
+    center = []
 
-    if left.include?(page + 1)
+    if last <= (length + 2)
       left = left - right
-      middle = []
+      right = right - left
+    elsif left.include?(page + 1)
       right = [last]
+      left = left - right
     elsif right.include?(page - 1)
       left = [1]
-      middle = []
       right = right - left
-    elsif middle.include?(page)
+    else
       left = [1]
-      middle = middle - left - right
       right = [last]
+      center = (page - window + 1).upto(page + window - 1).to_a
     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
       [
         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) },
+        left.map { |index| bootstrap_paginate_tag(index, page, url, params) },
+        (dots_tag if last > length && left == [1]),
+        center.map { |index| bootstrap_paginate_tag(index, page, url, params) },
+        (dots_tag if last > length && right == [last]),
+        right.map { |index| bootstrap_paginate_tag(index, page, url, params) },
         next_tag
       ].flatten.join.html_safe
     end

data/lib/effective_bootstrap/version.rb

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

metadata

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