universum 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db4bf31c857f63ae6e203d9ddcdb718556c6f2a7
-  data.tar.gz: 3989ec1e3962f0768a8a3c108e72a76b4c4b969b
+  metadata.gz: 70d14cee1fae619bb93bdf56c7a81b79987f16bb
+  data.tar.gz: 8ed7b6fde7aabaeb6430ebbc61c1863e50241064
 SHA512:
-  metadata.gz: 276c1b77f06cf0e0dcb10a7a4ca4ef072365f1852c30e5b83279582f4d38447ad178c975c9e169e40aef5871a8d830cd8748d371c9d5846f3fd3211fe251ed07
-  data.tar.gz: 7086a5e4984497cc116ee05eb397a34afc7e766474e5aacc802421a37c16c5c4031936dae03fbdecd8b9172c5d990c52391dc3a18b14620d4ae92b26e46405e4
+  metadata.gz: 6a06807b4ff6cd4a8b4d84dc688e8a9af995a08135aaca0fcf8b1f1d0c249cf0530560ca901ebcf9c189e4b11131037cd1862369e956a5117ac5a5ef9216287c
+  data.tar.gz: e3e45a313da7ee2c0e0094f61c5fc082e015b8a5d0dfcc3e291decbd430d48746fa10f0ad4db4f6fca171413fd6cb8a3af3aff5949e328ffddafe879fa731995

data/Manifest.txt

@@ -7,12 +7,11 @@ lib/universum.rb
 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/safe_array.rb
-lib/universum/safe_hash.rb
 lib/universum/transaction.rb
 lib/universum/type.rb
 lib/universum/units_money.rb
@@ -22,12 +21,9 @@ lib/universum/version.rb
 test/contracts/greeter.rb
 test/contracts/mytoken.rb
 test/helper.rb
-test/test_array.rb
 test/test_enum.rb
 test/test_event.rb
 test/test_greeter.rb
-test/test_hash.rb
-test/test_struct.rb
 test/test_units_money.rb
 test/test_units_time.rb
 test/test_version.rb

data/Rakefile

@@ -18,6 +18,7 @@ Hoe.spec 'universum' do
   self.history_file = 'CHANGELOG.md'
 
   self.extra_deps = [
+    ['safestruct'],
   ]
 
   self.licenses = ['Public Domain']

data/lib/universum.rb

@@ -9,6 +9,10 @@ require 'time'
 require 'uri'
 
 
+## 3rd party gems
+require 'safestruct'    # SafeArray, SafeHash, SafeStruct, etc.
+
+
 
 ## our own code
 require 'universum/version'    # note: let version always go first
@@ -16,9 +20,6 @@ require 'universum/version'    # note: let version always go first
 require 'universum/units_time'
 require 'universum/units_money'
 
-require 'universum/safe_array'
-require 'universum/safe_hash'
-
 require 'universum/enum'
 require 'universum/event'
 
@@ -33,6 +34,7 @@ require 'universum/receipt'
 
 require 'universum/universum'
 
+require 'universum/convert'
 
 
 puts Universum.banner   ## say hello

data/lib/universum/convert.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+###
+# 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
+  else
+    ## assume string (hex) address
+    ##  pass through for now
+    ##
+    ##   use an address lookup in the future - why? why not?
+    ##    Address.find_by_address( arg )
+    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  
+

data/lib/universum/event.rb

@@ -36,6 +36,7 @@ class Event
         fields.zip( args ).each do |field, arg|
           instance_variable_set( "@#{field}", arg )
         end
+        freeze    ### note: add freeze - assumes "immutable" struct-like class
       end
 
       fields.each do |field|

data/lib/universum/type.rb

@@ -1,15 +1,7 @@
 # encoding: utf-8
 
 
-## add dummy bool class for mapping and (payable) method signature
-
-class Integer
-  def self.zero() 0; end
-end
-
-class Bool
-  def self.zero() false; end
-end
+## add more dummy  classes for mapping and (payable) method signature
 
 class Money
   def self.zero() 0; end
