computable 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec5682e86b9081039947fc2718c8cdc42d2407af8cb0da30244a41b994d917f5
-  data.tar.gz: f8471eed0b3144951e4bb834e63013339e1af67842278e1bac7368c82070e76d
+  metadata.gz: 36fc11ccdc0bcfd191eae39d35bae6fc896b338b52a63a2b6693b33c865bfeaf
+  data.tar.gz: f7db8ba67c28d1983569d73b4ab1ebb269ed82e0476d8aab39b72e5a93d65f13
 SHA512:
-  metadata.gz: 9be1797f3865b5ed1f0cbf6b98c3a8ceca6342b689212a801e55e2ad1e3499618a1439746744260d719bda4e9895c0ff080b2a2e43a971414f06f18a60f9cb33
-  data.tar.gz: b3852ade5823458ff7a5da0e6e89416c3c9edd326fa3466781ad52cdf876aaa8ee032949b98a52b6646f37b8b8d7256a57ff41d1a5c01c041be4b53b88738232
+  metadata.gz: b742c59611981f23814e9b88b62c8b2aa1be6d61b8c3584d19724e40615fc5295381ef2d9e8302c6fd5ff24f6837f085582a4cfe02f4ef0a7febf71fb0d86e67
+  data.tar.gz: d076c6eb9329ae9848a5779205192be33936d1f2ca149366eb48a7998367d0236de9644e93d032e6cc1ed9015040b4d7b259723ee92eb22ca5125e4320d58559

data/computable.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", ">= 1.4", "< 3.0"
+  spec.add_development_dependency "bundler", ">= 1.4", "< 4.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest", "~> 5.6"
 end

data/lib/computable/version.rb

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

data/lib/computable.rb

@@ -27,21 +27,25 @@ class Computable
       @expired_from = {}
       @count = 0
       @value = Unknown
+      @value_calced = nil
       @in_process = false
       @recalc_error = nil
     end
 
     def inspect
       has = @recalc_error ? "error!" : "value:#{Unknown!=value}"
-      "<Variable #{name} used_for:#{used_for.keys} expired_from:#{expired_from.keys} has #{has} value_calced:#{value_calced.inspect}>"
+      "<Variable #{name} used_for:#{used_for.keys} expired_from:#{expired_from.keys} has #{has} value_calced:#{case value_calced when NilClass then :no when 1 then :yes when 2 then :exception end}>"
     end
 
     def calc!
       self.count += 1
-      self.value_calced = true
+      self.value_calced = 1
       @mutex.unlock
       begin
         calc_method.call(self)
+      rescue
+        self.value_calced = 2
+        raise
       ensure
         @mutex.lock
       end
@@ -90,7 +94,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?
@@ -162,7 +166,7 @@ class Computable
           end
           node.in_process = true
           node.count += 1
-          node.value_calced = true
+          node.value_calced = 1
           num_working += 1
           to_workers.push(node)
         end
@@ -189,14 +193,14 @@ class Computable
         used_for.clear
         self.value = value
       end
-      self.value_calced = false
+      self.value_calced = nil
     end
 
     def query_value(kaller)
       if kaller
         v2 = used_for[kaller.name]
         if v2
-          if Unknown==value && Unknown==v2.value && value_calced && v2.value_calced
+          if Unknown==value && Unknown==v2.value && value_calced == 1 && v2.value_calced
             raise RecursionDetected, "#{v2.name} depends on #{name}, but #{name} could not be computed without #{v2.name}"
           end
         else
@@ -275,11 +279,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,22 @@ 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"
+    def self.make_c
+      calc_value :c do
+        raise "my error" if enable
+        :x
+      end
     end
+    make_c
+
+    calc_value :a do
+      b
+    end
+    input_value :enable
   end
 
   def setup
@@ -20,11 +29,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:11:.* #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:11:.* #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:11:.* #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_input_value.rb

@@ -17,6 +17,11 @@ class TestInputValue < Minitest::Test
 #     @b.computable_display_dot
   end
 
+  def test_undefined_input_twice
+    assert_raises(Computable::UndefinedValue){ @b.o }
+    assert_raises(Computable::UndefinedValue){ @b.o }
+  end
+
   def test_undefined_input
     assert_raises(Computable::UndefinedValue){ @b.i }
     assert_raises(Computable::UndefinedValue){ @b.o }

data.tar.gz.sig

