webmention-endpoint 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f8949affbb9a7d11b3a7921836df000df533090
-  data.tar.gz: 6d8feea53689bb397ad3257eb8d2f27238887357
+  metadata.gz: 00d58c80ff5ed751aca7f953de02800064dd9155
+  data.tar.gz: 6b8cc6c70b1bcae664173cd987013ea6d8a50bea
 SHA512:
-  metadata.gz: ca338aef70ea4d02e959be264088c528dd9b4ea4959079d0b13e03abff4fade24ce83a5f0ac7065d1a582dae13054d7bc7d1bb6fed137e36d96a0c64296eaeb8
-  data.tar.gz: 9a2043839ba89dadc1944ead1a606276dabaa8eba495bf7f14175253348944521d194c39171f469a4f971a5f625a2f991a509e7b383102187df75036a50081a4
+  metadata.gz: cf48f7b374749c68727a346a111b818f5d7f59f740970339e3a304e724b784d4c4e45f47de51c4d22d9d3754f4434e7da81107bf90a3b23300b6a1f315938410
+  data.tar.gz: 866f1cb6ebfc5112726bd9ded282e8f441a45f74a08c1619fddb38e7edd7199bd120dfd1b3fdf24fe4e936062e594ef668eeebcc92497e4397fe357ea51c6f40

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.3.0 / 2018-07-05
+
+- Adds [Absolutely](https://github.com/jgarber623/absolutely) gem dependency for handling conversion of relative URLs to absolute URLs ([2b8f924](https://github.com/jgarber623/webmention-endpoint-ruby/commit/2b8f924)).
+
 ## 0.2.0 / 2018-06-25
 
 - Adds `Webmention::Endpoint::Error` class and subclasses ([f81852f](https://github.com/jgarber623/webmention-endpoint-ruby/commit/f81852f)).

data/CONTRIBUTING.md

@@ -33,5 +33,5 @@ Code formatting conventions are defined in the `.editorconfig` file which uses t
 
 Your bug fix or feature addition won't be rejected if it runs afoul of any (or all) of these guidelines, but following the guidelines will definitely make everyone's lives a little easier.
 
-[issues]: https://github.com/indieweb/webmention-endpoint-ruby/issues
-[pulls]: https://github.com/indieweb/webmention-endpoint-ruby/pulls
+[issues]: https://github.com/jgarber623/webmention-endpoint-ruby/issues
+[pulls]: https://github.com/jgarber623/webmention-endpoint-ruby/pulls

data/README.md

@@ -5,6 +5,7 @@
 [![Gem](https://img.shields.io/gem/v/webmention-endpoint.svg?style=for-the-badge)](https://rubygems.org/gems/webmention-endpoint)
 [![Downloads](https://img.shields.io/gem/dt/webmention-endpoint.svg?style=for-the-badge)](https://rubygems.org/gems/webmention-endpoint)
 [![Build](https://img.shields.io/travis/com/jgarber623/webmention-endpoint-ruby/master.svg?style=for-the-badge)](https://travis-ci.com/jgarber623/webmention-endpoint-ruby)
+[![Dependencies](https://img.shields.io/depfu/jgarber623/webmention-endpoint-ruby.svg?style=for-the-badge)](https://depfu.com/github/jgarber623/webmention-endpoint-ruby)
 [![Maintainability](https://img.shields.io/codeclimate/maintainability/jgarber623/webmention-endpoint-ruby.svg?style=for-the-badge)](https://codeclimate.com/github/jgarber623/webmention-endpoint-ruby)
 [![Coverage](https://img.shields.io/codeclimate/c/jgarber623/webmention-endpoint-ruby.svg?style=for-the-badge)](https://codeclimate.com/github/jgarber623/webmention-endpoint-ruby/code)
 
@@ -18,7 +19,7 @@
 
 Before installing and using webmention-endpoint-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).
 
-webmention-endpoint-ruby is developed using Ruby 2.4.4 and is additionally tested against Ruby 2.5.1 using [Travis CI](https://travis-ci.org/indieweb/webmention-endpoint-ruby).
+webmention-endpoint-ruby is developed using Ruby 2.4.4 and is additionally tested against Ruby 2.5.1 using [Travis CI](https://travis-ci.com/jgarber623/webmention-endpoint-ruby).
 
 ## Installation
 
@@ -82,7 +83,7 @@ puts discoverer.response # returns HTTP::Response
 
 There are several exceptions that may be raised by webmention-endpoint-ruby's underlying dependencies. These errors are raised as subclasses of `Webmention::Endpoint::Error` (which itself is a subclass of `StandardError`).
 
-From [sporkmonger/addressable](https://github.com/sporkmonger/addressable):
+From [jgarber623/absolutely](https://github.com/jgarber623/absolutely) and  [sporkmonger/addressable](https://github.com/sporkmonger/addressable):
 
 - `Webmention::Endpoint::InvalidURIError`
 
@@ -94,7 +95,7 @@ From [httprb/http](https://github.com/httprb/http):
 
 ## Contributing
 
-Interested in helping improve webmention-endpoint-ruby? Awesome! Your help is greatly appreciated. See [CONTRIBUTING.md](https://github.com/jgarber623/blob/master/CONTRIBUTING.md) for details.
+Interested in helping improve webmention-endpoint-ruby? Awesome! Your help is greatly appreciated. See [CONTRIBUTING.md](https://github.com/jgarber623/webmention-endpoint-ruby/blob/master/CONTRIBUTING.md) for details.
 
 ## Acknowledgments
 

data/lib/webmention/endpoint/discover.rb

@@ -6,14 +6,14 @@ module Webmention
         user_agent: 'Webmention Endpoint Discovery (https://rubygems.org/gems/webmention-endpoint)'
       }.freeze
 
-      # Liberal pattern matching a string of text between angle brackets
-      # https://tools.ietf.org/html/rfc5988#section-5.1
-      REGEXP_TARGET_URI_PATTERN = /^<(.*)>;/
-
       # Ultra-orthodox pattern matching allowed values in Link header `rel` parameter
       # https://tools.ietf.org/html/rfc8288#section-3.3
       REGEXP_REG_REL_TYPE_PATTERN = '[a-z\d][a-z\d\-\.]*'.freeze
 
+      # Liberal pattern matching a string of text between angle brackets
+      # https://tools.ietf.org/html/rfc5988#section-5.1
+      REGEXP_TARGET_URI_PATTERN = /^<(.*)>;/
+
       # Ultra-orthodox pattern matching Link header `rel` parameter including a `webmention` value
       # https://www.w3.org/TR/webmention/#sender-discovers-receiver-webmention-endpoint-p-1
       REGEXP_WEBMENTION_REL_PATTERN = /(?:;|\s)rel="?(?:#{REGEXP_REG_REL_TYPE_PATTERN}+\s)?webmention(?:\s#{REGEXP_REG_REL_TYPE_PATTERN})?"?/
@@ -30,7 +30,11 @@ module Webmention
       end
 
       def endpoint
-        @endpoint ||= absolutize(base: url, relative: (endpoint_from_headers || endpoint_from_body)) || nil
+        return unless endpoint_from_http_request
+
+        @endpoint ||= Absolutely.to_absolute_uri(base: url, relative: endpoint_from_http_request)
+      rescue Absolutely::InvalidURIError => error
+        raise InvalidURIError, error
       end
 
       def response
@@ -48,19 +52,6 @@ module Webmention
 
       private
 
-      def absolutize(base:, relative:)
-        return unless relative
-
-        base_uri = Addressable::URI.parse(base)
-        relative_uri = Addressable::URI.parse(relative)
-
-        return relative if relative_uri.absolute?
-
-        (base_uri + relative_uri).to_s
-      rescue Addressable::URI::InvalidURIError => error
-        raise InvalidURIError, error
-      end
-
       def endpoint_from_body
         return unless response.mime_type == 'text/html'
 
@@ -89,6 +80,10 @@ module Webmention
 
         return endpoint_match_data[1] if endpoint_match_data
       end
+
+      def endpoint_from_http_request
+        @endpoint_from_http_request ||= endpoint_from_headers || endpoint_from_body || nil
+      end
     end
   end
 end

data/lib/webmention/endpoint/version.rb

@@ -1,5 +1,5 @@
 module Webmention
   module Endpoint
-    VERSION = '0.2.0'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/lib/webmention/endpoint.rb

@@ -1,3 +1,4 @@
+require 'absolutely'
 require 'addressable/uri'
 require 'http'
 require 'nokogiri'

data/webmention-endpoint.gemspec

@@ -28,7 +28,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.16.1'
   spec.add_development_dependency 'simplecov-console', '~> 0.4.2'
 
+  spec.add_runtime_dependency 'absolutely', '~> 1.0'
   spec.add_runtime_dependency 'addressable', '~> 2.5', '>= 2.5.2'
   spec.add_runtime_dependency 'http', '~> 3.3'
-  spec.add_runtime_dependency 'nokogiri', '~> 1.8', '>= 1.8.3'
+  spec.add_runtime_dependency 'nokogiri', '~> 1.8', '>= 1.8.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webmention-endpoint
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jason Garber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-26 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -120,6 +120,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.2
+- !ruby/object:Gem::Dependency
+  name: absolutely
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -163,7 +177,7 @@ dependencies:
         version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -173,7 +187,7 @@ dependencies:
         version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.4
 description: Discover a URL’s Webmention endpoint.
 email:
 - jason@sixtwothree.org