etheruby 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e71770e0560d37ce8c5a1de9938fa0b921d82930
-  data.tar.gz: 5d767ce5e2cb2962938986eaa024d25b737a0414
+  metadata.gz: 03e991441d480f53c06da3f4ecec791df444fe14
+  data.tar.gz: 149da91a39786ce5c79e205dd835278810e57d8c
 SHA512:
-  metadata.gz: 15f46aad67387751154f6e8354215298405399005bde7b9593e42be9106183b1fc94893147771ac71a58e6d26cc34f235175cb815d617849d01de0456b120488
-  data.tar.gz: dc8ad2ea0a48a10d6e2384f0c7111f4462cac9eed69436ea5f727fa4c1cdd6c429681512538be2a994232c145e40a8b6552277d56f6dd030bf1589d4fc756e5c
+  metadata.gz: 8abbc10374fbc147f3ef1affc7b10bf5cb79c87cbb8ad47b3dd4b3918e00c6b2974ec21ada942c2bed82901276006e7b6a9668bafd114ffe9dc31cd502f013be
+  data.tar.gz: 7ccf898cbd557e98ca9b78df69b6e782f034f38b8548cb8e10b1bc05519b90652010f84f3740cab35edebfa9fe852bcb5a0885bd628b895c54168990072ea184

data/lib/etheruby.rb

@@ -1,6 +1,7 @@
 require 'logger'
 require_relative 'etheruby/client'
 require_relative 'etheruby/contract'
+require_relative 'etheruby/contract_instance'
 require_relative 'etheruby/ether_multipliable'
 require_relative 'etheruby/configuration'
 require_relative 'etheruby/railtie' if defined?(Rails)

data/lib/etheruby/contract.rb

@@ -4,16 +4,10 @@ require_relative 'client'
 require_relative 'contract_method_dsl'
 require_relative 'arguments_generator'
 require_relative 'response_parser'
+require_relative 'contract_base'
 
 module Etheruby::Contract
 
-  class NoContractMethodError < StandardError; end
-  class NoPasswordForAddress < StandardError; end
-
-  def contract_methods
-    @c_methods
-  end
-
   def initialize
     @c_methods = {}
     @logger = ::Logger.new(STDOUT)
@@ -25,99 +19,6 @@ module Etheruby::Contract
     @logger.progname = "Etheruby Contract '#{self.class.name}'"
   end
 
-  def at_address(address)
-    address = address[2..64].to_i(16) if address.is_a? ::String
-    @address = address
-  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 to_camel_case(sym)
-    ar = sym.to_s.split("_").map{|i| i.capitalize}
-    ar[0] = ar.first.downcase
-    ar.join.to_sym
-  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 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 }
-
-    [ :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
-        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 ClassMethods
     def method_missing(sym, *args, &blk)
       self.instance.send(sym, *args, &blk)
@@ -126,6 +27,7 @@ module Etheruby::Contract
 
   def self.included(base)
     base.include(::Singleton)
+    base.include(Etheruby::ContractBase)
     base.extend(ClassMethods)
   end
 

data/lib/etheruby/contract_base.rb

@@ -0,0 +1,124 @@
+require 'singleton'
+
+require_relative 'client'
+require_relative 'contract_method_dsl'
+require_relative 'arguments_generator'
+require_relative 'response_parser'
+
+module Etheruby::ContractBase
+
+  class NoContractMethodError < StandardError; end
+  class NoPasswordForAddress < StandardError; end
+
+  module ClassMethods
+    def contract_methods
+      @c_methods ||= {}
+    end
+
+    def contract_method(name, &blk)
+      cmd = Etheruby::ContractMethodDSL.new(name)
+      cmd.instance_exec &blk if blk
+      contract_methods[name] = cmd.validate!
+    end
+
+  end
+
+  def at_address(address)
+    address = address[2..64].to_i(16) if address.is_a? ::String
+    @address = address
+  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 to_camel_case(sym)
+    ar = sym.to_s.split("_").map{|i| i.capitalize}
+    ar[0] = ar.first.downcase
+    ar.join.to_sym
+  end
+
+  def method_missing(sym, *args)
+    unless self.class.contract_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 self.class.contract_methods.include? sym
+    execute_contract_method(self.class.contract_methods[sym], args)
+  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 }
+
+    [ :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
+        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
+
+  def self.included(base)
+    base.extend(ClassMethods)
+  end
+
+
+end

data/lib/etheruby/contract_instance.rb

@@ -0,0 +1,25 @@
+require_relative 'client'
+require_relative 'contract_method_dsl'
+require_relative 'arguments_generator'
+require_relative 'response_parser'
+require_relative 'contract_base'
+
+module Etheruby::ContractInstance
+
+  def self.included(base)
+    base.include(Etheruby::ContractBase)
+  end
+
+  def initialize(address)
+    @address = at_address(address)
+    @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
+
+
+end

data/lib/etheruby/railtie.rb

@@ -8,7 +8,7 @@ module Etheruby
     # Loads configuration
     initializer "etheruby.configure" do |app|
       Etheruby::Configuration.conf = if File.exist? './config/etheruby.yml'
-        YAML.load_file('./config/etheruby.yml')
+        YAML.load(ERB.new(File.read("./config/etheruby.yml")).result).with_indifferent_access
       else
         {}
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etheruby
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jérémy SEBAN
@@ -92,6 +92,8 @@ files:
 - lib/etheruby/client.rb
 - lib/etheruby/configuration.rb
 - lib/etheruby/contract.rb
+- lib/etheruby/contract_base.rb
+- lib/etheruby/contract_instance.rb
 - lib/etheruby/contract_method_dsl.rb
 - lib/etheruby/encoders/address.rb
 - lib/etheruby/encoders/arrays.rb