uri-ni 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f21e8e7bf5c19fc3eedf94e5a41c401c8bf0c49153b70abf1ec27d301811c9c
-  data.tar.gz: 10db96336f2f2509b4079d295af3bac755ecfdc07d06c2fc43fbebb21ba95974
+  metadata.gz: 971b72993168c64b86e07c62460ba32c22f3d2849f1b2bdcabf9d455b9ab320a
+  data.tar.gz: 9e90ac190a4ef2a956d24d9f90d2b460cca4b2af18abc7b695ca0bf5ea80f371
 SHA512:
-  metadata.gz: 803def5e52f0265a7cbb881bb874e3d306f352b79f24eee939981591692dad450bb3be5d5f88de050939a8c37154531935401e6f8abf62a7886583b2ed8527ac
-  data.tar.gz: d9081a72a683c62a550c28bb19c0c713913a20addebfbb9e203bceb5a04262f982d841bd5d65b0e773722ab10c15ec99da12f88ce9b67734f0a25a27ab00b4fb
+  metadata.gz: 8499f77ffdeb429a6b3d07021cfd4d825b492761bb780a2dff37fbee2c2955f2d7552aa3e11013bda54a04315bf3d8301b128abce4d3d8ea2048dc6b78b2ecfd
+  data.tar.gz: '08399a8e69433a93246327d336776f879fddb2fc6bdfd38e97d125aa974c4fa92297097c1e48389a7a7c17076874f2ad607eed1861de01889951e3bfcb894566'

data/lib/uri/ni/version.rb

@@ -3,7 +3,7 @@ require 'uri/generic'
 
 module URI
   class NI < Generic
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 
   # might as well put this here

data/lib/uri/ni.rb

@@ -182,6 +182,39 @@ class URI::NI < URI::Generic
     @host = v.to_s
   end
 
+  # This will attempt to coerce the input into a {URI::NI} if it's possible.
+  #
+  # @param arg [#to_s, URI::Generic] something that might be a URI
+  #
+  # @raise [URI::Error] if the URI itself is malformed
+  # @raise [ArgumentError] if it is not a `ni:` URI or HTTP(S) with
+  #  the `/.well-known/ni/…` construct
+  #
+  # @return [nil, URI::NI] the hash URI (maybe)
+  #
+  def self.try_uri arg
+    unless arg.is_a? URI
+      arg = arg.to_s
+      return unless %r{^(?i:ni|https?)://}.match? arg
+      arg = URI(arg)
+    end
+
+    # normalize the uri
+    arg = arg.normalize
+
+    # if HTTP(S) URI with `/.well-known/ni/…`, convert it
+    if m = %r{^/+\.well-known/+ni/+([^/]+)/+([0-9A-Za-z_-]+)$}.match(arg.path)
+      arg = URI('ni:///%s;%s' % m.captures)
+    end
+
+    raise ArgumentError,
+      "don't know what to do with a #{arg.scheme}: URI" unless
+      arg.is_a? URI::NI
+
+    # return it
+    arg.dup
+  end
+
   public
 
   # Transform a digest for a known algorithm into a {URI::NI}. Takes a
@@ -202,26 +235,16 @@ class URI::NI < URI::Generic
       # this will complain
       algo_for digest, algorithm
       return compute(digest)
-    elsif digest.is_a? URI::NI
+    elsif tmp = try_uri(digest)
       raise ArgumentError,
-        "digest algorithm #{digest.algorithm} does not match #{algorithm}" if
-        algorithm && algorithm != digest.algorithm
-      return digest
+        "digest algorithm #{tmp.algorithm} does not match #{algorithm}" if
+        algorithm && algorithm != tmp.algorithm
+      return tmp
     end
 
-    # make sure we're indeed dealing with a string
+    # okay now we should have a string that's just the hash
     digest = digest.to_s
 
-    # just parse if it's already a ni: URI string
-    if /^ni:/i.match? digest
-      digest = URI(digest)
-      raise ArgumentError,
-        "digest algorithm #{digest.algorithm} does not match #{algorithm}" if
-        algorithm && algorithm != digest.algorithm
-
-      return digest
-    end
-
     # get the expected length of the digest for the algorithm
     len = LENGTHS[algorithm.to_s.downcase.to_sym] or raise ArgumentError,
       "unsupported algorithm #{algorithm}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri-ni
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Dorian Taylor