@@ -17,33 +9,3 @@ end
 
 class Void   ## only used (reserved) for (payable) method signature now
 end
-
-
-class Mapping
-
-  def self.of( *args )
-     ## e.g. gets passed in [{Address=>Integer}]
-     ##  check for Integer - use Hash.new(0)
-     ##  check for Bool    - use Hash.new(False)
-     if args[0].is_a? Hash
-       arg = args[0].to_a   ## convert to array (for easier access)
-       klass_key   = arg[0][0]
-       klass_value = arg[0][1]
-       klass = SafeHash.build_class( klass_key, klass_value )
-       klass.new
-     else
-       ## todo/fix: throw argument error/exception
-       Hash.new    ## that is, "plain" {} with all "standard" defaults
-     end
-  end
-end
-
-
-class Array
-  ## "typed" safe array "constructor"
-  ## e.g.  Array.of( Address ) or Array.of( Money ) or Array.of( Proposal, size: 2 ) etc.
-  def self.of( klass_value )
-    klass = SafeArray.build_class( klass_value )
-    klass.new  ## todo: add klass.new( **kwargs ) for size: 2 etc.
-  end
-end

data/lib/universum/version.rb

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

data/test/test_event.rb

@@ -24,6 +24,7 @@ def test_bet_placed
   assert_equal '0xaaaa', bet.user
   assert_equal 2000,     bet.cap
   assert_equal 100,      bet.amount
+  assert_equal true,     bet.frozen?
 end
 
 def test_roll
@@ -33,6 +34,7 @@ def test_roll
   assert       roll.is_a?( Event )
   assert_equal 1,    roll.id
   assert_equal 2345, roll.rolled
+  assert_equal true, roll.frozen?
 end
 
 end # class TestEvent

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: universum
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-10 00:00:00.000000000 Z
+date: 2019-02-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: safestruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -60,12 +74,11 @@ files:
 - 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/safe_array.rb
-- lib/universum/safe_hash.rb
 - lib/universum/transaction.rb
 - lib/universum/type.rb
 - lib/universum/units_money.rb
@@ -75,12 +88,9 @@ files:
 - test/contracts/greeter.rb
 - test/contracts/mytoken.rb
 - test/helper.rb
-- test/test_array.rb
 - test/test_enum.rb
 - test/test_event.rb
 - test/test_greeter.rb
-- test/test_hash.rb
-- test/test_struct.rb
 - test/test_units_money.rb
 - test/test_units_time.rb
 - test/test_version.rb

data/lib/universum/safe_array.rb

@@ -1,69 +0,0 @@
-# encoding: utf-8
-
-class SafeArray
-
-  ## e.g.
-  ##  Array.of( Address ), Array.of( Integer), etc.
-
-  def self.build_class( klass_value )
-    ## note: care for now only about value type / class
-
-    ## note: keep a class cache
-    cache = @@cache ||= {}
-    klass = cache[ klass_value ]
-    return klass   if klass
-
-    klass = Class.new( SafeArray )
-    klass.class_eval( <<RUBY )
-      def self.klass_value
-        @klass_value ||= #{klass_value}
-      end
-RUBY
-    ## add to cache for later (re)use
-    cache[ klass_value ] = klass
-    klass
-  end
-
-
-  def self.new_zero()  new;  end
-  def self.zero()      @zero ||= new_zero;  end
-
-
-
-  def initialize
-    ## todo/check: if array works if value is a (nested/multi-dimensional) array
-    @ary  = []
-  end
-
-  def []=(index, value)
-    @ary[index] = value
-  end
-
-  def [](index)
-    item = @ary[ index ]
-    if item.nil?
-      ## todo/check:
-      ##    always return (deep) frozen zero object - why? why not?
-      ##     let user change the returned zero object - why? why not?
-      if self.class.klass_value.respond_to?( :new_zero )
-        ## note: use a new unfrozen copy of the zero object
-        ##    changes to the object MUST be possible (new "empty" modifable object expected)
-       item = self.class.klass_value.new_zero
-     else  # assume value semantics e.g. Integer, Bool, etc. zero values gets replaced
-       ## puts "use value semantics"
-       item = self.class.klass_value.zero
-     end
-    end
-    item
-  end
-
-  def push( item )
-    ## todo/fix: check if item.is_a? @type
-    ##   note: Address might be a String too (Address | String)
-    ##     store Address always as String!!! - why? why not?
-    @ary.push( item )
-  end
-
-  def size() @ary.size; end
-  def length() size; end
-end # class SafeArray

