bridgetown-paginate 1.0.0.beta2 → 1.0.0.beta3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 0e62fa684407f04d71210b75f98af3fd59de77e60b66a1638de5644b9a1344ec
4
- data.tar.gz: 77a89ded7a4b6d4c54e6dbd555328ac37270368ac04aebd2aacd1b626e084340
3
+ metadata.gz: dff7281daae0650621d5a231dc67249d8549768e21351c4bd913ed6d2454301d
4
+ data.tar.gz: 8ca315795dc4f6d9d149fc352f3ec37d88e595673b58cc35129234d407708c00
5
5
  SHA512:
6
- metadata.gz: b13e6b800070c71ce5ef28ea908cae648cb32f222f90421b3d31b6ed17c0f699016bfe71e071943fdb5d5cb71003890c5c079cd452000b5f3d897df29acb5a92
7
- data.tar.gz: 0dbb08fe19f823a4415c14b7f3850731a3ed64d50e159a439282438325e1c1cf34034f4588e26ebd583b349a05dcfbb4967ed308b0ec9159be03260c03a0b70a
6
+ metadata.gz: 21aa0af085af0e1af5bc85c4b56cd636ac0eeca1ba21e46795d6e00334386a8932cce19fda928da6f33cd664194a77a9ead2eb26512da4008e24924b29be2732
7
+ data.tar.gz: ded5c64021306919a9741b5aef831bec7457ad3f89b5fe383c638f4d86b1767a632e87c685e1ebb4e72cbebb3eaf34bacc918d894251da6589e3037736a1a132
@@ -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.beta2
4
+ version: 1.0.0.beta3
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-26 00:00:00.000000000 Z
11
+ date: 2022-02-18 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.beta2
19
+ version: 1.0.0.beta3
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.beta2
26
+ version: 1.0.0.beta3
27
27
  description:
28
28
  email: maintainers@bridgetownrb.com
29
29
  executables: []