webmention 2.0.0 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b40b0711592d5a14c2d9dc53b638e697ce1278ed3d3a851e559d6eb51752c7d4
-  data.tar.gz: 8a5a3f9508a6f071cdcdb7fe5126909678538b20c1bf043110e0e06ea56e75d1
+  metadata.gz: bdbd526bc4e17aa56447d83497ba225b902dd685581aab0934b9ef4ca4164c1e
+  data.tar.gz: 12feb3e14687d066fada7d39ca1f6689328f2160610bac5e4301254e61afe630
 SHA512:
-  metadata.gz: 8eb087999adce5389f37333598e1edaee18e96e748b9b11eee41f5bbb1ecc6cb511e0951eeba831df62d210972e296d0d5090adf6e25a3666eb182b503454d7e
-  data.tar.gz: ccb4e243d5c050d6e912a47a4a1fa0ee02594211192e81737011db1ded8a88eac4bfd11f32749ffba7dea1b08a50d326ed446d0688bb1ce406095bbbc1f57a58
+  metadata.gz: 407be30d3a706ade7b5a1bd7698aa6470e1962a657f17325b5a45356710ff67330650f9abf2923d2211eea59773d27a5140baaee7f2fd1fdd7e0da8d1ed33f13
+  data.tar.gz: 1d5b4eb9c3b20ab8ad4fb0183482485b54dc5d1047c359e08ea6a63d9e277276b47b73ec429450c51be871046d8b1c057bbed718a286556d8566464ab3d2d8ef

data/.rubocop.yml

@@ -1,5 +1,10 @@
 require:
+  - rubocop-minitest
   - rubocop-performance
+  - rubocop-rake
+
+AllCops:
+  NewCops: enable
 
 Layout/HashAlignment:
   EnforcedColonStyle: table
@@ -10,7 +15,6 @@ Layout/LineLength:
 
 Metrics/BlockLength:
   Exclude:
-    - webmention.gemspec
     - test/**/*
 
 Naming/RescuedExceptionsVariableName:
@@ -22,9 +26,5 @@ Style/Documentation:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-Style/SingleLineMethods:
-  Exclude:
-    - test/**/*
-
 Style/SymbolArray:
   Enabled: false

data/.ruby-version

@@ -1 +1 @@
-2.4.9
+2.5.8

data/.simplecov

@@ -3,8 +3,10 @@ require 'simplecov-console'
 SimpleCov.start do
   add_filter '/test/'
 
-  formatter SimpleCov::Formatter::MultiFormatter.new([
-    SimpleCov::Formatter::Console,
-    SimpleCov::Formatter::HTMLFormatter
-  ])
+  formatter SimpleCov::Formatter::MultiFormatter.new(
+    [
+      SimpleCov::Formatter::Console,
+      SimpleCov::Formatter::HTMLFormatter
+    ]
+  )
 end

data/.travis.yml

@@ -1,7 +1,6 @@
 dist: bionic
 language: ruby
 rvm:
-  - 2.4
   - 2.5
   - 2.6
   - 2.7

data/CHANGELOG.md

@@ -1,5 +1,32 @@
 # Changelog
 
