etheruby 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c811a2ccafa2d598947e5e1a0cbe902a1ce7032
-  data.tar.gz: 1c9f9002b6161d692b0119aee0c8e5c19c2b9ef4
+  metadata.gz: e1a876972cf55f4558f1fc345718c70f356cafbc
+  data.tar.gz: bf1a77caf62874d48134b0a878179385b509297b
 SHA512:
-  metadata.gz: acc9489c709e4ac3929f12f3910ae383400c9fe963e8b5392eb69f88393a98dd91ae0ad9e01fd5dc6b10dd40900776f6884b00aaf02e6aea538c6a89765e8243
-  data.tar.gz: a9a8a27cbcf4a03677247fe10d6566a862c98fdb1eea11dd116c7e7713c59d72055831988f61a55added40e54412ca5be750dd5de0aa46f46078f59dacddefc6
+  metadata.gz: 6d51f05ba07bab799c41a86394c6443ca90d9f78e099a2763655bbe876c7730ee718c62c94923e07ee4f4ee8a63fac7769d8bd8d7558cccefe9614c233d5a606
+  data.tar.gz: 137e7ea4cb2a7e63698d6abd7a4c2bce1019aed8b9fc8a875971a8011e42343e73a3a8312977ac6f5b25872ac39b0dec53260242c9e34be474b9e1ce1c795354

data/lib/etheruby.rb

@@ -2,4 +2,5 @@ require 'logger'
 require_relative 'etheruby/client'
 require_relative 'etheruby/contract'
 require_relative 'etheruby/ether_multipliable'
+require_relative 'etheruby/configuration'
 require_relative 'etheruby/railtie' if defined?(Rails)

data/lib/etheruby/configuration.rb

@@ -0,0 +1,15 @@
+module Etheruby
+
+  class Configuration
+
+    def self.conf=(value)
+      @@conf = value
+    end
+
+    def self.method_missing(sym, *arg)
+      return @@conf[sym.to_s]
+    end
+
+  end
+
+end

data/lib/etheruby/contract.rb

@@ -7,21 +7,6 @@ module Etheruby
   class NoContractMethodError < StandardError; end
   class NoPasswordForAddress < StandardError; end
 
-  class TransactionInformation
-    @@info = nil
-    def self.information=(_info)
-      @@info = _info
-    end
-    def self.set?() @@set end
-    def self.default_from() @@info[:default_from] end
-    def self.address_password(address)
-      unless @@info
-        raise NoPasswordForAddress.new("No password for address #{address}")
-      end
-      @@info[:addresses][address]
-    end
-  end
-
   def contract
     Class.new do
       def self.inherited(subclass)
@@ -95,17 +80,25 @@ module Etheruby
       end
 
       def self.do_eth_call(composed_body)
-        Client.eth.call(composed_body, "latest")
+        Client.eth.call(composed_body, Configuration.default_height || "latest")
       end
 
       def self.do_eth_transaction(composed_body)
-        from_address = composed_body[:from] || TransactionInformation.default_from
-        pwd = TransactionInformation.address_password(from_address)
-        return Client.personal.sendTransaction(composed_body.merge({from: from_address}), pwd)
+        from_address = composed_body[:from] || Configuration.default_from
+        pwd = Configuration.addresses[from_address]
+        Client.personal.sendTransaction(composed_body.merge({from: address_fix(from_address)}), pwd)
       end
 
       def self.address
-        "0x#{@@address.to_s(16)}"
+        address_fix(@@address)
+      end
+
+      def self.address_fix(addr)
+        if addr.is_a? ::String
+          addr
+        else
+          "0x#{@@address.to_s(16)}"
+        end
       end
     end
   end

data/lib/etheruby/railtie.rb

@@ -1,17 +1,22 @@
 Dir["./app/contracts/**/*.rb"].each { |f| require f }
 
+require 'yaml'
+
 module Etheruby
 
   class Railtie < Rails::Railtie
+    # Loads configuration
     initializer "etheruby.configure" do |app|
-      if app.config.respond_to? :etheruby_uri
-        Etheruby::Client.uri = app.config.etheruby_uri
+      Etheruby::Configuration.conf = if File.exist? './config/etheruby.yml'
+        YAML.load_file('./config/etheruby.yml')
+      else
+        {}
       end
+    end
 
-      if app.config.respond_to? :etheruby_enable_transactions
-        Etheruby::TransactionInformation.information = \
-          app.config.etheruby_enable_transactions
-      end
+    # Create setup rake task
+    rake_tasks do
+      load File.join(File.dirname(__FILE__), '../../tasks/etheruby/setup.task')
     end
   end
 

data/tasks/etheruby/etheruby.yml

@@ -0,0 +1,4 @@
+default_from: 0x0000000000000000000000000000000000000000
+default_height: latest
+addresses:
+  0x0000000000000000000000000000000000000000: my_address_passwd

data/tasks/etheruby/setup.task

@@ -0,0 +1,9 @@
+namespace :etheruby do
+  desc "Creates etheruby scaffold for rails"
+  task :setup => :environment do
+    require 'fileutils'
+    FileUtils.mkdir('./app/contracts') unless Dir.exist? './app/contracts'
+    FileUtils.touch('./app/contracts/.keep')
+    FileUtils.cp(File.join(File.dirname(__FILE__), 'etheruby.yml'), './config/etheruby.yml')
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etheruby
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Jérémy SEBAN
@@ -90,6 +90,7 @@ files:
 - lib/etheruby.rb
 - lib/etheruby/arguments_generator.rb
 - lib/etheruby/client.rb
+- lib/etheruby/configuration.rb
 - lib/etheruby/contract.rb
 - lib/etheruby/contract_method_dsl.rb
 - lib/etheruby/encoders/address.rb
@@ -106,6 +107,8 @@ files:
 - lib/etheruby/response_parser.rb
 - lib/etheruby/treat_variable.rb
 - lib/etheruby/type_matchers.rb
+- tasks/etheruby/etheruby.yml
+- tasks/etheruby/setup.task
 homepage: https://github.com/MechanicalSloth/etheruby
 licenses:
 - MIT