etheruby 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b35960ad21669693e324f1b0fe5a149f969b1fa
-  data.tar.gz: 0e449c63f6191bc83c3787b1028f18a74734ed08
+  metadata.gz: d05b717898b67d52f8facdbc4be52926a3bcf6a5
+  data.tar.gz: 19029f89222c3e5f4a844e8f0d3dd53b0e9506ff
 SHA512:
-  metadata.gz: a6f60f6a5ca338aa838b236e0063aef7319fd22dd5f7b5976cbb267bdbf4612a9777d465f5a613885d1da9cbda9ac60af3759be04842a46223a6041747d34f47
-  data.tar.gz: 6c402d40303b0814bf19b8378588d628748ee6d0daa8098cdf0eac14cb0c1a7d26b2e586c32b12a24d46d15ff2c6761151664b5a966bc78678849324d9b68624
+  metadata.gz: 76b2ed3ad4ab57f7c7456cb4742fce817f3b6ad816e54e3fa3809644a0d8442d94d2eae977776ac27efc5483f5f89fc4cc39c0b8dfa78b5d2caa47007ba5e1af
+  data.tar.gz: 610617a339890bb61e82cf2ac5720ebc1547b6ffe74eaefc5ab60a00b4307ddb198fbd47792ec1ed46125b438ed0ff98692c57fdb2eb7d2b97ecab22dde89180

data/lib/etheruby/contract.rb

@@ -46,7 +46,16 @@ module Etheruby
         @@logger.debug("Registred method #{name}")
       end
 
+      def self.to_camel_case(sym)
+        ar = sym.to_s.split("_").map{|i| i.capitalize}
+        ar[0] = ar.first.downcase
+        ar.join.to_sym
+      end
+
       def self.method_missing(sym, *args)
+        unless @@c_methods.include? sym
+          sym = self.to_camel_case(sym)
+        end
         raise NoContractMethodError.new (
           "The method #{sym} does not exist in the #{self.class.to_s} contract."
         ) unless @@c_methods.include? sym

data/lib/etheruby/encoders/address.rb

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

data/lib/etheruby/encoders/base.rb

@@ -6,7 +6,7 @@ module Etheruby
     class InvalidFormatForDataError < StandardError; end
 
     class Base
-      attr_reader :data
+      attr_accessor :data
 
       def initialize(_data)
         @data = _data

data/lib/etheruby/encoders/int.rb

@@ -5,6 +5,7 @@ module Etheruby::Encoders
   class Int < Base
 
     def encode(pad_to=64)
+      @data = data.to_i if data.is_a? ::String
       if data >= 0
         data.to_s(16).rjust(pad_to, '0')
       else
@@ -28,6 +29,7 @@ module Etheruby::Encoders
   class Uint < Base
 
     def encode(pad_to=64)
+      @data = data.to_i if data.is_a? ::String
       raise InvalidFormatForDataError.new("Unsigned integer #{data} < 0") if data < 0
       Int.new(data).encode(pad_to)
     end

data/lib/etheruby/response_parser.rb

@@ -18,19 +18,34 @@ module Etheruby
     attr_reader :returns, :response
 
     def initialize(_returns, _response)
-      @returns = _returns
+      @returns = if _returns.is_a? ::String or _returns.is_a? ::Symbol
+        [_returns]
+      else
+        _returns
+      end
       @response = _response[2.._response.length]
     end
 
     def parse
       return unless @returns
       real_response = @response
-      responses = {}
+      responses = if @returns.is_a? Array
+        []
+      else
+        {}
+      end
       i = 0
+
       loop do
-        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)
+        if @returns.is_a? ::Hash
+          return_name, return_type = returns.keys[i], returns.values[i]
+        else
+          return_type = returns[i]
+        end
+
+        # Treat element
+        if Etheruby::is_static_type? return_type
+          v, s = Etheruby::treat_variable return_type, real_response, :decode
         else
           value_position, s = Etheruby::Encoders::Uint.new(real_response).decode
           v, take_size = Etheruby::treat_variable(
@@ -39,17 +54,37 @@ module Etheruby
             :decode
           )
         end
-        if v.is_a? Etheruby::Encoders::DynamicArray or v.is_a? Etheruby::Encoders::StaticArray
+
+        # Treat arrays
+        if v.is_a? Etheruby::Encoders::DynamicArray or
+           v.is_a? Etheruby::Encoders::StaticArray
           v, s = v.decode
         end
-        responses[return_name] = v
+
+        # Add response to responses array
+        if returns.is_a? ::Hash
+          responses[return_name] = v
+        else
+          responses << v
+        end
+
+        # Continues until it has the good number of response
         break if responses.count == returns.count
         real_response = real_response[s*2..real_response.length]
         i += 1
       end
-      ResponseHolder.new(responses)
-    end
 
-  end
+      # Returning response in the appropriate format
+      if @returns.is_a? ::Hash
+        ResponseHolder.new responses
+      else
+        if @returns.count == 1
+          responses[0]
+        else
+          responses
+        end
+      end
 
+    end
+  end
 end

metadata

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