computable 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec5682e86b9081039947fc2718c8cdc42d2407af8cb0da30244a41b994d917f5
-  data.tar.gz: f8471eed0b3144951e4bb834e63013339e1af67842278e1bac7368c82070e76d
+  metadata.gz: 243882f1477717a2109d6206f3ed9b2d05ddc15f3a40e30262064ec5e5b2c180
+  data.tar.gz: 41a8407b1a93ff4ba101d96fface1dd34a75cf014133bd577e3b5c3eacd1400b
 SHA512:
-  metadata.gz: 9be1797f3865b5ed1f0cbf6b98c3a8ceca6342b689212a801e55e2ad1e3499618a1439746744260d719bda4e9895c0ff080b2a2e43a971414f06f18a60f9cb33
-  data.tar.gz: b3852ade5823458ff7a5da0e6e89416c3c9edd326fa3466781ad52cdf876aaa8ee032949b98a52b6646f37b8b8d7256a57ff41d1a5c01c041be4b53b88738232
+  metadata.gz: bec1240f2d68575246b3ae7c8dce73e6ef665e791186e769739955322e6af74ef5c448a5c0c2f7c1b2a9780c13e1d09e4c74956d2f956968b2028727a30e9e9b
+  data.tar.gz: c352cdcabb1d2bbc1240e65ef3fd3439918bfb0b046fd7a6085dd276772e204f3ae2db125564eb8d453a086d09c80a2e36868f191f45995fc2990f8a1e4dd013

data/lib/computable/version.rb

@@ -1,3 +1,3 @@
 class Computable
-  VERSION = "1.1.1"
+  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,11 +275,15 @@ 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
 

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.tar.gz.sig

@@ -1,2 +1,4 @@
-9o�W�J��%���e��2*x�l�8Q�f§�J��K����r�'[�@�]pI�BYj��'EJ*��2'����	��Jt�V�P�+�+�|Le�N�v�6ʻ�9$�#�K��V�摂�-M�gRU1|֩$�ʵz~G�A�F~ׅ��`���o��x�=n}�匹�����E�K�§?��1�R�$񻏊M4�y��;�N}��x-k�;�od���k�huVKTB5�z�$�ޅ�}y Da�N
-֣=��Caj
+�
+��m��>�r"�=l�H��п��C>�%�V�n"����V�@$��'v�7���?��M�;�ҕ�U^X��b��_��>�*j�����)6�v��d�o
+���kk������p��Yn��"�
+q��a꿙�%B뻪�5��C�['���`e�/�ZB���z�

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: computable
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  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-06-01 00:00:00.000000000 Z
+date: 2023-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,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.