data/lib/universum/safe_hash.rb

@@ -1,77 +0,0 @@
-# encoding: utf-8
-
-
-class SafeHash
-
-  ## e.g.
-  ##  Mapping.of( Address => Money )
-
-  ##   note: need to create new class!! for every mapping
-  ##     make klass_key class and
-  ##          klass_value class  into class instance variables
-  ##     that can get used by zero
-  ##       self.new returns a Hash.new/SafeHash.new like object
-
-  def self.build_class( klass_key, klass_value )
-    ## note: care for now only about value type / class
-
-    ## note: keep a class cache
-    cache = @@cache ||= {}
-    klass = cache[ klass_value ]
-    return klass   if klass
-
-    klass = Class.new( SafeHash )
-    klass.class_eval( <<RUBY )
-      def self.klass_key
-        @klass_key   ||= #{klass_key}
-      end
-      def self.klass_value
-        @klass_value ||= #{klass_value}
-      end
-RUBY
-    ## add to cache for later (re)use
-    cache[ klass_value ] = klass
-    klass
-  end
-
-
-  def self.new_zero()  new;  end
-  def self.zero()      @zero ||= new_zero;  end
-
-
-  def initialize
-    ## todo/check: if hash works if value is a (nested) hash
-    @h  = {}
-  end
-
-
-  def []=(key, value)
-    @h[key] = value
-  end
-
-  def [](key)
-    item = @h[ key ]
-    if item.nil?
-      ## pp self.class.klass_value
-      ## pp self.class.klass_value.zero
-
-      #####
-      # todo/check:
-      #    add zero to hash on lookup (increases size/length)
-      #    why? why not?
-
-      if self.class.klass_value.respond_to?( :new_zero )
-        ## note: use a dup(licated) unfrozen copy of the zero object
-        ##    changes to the object MUST be possible (new "empty" modifable object expected)
-       item = @h[ key ] = self.class.klass_value.new_zero
-     else  # assume value semantics e.g. Integer, Bool, etc. zero values gets replaced
-       ## puts "use value semantics"
-       item = @h[ key ] = self.class.klass_value.zero
-     end
-    end
-    item
-  end
-
-  def size() @h.size; end
-  def length() size; end
-end # class SafeHash

data/test/test_array.rb

@@ -1,52 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_array.rb
-
-
-require 'helper'
-
-
-class TestArray < MiniTest::Test
-
-  Array_Integer = SafeArray.build_class( Integer )
-  Array_Bool    = SafeArray.build_class( Bool )
-
-def test_integer
-  pp Array_Integer
-  pp ary = Array_Integer.new
-
-  assert_equal Integer, Array_Integer.klass_value
-  assert_equal 0, ary[0]
-  assert_equal 0, ary[1]
-
-  ary[0] = 101
-  ary[1] = 102
-  assert_equal 101,  ary[0]
-  assert_equal 102,  ary[1]
-
-  ## check Array.of  (uses cached classes)
-  assert_equal Array_Integer, Array.of( Integer ).class
-end
-
-
-def test_bool
-  pp Array_Bool
-  pp ary = Array_Bool.new
-
-  assert_equal Bool, Array_Bool.klass_value
-  assert_equal false,  ary[0]
-  assert_equal false,  ary[1]
-
-  ary[0] = true
-  ary[1] = true
-  assert_equal true,  ary[0]
-  assert_equal true,  ary[1]
-
-  ## check Array.of  (uses cached classes)
-  assert_equal Array_Bool, Array.of( Bool ).class
-end
-
-
-end # class TestArray

