bridgetown-paginate 0.21.0 → 0.21.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 108562c7b942bc8c4e1212fe7c6970c024c53508cfca7a30d3dfeaf721f31457
-  data.tar.gz: a82352dae39503a166cd2f59bea07dd9374209a667f2ce781c1bdb4aeffd2d6e
+  metadata.gz: b71e882e5543a240bc6a6f628ad81c4d93fd09f4df967a2add259a9b18fc6fae
+  data.tar.gz: e5ccdab51aa1c522d611f934f8cbd1d031424a1e553c11b2b943dcede0a8aa6a
 SHA512:
-  metadata.gz: d58f5898059fd3cb5e2cdc80c0bc5131076d9422bed5cfc156597b049f52c7fb7d1bf8ae174b02943b19bee02e96157a54491e566dd68c8d72827e02e403ceb7
-  data.tar.gz: 30f41b0e4a2cdef05ff86f224269a5fffbd85c8ec7ed42873294dcda8f62a60bf993d1e8dab651a46f6ecb8046ccf3f9f0760494876e34eab7aebdd7aeee3306
+  metadata.gz: e7a73d861b11556dca0a1018759ae80034b70c64a3b4efcf3c76cbaf6ba64a6caed19c34d434eb8889b1f8fd0152c4012a0b2add70581e66204fa7d83c9f2609
+  data.tar.gz: b7ea940094a639ca9ac7aa669e049aa625fc19d7c1e335d3f5bdb7fff5b0debb82687e8732fa33613007eb89975820bfc9c6a9bb473db6d217ac7433d03eb2d4

data/lib/bridgetown-paginate/pagination_model.rb

@@ -50,13 +50,18 @@ module Bridgetown
           template_config = Bridgetown::Utils.deep_merge_hashes(
             default_config,
             template.data["pagination"] || template.data["paginate"] || {}
-          )
+          ).tap do |config|
+            config["collection"] = config["collection"].to_s if config["collection"].is_a?(Symbol)
+            config["category"] = config["category"].to_s if config["category"].is_a?(Symbol)
+            config["tag"] = config["tag"].to_s if config["tag"].is_a?(Symbol)
+            config["locale"] = config["locale"].to_s if config["locale"].is_a?(Symbol)
+          end
 
           # Is debugging enabled on the page level
           @debug = template_config["debug"]
           _debug_print_config_info(template_config, template.path)
 
-          next if template_config["enabled"] == false
+          next unless template_config["enabled"]
 
           @logging_lambda.call "found page: " + template.path, "debug" unless @debug
 
@@ -340,7 +345,9 @@ module Bridgetown
                                  else
                                    template.dir
                                  end
-          first_index_page_url = Utils.ensure_trailing_slash(first_index_page_url)
+          first_index_page_url = Utils.ensure_trailing_slash(
+            Utils.remove_double_slash(first_index_page_url)
+          )
           paginated_page_url = File.join(first_index_page_url, paginated_page_url)
 
           # 3. Create the paginator logic for this page, pass in the prev and next

data/lib/bridgetown-paginate/utils.rb

@@ -36,9 +36,8 @@ module Bridgetown
       #         If the input already has a dot in position zero, it will be
       #         returned unchanged.
       #
-      # path - a String path
-      #
-      # Returns the path with a leading slash
+      # @param path [String]
+      # @return [String] the path with a leading slash
       def self.ensure_leading_dot(path)
         path[0..0] == "." ? path : ".#{path}"
       end
@@ -47,29 +46,26 @@ module Bridgetown
       #         If the input already has a forward slash in position zero, it will be
       #         returned unchanged.
       #
-      # path - a String path
-      #
-      # Returns the path with a leading slash
+      # @param path [String]
+      # @return [String] the path with a leading slash
       def self.ensure_leading_slash(path)
         path[0..0] == "/" ? path : "/#{path}"
       end
 
-      # Static: Return a String version of the input without a leading slash.
+      # Static: Return a String version of the input with only one leading slash.
       #
-      # path - a String path
-      #
-      # Returns the input without the leading slash
-      def self.remove_leading_slash(path)
-        path[0..0] == "/" ? path[1..-1] : path
+      # @param path [String]
+      # @return [String] the input without the leading slash
+      def self.remove_double_slash(path)
+        path[0..1] == "//" ? path[1..-1] : path
       end
 
       # Static: Return a String version of the input which has a trailing slash.
       #         If the input already has a forward slash at the end, it will be
       #         returned unchanged.
       #
-      # path - a String path
-      #
-      # Returns the path with a trailing slash
+      # @param path [String]
+      # @return [String] the path with a trailing slash
       def self.ensure_trailing_slash(path)
         path[-1] == "/" ? path : "#{path}/"
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-paginate
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.21.4
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.21.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.21.4
 description: 
 email: maintainers@bridgetownrb.com
 executables: []