computable 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5aa6e8a15124c51c77b6849974a4a8bec2badd58ee90532eabae5d974d2e1342
-  data.tar.gz: 47e2605924a75967629be1e6c9f1fa263f5c577771ddad3ffc05660a300734d3
+  metadata.gz: 13fb18bf83a5d205517573213cc3bcc657d6352b3f5a5edd64d204459bec2f97
+  data.tar.gz: 4306e9149b11afe479bf5611270c5176001c54eae0ded32220eb6352beb0a2bc
 SHA512:
-  metadata.gz: f394e585c1da2f6270ae4bfd2e520506738603ee07a5a7ddf1485a2aba061bf74bd40d61a4c4a3be74a8a89d279f97eb792179411cbbfe2b154b6cd4f62c9a0e
-  data.tar.gz: 28a0950d0fcd04a80eb865a62997f4cd5f8a577cfe8cb1e2854b672bb51a95051b61798dc50d3f74a0dcabe5706be3454908becba91405b2a7e1e07bcd0376c4
+  metadata.gz: 7d6a66fbb762e2f49f04ac44ead89a0d022faa984de4330220833fdfe85d8bb70aef82c69e5827c3ce02e71efa57717798abcd2423f829ab500ba12db9fb2d35
+  data.tar.gz: '097c6dcf414d402457fa2035265e8c6694aecd6ddf70cc81b90aefd5eda4f9f17f13a27beedf124dba0cb13786b8e2885fa8e3d6ef4e5af3c0477e65fdeb5a8d'

data/lib/computable/version.rb

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

data/lib/computable.rb

@@ -274,24 +274,35 @@ class Computable
     end
   end
 
+  private def improve_backtrace(err, block, text)
+    fpath, lineno = block.source_location
+    bt = err.backtrace
+    myloc = err.backtrace_locations.select.with_index{|loc, i| loc.path == fpath && loc.lineno >= lineno && !bt[i].include?("#") }.min{|a,b| a.lineno <=> b.lineno }
+    idx = err.backtrace_locations.index(myloc)
+    bt[idx] += " ##{text}"
+    raise err
+  end
+
   def self.calc_value name, format=nil, freeze: true, &block
     calc_method_id = "calc_#{name}".intern
-    define_method(calc_method_id, &block)
+    define_method(calc_method_id) do
+      instance_eval(&block)
+    rescue Exception => err
+      improve_backtrace(err, block, name)
+    end
 
     calc_method2_id = "calc_#{name}_with_tracking".intern
     define_method(calc_method2_id) do |v|
+      old_caller = Thread.current.thread_variable_get("Computable #{object_id}")
+      Thread.current.thread_variable_set("Computable #{self.object_id}", v)
       begin
-        old_caller = Thread.current.thread_variable_get("Computable #{object_id}")
-        Thread.current.thread_variable_set("Computable #{self.object_id}", v)
-        begin
-          puts "do calc #{v.inspect}" if @computable_debug
-          res = send(calc_method_id)
-          Computable.verify_format(name, res, format)
-          res.freeze if freeze
-          res
-        ensure
-          Thread.current.thread_variable_set("Computable #{self.object_id}", old_caller)
-        end
+        puts "do calc #{v.inspect}" if @computable_debug
+        res = send(calc_method_id)
+        Computable.verify_format(name, res, format)
+        res.freeze if freeze
+        res
+      ensure
+        Thread.current.thread_variable_set("Computable #{self.object_id}", old_caller)
       end
     end
 

data/test/test_backtrace.rb

