uri-ni 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46e2aa7887a91a2d14dd3f89a6a01e91ff00f6c966ba9256e256597d221d5b63
-  data.tar.gz: e1b4bf407d8c8f5b0a1643ffd6ffd3e14a7389098a0a9c1253e8cbd733003116
+  metadata.gz: 0210a945c627b9ec4a14f96b5beac95ca2084e5a873643ed963d37f939f81796
+  data.tar.gz: d3c7a53b7c0dfb92e64e2989114863838dbf2b895a9fb0a4375f86213fd61d7d
 SHA512:
-  metadata.gz: 22026ee328bbd59155fa3c0ab1b85d7565f868484d7a4454c5c45aacb6ea31d8f0482b216d59b46a15a460089f896c775cb62f1cb540755e6cef96732a01977d
-  data.tar.gz: 7c101253e23585c8045571bf4d00fd42deca06339cfe71bd9d93001d1d7138fe9eff99e4f899cb5344bf2adafc411ff8cb43e4413133eb1fe6dcce524730691b
+  metadata.gz: e02348cfcdb25c10a8ff83c462bfff0c3720b1488bedc33a3e8735eb1a98f3887afd50ca5d6f6674f30fd2ae92e3f5bf49822dbcc2ee6c1ee51385e55612ea36
+  data.tar.gz: 4f6a9d14efab6c9b6fa46c9df390d5222ef8a8a6afe4d06aeba6709284d59f20d35aa12d5da4f8f3dc52cb2a159dd17f97872165278324b0407b20f8e4280bd7

data/lib/uri/ni/version.rb

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

data/lib/uri/ni.rb

@@ -42,9 +42,25 @@ class URI::NI < URI::Generic
     "sha-256": Digest::SHA256,
     "sha-384": Digest::SHA384,
     "sha-512": Digest::SHA512,
+    # XXX not sure if i want to do this
+    "sha-256-32": Digest::SHA256,
+    "sha-256-64": Digest::SHA256,
+    "sha-256-96": Digest::SHA256,
+    "sha-256-120": Digest::SHA256,
+    "sha-256-128": Digest::SHA256,
   }
 
-  LENGTHS = DIGESTS.transform_values { |v| v.new.digest_length }
+  LENGTHS = DIGESTS.map do |k, v|
+    v = if m = /^sha-256-(\d+)$/.match(k)
+      m.captures.first.to_i / 8
+    else
+      v.new.digest_length
+    end
+
+    [k, v]
+  end.to_h.freeze
+
+  TRUNCATED = [32, 64, 96, 120, 128].map { |i| "sha-256-#{i}".to_sym }.freeze
 
   # resolve first against digest length and then class
   DIGEST_REV = {
@@ -261,7 +277,8 @@ class URI::NI < URI::Generic
     # special case for when the data is a digest
     ctx = nil
     if data.is_a? Digest::Instance
-      algorithm ||= algo_for data, algorithm
+      # note the self; this would have been a bug lol
+      self.algorithm = algorithm ||= algo_for data, algorithm
       ctx  = data
       data = nil # unset data
     else
@@ -296,17 +313,34 @@ class URI::NI < URI::Generic
       block.call ctx, nil
     end
 
-    self.set_path("/#{algorithm};" +
-      ctx.base64digest.tr('+/', '-_').tr('=', ''))
+    set_digest ctx.digest
+
     self
   end
 
+  # Returns true if the digest length matches the algorithm.
+  #
+  # @return [false, true]
+  #
+  def valid?
+    LENGTHS[algorithm] and LENGTHS[algorithm] == digest.length
+  end
+
+  # Returns true if the algorithm is a truncated one.
+  #
+  # @return [false, true]
+  #
+  def truncated?
+    TRUNCATED.include? algorithm
+  end
+
   # Display the available algorithms.
   #
   # @return [Array] containing the symbols representing the available
   #  digest algorithms.
-  def self.algorithms
-    DIGESTS.keys.sort
+  def self.algorithms truncated: false
+    out = DIGESTS.keys.sort
+    truncated ? out : out.reject { |a| /^sha-256-/.match? a }
   end
 
   # Obtain the algorithm of the digest. May be nil.
@@ -384,7 +418,10 @@ class URI::NI < URI::Generic
     when Digest::Instance
       compute value
     when String
-      value = transcode value, from: radix, to: 64
+      value = transcode value, from: radix
+      value = value[0, LENGTHS[a.to_sym]] # deal with truncation
+      value = transcode value, to: 64
+
       self.path = a ? "/#{a};#{value}" : "/;#{value}"
     when nil
       self.path = a ? "/#{a}" : ?/
@@ -530,16 +567,17 @@ class URI::NI < URI::Generic
     to_www https: false, authority: authority
   end
 
-  # Returns the set of supported algorithms.
-  # @return [Array] the algorithms
-  def self.algorithms
-    DIGESTS.keys
-  end
 
   # 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
-    DIGESTS.has_key? algorithm.to_s.downcase.to_sym
+    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
+
+    # etc
+    DIGESTS.has_key? algorithm
   end
 end

metadata

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