computable 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13fb18bf83a5d205517573213cc3bcc657d6352b3f5a5edd64d204459bec2f97
-  data.tar.gz: 4306e9149b11afe479bf5611270c5176001c54eae0ded32220eb6352beb0a2bc
+  metadata.gz: ec5682e86b9081039947fc2718c8cdc42d2407af8cb0da30244a41b994d917f5
+  data.tar.gz: f8471eed0b3144951e4bb834e63013339e1af67842278e1bac7368c82070e76d
 SHA512:
-  metadata.gz: 7d6a66fbb762e2f49f04ac44ead89a0d022faa984de4330220833fdfe85d8bb70aef82c69e5827c3ce02e71efa57717798abcd2423f829ab500ba12db9fb2d35
-  data.tar.gz: '097c6dcf414d402457fa2035265e8c6694aecd6ddf70cc81b90aefd5eda4f9f17f13a27beedf124dba0cb13786b8e2885fa8e3d6ef4e5af3c0477e65fdeb5a8d'
+  metadata.gz: 9be1797f3865b5ed1f0cbf6b98c3a8ceca6342b689212a801e55e2ad1e3499618a1439746744260d719bda4e9895c0ff080b2a2e43a971414f06f18a60f9cb33
+  data.tar.gz: b3852ade5823458ff7a5da0e6e89416c3c9edd326fa3466781ad52cdf876aaa8ee032949b98a52b6646f37b8b8d7256a57ff41d1a5c01c041be4b53b88738232

data/lib/computable/version.rb

@@ -1,3 +1,3 @@
 class Computable
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/lib/computable.rb

@@ -285,11 +285,7 @@ class Computable
 
   def self.calc_value name, format=nil, freeze: true, &block
     calc_method_id = "calc_#{name}".intern
-    define_method(calc_method_id) do
-      instance_eval(&block)
-    rescue Exception => err
-      improve_backtrace(err, block, name)
-    end
+    define_method(calc_method_id, &block)
 
     calc_method2_id = "calc_#{name}_with_tracking".intern
     define_method(calc_method2_id) do |v|
@@ -297,7 +293,11 @@ class Computable
       Thread.current.thread_variable_set("Computable #{self.object_id}", v)
       begin
         puts "do calc #{v.inspect}" if @computable_debug
-        res = send(calc_method_id)
+        begin
+          res = send(calc_method_id)
+        rescue Exception => err
+          improve_backtrace(err, block, name)
+        end
         Computable.verify_format(name, res, format)
         res.freeze if freeze
         res

data/test/test_inheritance.rb

@@ -0,0 +1,31 @@
+require_relative 'helper'
+
+class TestInheritance < Minitest::Test
+  class MyBuilder < Computable
+    calc_value :a do |*d|
+      "x#{d.inspect}"
+    end
+  end
+
+  class MyChild < MyBuilder
+    calc_value :a do |*d|
+      super() + "y#{d.inspect}"
+    end
+  end
+
+  def setup
+    @b = MyChild.new
+  end
+
+  def teardown
+#     @b.computable_display_dot
+  end
+
+  def test_super
+    assert_equal "x[]y[]", @b.a
+  end
+end
+
+class TestInheritanceParallel < TestInheritance
+  include Helper::EnableParallel
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: computable
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Lars Kanis
@@ -29,7 +29,7 @@ cert_chain:
   sc3NyOkGUGdfiee5VRG31Sh3LLON3YGED+zZAS+ZF6598y4vhv8MBLa1Oy357byC
   tTg=
   -----END CERTIFICATE-----
-date: 2022-05-18 00:00:00.000000000 Z
+date: 2022-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,6 +103,7 @@ files:
 - test/test_expired_recalc.rb
 - test/test_format.rb
 - test/test_freeze.rb
+- test/test_inheritance.rb
 - test/test_input_value.rb
 - test/test_parallel.rb
 - test/test_recursion_detection.rb
@@ -138,6 +139,7 @@ test_files:
 - test/test_expired_recalc.rb
 - test/test_format.rb
 - test/test_freeze.rb
+- test/test_inheritance.rb
 - test/test_input_value.rb
 - test/test_parallel.rb
 - test/test_recursion_detection.rb