micropub-endpoint 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbc2dfb68b80f95e2fb6bdcc8146597dbd0fbbf1
-  data.tar.gz: b6d1c604d7e6d74a0feb909eecb2fab8b056520e
+  metadata.gz: a6241a2f87a2ed02d0aa63794793b1af4a6188a7
+  data.tar.gz: 403b5e14381412d58ba15e1b96a355ad573c4c76
 SHA512:
-  metadata.gz: 681b8cda4b0c6aa053a7ec7cc3a467347283694c4d8a01197ded82bf27c79aeecca391ec59df1a358f202705bb160008e96aa91dd30fc18b52e4ca0bad697368
-  data.tar.gz: bb27d44678d41714b76ff1e9673619e2c1c9cc6e08f4fbe983d1a33fc6c7a5efa63d37d0812daa9f115e7a50871c715f553eb3d20338cb09e5cc32531da7ec05
+  metadata.gz: cb99051e43d51898e638e09c514e08a4b25cdc08aad828c11219c3baf50f6d2f6f94a258ea77301652853b864651b8e1257e2731a92d7d6e5c8ca2a51b2cee8a
+  data.tar.gz: fd405635d6f864e65aa6c72050ca6f1857bcf07844be358dc938bc7dc9239f39b198f437b3be6bd39ea0307d63e53b79640e945c3d3662afeaa824e94c9784a4

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Changelog
+
+## 0.2.0 / 2018-07-05
+
+- Add [Absolutely](https://github.com/jgarber623/absolutely) gem dependency for handling conversion of relative URLs to absolute URLs ([d17fe1e](https://github.com/jgarber623/micropub-endpoint-ruby/commit/d17fe1e)).
+
+## 0.1.0 / 2018-06-30
+
+- Initial release!

data/README.md

@@ -18,7 +18,7 @@
 
 Before installing and using micropub-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).
 
-micropub-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/micropub-endpoint-ruby).
+micropub-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/micropub-endpoint-ruby).
 
 ## Installation
 
@@ -82,7 +82,7 @@ puts discoverer.response # returns HTTP::Response
 
 There are several exceptions that may be raised by micropub-endpoint-ruby's underlying dependencies. These errors are raised as subclasses of `Micropub::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):
 
 - `Micropub::Endpoint::InvalidURIError`
 

data/lib/micropub/endpoint.rb

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

data/lib/micropub/endpoint/discover.rb

@@ -30,7 +30,11 @@ module Micropub
       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 Micropub
 
       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'
 
@@ -88,6 +79,10 @@ module Micropub
 
         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/micropub/endpoint/version.rb

@@ -1,5 +1,5 @@
 module Micropub
   module Endpoint
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

data/micropub-endpoint.gemspec

@@ -29,7 +29,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov-console', '~> 0.4.2'
   spec.add_development_dependency 'webmock', '~> 3.4', '>= 3.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: micropub-endpoint
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Jason Garber
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-30 00:00:00.000000000 Z
+date: 2018-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -140,6 +140,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.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
@@ -183,7 +197,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
@@ -193,7 +207,7 @@ dependencies:
         version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 1.8.4
 description: Discover a URL’s Micropub endpoint.
 email:
 - jason@sixtwothree.org
@@ -209,6 +223,7 @@ files:
 - ".ruby-version"
 - ".simplecov"
 - ".travis.yml"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE