uri-ni 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0210a945c627b9ec4a14f96b5beac95ca2084e5a873643ed963d37f939f81796
-  data.tar.gz: d3c7a53b7c0dfb92e64e2989114863838dbf2b895a9fb0a4375f86213fd61d7d
+  metadata.gz: 6f21e8e7bf5c19fc3eedf94e5a41c401c8bf0c49153b70abf1ec27d301811c9c
+  data.tar.gz: 10db96336f2f2509b4079d295af3bac755ecfdc07d06c2fc43fbebb21ba95974
 SHA512:
-  metadata.gz: e02348cfcdb25c10a8ff83c462bfff0c3720b1488bedc33a3e8735eb1a98f3887afd50ca5d6f6674f30fd2ae92e3f5bf49822dbcc2ee6c1ee51385e55612ea36
-  data.tar.gz: 4f6a9d14efab6c9b6fa46c9df390d5222ef8a8a6afe4d06aeba6709284d59f20d35aa12d5da4f8f3dc52cb2a159dd17f97872165278324b0407b20f8e4280bd7
+  metadata.gz: 803def5e52f0265a7cbb881bb874e3d306f352b79f24eee939981591692dad450bb3be5d5f88de050939a8c37154531935401e6f8abf62a7886583b2ed8527ac
+  data.tar.gz: d9081a72a683c62a550c28bb19c0c713913a20addebfbb9e203bceb5a04262f982d841bd5d65b0e773722ab10c15ec99da12f88ce9b67734f0a25a27ab00b4fb

data/lib/uri/ni/version.rb

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

data/lib/uri/ni.rb

@@ -198,14 +198,29 @@ class URI::NI < URI::Generic
   # @return [URI::NI] the transformed identifier
   #
   def self.ingest algorithm = nil, digest
-    return compute(digest) if digest.is_a? Digest::Instance
-    return digest if digest.is_a? URI::NI # noop
+    if digest.is_a? Digest::Instance
+      # this will complain
+      algo_for digest, algorithm
+      return compute(digest)
+    elsif digest.is_a? URI::NI
+      raise ArgumentError,
+        "digest algorithm #{digest.algorithm} does not match #{algorithm}" if
+        algorithm && algorithm != digest.algorithm
+      return digest
+    end
 
     # make sure we're indeed dealing with a string
     digest = digest.to_s
 
     # just parse if it's already a ni: URI string
-    return URI(digest) if /^ni:/i.match? digest
+    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,
@@ -338,14 +353,16 @@ class URI::NI < URI::Generic
   #
   # @return [Array] containing the symbols representing the available
   #  digest algorithms.
+  #
   def self.algorithms truncated: false
     out = DIGESTS.keys.sort
-    truncated ? out : out.reject { |a| /^sha-256-/.match? a }
+    truncated ? out : out - TRUNCATED
   end
 
   # Obtain the algorithm of the digest. May be nil.
   #
   # @return [Symbol, nil]
+  #
   def algorithm
     algo = assert_path.first
     return algo.to_sym if algo
@@ -353,7 +370,8 @@ class URI::NI < URI::Generic
 
   # Set the algorithm of the digest. Will croak if the path is malformed.
   #
-  # @return [Symbol, nil] the old algorithm
+  # @return [Symbol, nil]
+  #
   def algorithm= algo
     a, b = assert_path
     self.path   = "/#{algo}"
@@ -364,6 +382,7 @@ class URI::NI < URI::Generic
   # Obtain the authority (userinfo@host:port) if present.
   #
   # @return [String, nil] the authority
+  #
   def authority
     out = userinfo ? "#{userinfo}@#{host}" : host
     out += "#{out}:#{port}" if port
@@ -372,7 +391,8 @@ class URI::NI < URI::Generic
 
   # Set the authority of the URI.
   #
-  # @return [String, nil] the old authority
+  # @return [String, nil]
+  #
   def authority= authority
     old = self.authority
     u, h, p = assert_authority authority unless authority.nil?
@@ -393,6 +413,7 @@ class URI::NI < URI::Generic
   #
   # @param radix [256, 64, 32, 16] The radix of the representation
   # @param alt [false, true] Return the alternative representation
+  #
   # @return [String] The digest of the URI in the given representation
   #
   def digest radix: 256, alt: false
