universum 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ed79bd806a5db0f1d5a92a0dfd2e7f3f3b3db56
-  data.tar.gz: 89afee15e5c5800220c13f8f7b58dffb190a4177
+  metadata.gz: 9961651cc18f32bfc222fef5624575241469923a
+  data.tar.gz: ab74188d3a3324451981a8f67693ae494265ff39
 SHA512:
-  metadata.gz: ed45e6ab943f70fcd6a9c43c4faa98ab6f6e606f5808e188276b16efc1464603d393ccb4763484c4f33e8f0386a0644a83a6c0856b6197054240f67f486884bf
-  data.tar.gz: f9f0fe016eb2113b1705ec86aed96530690b250e8b83dbff0751b43b7d901ef404dd3bb769ef5e7ae66d75e9ec26cedca6e219fc6561c42e99355e17320be980
+  metadata.gz: 8317f92d3e8ad3e96f28fc29da3eb7964f624c443f1cc315fac1bcceb9a943a8894f29643c847254c0b8a5be2861e319f408147e88ecf020878d6736460098d6
+  data.tar.gz: 88481a56b4b6675c2039122b4dca23ec241f9c7fc5882e3c614726ba9201cb1bece06b5d2c14db8cbef250edf3ba87cf05bb6e64be2ac90783232c81ef860178

data/Manifest.txt

@@ -8,15 +8,12 @@ lib/universum/account.rb
 lib/universum/address.rb
 lib/universum/contract.rb
 lib/universum/convert.rb
-lib/universum/enum.rb
 lib/universum/event.rb
 lib/universum/function.rb
 lib/universum/receipt.rb
 lib/universum/storage.rb
 lib/universum/transaction.rb
 lib/universum/type.rb
-lib/universum/units_money.rb
-lib/universum/units_time.rb
 lib/universum/universum.rb
 lib/universum/version.rb
 test/contracts/ballot.rb
@@ -24,11 +21,8 @@ test/contracts/greeter.rb
 test/contracts/mytoken.rb
 test/helper.rb
 test/test_ballot.rb
-test/test_enum.rb
 test/test_event.rb
 test/test_greeter.rb
 test/test_mytoken.rb
 test/test_storage.rb
-test/test_units_money.rb
-test/test_units_time.rb
 test/test_version.rb

data/Rakefile

@@ -18,7 +18,9 @@ Hoe.spec 'universum' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['safestruct', '>=1.0.0'],
+    ['safestruct',  '>=1.2.0'],
+    ['units-time',  '>=1.0.2'],
+    ['units-money', '>=0.1.1'],
   ]
 
   self.licenses = ['Public Domain']

data/lib/universum.rb

@@ -10,19 +10,20 @@ require 'uri'
 
 
 ## 3rd party gems
-require 'safestruct'    # SafeArray, SafeHash, SafeStruct, etc.
+require 'safestruct'    # SafeArray, SafeHash, SafeStruct, Enum, etc.
 
 ## note: make Mapping an alias for Hash (lets you use Mapping.of() for Hash.of)
 Mapping = Hash
 
+require 'units-time'    # Timestamp, Timedelta, etc.
+require 'units-money'   # Money, etc.
+
+
 
 ## our own code
 require 'universum/version'    # note: let version always go first
 
-require 'universum/units_time'
-require 'universum/units_money'
 
-require 'universum/enum'
 require 'universum/event'
 
 require 'universum/function'

data/lib/universum/type.rb

@@ -3,9 +3,5 @@
 
 ## add more dummy  classes for mapping and (payable) method signature
 
-class Money
-  def self.zero() 0; end
-end
-
 class Void   ## only used (reserved) for (payable) method signature now
 end

data/lib/universum/universum.rb

@@ -17,7 +17,7 @@ end  # class Msg
 class Block
   attr_reader :timestamp, :number
 
-  def initialize( timestamp: Time.now.to_i, number: 0 )
+  def initialize( timestamp: Timestamp.now, number: 0 )
     @timestamp = timestamp   # unix epoch time (in seconds since 1970)
     @number    = number      # block height (start with 0 - genesis block)
   end

data/lib/universum/version.rb

@@ -7,7 +7,7 @@
 class Universum
 
   MAJOR = 0
-  MINOR = 4
+  MINOR = 5
   PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 

data/test/contracts/ballot.rb

@@ -1,12 +1,13 @@
 #########################
 # Ballot Contract
 
-Voter    = Struct.new( weight:   0,
-                       voted:    false,
-                       vote:     0,
-                       delegate: Address(0))
+Struct.new( :Voter,
+              weight:   0,
+              voted:    false,
+              vote:     0,
+              delegate: Address(0))
 
