bridgetown-builder 1.2.0 → 1.3.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4f3b5e5443d455e70f7a05b0e89ee387b152c059924e6cff045bcf0eb285729
-  data.tar.gz: 73b68f3525fac4a9640ceea765dbd4e63b313486a0b83843c5a03d572de2ac1b
+  metadata.gz: 3bd4294dca6d4f9998eaad39cf9f871b26fd3e027f592aeb744795b30264c06f
+  data.tar.gz: fbe83235997f06379f455ec5e8f9329fc6b75b8d3df0d3db797656d94f504e80
 SHA512:
-  metadata.gz: 8fb5357911e9ebf372de1a8f3b0469d598863c7ea1f108c7594efc7b6b71055468f18d49dc8aea4beed6a7c03038a1f6a5e8ecfab9a31c8838102c47fdd125ad
-  data.tar.gz: 5a677fb81f1142013dc178df1e4efdd6c08f6089b88e44e2400908ce5134d6a572b83ec438bb0c37cb430630534aa2c187d79e12e85347a5a4ab33278cc59964
+  metadata.gz: d742094bbc288aae967da7c5e47a7d7cfdb56ae41fbc5b6b5d5c728447c076e76ad98a070100aa01c2d1df8b5c3742189472e3247dc490eb05ae0350f88da48f
+  data.tar.gz: 33c455986f6405e237632d58035af6a11ede56b1deec2525bbd944c30eb4edaec16766703a26c90be3b8c82fa116d08a7802f8a935e62bb45afc9839c0b591f2

data/lib/bridgetown-builder/dsl/http.rb

@@ -1,16 +1,14 @@
 # frozen_string_literal: true
 
-require "faraday_middleware/redirect_limit_reached"
-require "faraday_middleware/response/follow_redirects"
-require "faraday_middleware/response/parse_json"
+require "faraday/follow_redirects"
 
 module Bridgetown
   module Builders
     module DSL
       module HTTP
-        def get(url, headers: {}, parse_json: true)
+        def get(url, headers: {}, parse_json: true, **params)
           body = begin
-            connection(parse_json: parse_json).get(url, headers: headers).body
+            connection(parse_json: parse_json).get(url, params, headers).body
           rescue Faraday::ParsingError
             Bridgetown.logger.error(
               "Faraday::ParsingError",
@@ -25,12 +23,14 @@ module Bridgetown
           headers["Content-Type"] = "application/json" if parse_json
 
           Faraday.new(headers: headers) do |faraday|
-            faraday.use FaradayMiddleware::FollowRedirects
+            faraday.response :follow_redirects
+
             if parse_json
-              faraday.use FaradayMiddleware::ParseJson, parser_options: {
+              faraday.response :json, parser_options: {
                 object_class: HashWithDotAccess::Hash,
               }
             end
+
             yield faraday if block_given?
           end
         end

data/lib/bridgetown-builder/dsl/inspectors.rb

@@ -28,7 +28,11 @@ module Bridgetown
           #
           # @return [String] transformed HTML
           def self.call(resource, inspectors)
-            doc = Nokogiri.HTML5(resource.output)
+            doc = if resource.site.config.html_inspector_parser == "nokolexbor"
+                    Nokolexbor::HTML(resource.output)
+                  else
+                    Nokogiri.HTML5(resource.output)
+                  end
 
             inspectors.each do |block|
               block.call(doc, resource)
@@ -73,9 +77,16 @@ module Bridgetown
               Bridgetown::Utils::RequireGems.require_with_graceful_fail "nokogiri"
             end
 
-            return if Nokogiri::XML::Node <= QuerySelection
+            Nokogiri::XML::Node.include QuerySelection unless Nokogiri::XML::Node <= QuerySelection
+          end
+
+          # Require the Nokolexbor gem if necessary and add the `QuerySelection` mixin
+          def setup_nokolexbor
+            unless defined?(Nokolexbor)
+              Bridgetown::Utils::RequireGems.require_with_graceful_fail "nokolexbor"
+            end
 
-            Nokogiri::XML::Node.include QuerySelection
+            Nokolexbor::Node.include QuerySelection unless Nokolexbor::Node <= QuerySelection
           end
 
           # Shorthand for `HTML.call`
@@ -91,12 +102,17 @@ module Bridgetown
 
         # Set up an inspector to review or manipulate HTML resources
         # @yield the block to be called after the resource has been rendered
-        # @yieldparam [Nokogiri::HTML5::Document] the Nokogiri document
+        # @yieldparam [Nokogiri::HTML5::Document, Nokolexbor::Document]
+        #   the Nokogiri or Nokolexbor document
         def inspect_html(&block)
           unless @_html_inspectors
             @_html_inspectors = []
 
-            Inspectors.setup_nokogiri
+            if site.config.html_inspector_parser == "nokolexbor"
+              Inspectors.setup_nokolexbor
+            else
+              Inspectors.setup_nokogiri
+            end
 
             hook :resources, :post_render do |resource|
               next unless HTML.can_run?(resource, @_html_inspectors)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-builder
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0.beta1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2023-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bridgetown-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0.beta1
 description: 
 email: maintainers@bridgetownrb.com
 executables: []
@@ -62,9 +62,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.4
 signing_key: