indieweb-endpoints 9.1.0 → 10.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da8f18ac80e24b04e834e41ef4ec959cc26c3496b888de60c92d518fb89bbc78
-  data.tar.gz: 64a2117a77c161ab5d4c5b616c4fe1685406ea58218ade5af72eb2998048f402
+  metadata.gz: 8f81df133c4d630c9b7d5fb2531c0518e19d2f4f0ad054fbb7175c34ace1ccb4
+  data.tar.gz: b5538c271d836b84f9b12a01f64e6c5f8476c485308dbe14403ae784ed8a0a5d
 SHA512:
-  metadata.gz: 54fdc8310a995d36c8f46e8926790bafd8352a5db02e32144a4d4ce074258bc5c7ca80cc9778d910a522749f4b9807eb5cd202465ee8d811ca5ee4d4aa6311f7
-  data.tar.gz: 1d36d41eccca9f32ccecd622bc739915af4af9f61596fabf48d994e4d6f741ae4c8013a064c9b908917bf6896ac4ad291df8a90e882f074a3b1a12dbcc23b76b
+  metadata.gz: f9b9b03ac7dca3260be3f2b50aab57c178b821f492783bf90977fa0b7987e6664e61e5a739dea743ed29fb4e880daa9bafda3ef55f039e7879c0b988398190a0
+  data.tar.gz: 46ab372866988e7ae8f8c04e51c5ca0c74a66ee93f61eba68dc1c703642f6c8867675bd9cbf0192ad36ef0e8d62f77224cde504e9fabdaa2101a2c537c683048

data/README.md