-Proposal = Struct.new( vote_count: 0 )
+Struct.new( :Proposal, vote_count: 0 )
 
 ## Create a new ballot with $(num_proposals) different proposals.
 def setup( num_proposals )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universum
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 2019-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safestruct
@@ -16,14 +16,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: units-time
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
+- !ruby/object:Gem::Dependency
+  name: units-money
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -75,15 +103,12 @@ files:
 - lib/universum/address.rb
 - lib/universum/contract.rb
 - lib/universum/convert.rb
-- lib/universum/enum.rb
 - lib/universum/event.rb
 - lib/universum/function.rb
 - lib/universum/receipt.rb
 - lib/universum/storage.rb
 - lib/universum/transaction.rb
 - lib/universum/type.rb
-- lib/universum/units_money.rb
-- lib/universum/units_time.rb
 - lib/universum/universum.rb
 - lib/universum/version.rb
 - test/contracts/ballot.rb
@@ -91,13 +116,10 @@ files:
 - test/contracts/mytoken.rb
 - test/helper.rb
 - test/test_ballot.rb
-- test/test_enum.rb
 - test/test_event.rb
 - test/test_greeter.rb
 - test/test_mytoken.rb
 - test/test_storage.rb
-- test/test_units_money.rb
-- test/test_units_time.rb
 - test/test_version.rb
 homepage: https://github.com/s6ruby/universum
 licenses:

data/lib/universum/enum.rb

@@ -1,92 +0,0 @@
-# encoding: utf-8
-
-##################################
-## auto-create/builds enum class.
-##
-## Example:
-##   State = Enum.new( :fundraising, :expired_refund, :successful)
-##     auto-creates/builds:
-##
-##  class Enum
-##    def initialize( key, value )
-##      @key   = key
-##      @value = value
-##    end
-##  end
-##
-##  class State < Enum
-##
-##    FUNDRAISING    = new(:fundraising,    0)
-##    EXPIRED_REFUND = new(:expired_refund, 1)
-##    SUCCESSFUL     = new(:successful,     2)
-##
-##    def self.fundraising()    FUNDRAISING; end
-##    def self.expired_refund() EXPIRED_REFUND; end
-##    def self.successful()     SUCCESSFUL; end
-##
-##    def fundraising?()     self == FUNDRAISING; end
-##    def expired_refund?()  self == EXPIRED_REFUND; end
-##    def successful?()      self == SUCCESSFUL; end
-##  end
-##
-##  pp state = State.fundraising     #=> #<State @key=:fundraising, @value=0>
-##  pp state.fundraising?            #=> true
-##  pp state.expired_refund?         #=> false
-##  pp state.successful?             #=> false
-##  pp state = State.expired_refund  #=> #<State @key=:expired_refund, @value=1>
-##  pp state.fundraising?            #=> false
-##  pp state.expired_refund?         #=> true
-##  pp state.successful?             #=> false
-
-
-## base class for enum
-class Enum
-  ## return a new Enum read-only class
-
-  def initialize( key, value )
-    @key   = key
-    @value = value
-  end
-
-
-  ###################
-  ##  meta-programming "macro" - build class (on the fly)
-  def self.build_class( *keys )
-
-    ## check if all keys are symbols and follow the ruby id(entifier) naming rules
-    keys.each do |key|
-      if key.is_a?( Symbol ) && key =~ /\A[a-z][a-zA-Z0-9_]*\z/
-      else
-        raise ArgumentError.new( "[Enum] arguments to Enum.new must be all symbols following the ruby id naming rules; >#{key}< failed" )
-      end
-    end
-       
-    klass = Class.new( Enum )
-
-    ## add self.new too - note: call/forward to "old" orginal self.new of Event (base) class
-    klass.define_singleton_method( :new ) do |*args|
-      old_new( *args )
-    end
-
-    keys.each_with_index do |key,index|
-      klass.class_eval( <<RUBY )
-        #{key.upcase} = new( :#{key}, #{index} )
-
-        def #{key}?
-          self == #{key.upcase}
-        end
-
-        def self.#{key}
-          #{key.upcase}
-        end
-RUBY
-    end
-
-    klass
-  end
-
-  class << self
-    alias_method :old_new, :new       # note: store "old" orginal version of new
-    alias_method :new,     :build_class    # replace original version with create
-  end
-end  # class Enum

data/lib/universum/units_money.rb

