computable 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 13fb18bf83a5d205517573213cc3bcc657d6352b3f5a5edd64d204459bec2f97
-  data.tar.gz: 4306e9149b11afe479bf5611270c5176001c54eae0ded32220eb6352beb0a2bc
+  metadata.gz: 243882f1477717a2109d6206f3ed9b2d05ddc15f3a40e30262064ec5e5b2c180
+  data.tar.gz: 41a8407b1a93ff4ba101d96fface1dd34a75cf014133bd577e3b5c3eacd1400b
 SHA512:
-  metadata.gz: 7d6a66fbb762e2f49f04ac44ead89a0d022faa984de4330220833fdfe85d8bb70aef82c69e5827c3ce02e71efa57717798abcd2423f829ab500ba12db9fb2d35
-  data.tar.gz: '097c6dcf414d402457fa2035265e8c6694aecd6ddf70cc81b90aefd5eda4f9f17f13a27beedf124dba0cb13786b8e2885fa8e3d6ef4e5af3c0477e65fdeb5a8d'
+  metadata.gz: bec1240f2d68575246b3ae7c8dce73e6ef665e791186e769739955322e6af74ef5c448a5c0c2f7c1b2a9780c13e1d09e4c74956d2f956968b2028727a30e9e9b
+  data.tar.gz: c352cdcabb1d2bbc1240e65ef3fd3439918bfb0b046fd7a6085dd276772e204f3ae2db125564eb8d453a086d09c80a2e36868f191f45995fc2990f8a1e4dd013

data/lib/computable/version.rb

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

data/lib/computable.rb

@@ -90,7 +90,7 @@ class Computable
 
       puts "recalc #{inspect}" if @comp.computable_debug
       expired_from.each do |name2, v2|
-        v2.recalc_value
+        v2.recalc_value  # Adjust improve_backtrace when moving this line within method recalc_value
       end
 
       unless expired_from.empty?
@@ -275,21 +275,21 @@ class Computable
   end
 
   private def improve_backtrace(err, block, text)
+    recalc_location_fpath, recalc_location_lineno = Variable.instance_method(:recalc_value).source_location
     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 }
+    myloc = err.backtrace_locations.find.with_index do |loc, i|
+      (loc.path == recalc_location_fpath && loc.lineno == recalc_location_lineno + 5 && !bt[i].include?("#")) ||
+      (loc.path == fpath && loc.lineno >= lineno && !bt[i].include?("#") && !bt[i].include?("#"))
+    end
     idx = err.backtrace_locations.index(myloc)
-    bt[idx] += " ##{text}"
+    bt[idx] += " ##{text}" if idx
     raise err
   end
 
   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 +297,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_backtrace.rb

@@ -2,13 +2,19 @@ require_relative 'helper'
 
 class TestBacktrace < Minitest::Test
   class MyBuilder < Computable
-    calc_value :a do
-      b
+    calc_value :b do
+      c
     end
 
-    calc_value :b do
-      raise "my error"
+    calc_value :c do
+      raise "my error" if enable
+      :x
     end
+
+    calc_value :a do
+      b
+    end
+    input_value :enable
   end
 
   def setup
@@ -20,11 +26,36 @@ class TestBacktrace < Minitest::Test
   end
 
   def test_backtrace_decoration
