uri-ni 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1c4325ac19a7451179586b13811dab241ea0ea6ecb5d5e655193a4b1780e3b0
-  data.tar.gz: b3318a52162366d7887619c7b2b60727f5b43c6624960e61affaad53b6a25121
+  metadata.gz: 46e2aa7887a91a2d14dd3f89a6a01e91ff00f6c966ba9256e256597d221d5b63
+  data.tar.gz: e1b4bf407d8c8f5b0a1643ffd6ffd3e14a7389098a0a9c1253e8cbd733003116
 SHA512:
-  metadata.gz: 9892531f60b96df7e275f5ec5b5b2e9088166bf40883363a40f3002b47af05ca7905e287f2251d00689305b97f6f2e0f70fec7ef28f86c7a1b03c43b7ddf9928
-  data.tar.gz: 1c390012d6210ea3b02798eedd22f2d3a920c0961d458b06487f6a52002924bd9007139f142fb6255a0afe652c64e30b032882795138cdadb55457af1c16da26
+  metadata.gz: 22026ee328bbd59155fa3c0ab1b85d7565f868484d7a4454c5c45aacb6ea31d8f0482b216d59b46a15a460089f896c775cb62f1cb540755e6cef96732a01977d
+  data.tar.gz: 7c101253e23585c8045571bf4d00fd42deca06339cfe71bd9d93001d1d7138fe9eff99e4f899cb5344bf2adafc411ff8cb43e4413133eb1fe6dcce524730691b

data/lib/uri/ni/version.rb

@@ -3,9 +3,13 @@ require 'uri/generic'
 
 module URI
   class NI < Generic
-    VERSION = "0.1.4"
+    VERSION = "0.2.0"
   end
 
   # might as well put this here
-  @@schemes['NI'] = NI
+  if self.respond_to? :register_scheme
+    register_scheme 'NI', NI
+  else
+    @@schemes['NI'] = NI
+  end
 end

data/lib/uri/ni.rb

@@ -44,6 +44,8 @@ class URI::NI < URI::Generic
     "sha-512": Digest::SHA512,
   }
 
+  LENGTHS = DIGESTS.transform_values { |v| v.new.digest_length }
+
   # resolve first against digest length and then class
   DIGEST_REV = {
     64 => { Digest::SHA512 => :"sha-512", Digest::SHA2   => :"sha-512" },
@@ -95,11 +97,14 @@ class URI::NI < URI::Generic
     16  => [/^[0-9A-Fa-f]*$/, 'Data %s is not in hexadecimal'],
   }
 
-  def assert_repr data, radix
+  ASSERT_REPR = -> data, radix do
     re, error = ASSERT[radix]
-    raise ArgumentError, error % data unless re.match data
+    raise ArgumentError, error % data unless re.match? data
   end
 
+  define_method :assert_repr, &ASSERT_REPR
+  define_singleton_method :assert_repr, &ASSERT_REPR
+
   # from whatever to binary
   DECODE = {
     256 => -> x { x },
@@ -133,12 +138,15 @@ class URI::NI < URI::Generic
     16  => -> x { x.upcase },
   }
 
-  def transcode data, from: 256, to: 256, alt: false
+  TRANSCODE = -> data, from: 256, to: 256, alt: false do
     assert_repr data, from
     data = ENCODE[to].call(DECODE[from].call data) unless from == to
     alt ? ALT[to].call(data) : CANON[to].call(data)
   end
 
+  define_method :transcode, &TRANSCODE
+  define_singleton_method :transcode, &TRANSCODE
+
   protected
 
   # holy crap you can override these?
@@ -160,6 +168,53 @@ class URI::NI < URI::Generic
 
   public
 
+  # Transform a digest for a known algorithm into a {URI::NI}. Takes a
+  # binary, Base64, Base32, or hexadecimal string.
+  #
+  # @param algorithm [Symbol,#to_sym] a supported algorithm
+  # @param digest [String, #to_s, Digest::Instance] the digest (or context)
+  #
+  # @raise [ArgumentError] if the algorithm is unsupported
+  # @raise [ArgumentError] if the input string is not the right length
+  #  for the algorithm
+  # @raise [ArgumentError] if the input string is incorrectly encoded
+  #
+  # @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
+
+    # 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
+
+    # get the expected length of the digest for the algorithm
+    len = LENGTHS[algorithm.to_s.downcase.to_sym] or raise ArgumentError,
+      "unsupported algorithm #{algorithm}"
+
+    # the length of the string is used to determine the expected encoding
+    radix = case digest.length
+            when len then 256
+            when -> x { x >= (len * 8 / 6.0).ceil && x < (len * 8 / 5.0).ceil }
+              # note that a length longer than base64 but shorter than base32
+              # can be assumed to be base64 with padding
+              64
+            when (len * 8 / 5.0).ceil then 32
+            when len * 2 then 16
+            else
+              raise ArgumentError, "invalid string length: #{digest.length}"
+            end
+
+    # then we lint it to see if it's correct
+    digest = transcode digest, from: radix, to: 64
+
+    # then we transcode
+    URI("ni:///#{algorithm};#{digest}")
+  end
+
   # Compute an RFC6920 URI from a data source.
   #
   # @param data [#to_s, IO, Digest, nil]
@@ -171,8 +226,8 @@ class URI::NI < URI::Generic
   # @yieldparam ctx [Digest::Instance] The digest instance to the block
   # @yieldparam buf [String, nil] The current read buffer (if +data+ is set)
   # @yieldreturn [nil] The result of the block is ignored
-  # 
-  # @return [URI::NI] 
+  #
+  # @return [URI::NI]
   def self.compute data = nil, algorithm: :"sha-256", blocksize: 65536,
       authority: nil, query: nil, &block
 
@@ -192,7 +247,7 @@ class URI::NI < URI::Generic
       ctx = DIGESTS[algorithm]
     ctx.new
   end
-  
+
   # (Re)-compute a digest using existing information from an instance.
   # @see .compute
   def compute data = nil, algorithm: nil, blocksize: 65536,

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: uri-ni
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Dorian Taylor
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,7 +64,6 @@ licenses:
 - Apache-2.0
 metadata:
   homepage_uri: https://github.com/doriantaylor/rb-uri-ni
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -80,8 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: URI handler for RFC6920 ni:/// URIs
 test_files: []