@@ -1,63 +0,0 @@
-# encoding: utf-8
-
-class Integer
-
-  E3  = 10**3   # 1_000
-  E6  = 10**6   # 1_000_000
-  E9  = 10**9   # 1_000_000_000
-  E12 = 10**12  # 1_000_000_000_000
-  E15 = 10**15  # 1_000_000_000_000_000
-  E18 = 10**18  # 1_000_000_000_000_000_000
-
-  def e3()  self * E3; end
-  def e6()  self * E6; end
-  def e9()  self * E9; end
-  def e12() self * E12; end
-  def e15() self * E15; end
-  def e18() self * E18; end
-
-
-  ## todo/fix: move ethereum money units to a module and include here
-
-  ###########
-  # Ethereum money units
-  #
-  #  wei                     1 wei | 1
-  #  kwei (babbage)        1e3 wei | 1_000
-  #  mwei (lovelace)       1e6 wei | 1_000_000
-  #  gwei (shannon)        1e9 wei | 1_000_000_000
-  #  microether (szabo)   1e12 wei | 1_000_000_000_000
-  #  milliether (finney)  1e15 wei | 1_000_000_000_000_000
-  #  ether                1e18 wei | 1_000_000_000_000_000_000
-  #
-  #  Names in Honor:
-  #   wei            => Wei Dai
-  #   lovelace       => Ada Lovelace (1815-1852)
-  #   babbage	       => Charles Babbage (1791-1871)
-  #   shannon	       => Claude Shannon (1916-2001)
-  #   szabo          => Nick Szabo
-  #   finney         => Hal Finney (1956-2014)
-
-  def wei()        self; end
-  def kwei()       self * E3; end
-  def mwei()       self * E6; end
-  def gwei()       self * E9; end
-  def microether() self * E12; end
-  def milliether() self * E15; end
-  def ether()      self * E18; end
-
-  ########################################################
-  ## alias - use alias or alias_method - why? why not?
-  def babbage()   kwei; end
-  def lovelace()  mwei; end
-  def shannon()   gwei; end
-  def szabo()     microether; end
-  def finney()    milliether; end
-
-  def microeth()  microether; end
-  def micro()     microether; end
-  def millieth()  milliether; end
-  def milli()     milliether; end
-  def eth()       ether; end
-
-end  # class Integer

data/lib/universum/units_time.rb

@@ -1,51 +0,0 @@
-# encoding: utf-8
-
-
-class Integer
-
-  ######################################
-  ## note: there's NO month (for now)!!!
-  ##   why?  month might be 28,29,30,31  days
-  ##    use days e.g. 30.days or 31.days etc.
-
-  HOUR_IN_SECONDS       =  60 * 60                # 60 minutes * 60 seconds
-  DAY_IN_SECONDS        =  24 * HOUR_IN_SECONDS   # 24 hours * 60 * 60
-  WEEK_IN_SECONDS       =   7 * DAY_IN_SECONDS    #  7 days * 24 * 60 * 60
-  FORTNIGHT_IN_SECONDS  =  14 * DAY_IN_SECONDS    # 14 days * 24 * 60 * 60
-  YEAR_IN_SECONDS       = 365 * DAY_IN_SECONDS    # 365 days * 24 * 60 * 60
-
-  def second()    self; end
-  def minute()    self * 60; end
-  def hour()      self * HOUR_IN_SECONDS; end
-  def day()       self * DAY_IN_SECONDS;  end
-  def week()      self * WEEK_IN_SECONDS; end
-  def fortnight() self * FORTNIGHT_IN_SECONDS; end
-  def year()      self * YEAR_IN_SECONDS; end
-
-  ########################################################
-  ## alias - use alias or alias_method - why? why not?
-  def seconds() second; end
-  def secs()    second; end
-  def sec()     second; end
-  def s()       second; end
-
-  def minutes() minute; end
-  def mins()    minute; end
-  def min()     minute; end
-  def m()       minute; end
-
-  def hours()   hour; end
-  def h()       hour; end
-
-  def days() day; end
-  def d()    day; end
-
-  def weeks() week; end
-  def w()     week; end
-
-  def fortnights() fortnight; end
-
-  def years() year; end
-  def y()     year; end
-
-end # class Integer

data/test/test_enum.rb

@@ -1,30 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_enum.rb
-
-
-require 'helper'
-
-
-class TestEnum < MiniTest::Test
-
-  State = Enum.new( :fundraising, :expired_refund, :successful )
-
-def test_state
-  pp State
-
-  state = State.fundraising
-  assert state.is_a?( Enum )
-
-  assert_equal true,  state.fundraising?
-  assert_equal false, state.expired_refund?
-  assert_equal false, state.successful?
-
-  state = State.expired_refund
-  assert_equal false, state.fundraising?
-  assert_equal true,  state.expired_refund?
-  assert_equal false, state.successful?
-end
-end # class TestEnum

data/test/test_units_money.rb