+    @b.enable = true
+    err = assert_raises(StandardError){ @b.b }
+    bt = err.backtrace.join("\n")
+    assert_match(/my error/, err.to_s)
+    assert_match(/test_backtrace.rb:10:.* #c$/, bt)
+    assert_match(/test_backtrace.rb:6:.* #b$/, bt)
+  end
+
+  def test_recalc_backtrace_decoration
+    @b.enable = false
+    @b.b
+    @b.enable = true
+
+    err = assert_raises(StandardError){ @b.b }
+    bt = err.backtrace.join("\n")
+    assert_match(/my error/, err.to_s)
+    assert_match(/test_backtrace.rb:10:.* #c$/, bt)
+    assert_match(/block in recalc_value' #b$/, bt) unless @b.computable_max_threads
+  end
+
+  def test_recalc_longer_backtrace_decoration
+    @b.enable = false
+    @b.a
+    @b.enable = true
+
     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)
+    assert_match(/test_backtrace.rb:10:.* #c$/, bt)
+    assert_match(/block in recalc_value' #b.*block in recalc_value' #a$/m, bt) unless @b.computable_max_threads
   end
 end
 

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.2
 platform: ruby
 authors:
 - Lars Kanis
@@ -10,9 +10,9 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDLjCCAhagAwIBAgIBCjANBgkqhkiG9w0BAQsFADA9MQ4wDAYDVQQDDAVrYW5p
+  MIIDLjCCAhagAwIBAgIBCzANBgkqhkiG9w0BAQsFADA9MQ4wDAYDVQQDDAVrYW5p
   czEXMBUGCgmSJomT8ixkARkWB2NvbWNhcmQxEjAQBgoJkiaJk/IsZAEZFgJkZTAe
-  Fw0yMjA0MTExMTMwNTNaFw0yMzA0MTExMTMwNTNaMD0xDjAMBgNVBAMMBWthbmlz
+  Fw0yMzA0MjgwOTI0NDhaFw0yNDA0MjcwOTI0NDhaMD0xDjAMBgNVBAMMBWthbmlz
   MRcwFQYKCZImiZPyLGQBGRYHY29tY2FyZDESMBAGCgmSJomT8ixkARkWAmRlMIIB
   IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApop+rNmg35bzRugZ21VMGqI6
   HGzPLO4VHYncWn/xmgPU/ZMcZdfj6MzIaZJ/czXyt4eHpBk1r8QOV3gBXnRXEjVW
@@ -21,15 +21,15 @@ cert_chain:
   Q53c63+VLGsOjODl1yPn/2ejyq8qWu6ahfTxiIlSar2UbwtaQGBDFdb2CXgEufXT
   L7oaPxlmj+Q2oLOfOnInd2Oxop59HoJCQPsg8f921J43NCQGA8VHK6paxIRDLQID
   AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvgTdT7fe
-  x17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQELBQADggEBAILiaB/unSVBfX5n7uL8
-  veGGCOHuGYhCGqspb6mYiCx0dmV3RPRiEfGDLfzcXbHNx/3AjygcxH4Slr+pmaxr
-  04Xli3WurocnjoANSWqCwpHH3OhSVxFgBNrCa3OMWcIr0xKH+I7PXA80SXe0pzfg
-  ePjpzTY71j+rcyRJqWiU5/zwdUaCCelBJscxh/0IaNcz67ocCEMRj0n4m5HFEmZL
-  9zKkMZFoOjxRQjcL84QU7ZXnnFR5HG8nLw+NqWjo49W6MBQ9HGFda2tk3OpBhyWS
-  sc3NyOkGUGdfiee5VRG31Sh3LLON3YGED+zZAS+ZF6598y4vhv8MBLa1Oy357byC
-  tTg=
+  x17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQELBQADggEBACAxNXwfMGG7paZjnG/c
+  smdi/ocW2GmCNtILaSzDZqlD5LoA68MiO7u5vwWyBaDJ6giUB330VJoGRbWMxvxN
+  JU6Bnwa4yYp9YtF91wYIi7FXwIrCPKd9bk3bf4M5wECdsv+zvVceq2zRXqD7fci8
+  1LRG8ort/f4TgaT7B4aNwOaabA2UT6u0FGeglqxLkhir86MY3QQyBfJZUoTKWGkz
+  S9a7GXsYpe+8HMOaE4+SZp8SORKPgATND5m/4VdzuO59VXjE5UP7QpXigbxAt7H7
+  ciK5Du2ZDhowmWzZwNzR7VvVmfAK6RQJlRB03VkkQRWGld5yApOrYDne6WbD8kE0
+  uM8=
   -----END CERTIFICATE-----
-date: 2022-05-18 00:00:00.000000000 Z
+date: 2023-12-06 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
@@ -126,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.15
 signing_key: 
 specification_version: 4
 summary: Define computation tasks with automatic caching and dependency tracking.
@@ -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

metadata.gz.sig

@@ -1,2 +1 @@
-P��t^���#'n�̍Q|^�J3�ߋ^��о�]�՛�i�/\,h����*����O�8t����a�]�Ji�;���j>�s��$u�
-�%��\ȹ�%z8/�y;��̥؀������&�2u�`�%ő�>�F����e	3O�p�8ʡ?��!��
+P�>���x-���+�������[d��Z�D�?�~