@@ -1,2 +1,3 @@
-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
+D��u�G��#��p���r[{tB���
[����'CU�x��C K���RT��݈�
���R�ŅҲ�vIݧa����#�B���(o�=�uc��=����a��*w^1��T
i
+n�/C6�`j�8(���w߯�܄ٷ���u���,u��N�0��P6�C�4/��`�f-�TmZ/�E>RlZ�U��
+�{�D�Xn���k��Q��f.��K@��-��ܬ��]�rm���[*�s�d��|�~8�Q��`��s�\
 ?S�{�$+	N�Q�k]iі�p�l f�p��vE��p�O��lBpڌ(�i�EQb�Iڽك�����%U��

metadata

@@ -1,35 +1,38 @@
 --- !ruby/object:Gem::Specification
 name: computable
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Lars Kanis
-autorequire: 
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDLjCCAhagAwIBAgIBCjANBgkqhkiG9w0BAQsFADA9MQ4wDAYDVQQDDAVrYW5p
-  czEXMBUGCgmSJomT8ixkARkWB2NvbWNhcmQxEjAQBgoJkiaJk/IsZAEZFgJkZTAe
-  Fw0yMjA0MTExMTMwNTNaFw0yMzA0MTExMTMwNTNaMD0xDjAMBgNVBAMMBWthbmlz
-  MRcwFQYKCZImiZPyLGQBGRYHY29tY2FyZDESMBAGCgmSJomT8ixkARkWAmRlMIIB
-  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApop+rNmg35bzRugZ21VMGqI6
-  HGzPLO4VHYncWn/xmgPU/ZMcZdfj6MzIaZJ/czXyt4eHpBk1r8QOV3gBXnRXEjVW
-  9xi+EdVOkTV2/AVFKThcbTAQGiF/bT1n2M+B1GTybRzMg6hyhOJeGPqIhLfJEpxn
-  lJi4+ENAVT4MpqHEAGB8yFoPC0GqiOHQsdHxQV3P3c2OZqG+yJey74QtwA2tLcLn
-  Q53c63+VLGsOjODl1yPn/2ejyq8qWu6ahfTxiIlSar2UbwtaQGBDFdb2CXgEufXT
-  L7oaPxlmj+Q2oLOfOnInd2Oxop59HoJCQPsg8f921J43NCQGA8VHK6paxIRDLQID
-  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvgTdT7fe
-  x17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQELBQADggEBAILiaB/unSVBfX5n7uL8
-  veGGCOHuGYhCGqspb6mYiCx0dmV3RPRiEfGDLfzcXbHNx/3AjygcxH4Slr+pmaxr
-  04Xli3WurocnjoANSWqCwpHH3OhSVxFgBNrCa3OMWcIr0xKH+I7PXA80SXe0pzfg
-  ePjpzTY71j+rcyRJqWiU5/zwdUaCCelBJscxh/0IaNcz67ocCEMRj0n4m5HFEmZL
-  9zKkMZFoOjxRQjcL84QU7ZXnnFR5HG8nLw+NqWjo49W6MBQ9HGFda2tk3OpBhyWS
-  sc3NyOkGUGdfiee5VRG31Sh3LLON3YGED+zZAS+ZF6598y4vhv8MBLa1Oy357byC
-  tTg=
+  MIIEBDCCAmygAwIBAgIBAzANBgkqhkiG9w0BAQsFADAoMSYwJAYDVQQDDB1sYXJz
+  L0RDPWdyZWl6LXJlaW5zZG9yZi9EQz1kZTAeFw0yNDEyMjkxOTU2NTZaFw0yNTEy
+  MjkxOTU2NTZaMCgxJjAkBgNVBAMMHWxhcnMvREM9Z3JlaXotcmVpbnNkb3JmL0RD
+  PWRlMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAwum6Y1KznfpzXOT/
+  mZgJTBbxZuuZF49Fq3K0WA67YBzNlDv95qzSp7V/7Ek3NCcnT7G+2kSuhNo1FhdN
+  eSDO/moYebZNAcu3iqLsuzuULXPLuoU0GsMnVMqV9DZPh7cQHE5EBZ7hlzDBK7k/
+  8nBMvR0mHo77kIkapHc26UzVq/G0nKLfDsIHXVylto3PjzOumjG6GhmFN4r3cP6e
+  SDfl1FSeRYVpt4kmQULz/zdSaOH3AjAq7PM2Z91iGwQvoUXMANH2v89OWjQO/NHe
+  JMNDFsmHK/6Ji4Kk48Z3TyscHQnipAID5GhS1oD21/WePdj7GhmbF5gBzkV5uepd
+  eJQPgWGwrQW/Z2oPjRuJrRofzWfrMWqbOahj9uth6WSxhNexUtbjk6P8emmXOJi5
+  chQPnWX+N3Gj+jjYxqTFdwT7Mj3pv1VHa+aNUbqSPpvJeDyxRIuo9hvzDaBHb/Cg
+  9qRVcm8a96n4t7y2lrX1oookY6bkBaxWOMtWlqIprq8JZXM9AgMBAAGjOTA3MAkG
+  A1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQWBBQ4h1tIyvdUWtMI739xMzTR
+  7EfMFzANBgkqhkiG9w0BAQsFAAOCAYEAoZZWzNV2XXaoSmvyamSSN+Wt/Ia+DNrU
+  2pc3kMEqykH6l1WiVPszr6HavQ//2I2UcSRSS5AGDdiSXcfyFmHtMBdtJHhTPcn7
+  4DLliB0szpvwG+ltGD8PI8eWkLaTQeFzs+0QCTavgKV+Zw56Q0J5zZvHHUMrLkUD
+  qhwKjdTdkrRTn9Sqi0BrIRRZGTUDdrt8qoWm35aES5arKZzytgrRD/kXfFW2LCg0
+  FzgTKibR4/3g8ph94kQLg/D2SMlVPkQ3ECi036mZxDC2n8V6u3rDkG5923wmrRZB
+  J6cqz475Q8HYORQCB68OPzkWMfC7mBo3vpSsIqRoNs1FE4FJu4FGwZG8fBSrDC4H
+  bZe+GtyS3e2SMjgT65zp35gLO9I7MquzYN9P6V2u1iBpTycchk5z9R1ghxzZSBT8
+  DrkJ9tVlPQtJB0LqT0tvBap4upnwT1xYq721b5dwH6AF4Pi6iz/dc5vnq1/MH8bV
+  8VbbBzzeE7MsvgkP3sHlLmY8PtuyViJ8
   -----END CERTIFICATE-----
-date: 2022-06-01 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -40,7 +43,7 @@ dependencies:
         version: '1.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +53,7 @@ dependencies:
         version: '1.4'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +115,6 @@ homepage: https://github.com/larskanis/computable
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -127,8 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
-signing_key: 
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Define computation tasks with automatic caching and dependency tracking.
 test_files: