etheruby 1.0.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 384256862997b691646324f17aae5b7114b30919
-  data.tar.gz: c5de6e19fff5ba0ec1564b3ae91e6e6d561a9b4e
+  metadata.gz: 63c64dface6667998a6f2cf763ddddb5d7237937
+  data.tar.gz: b8af106669bdea61b1ab7db1a1e074554fa2dd0c
 SHA512:
-  metadata.gz: 073e28a69ee77267c32ee7db2c5edc44d87ed460913a09d3e47550a06ccd83197815328d722b0fb085dcc0c0bf70f299120182946c9145677e38c9b838d5e6c5
-  data.tar.gz: 81605c560b0bc722580fac91aece06c72cbcab6726b82dcb783a9a2866803b53081fe78146976a768c733689fe7e056fe74954a570ebce9cdb38070867b2719a
+  metadata.gz: 09d980f7363f40097b0768bd7242b70fa4266d3952fc1735a8ff0381da7c410da75d5f665a9a1ff909eb9f90a304a4ede7358dc113d33559d31edbbbe301117f
+  data.tar.gz: 58bc4a1edff18866bec0c81895d23f164dc6b7ca9dcf88ae7f45a7bb3ad86d9f973db5ad6795d6c28b9afe19411d3565537f6df750c7b2aaa5c774a57c0b056b

data/lib/etheruby/contract.rb

@@ -1,118 +1,132 @@
+require 'singleton'
+
 require_relative 'client'
 require_relative 'contract_method_dsl'
 require_relative 'arguments_generator'
 require_relative 'response_parser'
 
-module Etheruby
+module Etheruby::Contract
+
   class NoContractMethodError < StandardError; end
   class NoPasswordForAddress < StandardError; end
 
-  def contract
-    Class.new do
-      def self.inherited(subclass)
-        @@c_methods = {}
-        @@logger = ::Logger.new(STDOUT)
-        @@logger.level = if ENV.has_key? 'ETHERUBY_DEBUG'
-          ::Logger::DEBUG
-        else
-          ::Logger::WARN
-        end
-        @@logger.progname = "Etheruby Contract '#{subclass.name}'"
-      end
+  def contract_methods
+    @c_methods
+  end
 
-      def self.at_address(address)
-        address = address[2..64].to_i(16) if address.is_a? ::String
-        @@address = address
-      end
+  def initialize
+    @c_methods = {}
+    @logger = ::Logger.new(STDOUT)
+    @logger.level = if ENV.has_key? 'ETHERUBY_DEBUG'
+      ::Logger::DEBUG
+    else
+      ::Logger::WARN
+    end
+    @logger.progname = "Etheruby Contract '#{self.class.name}'"
+  end
 
-      def self.method(name, &blk)
-        cmd = ContractMethodDSL.new(name)
-        cmd.instance_exec &blk if blk
-        @@c_methods[name] = cmd.validate!
-        @@logger.debug("Registred method #{name}")
-      end
+  def at_address(address)
+    address = address[2..64].to_i(16) if address.is_a? ::String
+    @address = address
+  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 contract_method(name, &blk)
+    cmd = Etheruby::ContractMethodDSL.new(name)
+    cmd.instance_exec &blk if blk
+    @c_methods[name] = cmd.validate!
+    @logger.debug("Registred method #{name}")
+  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
-        execute_contract_method(@@c_methods[sym], args)
-      end
+  def 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.execute_contract_method(method_info, args)
-        arguments = ArgumentsGenerator.new(method_info[:params], args).to_s
-        data = "#{method_info[:signature]}#{arguments}"
-        composed_body = { to: self.address, data: data }
-
-        [ :gas, :gasPrice, :value, :from ].each { |kw|
-          composed_body[kw] = method_info[kw] if method_info.has_key? kw
-        }
-
-        @@logger.debug("Calling #{method_info[:name]} with parameters #{composed_body.inspect}")
-
-        response = if method_info.has_key?(:force_transac) and method_info[:force_transac]
-          do_eth_transaction composed_body
-        else
-          call_api composed_body
-        end
-
-        if response.is_a? Hash and response.has_key? 'error'
-          @@logger.error("Failed contract execution #{response['error']['message']}")
-        elsif response.is_a? Hash and response.has_key? 'result'
-          @@logger.debug("Response from API for #{method_info[:name]} : #{response.inspect}")
-          if method_info.has_key? :returns
-            ResponseParser.new(method_info[:returns], response['result']).parse
-          else
-            response['result']
-          end
-        else
-          @@logger.error("Failed contract execution response : #{response.inspect}")
-        end
-      end
+  def 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
+    execute_contract_method(@c_methods[sym], args)
+  end
 
