tezos_client 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6de17ecf9250b846d61ac7c09163ae7d724bbf2cef921accfb363c17642d09bd
-  data.tar.gz: eceb944bc3de48585b37adb47d9004193b3b96b6803071ccb543c969d8d11888
+  metadata.gz: df136ec49d2d790db5cee86eb542be4c0a0ffbc08cd32da8b45ed24f3b30faac
+  data.tar.gz: 245b8ca7495bd975cd20e41fcec00968ff436d80c2cbdfebdd47f95618323c67
 SHA512:
-  metadata.gz: af341ffed833a6f8683653b96f8a3cbc0b9397e7b5d56e734a6a528f96904c2ec45d252bd05be6ea8f009a54b55cc7d758784006c99c393ac3d4871913aeede9
-  data.tar.gz: 4a0ae7f0d075caace39047dcc9a012811484a0569a86223a508e8bb8fbbad578456bea5852c3243ff1b99ec4fdbc847abefd8dddaa24d3dd5e6490fb1e44323a
+  metadata.gz: 1ef0f079eb71e4fa9e2716130d7cbd06f33abd93a8dfdf14c9b388730fe0289b21d8d4b4424b2f246c8dfd3079af5b16e4438b3a22bab8ce0c564f8f5794e11f
+  data.tar.gz: 90b9ef025edacccf89275c4f5ec6be72511f182705f6b224fb756f05259fdd940e480fc4b4368d674122858f0da2195c200a77585750a77c0ef3e0b7c2f02114

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tezos_client (1.1.1)
+    tezos_client (1.1.2)
       active_interaction (~> 3.7)
       activesupport (~> 6.0.0)
       base58 (~> 0.2.3)

data/lib/tezos_client/tools/convert_to_hash.rb

@@ -5,83 +5,95 @@ class TezosClient::Tools::ConvertToHash < ActiveInteraction::Base
   interface :type
 
   def execute
+    decorated_value
+  end
+
+  private
+  def value
     case type[:prim]
     when "pair"
-      pair_type(data: data, type: type)
+      pair_type
     when "list"
-      list_type(data: data, type: type)
+      list_type
     when "int"
-      int_type(data: data, type: type)
+      int_type
     when "nat"
-      int_type(data: data, type: type)
+      int_type
     when "key"
-      key_type(data: data, type: type)
+      key_type
     when "timestamp"
-      timestamp_type(data: data, type: type)
+      timestamp_type
     when "string"
-      string_type(data: data, type: type)
+      string_type
     when "address"
-      address_type(data: data, type: type)
+      address_type
     else
       raise "type '#{type[:prim]}' not implemented"
     end
   end
 
-  private
-    def pair_type(data:, type:)
-      raise "Not a 'Pair' type" unless data[:prim] == "Pair"
-      raise "Difference detected between data and type \nDATA: #{data} \nTYPE:#{type} " unless data[:args].size == type[:args].size
-
-      result = {}
-      data[:args].size.times do |iter|
-        result.merge!(
-          compose(
-            TezosClient::Tools::ConvertToHash,
-            data: data[:args][iter],
-            type: type[:args][iter]
-          )
-        )
-      end
-      result
-    end
+  def pair_type
+    raise "Not a 'Pair' type" unless data[:prim] == "Pair"
+    raise "Difference detected between data and type \nDATA: #{data} \nTYPE:#{type} " unless data[:args].size == type[:args].size
 
-    def list_type(data:, type:)
-      {
-        var_name(type) => convert_list_element(data: data, element_type: type[:args].first)
-      }
-    end
+    (data[:args]).zip(type[:args]).map do |data_n, type_n|
+      compose(
+        TezosClient::Tools::ConvertToHash,
+        data: data_n,
+        type: type_n
+      )
+    end.reduce({}, &:merge)
+  end
 
-    def convert_list_element(data:, element_type:)
-      data.map do |elem|
-        compose(
-          TezosClient::Tools::ConvertToHash,
-          data: elem,
-          type: element_type
-        )
-      end
-    end
+  def list_type
+    convert_list_element(data: data, element_type: type[:args].first)
+  end
 
-    def int_type(data:, type:)
-      { var_name(type) => data[:int].to_i }
+  def convert_list_element(data:, element_type:)
+    data.map do |elem|
+      compose(
+        TezosClient::Tools::ConvertToHash,
+        data: elem,
+        type: element_type
+      )
     end
+  end
 
-    def key_type(data:, type:)
-      { var_name(type) => data[:bytes] || data[:string] }
-    end
+  def int_type
+    data[:int].to_i
+  end
 
-    def timestamp_type(data:, type:)
-      { var_name(type) => Time.zone.at(data[:int].to_i) }
-    end
+  def key_type
+    data[:bytes] || data[:string]
+  end
 
-    def string_type(data:, type:)
-      { var_name(type) => data[:string] }
-    end
+  def timestamp_type
+    Time.zone.at(data[:int].to_i)
+  end
 
-    def address_type(data:, type:)
-      { var_name(type) => data[:bytes] || data[:string] }
-    end
+  def string_type
+    data[:string]
+  end
 
-    def var_name(type)
-      "#{type[:annots].first[1..-1]}".to_sym
-    end
+  def address_type
+    data[:bytes] || data[:string]
+  end
+
+  def decorated_value
+    anonymous? ? value : { var_name => value }
+  end
+
+  def anonymous?
+    !(type.key?(:annots) && type[:annots].any?)
+  end
+
+  def var_name_annot
+    type[:annots].first
+  end
+
+  def var_name
+    return nil if anonymous?
+
+    "#{var_name_annot[1..-1]}".to_sym
+  end
 end

data/lib/tezos_client/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class TezosClient
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tezos_client
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Pierre Michard