@@ -1,59 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_units_money.rb
-
-
-require 'helper'
-
-
-class TestUnitsMoney < MiniTest::Test
-
-def test_money
-  assert_equal 1_000_000_000_000_000_000, 1.e18
-  assert_equal 1_000_000_000_000_000,     1.e15
-  assert_equal 1_000_000_000_000,         1.e12
-  assert_equal 1_000_000_000,             1.e9
-  assert_equal 1_000_000,                 1.e6
-  assert_equal 1_000,                     1.e3
-
-
-  value = rand( 1_000_000_000 )
-
-  assert_equal 1_000_000_000_000_000_000,       1.ether
-  assert_equal 1_000_000_000_000_000_000,       1.eth
-  assert_equal 1_000_000_000_000_000_000*2,     1.ether*2
-  assert_equal value+1_000_000_000_000_000_000, value+1.ether
-
-  assert_equal 1_000_000_000_000_000,       1.milliether
-  assert_equal 1_000_000_000_000_000,       1.millieth
-  assert_equal 1_000_000_000_000_000,       1.milli
-  assert_equal 1_000_000_000_000_000,       1.finney
-  assert_equal 1_000_000_000_000_000*2,     1.milliether*2
-  assert_equal value+1_000_000_000_000_000, value+1.milliether
-
-  assert_equal 1_000_000_000_000,       1.microether
-  assert_equal 1_000_000_000_000,       1.microeth
-  assert_equal 1_000_000_000_000,       1.micro
-  assert_equal 1_000_000_000_000,       1.szabo
-  assert_equal 1_000_000_000_000*2,     1.microether*2
-  assert_equal value+1_000_000_000_000, value+1.microether
-
-  assert_equal 1_000_000_000,       1.gwei
-  assert_equal 1_000_000_000,       1.shannon
-  assert_equal 1_000_000_000*2,     1.gwei*2
-  assert_equal value+1_000_000_000, value+1.gwei
-
-  assert_equal 1_000_000,       1.mwei
-  assert_equal 1_000_000,       1.lovelace
-  assert_equal 1_000_000*2,     1.mwei*2
-  assert_equal value+1_000_000, value+1.mwei
-
-  assert_equal 1_000,       1.kwei
-  assert_equal 1_000,       1.babbage
-  assert_equal 1_000*2,     1.kwei*2
-  assert_equal value+1_000, value+1.kwei
-end
-
-end # class TestUnitsMoney

data/test/test_units_time.rb

@@ -1,75 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_units_time.rb
-
-
-require 'helper'
-
-
-class TestUnitsTime < MiniTest::Test
-
-def test_time
-  now = Time.now.to_i
-
-  assert_equal 31_536_000,      1.year
-  assert_equal 31_536_000,      1.y
-  assert_equal 31_536_000*2,    2.years
-  assert_equal 31_536_000*2,    1.y*2
-  assert_equal now+31_536_000,  now+1.year
-  assert_equal 31_536_000,      365.days
-  assert_equal 31_536_000,      365*24.hours
-
-  assert_equal 1_209_600,     1.fortnight
-  assert_equal 1_209_600*2,   2.fortnights
-  assert_equal 1_209_600*2,   1.fortnight*2
-  assert_equal now+1_209_600, now+1.fortnight
-  assert_equal 1_209_600,     2.weeks
-  assert_equal 1_209_600,     14.days
-  assert_equal 1_209_600,     14*24.hours
-
-  assert_equal 604_800,       1.week
-  assert_equal 604_800,       1.w
-  assert_equal 604_800*2,     2.weeks
-  assert_equal 604_800*2,     1.week*2
-  assert_equal now+604_800,   now+1.week
-  assert_equal 604_800,       7.days
-  assert_equal 604_800,       7*24.hours
-
-  assert_equal 86_400,     1.day
-  assert_equal 86_400,     1.d
-  assert_equal 86_400*2,   2.days
-  assert_equal 86_400*2,   1.day*2
-  assert_equal now+86_400, now+1.day
-  assert_equal 86_400,     24.hours
-  assert_equal 86_400,     24*1.hour
-
-  assert_equal 3600,     1.hour
-  assert_equal 3600,     1.h
-  assert_equal 3600*2,   2.hours
-  assert_equal 3600*2,   1.hour*2
-  assert_equal now+3600, now+1.hour
-  assert_equal 3600,     60.minutes
-  assert_equal 3600,     60*1.minute
-
-  assert_equal 60,       1.minute
-  assert_equal 60,       1.min
-  assert_equal 60,       1.m
-  assert_equal 60*2,     2.minutes
-  assert_equal 60*2,     2.mins
-  assert_equal 60*2,     1.minute*2
-  assert_equal now+60,   now+1.minute
-  assert_equal 60,       60.seconds
-  assert_equal 60,       60*1.second
-
-  assert_equal 1,     1.second
-  assert_equal 1,     1.sec
-  assert_equal 1,     1.s
-  assert_equal 1*2,   2.seconds
-  assert_equal 1*2,   2.secs
-  assert_equal 1*2,   1.second*2
-  assert_equal now+1, now+1.second
-end
-
-end # class TestUnitsTime