ruby-ipfs-api 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24d678460e6540e0cdb6ba0adb78059cf62cb57c
-  data.tar.gz: 3654e0e6d008375a2a1c58ddd921dcb7992dbdeb
+  metadata.gz: 4e12832ab225871a45af126b0d9f44bfa8f62f45
+  data.tar.gz: 28ae276440460f49731372b1377a3cc1fcd0a401
 SHA512:
-  metadata.gz: 68ebf7fc1d165de81ba34621dff8a403556fdb46e339dface000846c3d740c328d034ffdc2e6decdf6b98624a53a219e83d761d8729d6673a054a09295570627
-  data.tar.gz: c9fa6d861c4f2bb36f5e1b9341c5cf28d9532b7253d5c271b5cd6a8b8ca2cbb4b88f64b73f257801a40783734ac98abe21b2add0850eb85bdd5c5d7654d8b0f3
+  metadata.gz: ed342f1e0f2a0c1e162d0096d2c9ca67632d9eb5ee339a53ea08eceb4931d2b871dc86d4f896771631f55d5b353c880e0dc35e6ad211054ec7ab93de736c53a8
+  data.tar.gz: ce0d390bf86ae14915e4cb22c5f01da2f9de0e4a0f2e65b2756833eca69a9b86e8b679a185149be55f030318cee0e9e4ffb2e92ca78ea129b1662f4ae98e4078

data/lib/multihash.rb

@@ -1,42 +1,49 @@
+require_relative './base'
 require_relative './errors'
 
 module Ipfs
-
   class Multihash
-    attr_reader :hash_func_type, :digest_length, :digest_value
+    attr_reader :hash_func_type, :digest_length
+
+    FUNCTIONS = [
+      { name: :sha256, type_code: 0x12, digest_length: 0x20 }
+    ]
+
+    def initialize(multihash)
+      @base58_encoded = multihash
+      @bytes_encoded = to_bytes
+
+      @function = find_hash_function(@bytes_encoded[0])
 
-    DEFAULT_LENGTH = 46
-    VALID_DIGEST_LENGTH = 'm'
-    FUNCTION_TYPE_CODE = {
-      sha256: 'Q'
-    }
+      raise Error::InvalidMultihash, "The hash func type could not be found" if @function.nil?
 
-    def initialize(hash)
-      @hash_func_type = hash[0]
-      @digest_length = hash[1]
-      @digest_value = hash[2..-1]
+      @hash_func_type = @function[:name]
+      @digest_length = @function[:digest_length]
 
-      raise Ipfs::Error::InvalidMultihash, "The hash '#{raw}' is invalid." unless valid?
+      raise Error::InvalidMultihash,
+            "The hash '#{@base58_encoded}' is invalid." unless correct_length?
+    end
+
+    def to_bytes
+      [Base58.decode(@base58_encoded).to_s(16)]
+        .pack('H*')
+        .unpack('C*')
     end
 
     def raw
-      "#{@hash_func_type}#{@digest_length}#{@digest_value}"
+      @base58_encoded
     end
 
     alias to_s raw
 
     private
 
-    def valid?
-      correct_length? && encoded_digest?(:sha256)
+    def find_hash_function(func_type_code)
+      FUNCTIONS.find { |function| function[:type_code] == func_type_code }
     end
 
     def correct_length?
-      raw.length == DEFAULT_LENGTH
-    end
-
-    def encoded_digest?(encoding)
-      @hash_func_type == FUNCTION_TYPE_CODE[encoding]
+      @digest_length == @bytes_encoded[2..-1].length
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-ipfs-api
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tom Benett