@@ -407,6 +428,7 @@ class URI::NI < URI::Generic
   #
   # @param value [String, nil, Digest::Instance] The new digest
   # @param radix [256, 64, 32, 16] The radix of the encoding (default 256)
+  #
   # @return [String] The _old_ digest in the given radix
   #
   def set_digest value, radix: 256
@@ -440,6 +462,7 @@ class URI::NI < URI::Generic
   # objects will just be run through #compute, with all that entails.
   #
   # @param value [String, nil, Digest::Instance] the new digest
+  #
   # @return [String, nil, Digest::Instance] the value passed in
   #
   def digest= value
@@ -451,6 +474,7 @@ class URI::NI < URI::Generic
   # representation.
   #
   # @param alt [false, true] Return the alternative representation
+  #
   # @return [String] The hexadecimal digest
   #
   def hexdigest alt: false
@@ -458,8 +482,11 @@ class URI::NI < URI::Generic
   end
 
   # Set the digest value, assuming a hexadecimal input.
+  #
   # @param value [String, nil, Digest::Instance] the new digest
+  #
   # @return [String, nil, Digest::Instance] the value passed in
+  #
   def hexdigest= value
     set_digest value, radix: 16
   end
@@ -469,6 +496,7 @@ class URI::NI < URI::Generic
   # representation. Note this method requires the base32 module.
   #
   # @param alt [false, true] Return the alternative representation
+  #
   # @return [String] The base32 digest
   #
   def b32digest alt: false
@@ -476,8 +504,11 @@ class URI::NI < URI::Generic
   end
 
   # Set the digest value, assuming a base32 input (requires base32).
+  #
   # @param value [String, nil, Digest::Instance] the new digest
+  #
   # @return [String, nil, Digest::Instance] the value passed in
+  #
   def b32digest= value
     set_digest value, radix: 32
   end
@@ -488,6 +519,7 @@ class URI::NI < URI::Generic
   # (_non_-URL-safe) base64 representation.
   #
   # @param alt [false, true] Return the alternative representation
+  #
   # @return [String] The base64 digest
   #
   def b64digest alt: false
@@ -495,8 +527,11 @@ class URI::NI < URI::Generic
   end
 
   # Set the digest value, assuming a base64 input.
+  #
   # @param value [String, nil, Digest::Instance] the new digest
+  #
   # @return [String, nil, Digest::Instance] the value passed in
+  #
   def b64digest= value
     set_digest value, radix: 64
   end
@@ -506,6 +541,7 @@ class URI::NI < URI::Generic
   #
   # @param authority [#to_s, URI] Override the authority part of the URI
   # @param https [true, false] Whether the URL is to be HTTPS.
+  #
   # @return [URI::HTTPS, URI::HTTP] The generated URL.
   #
   def to_www https: true, authority: nil
@@ -551,6 +587,7 @@ class URI::NI < URI::Generic
   # Unconditionally returns an HTTPS URL.
   #
   # @param authority [#to_s, URI] Override the authority part of the URI
+  #
   # @return [URI::HTTPS]
   #
   def to_https authority: nil
@@ -561,6 +598,7 @@ class URI::NI < URI::Generic
   # Unconditionally returns an HTTP URL.
   #
   # @param authority [#to_s, URI] Override the authority part of the URI
+  #
   # @return [URI::HTTP]
   #
   def to_http authority: nil
@@ -569,15 +607,20 @@ class URI::NI < URI::Generic
 
 
   # Returns true if the algorithm is supported.
+  #
   # @param algorithm [Symbol,String] the algorithm identifier to test
+  #
   # @return [true, false] whether it is supported
+  #
   def self.valid_algo? algorithm
-    algorithm = algorithm.to_s.downcase.to_sym
-
-    # special case for truncated sha-256
-    return true if /^(sha-256)-(32|64|96|120|128)$/.match? algorithm
+    DIGESTS.has_key? algorithm.to_s.downcase.to_sym
+  end
 
-    # etc
-    DIGESTS.has_key? algorithm
+  # Returns true if the supplied algorithm is a truncated one.
+  #
+  # @return [false, true]
+  #
+  def self.truncated? algorithm
+    valid_algo?(algorithm) && TRUNCATED.include?(algorithm.to_s.downcase.to_sym)
   end
 end

metadata

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