bridgetown-paginate 1.0.0.beta1 → 1.0.0

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
  SHA256:
3
- metadata.gz: 598253ec8df444a3d539ba263176f314a28da389ad085a3a36ce859cf97d684b
4
- data.tar.gz: 9fd2198fb261f3a7212899a97c68c40aca130bc543865e7d05f3463a6351b5f5
3
+ metadata.gz: fd80c11ef16fed5c96abe33b21af69f82bc7497342d269314ca8c9bd6db7b1bb
4
+ data.tar.gz: 808d8dad4b55f0c93a874542c1fa7540c1d7b6c6389c9905c17fda333f319db2
5
5
  SHA512:
6
- metadata.gz: d2111a8417f2a5f1f13803986f5fe29527dd9496626b35a0371d91503665bd74ab05bcf24e0edaa1426ad02351abcdd1f01b39ac946764612316b220c62ccb0c
7
- data.tar.gz: 3ac2e512502227f3a4e4d777a4981bc4182229f1b4e61d72124ea2c5bb587263326f04428f74ead715fda783b7125468d7cc504f98ececa1c3a2ada6657f6c05
6
+ metadata.gz: f69ff99f1a614245be8d04352759d2d81990e12570c80d72723c14339b64020ffd99e9bcb02b6392d8fe19b971e69c5fd672c3fabfac9cd3b62f891bf4b5eca9
7
+ data.tar.gz: 1c3dfc941f74f43bb0dd31c71fca119beaffcad6804c7c986a4080a8ab8582a2c393e60648c548b6543233364d731f2a284886066fbd426b3deeab17ff126c1f
@@ -366,18 +366,7 @@ module Bridgetown
366
366
  index_page_ext
367
367
  )
368
368
 
369
- # Create the url for the new page, make sure we prepend any permalinks
370
- # that are defined in the template page before
371
- if newpage.paginator.page_path.end_with? "/"
372
- newpage.set_url(File.join(newpage.paginator.page_path, index_page_with_ext))
373
- elsif newpage.paginator.page_path.end_with? index_page_ext.to_s
374
- # Support for direct .html files
375
- newpage.set_url(newpage.paginator.page_path)
376
- else
377
- # Support for extensionless permalinks
378
- newpage.set_url(newpage.paginator.page_path + index_page_ext.to_s)
379
- end
380
-
369
+ newpage.set_url(newpage.paginator.page_path)
381
370
  newpage.data["permalink"] = newpage.paginator.page_path if template.data["permalink"]
382
371
 
383
372
  # Transfer the title across to the new page
@@ -34,7 +34,7 @@ module Bridgetown
34
34
  # rubocop:disable Naming/AccessorMethodName
35
35
  def set_url(url_value)
36
36
  @path = url_value.delete_prefix "/"
37
- @dir = File.dirname(@path)
37
+ @dir = @path.ends_with?("/") ? @path : File.dirname(@path)
38
38
  @url = url_value
39
39
  end
40
40
  # rubocop:enable Naming/AccessorMethodName
@@ -42,8 +42,8 @@ module Bridgetown
42
42
  # Ensure that the current page has correct extensions if needed
43
43
  this_page_url = Utils.ensure_full_path(
44
44
  @page == 1 ? first_index_page_url : paginated_page_url,
45
- !default_indexpage || default_indexpage.empty? ? "index" : default_indexpage,
46
- !default_ext || default_ext.empty? ? ".html" : default_ext
45
+ default_indexpage || "",
46
+ default_ext || ""
47
47
  )
48
48
 
49
49
  # To support customizable pagination pages we attempt to explicitly
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bridgetown-paginate
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.beta1
4
+ version: 1.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bridgetown Team
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-01-13 00:00:00.000000000 Z
11
+ date: 2022-03-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bridgetown-core
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 1.0.0.beta1
19
+ version: 1.0.0
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 1.0.0.beta1
26
+ version: 1.0.0
27
27
  description:
28
28
  email: maintainers@bridgetownrb.com
29
29
  executables: []
@@ -57,9 +57,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
57
57
  version: '0'
58
58
  required_rubygems_version: !ruby/object:Gem::Requirement
59
59
  requirements:
60
- - - ">"
60
+ - - ">="
61
61
  - !ruby/object:Gem::Version
62
- version: 1.3.1
62
+ version: '0'
63
63
  requirements: []
64
64
  rubygems_version: 3.1.4
65
65
  signing_key: