etheruby 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3820276ab8945379dd964e4bb2eb648acdac6f74
-  data.tar.gz: 9fb6b699587224619e6e73d8d53a4c708b4b731a
+  metadata.gz: 2b35960ad21669693e324f1b0fe5a149f969b1fa
+  data.tar.gz: 0e449c63f6191bc83c3787b1028f18a74734ed08
 SHA512:
-  metadata.gz: a3a66b0a3f071199be7f96e40eea49be3e526616b489db56227c685fa039297905876b75b11e4db695ce2c116bed293c2c49a834ede7bda30e83d4bd930d3a46
-  data.tar.gz: 92c55c8446de0ff92746e0b6a575bb7e2afb452dea3c0f67654d4767efc82be8afe5cdd3933796b6540a4b086c30b1e437a09092e0cf7c1f8a4db32d6f8c988c
+  metadata.gz: a6f60f6a5ca338aa838b236e0063aef7319fd22dd5f7b5976cbb267bdbf4612a9777d465f5a613885d1da9cbda9ac60af3759be04842a46223a6041747d34f47
+  data.tar.gz: 6c402d40303b0814bf19b8378588d628748ee6d0daa8098cdf0eac14cb0c1a7d26b2e586c32b12a24d46d15ff2c6761151664b5a966bc78678849324d9b68624

data/lib/etheruby/contract_method_dsl.rb

@@ -22,7 +22,7 @@ module Etheruby
       end
     end
 
-    def returns(*args)
+    def returns(args)
       data[:returns] = args
     end
 

data/lib/etheruby/encoders/address.rb

@@ -5,7 +5,12 @@ module Etheruby::Encoders
 
   class Address < Base
     def encode
-      Uint.new(data).encode
+      puts data.class
+      if data.is_a?(::String)
+        Uint.new(data[2..64].to_i(16)).encode
+      else
+        Uint.new(data).encode
+      end
     end
 
     def decode

data/lib/etheruby/response_parser.rb

@@ -4,6 +4,15 @@ require_relative 'encoders/int'
 
 module Etheruby
 
+  class ResponseHolder
+    def initialize(_values={})
+      @values=_values
+    end
+    def method_missing(sym, *args)
+      @values[sym]
+    end
+  end
+
   class ResponseParser
 
     attr_reader :returns, :response
@@ -14,11 +23,12 @@ module Etheruby
     end
 
     def parse
+      return unless @returns
       real_response = @response
-      values = []
+      responses = {}
       i = 0
       loop do
-        return_type = returns[i]
+        return_name, return_type = returns.keys[i], returns.values[i]
         if Etheruby::is_static_type?(return_type)
           v, s = Etheruby::treat_variable(return_type, real_response, :decode)
         else
@@ -32,16 +42,12 @@ module Etheruby
         if v.is_a? Etheruby::Encoders::DynamicArray or v.is_a? Etheruby::Encoders::StaticArray
           v, s = v.decode
         end
-        values << v
-        break if values.count == returns.count
+        responses[return_name] = v
+        break if responses.count == returns.count
         real_response = real_response[s*2..real_response.length]
         i += 1
       end
-      if values.count == 1
-        values[0]
-      else
-        values
-      end
+      ResponseHolder.new(responses)
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etheruby
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Jérémy SEBAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov