universum 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9961651cc18f32bfc222fef5624575241469923a
-  data.tar.gz: ab74188d3a3324451981a8f67693ae494265ff39
+  metadata.gz: b8948db2f1aea78f74fb4f7b28cb3fc9a71305f5
+  data.tar.gz: c30a20c747c63c936198d708d577ee83814c5cff
 SHA512:
-  metadata.gz: 8317f92d3e8ad3e96f28fc29da3eb7964f624c443f1cc315fac1bcceb9a943a8894f29643c847254c0b8a5be2861e319f408147e88ecf020878d6736460098d6
-  data.tar.gz: 88481a56b4b6675c2039122b4dca23ec241f9c7fc5882e3c614726ba9201cb1bece06b5d2c14db8cbef250edf3ba87cf05bb6e64be2ac90783232c81ef860178
+  metadata.gz: c558a3f8bc24ad303de084f126bf75b7d7cb40c32d6ba8311cb7afbd959072fa8777b6c84ee339b735db91fa79f35af2a926cd16a1fdb7d012b255c58ff00258
+  data.tar.gz: 0dd4ed89cf4fe5d82b725c5fe6dde84b92b9488caf03c3acef08de94323fb3048fdf5545ff3cd79539cb9b2d93a8e7ec14c797c17b5e5cb89ae5d3ceabc81a35

data/Rakefile

@@ -18,8 +18,8 @@ Hoe.spec 'universum' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
-    ['safestruct',  '>=1.2.0'],
-    ['units-time',  '>=1.0.2'],
+    ['safestruct',  '>=1.2.2'],
+    ['units-time',  '>=1.1.0'],
     ['units-money', '>=0.1.1'],
   ]
 

data/lib/universum/contract.rb

@@ -105,15 +105,24 @@ class Contract
   # def receive    ## @payable default fallback - use different name - why? why not? (e.g. handle/process/etc.)
   # end
 
-  def assert( condition )
+
+  ####
+  ###  todo/fix: use module Assertions  and include in contract class
+  def assert( condition, message=nil )
+    ## note: use message to avoid conflict with msg helper/builtin in contract!!!
     if condition == true
       ## do nothing
     else
-      raise 'Contract Assertion Failed; Contract Halted (Stopped)'
+      if message
+        raise "Contract Assertion Failed; Contract Halted (Stopped): #{message}"
+      else
+        raise 'Contract Assertion Failed; Contract Halted (Stopped)'
+      end
     end
   end
 
 
+
   def log( event ) Universum.log( event ); end
   def msg()        Universum.msg;          end
   def block()      Universum.block;        end

data/lib/universum/convert.rb

@@ -1,8 +1,11 @@
 # encoding: utf-8
 
-###
-# e.g. use Address(0) 
 
+## note: put all "global" Kernel converter methods into Kernel module
+module Kernel
+
+###
+# e.g. use Address(0)
 def Address( arg )
   if arg == 0 || arg == '0x0' || arg == '0x0000'
     '0x0000'   ## note: return a string for now and NOT (typed) Address.zero
@@ -16,11 +19,4 @@ def Address( arg )
   end
 end
 
-
-
-###
-## todo - add a global method_missing handler for (auto-)adding converters for Structs - why? why not?
-##  e.g. how to auto-create   Vote(0) for Vote.zero  or Bet(0) for Bet.zero and so on - why? why not?
-##
-##   def Vote( arg ) Vote.zero; end  
-
+end # module Kernel

data/lib/universum/event.rb

@@ -4,7 +4,7 @@
 ## auto-create/builds struct-like class.
 ##
 ## Example:
-##   Roll = Event.new( :id, :rolled )
+##  Event.new( :Roll, :id, :rolled )
 ##     auto-creates/builds:
 ##
 ##   class Event; end
@@ -23,6 +23,7 @@
 ##   pp roll.rolled                  #=> 2345
 
 
+module Safe
 ## base class for events
 class Event
   ## return a new Struct-like read-only class
@@ -30,7 +31,7 @@ class Event
   ###################
   ##  meta-programming "macro" - build class (on the fly)
   ##
-  def self.build_class( *fields )
+  def self.build_class( class_name, *fields )
     klass = Class.new( Event ) do
       define_method( :initialize ) do |*args|
         fields.zip( args ).each do |field, arg|
@@ -51,6 +52,10 @@ class Event
       old_new( *args )
     end
 
+    ## note: use Safe (module) and NOT Object for namespacing
+    ##   use include Safe to make all structs global
+    Safe.const_set( class_name, klass )   ## returns klass (plus sets global constant class name)
+
     klass
   end
 
@@ -59,3 +64,21 @@ class Event
     alias_method :new,     :build_class    # replace original version with create
   end
 end  # class Event
+
+module SafeHelper
+  def event( class_name, *args )
+    ########################################
+    # note: lets you use:
+    #   enum :Color, :red, :green, :blue
+    #    -or-
+    #   enum :Color, [:red, :green, :blue]
+    if args[0].is_a?( Array )
+      fields = args[0]
+    else
+      fields = args
+    end
+
+    Event.new( class_name, *fields )
+  end
+end # module SafeHelper
+end # module Safe

data/lib/universum/version.rb

@@ -8,7 +8,7 @@ class Universum
 
   MAJOR = 0
   MINOR = 5
-  PATCH = 0
+  PATCH = 1
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/contracts/ballot.rb

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

data/test/test_event.rb

@@ -9,9 +9,12 @@ require 'helper'
 
 
 class TestEvent < MiniTest::Test
+  include Safe
 
-  BetPlaced = Event.new( :id, :user, :cap, :amount )
-  Roll      = Event.new( :id, :rolled )
+  ## Event.new( :BetPlaced, :id, :user, :cap, :amount )
+  ## Event.new( :Roll, :id, :rolled )
+  event :BetPlaced, :id, :user, :cap, :amount
+  event :Roll, :id, :rolled
 
 
 def test_bet_placed

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: universum
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-10 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: safestruct
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: units-time
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: units-money
   requirement: !ruby/object:Gem::Requirement