dimples 3.0.4 → 3.0.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 250405af2e270c7f48443222c7503a2ea14fdb05
4
- data.tar.gz: 45648589f28e96b6299beaea14132c9d29a5e5bf
3
+ metadata.gz: ec2b503cd1771c15f3bc623f958e154abc9b3e4a
4
+ data.tar.gz: 7ca76777baf6e46b8bf9ea75f289735831652a41
5
5
  SHA512:
6
- metadata.gz: f7b0876e40572826cb5fb8e6b0195d570250c2c52710d5a0a14e88a32b65794cbe13f00bfb7b1c77d59de152080ba1a237f176962a923e301478cef0dad9e5ef
7
- data.tar.gz: e7873ddab0ae82decade47aefd4bdcfe87afe238790044aa6f57d3bedc0690df6eb2be7d1d5a75348fb2f226448cbccb2569a67f6b7684f8fbf41c800720af1d
6
+ metadata.gz: 1a47598c8330876eb5681ef29ec7353c4c8aec8dff8de2e8dbcddbfbae1ca1174a2958f23727327ae98097787cc2983550db386bba5cdf9aa9b3d407530cfe59
7
+ data.tar.gz: 61d0c564a93baffe52a45b0aba6d02215671e24de2459f8489877214b13205456bc6a0bf7295f55662a69bde5e4abd505953d65cd7d46a1e91546fbb485d67cd
@@ -4,11 +4,11 @@ module Dimples
4
4
  # A module that supports pagination.
5
5
  module Pagination
6
6
  def paginate(site, items, path, layout, options = {})
7
- context = options[:context] || {}
7
+ context = options.delete(:context) || {}
8
8
  url = path.gsub(site.output_paths[:site], '') + '/'
9
- per_page = options[:per_page] || site.config['pagination']['per_page']
9
+ per_page = options.delete(:per_page) || site.config['pagination']['per_page']
10
10
 
11
- pager = Pager.new(url, items, per_page)
11
+ pager = Pager.new(url, items, per_page, options)
12
12
 
13
13
  pager.each do |index, page_items|
14
14
  page = Dimples::Page.new(site)
@@ -40,11 +40,12 @@ module Dimples
40
40
  attr_reader :page_count
41
41
  attr_reader :item_count
42
42
 
43
- def initialize(url, items, per_page)
43
+ def initialize(url, items, per_page, options = {})
44
44
  @url = url
45
45
  @items = items
46
46
  @per_page = per_page
47
47
  @page_count = (items.length.to_f / per_page.to_i).ceil
48
+ @page_prefix = options[:page_prefix] || 'page'
48
49
 
49
50
  step_to(1)
50
51
  end
@@ -69,11 +70,11 @@ module Dimples
69
70
 
70
71
  def previous_page_url
71
72
  return unless @previous_page
72
- @previous_page != 1 ? "#{@url}page#{@previous_page}" : @url
73
+ @previous_page != 1 ? "#{@url}#{@page_prefix}#{@previous_page}" : @url
73
74
  end
74
75
 
75
76
  def next_page_url
76
- "#{@url}page#{@next_page}" if @next_page
77
+ "#{@url}#{@page_prefix}#{@next_page}" if @next_page
77
78
  end
78
79
 
79
80
  def to_h
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Dimples
4
- VERSION = '3.0.4'
4
+ VERSION = '3.0.5'
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: dimples
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.4
4
+ version: 3.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Daniel Bogan
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-08-30 00:00:00.000000000 Z
11
+ date: 2017-08-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: tilt