goldfinger 1.2.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b9f439ace3badfbfd7be9f56df56d275b831973
-  data.tar.gz: 6bfef9289937a10a6681a22b6ff8f02fd39024ed
+  metadata.gz: dddcce07ce9462a9e37c4339d722d7a93687d49a
+  data.tar.gz: c520b7d8b7504f46d2c33f13020359856c25865f
 SHA512:
-  metadata.gz: 88dae51709e0a492b830f57f6e57b5b47714f42c572b4b582aa54d330bcd9ffacfcbb640a7b677e1b8ec586fcee62477353a42addeb2f9759075405c8948d13d
-  data.tar.gz: 02af661772034400db9f96df7097d5f0c838b83c11778931afbd7551718d0e403158c4ab6eed1d9bb5f2ca2334964c04170377382f89288efb9a87436c6c020c
+  metadata.gz: 16b82f58d3b734b7a254d06214ca1875953cda6b134a57e00a63b057029041e1b238af087c8a87ff36db00afc5f5c7c5871b29f42c079dfc88b10ee6708f3461
+  data.tar.gz: 58c4b87d7834551e51372e3244aa6d00e4eeff7fb1c809cdf97404e459b857c2b35a4b38268da452105ca89ee5c59db062235c214dc0b0bcdd9c99b756a848a0

data/README.md