+## v5.0.0 / 2020-12-13
+
+- Update absolutely and indieweb-endpoints gems to v5.0 (89f4ea8)
+
+## v4.0.0 / 2020-08-23
+
+- **Breaking change:** Update minimum supported Ruby version to 2.5 (b2bc62f)
+- Update indieweb-endpoints to 4.0 (e61588f)
+- Update project Ruby version to 2.5.8 (2a626a6)
+
+## v3.0.0 / 2020-05-19
+
+- Reject "internal" URLs when sending webmentions (#24) (ccc82c8)
+- Select only HTTP/HTTPS URLs when sending webmentions (#22) (39e5852)
+
+## 2.2.0 / 2020-05-18
+
+- Update absolutely and indieweb-endpoints gems (350d2ed)
+- Add pry-byebug and `bin/console` script (d2c5e03)
+- Move development dependencies to Gemfile per current Bundler conventions (3a2fc21)
+- Update development Ruby version to 2.4.10 (4c7d1f7)
+
+## 2.1.0 / 2020-04-06
+
+- Refactor `BaseParser` class and remove `Registerable` module (b706229)
+- Refactor `HttpRequest` and `NodeParser` classes into Service Objects (f29c073 and 7456bf1)
+
 ## 2.0.0 / 2020-01-25
 
 - Add Ruby 2.7 to list of supported Ruby versions (c67ed14)

data/CONTRIBUTING.md

@@ -8,9 +8,9 @@ There are a couple ways you can help improve webmention-client-ruby:
 
 ## Getting Started
 
-webmention-client-ruby is developed using Ruby 2.4.9 and is additionally tested against Ruby 2.5, 2.6, and 2.7 using [Travis CI](https://travis-ci.org/indieweb/webmention-client-ruby).
+webmention-client-ruby is developed using Ruby 2.5.8 and is additionally tested against Ruby 2.6 and 2.7 using [Travis CI](https://travis-ci.org/indieweb/webmention-client-ruby).
 
-Before making changes to webmention-client-ruby, you'll want to install Ruby 2.4.9. It's recommended that you use 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). Once you've installed Ruby 2.4.9 using your method of choice, install the project's gems by running:
+Before making changes to webmention-client-ruby, you'll want to install Ruby 2.5.8. It's recommended that you use 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). Once you've installed Ruby 2.5.8 using your method of choice, install the project's gems by running:
 
 ```sh
 bundle install

data/Gemfile

@@ -2,3 +2,16 @@ source 'https://rubygems.org'
 
 # Specify gem's dependencies in webmention.gemspec
 gemspec
+
+gem 'minitest', '~> 5.14'
+gem 'minitest-reporters', '~> 1.4'
+gem 'pry-byebug', '~> 3.9'
+gem 'rake', '~> 13.0'
+gem 'reek', '~> 6.0'
+gem 'rubocop', '~> 1.6'
+gem 'rubocop-minitest', '~> 0.10.1'
+gem 'rubocop-performance', '~> 1.9'
+gem 'rubocop-rake', '~> 0.5.1'
+gem 'simplecov', '~> 0.20.0'
+gem 'simplecov-console', '~> 0.8.0'
+gem 'webmock', '~> 3.10'

data/README.md

@@ -16,9 +16,9 @@
 
 ## Getting Started
 
-Before installing and using webmention-client-ruby, you'll want to have [Ruby](https://www.ruby-lang.org) 2.4 (or newer) installed. It's recommended that you use 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).
+Before installing and using webmention-client-ruby, you'll want to have [Ruby](https://www.ruby-lang.org) 2.5 (or newer) installed. It's recommended that you use 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).
 
-webmention-client-ruby is developed using Ruby 2.4.9 and is additionally tested against Ruby 2.5, 2.6, and 2.7 using [Travis CI](https://travis-ci.org/indieweb/webmention-client-ruby).
+webmention-client-ruby is developed using Ruby 2.5.8 and is additionally tested against Ruby 2.6 and 2.7 using [Travis CI](https://travis-ci.org/indieweb/webmention-client-ruby).
 
 ## Installation
 

data/lib/webmention.rb

@@ -8,20 +8,31 @@ require 'webmention/version'
 require 'webmention/exceptions'
 
 require 'webmention/client'
-require 'webmention/http_request'
-require 'webmention/registerable'
 
 require 'webmention/parsers'
+require 'webmention/parsers/base_parser'
 require 'webmention/parsers/html_parser'
 
+require 'webmention/services/http_request_service'
+
 module Webmention
-  class << self
-    def client(source)
-      Client.new(source)
-    end
+  # Create a new Webmention::Client
+  # Convenience method for Webmention::Client.new
+  #
+  #   client = Webmention.client('https://source.example.com/post/100')
+  #
+  # @param source [String] An absolute URL representing the source document
+  # @return [Webmention::Client]
+  def self.client(source)
+    Client.new(source)
+  end
 
-    def send_mention(source, target)
-      client(source).send_mention(target)
-    end
+  # Send a webmention from the source URL to the target URL
+  #
+  # @param source [String] An absolute URL representing the source document
+  # @param target [String] An absolute URL representing the target document
+  # @return [HTTP::Response, nil]
+  def self.send_mention(source, target)
+    client(source).send_mention(target)
   end
 end

data/lib/webmention/client.rb

@@ -1,5 +1,10 @@
 module Webmention
   class Client
+    # Create a new Webmention::Client
+    #
+    #   client = Webmention::Client.new('https://source.example.com/post/100')
+    #
+    # @param source [String] An absolute URL representing the source document
     def initialize(source)
       raise ArgumentError, "source must be a String (given #{source.class.name})" unless source.is_a?(String)
 
@@ -8,22 +13,34 @@ module Webmention
       raise ArgumentError, 'source must be an absolute URL (e.g. https://example.com)' unless source_uri.absolute?
     end
 
+    # Send webmentions to all mentioned URLs in this client's source document
+    #
+    # @return [Hash{String => HTTP::Response, nil}]
     def send_all_mentions
       mentioned_urls.each_with_object({}) { |url, hash| hash[url] = send_mention(url) }
     end
 
+    # Extract mentioned URLs from this client's source document
+    #
+    # @return [Array<String>]
+    # @raise [Webmention::UnsupportedMimeTypeError]
     def mentioned_urls
       raise UnsupportedMimeTypeError, "Unsupported MIME Type: #{source_response.mime_type}" unless parser_for_mime_type
 
       @mentioned_urls ||= parser_for_mime_type.new(source_response).results
     end
 
+    # Send a webmention from this client's source URL to the target URL
+    #
+    # @param target [String] An absolute URL representing the target document
+    # @return [HTTP::Response, nil]
+    # @raise [Webmention::ArgumentError, Webmention::ConnectionError, Webmention::InvalidURIError, Webmention::TimeoutError, Webmention::TooManyRedirectsError]
     def send_mention(target)
-      endpoint = IndieWeb::Endpoints.get(target).webmention
+      endpoint = IndieWeb::Endpoints.get(target)[:webmention]
 
       return unless endpoint
 
-      HttpRequest.post(Addressable::URI.parse(endpoint), source: @source, target: target)
+      Services::HttpRequestService.post(Addressable::URI.parse(endpoint), source: @source, target: target)
     rescue IndieWeb::Endpoints::IndieWebEndpointsError => exception
       raise Webmention.const_get(exception.class.name.split('::').last), exception
     end
@@ -35,7 +52,7 @@ module Webmention
     end
 
     def source_response
-      @source_response ||= HttpRequest.get(source_uri)
+      @source_response ||= Services::HttpRequestService.get(source_uri)
     end
 
     def source_uri

data/lib/webmention/parsers.rb

@@ -1,29 +1,11 @@
 module Webmention
   module Parsers
-    extend Registerable
-
-    class BaseParser
-      def initialize(response)
-        raise ArgumentError, "response must be an HTTP::Response (given #{response.class.name})" unless response.is_a?(HTTP::Response)
-
-        @response = response
-
-        raise UnsupportedMimeTypeError, "Unsupported MIME Type: #{response.mime_type}" unless self.class.mime_types.include?(response.mime_type)
-      end
-
-      def results
-        @results ||= parse_response_body
-      end
-
-      private
-
-      def response_body
-        @response_body ||= @response.body.to_s
-      end
+    def self.register(klass)
+      klass.mime_types.each { |mime_type| registered[mime_type] = klass }
+    end
 
-      def response_url
-        @response_url ||= @response.uri.to_s
-      end
+    def self.registered
+      @registered ||= {}
     end
   end
 end

data/lib/webmention/parsers/base_parser.rb

@@ -0,0 +1,27 @@
+module Webmention
+  module Parsers
+    class BaseParser
+      class << self
+        attr_reader :mime_types
+      end
+
+      def initialize(response)
+        raise ArgumentError, "response must be an HTTP::Response (given #{response.class.name})" unless response.is_a?(HTTP::Response)
+
+        @response = response
+
+        raise UnsupportedMimeTypeError, "Unsupported MIME Type: #{response.mime_type}" unless self.class.mime_types.include?(response.mime_type)
+      end
+
+      private
+
+      def response_body
+        @response_body ||= @response.body.to_s
+      end
+
+      def response_url
+        @response_url ||= @response.uri.to_s
+      end
+    end
+  end
+end

data/lib/webmention/parsers/html_parser.rb

@@ -1,23 +1,26 @@
 module Webmention
   module Parsers
     class HtmlParser < BaseParser
-      def self.mime_types
-        ['text/html']
-      end
+      @mime_types = ['text/html']
 
       Parsers.register(self)
 
-      HTML_ATTRIBUTE_MAP = {
-        cite:   %w[blockquote del ins q],
-        data:   %w[object],
-        href:   %w[a area],
-        poster: %w[video],
-        src:    %w[audio embed img source track video],
-        srcset: %w[img source]
+      HTML_ATTRIBUTES_MAP = {
+        'cite'   => %w[blockquote del ins q],
+        'data'   => %w[object],
+        'href'   => %w[a area],
+        'poster' => %w[video],
+        'src'    => %w[audio embed img source track video],
+        'srcset' => %w[img source]
       }.freeze
 
-      CSS_SELECTORS_MAP = HTML_ATTRIBUTE_MAP.each_with_object({}) do |(attribute, elements), hash|
-        hash[attribute] = elements.map { |element| "#{element}[#{attribute}]" }
+      CSS_SELECTORS_ARRAY = HTML_ATTRIBUTES_MAP.flat_map { |attribute, names| names.map { |name| "#{name}[#{attribute}]" } }.freeze
+
+      # Parse an HTML string for URLs
+      #
+      # @return [Array<String>] Unique external URLs whose scheme matches http/https
+      def results
+        @results ||= resolved_urls.uniq.select { |url| url.match?(%r{https?://}) }.reject { |url| url.match(/^#{response_url}(?:#.*)?$/) }
       end
 
       private
@@ -26,46 +29,35 @@ module Webmention
         @doc ||= Nokogiri::HTML(response_body)
       end
 
-      # Parse an HTML string for URLs
-      #
-      # @return [Array] the URLs
-      def parse_response_body
-        CSS_SELECTORS_MAP
-          .each_with_object([]) { |(*args), array| array << search_node(*args) }
-          .flatten
-          .map { |url| Absolutely.to_abs(base: response_url, relative: url) }
-          .uniq
+      def resolved_urls
+        UrlAttributesParser.parse(*url_attributes).map { |url| Absolutely.to_abs(base: response_url, relative: url) }
       end
 
       def root_node
-        @root_node ||= doc.css('.h-entry .e-content').first || doc.css('.h-entry').first || doc.css('body')
+        doc.at_css('.h-entry .e-content', '.h-entry') || doc.css('body')
+      end
+
+      def url_attributes
+        url_nodes.flat_map(&:attribute_nodes).select { |attribute| HTML_ATTRIBUTES_MAP.key?(attribute.name) }
       end
 
-      def search_node(attribute, selectors)
-        NodeParser.nodes_from(root_node, selectors).map { |node| NodeParser.values_from(node, attribute) }.reject(&:empty?)
+      def url_nodes
+        root_node.css(*CSS_SELECTORS_ARRAY)
       end
 
-      module NodeParser
-        class << self
-          # Search a node for matching elements
-          #
-          # @param node [Nokogiri::XML::Element]
-          # @param selectors [Array]
-          # @return [Nokogiri::XML::NodeSet]
-          def nodes_from(node, selectors)
-            node.css(*selectors)
-          end
+      module UrlAttributesParser
+        # @param attributes [Array<Nokogiri::XML::Attr>]
+        # @return [Array<String>]
+        def self.parse(*attributes)
+          attributes.flat_map { |attribute| value_from(attribute) }
+        end
 
-          # Derive attribute values from a single node
-          #
-          # @param node [Nokogiri::XML::Element]
-          # @param attribute [Symbol]
-          # @return [Array] the HTML attribute values
-          def values_from(node, attribute)
-            return Array(node[attribute]) unless attribute == :srcset
+        # @param attribute [Nokogiri::XML::Attr]
+        # @return [String, Array<String>]
+        def self.value_from(attribute)
+          return attribute.value unless attribute.name == 'srcset'
 
-            node[attribute].split(',').map { |value| value.strip.match(/^\S+/).to_s }
-          end
+          attribute.value.split(',').map { |value| value.strip.match(/^\S+/).to_s }
         end
       end
     end

data/lib/webmention/services/http_request_service.rb

@@ -0,0 +1,47 @@
+module Webmention
+  module Services
+    module HttpRequestService
+      # Defaults derived from Webmention specification examples
+      # https://www.w3.org/TR/webmention/#limits-on-get-requests
+      # rubocop:disable Layout/HashAlignment
+      HTTP_CLIENT_OPTS = {
+        follow: {
+          max_hops: 20
+        },
+        headers: {
+          accept: '*/*',
+          user_agent: 'Webmention Client (https://rubygems.org/gems/webmention)'
+        },
+        timeout_options: {
+          connect_timeout: 5,
+          read_timeout: 5
+        }
+      }.freeze
+      # rubocop:enable Layout/HashAlignment
+
+      class << self
+        def get(uri)
+          request(:get, uri)
+        end
+
+        def post(uri, **options)
+          request(:post, uri, form: options)
+        end
+
+        private
+
+        def client
+          @client ||= HTTP::Client.new(HTTP_CLIENT_OPTS)
+        end
+
+        def request(method, uri, **options)
+          client.request(method, uri, options)
+        rescue HTTP::ConnectionError,
+               HTTP::TimeoutError,
+               HTTP::Redirector::TooManyRedirectsError => exception
+          raise Webmention.const_get(exception.class.name.split('::').last), exception
+        end
+      end
+    end
+  end
+end

data/lib/webmention/version.rb

@@ -1,3 +1,3 @@
 module Webmention
-  VERSION = '2.0.0'.freeze
+  VERSION = '5.0.0'.freeze
 end

data/webmention.gemspec

@@ -1,10 +1,7 @@
-lib = File.expand_path('lib', __dir__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require 'webmention/version'
+require_relative 'lib/webmention/version'
 
 Gem::Specification.new do |spec|
-  spec.required_ruby_version = ['>= 2.4', '< 2.8']
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.5', '< 2.8')
 
   spec.name          = 'webmention'
   spec.version       = Webmention::VERSION
@@ -16,28 +13,18 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/indieweb/webmention-client-ruby'
   spec.license       = 'Apache-2.0'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin|test)/}) }
+  spec.files         = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin|test)/}) }
+  end
 
   spec.require_paths = ['lib']
 
-  spec.metadata = {
-    'bug_tracker_uri' => "#{spec.homepage}/issues",
-    'changelog_uri'   => "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md"
-  }
-
-  spec.add_development_dependency 'minitest', '~> 5.14'
-  spec.add_development_dependency 'minitest-reporters', '~> 1.4'
-  spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'reek', '~> 5.6'
-  spec.add_development_dependency 'rubocop', '~> 0.79.0'
-  spec.add_development_dependency 'rubocop-performance', '~> 1.5'
-  spec.add_development_dependency 'simplecov', '~> 0.17.1'
-  spec.add_development_dependency 'simplecov-console', '~> 0.6.0'
-  spec.add_development_dependency 'webmock', '~> 3.8'
+  spec.metadata['bug_tracker_uri'] = "#{spec.homepage}/issues"
+  spec.metadata['changelog_uri']   = "#{spec.homepage}/blob/v#{spec.version}/CHANGELOG.md"
 
-  spec.add_runtime_dependency 'absolutely', '~> 3.1'
+  spec.add_runtime_dependency 'absolutely', '~> 5.0'
   spec.add_runtime_dependency 'addressable', '~> 2.7'
-  spec.add_runtime_dependency 'http', '~> 4.3'
-  spec.add_runtime_dependency 'indieweb-endpoints', '~> 2.0'
+  spec.add_runtime_dependency 'http', '~> 4.4'
+  spec.add_runtime_dependency 'indieweb-endpoints', '~> 5.0'
   spec.add_runtime_dependency 'nokogiri', '~> 1.10'
 end

metadata

@@ -1,156 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: webmention
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 5.0.0
 platform: ruby
 authors:
 - Aaron Parecki
 - Nat Welch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-25 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.14'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.14'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13.0'
-- !ruby/object:Gem::Dependency
-  name: reek
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.6'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.79.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.79.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.5'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.17.1
-- !ruby/object:Gem::Dependency
-  name: simplecov-console
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.6.0
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: absolutely
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -171,28 +45,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
   name: indieweb-endpoints
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -231,10 +105,10 @@ files:
 - lib/webmention.rb
 - lib/webmention/client.rb
 - lib/webmention/exceptions.rb
-- lib/webmention/http_request.rb
 - lib/webmention/parsers.rb
+- lib/webmention/parsers/base_parser.rb
 - lib/webmention/parsers/html_parser.rb
-- lib/webmention/registerable.rb
+- lib/webmention/services/http_request_service.rb
 - lib/webmention/version.rb
 - webmention.gemspec
 homepage: https://github.com/indieweb/webmention-client-ruby
@@ -242,8 +116,8 @@ licenses:
 - Apache-2.0
 metadata:
   bug_tracker_uri: https://github.com/indieweb/webmention-client-ruby/issues
-  changelog_uri: https://github.com/indieweb/webmention-client-ruby/blob/v2.0.0/CHANGELOG.md
-post_install_message: 
+  changelog_uri: https://github.com/indieweb/webmention-client-ruby/blob/v5.0.0/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -251,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
   - - "<"
     - !ruby/object:Gem::Version
       version: '2.8'
@@ -261,8 +135,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Webmention notification client
 test_files: []

data/lib/webmention/http_request.rb

@@ -1,41 +0,0 @@
-module Webmention
-  class HttpRequest
-    # Defaults derived from Webmention specification examples
-    # https://www.w3.org/TR/webmention/#limits-on-get-requests
-    # rubocop:disable Layout/HashAlignment
-    HTTP_CLIENT_OPTS = {
-      follow: {
-        max_hops: 20
-      },
-      headers: {
-        accept: '*/*',
-        user_agent: 'Webmention Client (https://rubygems.org/gems/webmention)'
-      },
-      timeout_options: {
-        connect_timeout: 5,
-        read_timeout: 5
-      }
-    }.freeze
-    # rubocop:enable Layout/HashAlignment
-
-    class << self
-      def get(uri)
-        request(:get, uri)
-      end
-
-      def post(uri, **options)
-        request(:post, uri, form: options)
-      end
-
-      private
-
-      def request(method, uri, **options)
-        HTTP::Client.new(HTTP_CLIENT_OPTS).request(method, uri, options)
-      rescue HTTP::ConnectionError,
-             HTTP::TimeoutError,
-             HTTP::Redirector::TooManyRedirectsError => exception
-        raise Webmention.const_get(exception.class.name.split('::').last), exception
-      end
-    end
-  end
-end

data/lib/webmention/registerable.rb

@@ -1,11 +0,0 @@
-module Webmention
-  module Registerable
-    def register(klass)
-      klass.mime_types.each { |mime_type| registered[mime_type] = klass }
-    end
-
-    def registered
-      @registered ||= {}
-    end
-  end
-end