goldfinger 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ccb83bc7919c4a975043eb396ad2918eed58d66
-  data.tar.gz: b8ca3a1309fd418c5ee8e5cd57cc2b274e3d454e
+  metadata.gz: 7b9f439ace3badfbfd7be9f56df56d275b831973
+  data.tar.gz: 6bfef9289937a10a6681a22b6ff8f02fd39024ed
 SHA512:
-  metadata.gz: 65e977f822f5eaa7ff38528bcb55c363b75aae26cedf05bb7c14c25719aa899d05147881a502fefcdb1f2cd253faadf0d22514dedc2e3ea17341b53d5bd5a0e0
-  data.tar.gz: b7efffe3f7de0d3fcb75ee63e99e91985d6b074af0a210c79f6191d2ceb0695ded59619fbd3d0a9d8400e56ca6a4e6081b0aed16f28d078eb2452a6b4e37e871
+  metadata.gz: 88dae51709e0a492b830f57f6e57b5b47714f42c572b4b582aa54d330bcd9ffacfcbb640a7b677e1b8ec586fcee62477353a42addeb2f9759075405c8948d13d
+  data.tar.gz: 02af661772034400db9f96df7097d5f0c838b83c11778931afbd7551718d0e403158c4ab6eed1d9bb5f2ca2334964c04170377382f89288efb9a87436c6c020c

data/lib/goldfinger/client.rb

@@ -13,23 +13,17 @@ module Goldfinger
       ssl = true
 
       begin
-        template = perform_get(url(ssl))
-      rescue HTTP::Error
-        if ssl
-          ssl = false
-          retry
-        else
-          raise Goldfinger::NotFoundError
-        end
-      end
-
-      raise Goldfinger::NotFoundError, 'No host-meta on the server' if template.code != 200
+        response = perform_get(standard_url(ssl))
 
-      response = perform_get(url_from_template(template.body))
+        return finger_from_template if response.code != 200
 
-      raise Goldfinger::NotFoundError, 'No such user on the server' if response.code != 200
+        Goldfinger::Result.new(response)
+      rescue HTTP::Error
+        raise Goldfinger::NotFoundError unless ssl
 
-      Goldfinger::Result.new(response)
+        ssl = false
+        retry
+      end
     rescue HTTP::Error
       raise Goldfinger::NotFoundError
     rescue OpenSSL::SSL::SSLError
@@ -40,10 +34,35 @@ 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
+
+      raise Goldfinger::NotFoundError, 'No host-meta on the server' if template.code != 200
+
+      response = perform_get(url_from_template(template.body))
+
+      raise Goldfinger::NotFoundError, 'No such user on the server' if response.code != 200
+
+      Goldfinger::Result.new(response)
+    end
+
     def url(ssl = true)
       "http#{'s' if ssl}://#{domain}/.well-known/host-meta"
     end
 
+    def standard_url(ssl = true)
+      "http#{'s' if ssl}://#{domain}/.well-known/webfinger?resource=#{@uri}"
+    end
+
     def url_from_template(template)
       xml   = Nokogiri::XML(template)
       links = xml.xpath('//xmlns:Link[@rel="lrdd"]')

metadata

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