data/test/test_hash.rb

@@ -1,84 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_hash.rb
-
-
-require 'helper'
-
-
-class TestHash < MiniTest::Test
-
-  ## sig: [Integer, Bool, Integer, Address]
-  Voter = Struct.new( :weight, :voted, :vote, :delegate ) do
-     def self.new_zero
-       new( 0, false, 0, '0x0000' )
-     end
-     def self.zero
-       @zero ||= new_zero
-     end
-  end
-
-  Hash_X_Integer = SafeHash.build_class( String, Integer )
-  Hash_X_Bool    = SafeHash.build_class( String, Bool )
-  Hash_X_Voter   = SafeHash.build_class( String, Voter )
-
-def test_integer
-  pp Hash_X_Integer
-  pp h = Hash_X_Integer.new
-
-  assert_equal Integer, Hash_X_Integer.klass_value
-  assert_equal 0,  h['0x1111']
-  assert_equal 0,  h['0x2222']
-
-  h['0x1111'] = 101
-  h['0x2222'] = 102
-  assert_equal 101,  h['0x1111']
-  assert_equal 102,  h['0x2222']
-
-  ## check Mapping.of  (uses cached classes)
-  assert_equal Hash_X_Integer, Mapping.of( String => Integer ).class
-end
-
-
-def test_bool
-  pp Hash_X_Bool
-  pp h = Hash_X_Bool.new
-
-  assert_equal Bool, Hash_X_Bool.klass_value
-  assert_equal false,  h['0x1111']
-  assert_equal false,  h['0x2222']
-
-  h['0x1111'] = true
-  h['0x2222'] = true
-  assert_equal true,  h['0x1111']
-  assert_equal true,  h['0x2222']
-
-  ## check Mapping.of  (uses cached classes)
-  assert_equal Hash_X_Bool, Mapping.of( String => Bool ).class
-end
-
-
-def test_voter
-  pp Hash_X_Voter
-  pp h = Hash_X_Voter.new
-
-  assert_equal Voter, Hash_X_Voter.klass_value
-  assert_equal Voter.zero, h['0x1111']
-  assert_equal Voter.zero, h['0x2222']
-
-  h['0x1111'].voted = true
-  h['0x2222'].voted = true
-  assert_equal true,  h['0x1111'].voted
-  assert_equal true,  h['0x2222'].voted
-
-  pp h['0x1111']
-  pp h['0x2222']
-
-  ## check Mapping.of  (uses cached classes)
-  assert_equal Hash_X_Voter, Mapping.of( String => Voter ).class
-end
-
-
-end # class TestHash

data/test/test_struct.rb

@@ -1,35 +0,0 @@
-# encoding: utf-8
-
-###
-#  to run use
-#     ruby -I ./lib -I ./test test/test_struct.rb
-
-
-require 'helper'
-
-
-class TestStruct < MiniTest::Test
-
-  ## sig: [Integer, Bool, Integer, Address]
-  Voter = Struct.new( :weight, :voted, :vote, :delegate ) do
-     def self.new_zero
-       new( 0, false, 0, '0x0000' )
-     end
-     def self.zero
-       @zero ||= new_zero
-     end
-  end
-
-
-def test_zero
-  assert_equal Voter.zero, Voter.zero
-
-  zerodup = Voter.zero.dup
-  zerodup.delegate = '0x1111'
-  pp zerodup
-
-  assert_equal '0x0000', Voter.zero.delegate
-end
-
-
-end # class TestStruct