@@ -0,0 +1,33 @@
+require_relative 'helper'
+
+class TestBacktrace < Minitest::Test
+  class MyBuilder < Computable
+    calc_value :a do
+      b
+    end
+
+    calc_value :b do
+      raise "my error"
+    end
+  end
+
+  def setup
+    @b = MyBuilder.new
+  end
+
+  def teardown
+#     @b.computable_display_dot
+  end
+
+  def test_backtrace_decoration
+    err = assert_raises(StandardError){ @b.a }
+    bt = err.backtrace.join("\n")
+    assert_match(/my error/, err.to_s)
+    assert_match(/test_backtrace.rb:10:.* #b$/, bt)
+    assert_match(/test_backtrace.rb:6:.* #a$/, bt)
+  end
+end
+
+class TestBacktraceParallel < TestBacktrace
+  include Helper::EnableParallel
+end

data/test/test_parallel.rb

@@ -101,12 +101,12 @@ class TestParallel < Minitest::Test
       @b.computable_max_threads = nil
       @b.i1, @b.i2 = 2, 3
       dt, res = diff_time{ @b.o }
-      assert_in_delta 0.8, dt, 0.05
+      assert_in_delta 0.8, dt, 0.1
       assert_equal 20, res
 
       @b.i1, @b.i2 = 4, 5
       dt, res = diff_time{ @b.o }
-      assert_in_delta 0.2, dt, 0.05
+      assert_in_delta 0.2, dt, 0.1
       assert_equal 36, res
     end
 
@@ -114,12 +114,12 @@ class TestParallel < Minitest::Test
       @b.computable_max_threads = 2
       @b.i1, @b.i2 = 2, 3
       dt, res = diff_time{ @b.o }
-      assert_in_delta 0.8, dt, 0.05
+      assert_in_delta 0.8, dt, 0.1
       assert_equal 20, res
 
       @b.i1, @b.i2 = 4, 5
       dt, res = diff_time{ @b.o }
-      assert_in_delta 0.4, dt, 0.05
+      assert_in_delta 0.4, dt, 0.1
       assert_equal 36, res
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: computable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Lars Kanis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDLjCCAhagAwIBAgIBCTANBgkqhkiG9w0BAQsFADA9MQ4wDAYDVQQDDAVrYW5p
+  MIIDLjCCAhagAwIBAgIBCjANBgkqhkiG9w0BAQsFADA9MQ4wDAYDVQQDDAVrYW5p
   czEXMBUGCgmSJomT8ixkARkWB2NvbWNhcmQxEjAQBgoJkiaJk/IsZAEZFgJkZTAe
-  Fw0yMTA0MDcxMzQzNTZaFw0yMjA0MDcxMzQzNTZaMD0xDjAMBgNVBAMMBWthbmlz
+  Fw0yMjA0MTExMTMwNTNaFw0yMzA0MTExMTMwNTNaMD0xDjAMBgNVBAMMBWthbmlz
   MRcwFQYKCZImiZPyLGQBGRYHY29tY2FyZDESMBAGCgmSJomT8ixkARkWAmRlMIIB
   IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApop+rNmg35bzRugZ21VMGqI6
   HGzPLO4VHYncWn/xmgPU/ZMcZdfj6MzIaZJ/czXyt4eHpBk1r8QOV3gBXnRXEjVW
@@ -21,15 +21,15 @@ cert_chain:
   Q53c63+VLGsOjODl1yPn/2ejyq8qWu6ahfTxiIlSar2UbwtaQGBDFdb2CXgEufXT
   L7oaPxlmj+Q2oLOfOnInd2Oxop59HoJCQPsg8f921J43NCQGA8VHK6paxIRDLQID
   AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvgTdT7fe
-  x17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQELBQADggEBAGCQhS4TBqUG1bSY5gw5
-  emj2GNePHFNlXTZ/W0/7FlnXQz/LyBZeYmy4AIHcdY0w9xsu3bPNGk8kLBkHgK3Y
-  l/yWiUK0NYRI3K3yI2EoTfrHPDT8XIgBPeUUGv5Nje+SUYMQWsfYWKo3+vLEG64a
-  n1xP+1+g2Za39WCS5LwnDWMiIk47NnxR9yXErKd0Iau/Q/IarYsHFX6kWWmlMoln
-  W1lMomCcOJFwIPnsy6aqq7YfS0YcqyHjcvs1h5k3zPaIRWhoPlQivniMVMa3Txh+
-  NEF/4atY64rruzkyfxGEcrFFOHJIkWnWQjRGaiZdgULxf7ira2gEFvV/ZtamqJWF
-  c+I=
+  x17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQELBQADggEBAILiaB/unSVBfX5n7uL8
+  veGGCOHuGYhCGqspb6mYiCx0dmV3RPRiEfGDLfzcXbHNx/3AjygcxH4Slr+pmaxr
+  04Xli3WurocnjoANSWqCwpHH3OhSVxFgBNrCa3OMWcIr0xKH+I7PXA80SXe0pzfg
+  ePjpzTY71j+rcyRJqWiU5/zwdUaCCelBJscxh/0IaNcz67ocCEMRj0n4m5HFEmZL
+  9zKkMZFoOjxRQjcL84QU7ZXnnFR5HG8nLw+NqWjo49W6MBQ9HGFda2tk3OpBhyWS
+  sc3NyOkGUGdfiee5VRG31Sh3LLON3YGED+zZAS+ZF6598y4vhv8MBLa1Oy357byC
+  tTg=
   -----END CERTIFICATE-----
-date: 2022-03-25 00:00:00.000000000 Z
+date: 2022-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -97,6 +97,7 @@ files:
 - lib/computable.rb
 - lib/computable/version.rb
 - test/helper.rb
+- test/test_backtrace.rb
 - test/test_candy.rb
 - test/test_debug.rb
 - test/test_expired_recalc.rb
@@ -131,6 +132,7 @@ specification_version: 4
 summary: Define computation tasks with automatic caching and dependency tracking.
 test_files:
 - test/helper.rb
+- test/test_backtrace.rb
 - test/test_candy.rb
 - test/test_debug.rb
 - test/test_expired_recalc.rb