-      def self.call_api(composed_body)
-        if composed_body.has_key? :gas or composed_body.has_key? :value
-          return do_eth_transaction(composed_body)
-        else
-          return do_eth_call(composed_body)
-        end
-      end
+  def execute_contract_method(method_info, args)
+    arguments = Etheruby::ArgumentsGenerator.new(method_info[:params], args).to_s
+    data = "#{method_info[:signature]}#{arguments}"
+    composed_body = { to: self.address, data: data }
 
-      def self.do_eth_call(composed_body)
-        Client.eth.call(composed_body, Configuration.default_height || "latest")
-      end
+    [ :gas, :gasPrice, :value, :from ].each { |kw|
+      composed_body[kw] = method_info[kw] if method_info.has_key? kw
+    }
 
-      def self.do_eth_transaction(composed_body)
-        from_address = composed_body[:from] || Configuration.default_from
-        pwd = Configuration.addresses[from_address]
-        composed_body[:from] = address_fix(from_address)
-        Client.personal.sendTransaction(composed_body, pwd)
-      end
+    @logger.debug("Calling #{method_info[:name]} with parameters #{composed_body.inspect}")
 
-      def self.address
-        address_fix(@@address)
-      end
+    response = if method_info.has_key?(:force_transac) and method_info[:force_transac]
+      do_eth_transaction composed_body
+    else
+      call_api composed_body
+    end
 
-      def self.address_fix(addr)
-        if addr.is_a? ::String
-          addr
-        else
-          "0x#{addr.to_s(16).rjust(40, "0")}"
-        end
+    if response.is_a? Hash and response.has_key? 'error'
+      @logger.error("Failed contract execution #{response['error']['message']}")
+    elsif response.is_a? Hash and response.has_key? 'result'
+      @logger.debug("Response from API for #{method_info[:name]} : #{response.inspect}")
+      if method_info.has_key? :returns
+        Etheruby::ResponseParser.new(method_info[:returns], response['result']).parse
+      else
+        response['result']
       end
+    else
+      @logger.error("Failed contract execution response : #{response.inspect}")
+    end
+  end
+
+  def call_api(composed_body)
+    if composed_body.has_key? :gas or composed_body.has_key? :value
+      return do_eth_transaction(composed_body)
+    else
+      return do_eth_call(composed_body)
+    end
+  end
+
+  def do_eth_call(composed_body)
+    Etheruby::Client.eth.call(
+      composed_body,
+      Etheruby::Configuration.default_height || "latest"
+    )
+  end
+
+  def do_eth_transaction(composed_body)
+    from_address = composed_body[:from] || Etheruby::Configuration.default_from
+    pwd = Etheruby::Configuration.addresses[from_address]
+    composed_body[:from] = address_fix(from_address)
+    Etheruby::Client.personal.sendTransaction(composed_body, pwd)
+  end
+
+  def address
+    address_fix(@address)
+  end
+
+  def address_fix(addr)
+    if addr.is_a? ::String
+      addr
+    else
+      "0x#{addr.to_s(16).rjust(40, "0")}"
     end
   end
 
-  module_function :contract
+  module ClassMethods
+    def method_missing(sym, *args, &blk)
+      self.instance.send(sym, *args, &blk)
+    end
+  end
+
+  def self.included(base)
+    base.include(::Singleton)
+    base.extend(ClassMethods)
+  end
 
-  Contract = Etheruby::contract
 end

data/lib/etheruby/ether_multipliable.rb

@@ -25,11 +25,7 @@ module EtherMultipliable
   end
 end
 
-class Fixnum
-  include EtherMultipliable
-end
-
-class Bignum
+class Integer
   include EtherMultipliable
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: etheruby
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 2.0.0
 platform: ruby
 authors:
 - Jérémy SEBAN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
@@ -109,7 +109,7 @@ files:
 - lib/etheruby/type_matchers.rb
 - tasks/etheruby/etheruby.yml
 - tasks/etheruby/setup.task
-homepage: https://github.com/MechanicalSloth/etheruby
+homepage: https://github.com/FranceChain-Solutions/etheruby
 licenses:
 - MIT
 metadata: {}
@@ -121,7 +121,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="