@@ -10,11 +10,11 @@
 
 - Compliant with [Section 4.1](https://www.w3.org/TR/indieauth/#discovery-by-clients) and [Section 4.2.2](https://www.w3.org/TR/indieauth/#redirect-url) of [the W3C's IndieAuth Working Group Note](https://www.w3.org/TR/indieauth/), [Section 5.3](https://www.w3.org/TR/micropub/#endpoint-discovery) of [the W3C's Micropub Recommendation](https://www.w3.org/TR/micropub/), and [Section 3.1.2](https://www.w3.org/TR/webmention/#sender-discovers-receiver-webmention-endpoint) of [the W3C's Webmention Recommendation](https://www.w3.org/TR/webmention/).
 - Passes all Endpoint Discovery tests on [webmention.rocks](https://webmention.rocks).
-- Supports Ruby 2.6 and newer.
+- Supports Ruby 2.7 and newer.
 
 ## Getting Started
 
-Before installing and using indieweb-endpoints-ruby, you'll want to have [Ruby](https://www.ruby-lang.org) 2.6 (or newer) installed. Using a Ruby version managment tool like [rbenv](https://github.com/rbenv/rbenv), [chruby](https://github.com/postmodern/chruby), or [rvm](https://github.com/rvm/rvm) is recommended.
+Before installing and using indieweb-endpoints-ruby, you'll want to have [Ruby](https://www.ruby-lang.org) 2.7 (or newer) installed. Using a Ruby version managment tool like [rbenv](https://github.com/rbenv/rbenv), [chruby](https://github.com/postmodern/chruby), or [rvm](https://github.com/rvm/rvm) is recommended.
 
 indieweb-endpoints-ruby is developed using Ruby 3.4 and is tested against additional Ruby versions using [GitHub Actions](https://github.com/indieweb/indieweb-endpoints-ruby/actions).
 

data/indieweb-endpoints.gemspec

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = ">= 2.6"
+  spec.required_ruby_version = ">= 2.7"
 
   spec.name = "indieweb-endpoints"
-  spec.version = "9.1.0"
+  spec.version = "10.0.1"
   spec.authors = ["Jason Garber"]
   spec.email = ["jason@sixtwothree.org"]
 
@@ -29,6 +29,6 @@ Gem::Specification.new do |spec|
   }
 
   spec.add_dependency "http", "~> 5.2"
-  spec.add_dependency "link-header-parser", "~> 6.1"
-  spec.add_dependency "nokogiri", ">= 1.13"
+  spec.add_dependency "link-header-parser", "~> 7.0", ">= 7.0.1"
+  spec.add_dependency "nokogiri-html-ext", "~> 1.4"
 end

data/lib/indieweb/endpoints/client.rb

@@ -3,13 +3,6 @@
 module IndieWeb
   module Endpoints
     class Client
-      HTTP_HEADERS_OPTS = {
-        accept: "*/*",
-        user_agent: "IndieWeb Endpoint Discovery (https://rubygems.org/gems/indieweb-endpoints)",
-      }.freeze
-
-      private_constant :HTTP_HEADERS_OPTS
-
       # Create a new client with a URL to parse for IndieWeb endpoints.
       #
       # @example
@@ -19,15 +12,20 @@ module IndieWeb
       #
       # @raise [InvalidURIError]
       def initialize(url)
-        @uri = HTTP::URI.parse(url.to_s)
+        @uri = HTTP::URI.parse(url)
       rescue Addressable::URI::InvalidURIError => e
         raise InvalidURIError, e
       end
 
+      # :nocov:
       # @return [String]
       def inspect
-        %(#<#{self.class.name}:#{format("%#0x", object_id)} uri: "#{uri}">)
+        format "#<%<class>s:%<id>#0x @uri=%<uri>s",
+               class: self.class,
+               id: object_id << 1,
+               uri: uri.inspect
       end
+      # :nocov:
 
       # A Hash of the discovered IndieWeb endpoints from the provided URL.
       #
@@ -36,17 +34,18 @@ module IndieWeb
         @endpoints ||= Parser.new(response).to_h
       end
 
-      # The {HTTP::Response} object returned by the provided URL.
+      # The +HTTP::Response+ object.
       #
       # @return [HTTP::Response]
       #
       # @raise [HttpError, SSLError]
       def response
-        @response ||= HTTP
-                        .follow(max_hops: 20)
-                        .headers(HTTP_HEADERS_OPTS)
-                        .timeout(connect: 5, read: 5)
-                        .get(uri)
+        @response ||=
+          HTTP
+            .follow(max_hops: 20)
+            .headers(accept: "*/*", user_agent: user_agent)
+            .timeout(connect: 5, read: 5)
+            .get(uri)
       rescue HTTP::Error => e
         raise HttpError, e
       rescue OpenSSL::SSL::SSLError => e
@@ -57,6 +56,11 @@ module IndieWeb
 
       # @return [HTTP::URI]
       attr_reader :uri
+
+      # @return [String]
+      def user_agent
+        "Mozilla/5.0 (compatible; IndieWebEndpointsDiscovery/1.0; +https://rubygems.org/gems/indieweb-endpoints)"
+      end
     end
   end
 end

data/lib/indieweb/endpoints/exceptions.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module IndieWeb
+  module Endpoints
+    class Error < StandardError; end
+
+    class HttpError < Error; end
+
+    class InvalidURIError < Error; end
+
+    class SSLError < Error; end
+  end
+end

data/lib/indieweb/endpoints/parser.rb

@@ -16,17 +16,12 @@ module IndieWeb
       #
       # @raise [InvalidURIError]
       def matches(identifier, node_names: ["link"])
-        results =
-          (matches_from_headers(identifier) + matches_from_body(identifier, node_names))
-            .compact
-            .map! { |endpoint| response.uri.join(endpoint).to_s }
+        results = (matches_from_headers(identifier) + matches_from_body(identifier, node_names)).compact
 
         results.uniq!
         results.sort!
 
         results
-      rescue Addressable::URI::InvalidURIError => e
-        raise InvalidURIError, e
       end
 
       # @param (see #matches)
@@ -56,30 +51,37 @@ module IndieWeb
 
       # @return [Nokogiri::HTML5::Document]
       def body
-        @body ||= Nokogiri::HTML5(response.body)
+        @body ||= Nokogiri::HTML5(response.body, response.uri).resolve_relative_urls!
       end
 
       # @return [Hash{Symbol => Array<LinkHeaderParser::LinkHeader>}]
       def headers
-        @headers ||= LinkHeaderParser.parse(response.headers.get("link"), base: response.uri).group_by_relation_type
+        @headers ||= LinkHeaderParser.parse(response.headers.get("link"), base_uri: response.uri).group_by_relation_type
       end
 
+      # Reject URLs with fragment identifiers per the IndieAuth specification.
+      #
+      # @param identifier [String, #to_s]
+      # @param node_names [Array<String, #to_s>]
+      #
       # @return [Array<String>]
       def matches_from_body(identifier, node_names)
         return [] unless response.mime_type == "text/html"
 
-        # Reject endpoints that contain a fragment identifier.
-        selectors = node_names.map { |node| %(#{node}[rel~="#{identifier}"][href]:not([href*="#"])) }.join(",")
-
-        body.css(selectors).map { |element| element["href"] }
+        body
+          .css(*node_names.map { |node| %(#{node}[rel~="#{identifier}"][href]:not([href*="#"]) / @href) })
+          .map(&:value)
       end
 
+      # Reject URLs with fragment identifiers per the IndieAuth specification.
+      #
+      # @param identifier [String, #to_sym]
+      #
       # @return [Array<String>]
       def matches_from_headers(identifier)
-        # Reject endpoints that contain a fragment identifier.
-        Array(headers[identifier.to_sym])
-          .filter { |header| !HTTP::URI.parse(header.target_uri).fragment }
-          .map(&:target_uri)
+        Array(headers[identifier]).filter_map do |header|
+          header.target_uri unless HTTP::URI.parse(header.target_uri).fragment
+        end
       end
     end
   end

data/lib/indieweb/endpoints.rb

@@ -2,21 +2,15 @@
 
 require "http"
 require "link-header-parser"
-require "nokogiri"
+require "nokogiri/html-ext"
+
+require_relative "endpoints/exceptions"
 
 require_relative "endpoints/client"
 require_relative "endpoints/parser"
 
 module IndieWeb
   module Endpoints
-    class Error < StandardError; end
-
-    class HttpError < Error; end
-
-    class InvalidURIError < Error; end
-
-    class SSLError < Error; end
-
     # Discover a URL's IndieAuth, Micropub, Microsub, and Webmention endpoints.
     #
     # Convenience method for {Client#endpoints}.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: indieweb-endpoints
 version: !ruby/object:Gem::Version
-  version: 9.1.0
+  version: 10.0.1
 platform: ruby
 authors:
 - Jason Garber
@@ -29,28 +29,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6.1'
+        version: '7.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.0.1
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: nokogiri-html-ext
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '1.4'
 description: Discover a URL’s IndieAuth, Micropub, Microsub, and Webmention endpoints.
 email:
 - jason@sixtwothree.org
@@ -66,17 +72,18 @@ files:
 - indieweb-endpoints.gemspec
 - lib/indieweb/endpoints.rb
 - lib/indieweb/endpoints/client.rb
+- lib/indieweb/endpoints/exceptions.rb
 - lib/indieweb/endpoints/parser.rb
 homepage: https://github.com/indieweb/indieweb-endpoints-ruby
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/indieweb/indieweb-endpoints-ruby/issues
-  changelog_uri: https://github.com/indieweb/indieweb-endpoints-ruby/releases/tag/v9.1.0
-  documentation_uri: https://rubydoc.info/gems/indieweb-endpoints/9.1.0
+  changelog_uri: https://github.com/indieweb/indieweb-endpoints-ruby/releases/tag/v10.0.1
+  documentation_uri: https://rubydoc.info/gems/indieweb-endpoints/10.0.1
   homepage_uri: https://github.com/indieweb/indieweb-endpoints-ruby
   rubygems_mfa_required: 'true'
-  source_code_uri: https://github.com/indieweb/indieweb-endpoints-ruby/tree/v9.1.0
+  source_code_uri: https://github.com/indieweb/indieweb-endpoints-ruby/tree/v10.0.1
 rdoc_options: []
 require_paths:
 - lib
@@ -84,7 +91,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="