scale.rb 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ce5a456e8313b36d61cbfbff272c86985a6dc240603b37d6e96bd1cc0f28a9b
-  data.tar.gz: fda311dc30d0f8b31c62d9332bf241bab5b5646b6919fcb3b41814126692f469
+  metadata.gz: 861596854598a5ea2a2648cc9fe3b32915eeba97a372f2c49ba1839537cd6741
+  data.tar.gz: 222a2e692373bd1523f37927a304c12f2d24d252c428be3b6beb8b4dc52163c8
 SHA512:
-  metadata.gz: 2d9d0c5ccc5cdc2e34515af88a64164678ce6f18a128f3e935906a362979ff6be7e83c0ea9ab17350acb3fb91e67766dbc3bc247fc733dd4310c9efb3aaf6857
-  data.tar.gz: 9c0a9f424308e368dc886ad31f568b118fa5596d21b7d5cd9d79bbefcf41a8324c4d3f885f24334165cac769e33da988f2b1f03097a966f19003b7c027cd8ab3
+  metadata.gz: 68406b9ce9d33d5bf4513fc825f7e76b5e290f52a6b144893ff9df130e513ff01f20b647e51eab61efef2f15bb4b4be0db0b0a817cba465f268577199731f4d3
+  data.tar.gz: d0225db7a736a2909dd8e3967658b9fef543457e2eea479e09af8944161830fbad114782ec8fa0014e6a4df5f8599c3b128dcc16cc00c3518dcd836f1b6dd4ef

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    scale.rb (0.3.0)
+    scale.rb (0.3.1)
       base58
       blake2b_rs (~> 0.1.2)
       faye-websocket

data/lib/scale.rb

@@ -44,7 +44,7 @@ module Scale
 
   module Types
     class << self
-      attr_accessor :debug
+      attr_accessor :debug, :logger
     end
 
     def self.check_types
@@ -126,3 +126,4 @@ class ::Hash
 end
 
 Scale::Types.debug = false
+Scale::Types.logger = Logger.new(STDOUT)

data/lib/scale/version.rb

@@ -1,3 +1,3 @@
 module Scale
-  VERSION = "0.3.0".freeze
+  VERSION = "0.3.1".freeze
 end

data/lib/substrate_client.rb

@@ -122,8 +122,8 @@ class SubstrateClient
     block = self.chain_getBlock(block_hash)
     SubstrateClient::Helper.decode_block(block)
   rescue => ex
-    puts ex.message
-    puts ex.backtrace.join("\n\t")
+    Scale::Types.logger.error ex
+    Scale::Types.logger.error ex.backtrace.join("\n\t")
   end
 
   def get_block_events(block_hash=nil)

data/lib/type_builder.rb

@@ -41,11 +41,12 @@ module Scale
           # 5. Struct, 6. Enum, 7. Set
           else 
 
-            if type_info["type"] == "struct"
+            type_info.transform_keys!(&:to_sym)
+            if type_info[:type] == "struct"
               build_struct(type_info)
-            elsif type_info["type"] == "enum"
+            elsif type_info[:type] == "enum"
               build_enum(type_info)
-            elsif type_info["type"] == "set"
+            elsif type_info[:type] == "set"
               build_set(type_info)
             else
               raise Scale::TypeBuildError.new("Failed to build a type from #{type_info}")
@@ -158,7 +159,7 @@ module Scale
 
         def build_struct(type_info)
           # items: {"a" => Type}
-          items = type_info["type_mapping"].map do |item|
+          items = type_info[:type_mapping].map do |item|
             item_name = item[0]
             item_type = get(item[1])
             [item_name, item_type]
@@ -183,10 +184,10 @@ module Scale
 
         # not implemented: ["Compact", "Hex"]
         def build_enum(type_info)
-          # type_info: [["Item1", "Compact"], [["Item2", "Hex"]]
-          if type_info.has_key?("type_mapping")
+          # type_mapping: [["Item1", "Compact"], [["Item2", "Hex"]]
+          if type_info.has_key?(:type_mapping)
             # items: {a: Type}
-            items = type_info["type_mapping"].map do |item|
+            items = type_info[:type_mapping].map do |item|
               item_name = item[0]
               item_type = get(item[1])
               [item_name.to_sym, item_type]
@@ -210,14 +211,14 @@ module Scale
             end
           end
 
-          # [1, "hello"]
-          if type_info.has_key?("value_list")
-            type_name = "Enum#{type_info["value_list"].map {|value| value.to_s.camelize2}.join}"
+          # value_list: [1, "hello"]
+          if type_info.has_key?(:value_list)
+            type_name = "Enum#{type_info[:value_list].map {|value| value.to_s.camelize2}.join}"
 
             if !Scale::Types.const_defined?(type_name)
               klass = Class.new do
                 include Scale::Types::Enum
-                values *type_info["value_list"]
+                values *type_info[:value_list]
               end
               return Scale::Types.const_set type_name, klass
             else
@@ -237,12 +238,12 @@ module Scale
           # }
         # }
         def build_set(type_info)
-          type_name = "Set#{type_info["value_list"].keys.map(&:camelize2).join("")}"
+          type_name = "Set#{type_info[:value_list].keys.map(&:camelize2).join("")}"
           if !Scale::Types.const_defined?(type_name)
-            bytes_length = type_info["value_type"][1..].to_i / 8
+            bytes_length = type_info[:value_type][1..].to_i / 8
             klass = Class.new do
               include Scale::Types::Set
-              items type_info["value_list"], bytes_length
+              items type_info[:value_list], bytes_length
             end
             return Scale::Types.const_set type_name, klass
           else

data/lib/type_registry.rb

@@ -26,7 +26,7 @@ module Scale
           @types = default_types.merge(spec_types)
         rescue => ex
           # TODO: check different errors
-          puts "There is no types json file named #{spec_name}"
+          Scale::Types.logger.error "There is no types json file named #{spec_name}"
           @types = default_types
         end
       else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scale.rb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Wu Minzhe
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-11 00:00:00.000000000 Z
+date: 2021-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blake2b_rs