Refactor parsers

Author: jgarber623

lib/indieweb/endpoints/parsers/base_parser.rb

@@ -28,12 +28,24 @@ def mapped_results
           raise InvalidURIError, exception
         end
 
+        def parsed_response_body
+          @parsed_response_body ||= Nokogiri::HTML(response.body.to_s)
+        end
+
+        def parsed_response_headers
+          @parsed_response_headers ||= LinkHeaderParser.parse(response.headers.get('link'), base: response.uri)
+        end
+
         def results_from_body
-          @results_from_body ||= Services::ResponseParserService.parse_body(response, self.class.identifier)
+          return unless response.mime_type == 'text/html'
+
+          Services::ResponseParserService.parse_body(parsed_response_body, self.class.identifier)
         end
 
         def results_from_headers
-          @results_from_headers ||= Services::ResponseParserService.parse_headers(response, self.class.identifier)
+          return if parsed_response_headers.none?
+
+          Services::ResponseParserService.parse_headers(parsed_response_headers, self.class.identifier)
         end
 
         def results_from_http_request

lib/indieweb/endpoints/parsers/webmention_parser.rb

@@ -9,7 +9,7 @@ class WebmentionParser < BaseParser
         private
 
         def results_for_node(node)
-          Services::ResponseParserService.parse_body(response, self.class.identifier, node)
+          Services::ResponseParserService.parse_body(parsed_response_body, self.class.identifier, node)
         end
 
         # https://www.w3.org/TR/webmention/#sender-discovers-receiver-webmention-endpoint

lib/indieweb/endpoints/services/response_parser_service.rb

@@ -2,26 +2,24 @@ module IndieWeb
   module Endpoints
     module Services
       class ResponseParserService
-        # @param response [HTTP::Response]
+        # @param body [Nokogiri::HTML::Document]
         # @param identifier [Symbol]
         # @return [Array<String>]
-        def self.parse_body(response, identifier, node = 'link')
-          return unless response.mime_type == 'text/html'
-
+        def self.parse_body(body, identifier, node = 'link')
           # Reject endpoints that contain a fragment identifier
-          Nokogiri::HTML(response.body.to_s).css(%(#{node}[rel~="#{identifier}"][href]:not([href*="#"]))).map { |element| element['href'] }
+          body.css(%(#{node}[rel~="#{identifier}"][href]:not([href*="#"]))).map { |element| element['href'] }
         end
 
-        # @param response [HTTP::Response]
+        # @param headers [LinkHeaderParser::LinkHeadersCollection]
         # @param identifier [Symbol]
         # @return [Array<String>, nil]
-        def self.parse_headers(response, identifier)
-          headers = LinkHeaderParser.parse(response.headers.get('link'), base: response.uri.to_s).group_by_relation_type[identifier]
+        def self.parse_headers(headers, identifier)
+          headers_for_identifier = headers.group_by_relation_type[identifier]
 
-          return unless headers
+          return unless headers_for_identifier
 
           # Reject endpoints that contain a fragment identifier
-          headers.reject { |header| Addressable::URI.parse(header.target_uri).fragment }.map(&:target_uri)
+          headers_for_identifier.reject { |header| Addressable::URI.parse(header.target_uri).fragment }.map(&:target_uri)
         end
       end
     end