goldfinger 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc820ab656edf8cb51e9e515f3b511d630d9dfe7
-  data.tar.gz: 1512d16c46857a137482aad40afa8ef73b7b2bc5
+  metadata.gz: 06a8ef2a1e5478c256b81c6a152c5fdd8681f626
+  data.tar.gz: ca099d14c413a8b3825e19efcd2e2c1930d6fc29
 SHA512:
-  metadata.gz: 3100976ad899644f228ab156571cef90a9bc03b5e0b09ef5ed842d2488e47d21fc1c818c811dc3160af6332ad87fabe02360a59393fb149ae93f7bf163cfe731
-  data.tar.gz: 2139ccddfd20b492d6fa99692f3fb3bac53245e2e08fc426f34aba25f8b90460e4093b1c976742f52116eb7ff36085f60ab875fb0cf0140db4b160a74bc3a2f6
+  metadata.gz: 856a7925e94dce04b68bbc7ca1c116f35f916cd75709b0db1596bb2c8c1424ff8ade41392dcac6d1aa612ec918b7e9d2cb19b53d42b3b7939b7ca7215692e308
+  data.tar.gz: 9bef19672f88c9abf5d29e10c2f1412168ae868277d918c8cadccea39c89d3c1cd8614704b7beba8b7977dfb3f89bee28fe720eb7de9d58321eed9e9f540a6f8

data/lib/goldfinger/client.rb

@@ -13,7 +13,7 @@ module Goldfinger
       ssl = true
 
       begin
-        _, template = perform_get(url(ssl))
+        template = perform_get(url(ssl))
       rescue HTTP::Error
         if ssl
           ssl = false
@@ -23,11 +23,13 @@ module Goldfinger
         end
       end
 
-      headers, body = perform_get(url_from_template(template))
+      raise Goldfinger::NotFoundError, "No host-meta on the server" if template.code != 200
 
-      raise Goldfinger::Error, "Invalid response mime type: #{headers.get(HTTP::Headers::CONTENT_TYPE).first}" unless ['application/jrd+json', 'application/xrd+xml'].include?(headers.get(HTTP::Headers::CONTENT_TYPE).first)
+      response = perform_get(url_from_template(template.body))
 
-      Goldfinger::Result.new(headers, body)
+      raise Goldfinger::NotFoundError, "No such user on the server" if response.code != 200
+
+      Goldfinger::Result.new(response)
     rescue HTTP::Error
       raise Goldfinger::NotFoundError
     rescue OpenSSL::SSL::SSLError
@@ -48,7 +50,7 @@ module Goldfinger
 
       links.first.attribute('template').value.gsub('{uri}', @uri)
     rescue Nokogiri::XML::XPath::SyntaxError
-      raise Goldfinger::Error, 'Bad XML'
+      raise Goldfinger::Error, "Bad XML: #{template}"
     end
 
     def domain

data/lib/goldfinger/request.rb

@@ -10,14 +10,13 @@ module Goldfinger
     end
 
     def perform
-      response = http_client.request(@request_method, @uri.to_s, @options)
-      [response.headers, response.body]
+      http_client.request(@request_method, @uri.to_s, @options)
     end
 
     private
 
     def http_client
-      HTTP.timeout(:per_operation, write: 60, connect: 20, read: 60)
+      HTTP.timeout(:per_operation, write: 60, connect: 20, read: 60).follow
     end
   end
 end

data/lib/goldfinger/result.rb

@@ -1,8 +1,16 @@
 module Goldfinger
   class Result
-    def initialize(headers, body)
-      @mime_type  = headers.get(HTTP::Headers::CONTENT_TYPE).first
-      @body       = body
+    MIME_TYPES = [
+      'application/jrd+json',
+      'application/json',
+      'application/xrd+xml',
+      'application/xml',
+      'text/xml'
+    ].freeze
+
+    def initialize(response)
+      @mime_type  = response.mime_type
+      @body       = response.body
       @subject    = nil
       @aliases    = []
       @links      = {}
@@ -62,8 +70,10 @@ module Goldfinger
       case @mime_type
       when 'application/jrd+json', 'application/json'
         parse_json
-      when 'application/xrd+xml'
+      when 'application/xrd+xml', 'application/xml', 'text/xml'
         parse_xml
+      else
+        raise Goldfinger::Error, "Invalid response mime type: #{@mime_type}"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goldfinger
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Eugen Rochko