@@ -1,15 +1,18 @@
-Goldfinger, a Webfinger client for Ruby
+Goldfinger, a WebFinger client for Ruby
 =======================================
 
 [![Gem Version](http://img.shields.io/gem/v/goldfinger.svg)][gem]
-[![Build Status](http://img.shields.io/travis/Gargron/goldfinger.svg)][travis]
-[![Dependency Status](http://img.shields.io/gemnasium/Gargron/goldfinger.svg)][gemnasium]
+[![Build Status](http://img.shields.io/travis/tootsuite/goldfinger.svg)][travis]
+[![Dependency Status](http://img.shields.io/gemnasium/tootsuite/goldfinger.svg)][gemnasium]
 
 [gem]: https://rubygems.org/gems/goldfinger
-[travis]: https://travis-ci.org/Gargron/goldfinger
-[gemnasium]: https://gemnasium.com/Gargron/goldfinger
+[travis]: https://travis-ci.org/tootsuite/goldfinger
+[gemnasium]: https://gemnasium.com/tootsuite/goldfinger
 
-A Webfinger client for Ruby. Supports `application/xrd+xml` and `application/jrd+json` responses. Raises `Goldfinger::NotFoundError` on failure to fetch the Webfinger or XRD data, or `Goldfinger::SSLError` if something is wrong with the HTTPS connection it uses.
+A WebFinger client for Ruby. Supports `application/xrd+xml` and `application/jrd+json` responses. Raises `Goldfinger::NotFoundError` on failure to fetch the Webfinger or XRD data, can also raise `HTTP:Error` or `OpenSSL::SSL::SSLError` if something is wrong with the HTTPS connection it uses.
+
+- **Does not** fall back to HTTP if HTTPS is not available
+- **Does** check host-meta XRD, but *only* if the standard WebFinger path yielded no result
 
 ## Installation
 
@@ -30,4 +33,4 @@ A Webfinger client for Ruby. Supports `application/xrd+xml` and `application/jrd
 
 ## RFC support
 
-The official Webfinger RFC is [7033](https://tools.ietf.org/html/rfc7033).
+The official WebFinger RFC is [7033](https://tools.ietf.org/html/rfc7033).

data/lib/goldfinger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'goldfinger/request'
 require 'goldfinger/link'
 require 'goldfinger/result'
@@ -11,9 +13,6 @@ module Goldfinger
   class NotFoundError < Error
   end
 
-  class SSLError < Error
-  end
-
   # Returns result for the Webfinger query
   #
   # @raise [Goldfinger::NotFoundError] Error raised when the Webfinger resource could not be retrieved

data/lib/goldfinger/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'addressable'
 require 'nokogiri'
 
@@ -10,24 +12,11 @@ module Goldfinger
     end
 
     def finger
-      ssl = true
-
-      begin
-        response = perform_get(standard_url(ssl))
-
-        return finger_from_template if response.code != 200
+      response = perform_get(standard_url)
 
-        Goldfinger::Result.new(response)
-      rescue HTTP::Error
-        raise Goldfinger::NotFoundError unless ssl
+      return finger_from_template if response.code != 200
 
-        ssl = false
-        retry
-      end
-    rescue HTTP::Error
-      raise Goldfinger::NotFoundError
-    rescue OpenSSL::SSL::SSLError
-      raise Goldfinger::SSLError
+      Goldfinger::Result.new(response)
     rescue Addressable::URI::InvalidURIError
       raise Goldfinger::NotFoundError, 'Invalid URI'
     end
@@ -35,16 +24,7 @@ module Goldfinger
     private
 
     def finger_from_template
-      ssl = true
-
-      begin
-        template = perform_get(url(ssl))
-      rescue HTTP::Error
-        raise Goldfinger::NotFoundError unless ssl
-
-        ssl = false
-        retry
-      end
+      template = perform_get(url)
 
       raise Goldfinger::NotFoundError, 'No host-meta on the server' if template.code != 200
 
@@ -55,12 +35,12 @@ module Goldfinger
       Goldfinger::Result.new(response)
     end
 
-    def url(ssl = true)
-      "http#{'s' if ssl}://#{domain}/.well-known/host-meta"
+    def url
+      "https://#{domain}/.well-known/host-meta"
     end
 
-    def standard_url(ssl = true)
-      "http#{'s' if ssl}://#{domain}/.well-known/webfinger?resource=#{@uri}"
+    def standard_url
+      "https://#{domain}/.well-known/webfinger?resource=#{@uri}"
     end
 
     def url_from_template(template)

data/lib/goldfinger/link.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Goldfinger
   # @!attribute [r] href
   #   @return [String] The href the link points to

data/lib/goldfinger/request.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'http'
 require 'addressable'
 

data/lib/goldfinger/result.rb

@@ -1,13 +1,23 @@
+# frozen_string_literal: true
+
+require 'oj'
+
 module Goldfinger
+  # @!attribute [r] subject
+  #   @return [String] URI that identifies the entity that the JRD describes.
+  # @!attribute [r] aliases
+  #   @return [Array] Zero or more URI strings that identify the same entity as the "subject" URI.
   class Result
     MIME_TYPES = [
       'application/jrd+json',
       'application/json',
       'application/xrd+xml',
       'application/xml',
-      'text/xml'
+      'text/xml',
     ].freeze
 
+    attr_reader :subject, :aliases
+
     def initialize(response)
       @mime_type  = response.mime_type
       @body       = response.body
@@ -19,20 +29,6 @@ module Goldfinger
       parse
     end
 
-    # The value of the "subject" member is a URI that identifies the entity
-    # that the JRD describes.
-    # @return [String]
-    def subject
-      @subject
-    end
-
-    # The "aliases" array is an array of zero or more URI strings that
-    # identify the same entity as the "subject" URI.
-    # @return [Array]
-    def aliases
-      @aliases
-    end
-
     # The "properties" object comprises zero or more name/value pairs whose
     # names are URIs (referred to as "property identifiers") and whose
     # values are strings or nil.
@@ -78,7 +74,7 @@ module Goldfinger
     end
 
     def parse_json
-      json = JSON.parse(@body)
+      json = Oj.load(@body, mode: :null)
 
       @subject    = json['subject']
       @aliases    = json['aliases'] || []
@@ -94,7 +90,7 @@ module Goldfinger
       xml = Nokogiri::XML(@body)
 
       @subject = xml.at_xpath('//xmlns:Subject').content
-      @aliases = xml.xpath('//xmlns:Alias').map { |a| a.content }
+      @aliases = xml.xpath('//xmlns:Alias').map(&:content)
 
       properties = xml.xpath('/xmlns:XRD/xmlns:Property')
       properties.each { |prop| @properties[prop.attribute('type').value] = prop.attribute('nil') ? nil : prop.content }

data/lib/goldfinger/utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Goldfinger
   module Utils
     def perform_get(path, options = {})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goldfinger
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Eugen Rochko
@@ -16,56 +16,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.15'
 description: A Webfinger utility for Ruby
 email: eugen@zeonfederated.com
 executables: []
@@ -92,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -100,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A Webfinger utility for Ruby