active_interaction 3.8.1 → 3.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0548218152b9de3c7b9d3138ba8e6d18404da27e0ffb7e2ed95195f066dd681b'
-  data.tar.gz: 917d2fe9a9c99b468aa2ad80e861e27e20f0f6caf8fdbe2698ce29f7e7ec2864
+  metadata.gz: ab5fbe89ea464ba3cbd680d4b444aff591500d843602bd0f94059de42c680739
+  data.tar.gz: cb6f3f963b5614a6eab29e611369917d9a4252948aa42e6ab9107d730745fda7
 SHA512:
-  metadata.gz: bdd646f710eb2f8d49ba74224e17b9b4d0b4595708ee9dba6bad53dd59652ec69fb4e2f3ebcb538f949197103d5a011d1319e4a57cc9d7c96ebe21578b9b8b42
-  data.tar.gz: b0853777a9cd4be10de3f6de7980ba52fa8448a57203f9c531df84c5c55bfbd675860b52dc320b996e0110c5d1353e21f868a900d742828cc8b5d0b0abb72cac
+  metadata.gz: 34b4222d51134f6a704d21a79d1c44e71d6edb4471156188564973a89fdfef68d156575dc0ec777d6b18ef6420e775ca61e9034fd44427c7cc4a66afb6bbad1a
+  data.tar.gz: 912a034a88b9c0fa10a78b83a5c8b0ceae6b3040a7c81e7550c11af16bbe60e639251e67df58c41b19b297eefcafe9a6101ae92dacaee382fec2ff1ac0fa7827

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# [3.8.2][] (2020-04-22)
+
+## Fixed
+
+- [479][] Composed interactions that throw errors now show a complete backtrace instead of ending at the `run!` of the outermost interaction.
+
 # [3.8.1][] (2020-04-04)
 
 ## Fixed
@@ -765,6 +771,7 @@ Example.run
 
 - Initial release.
 
+  [3.8.2]: https://github.com/AaronLasseigne/active_interaction/compare/v3.8.1...v3.8.2
   [3.8.1]: https://github.com/AaronLasseigne/active_interaction/compare/v3.8.0...v3.8.1
   [3.8.0]: https://github.com/AaronLasseigne/active_interaction/compare/v3.7.1...v3.8.0
   [3.7.1]: https://github.com/AaronLasseigne/active_interaction/compare/v3.7.0...v3.7.1
@@ -963,3 +970,4 @@ Example.run
   [#457]: https://github.com/AaronLasseigne/active_interaction/issues/457
   [#477]: https://github.com/AaronLasseigne/active_interaction/issues/477
   [#476]: https://github.com/AaronLasseigne/active_interaction/issues/476
+  [#479]: https://github.com/AaronLasseigne/active_interaction/issues/479

data/CONTRIBUTING.md

@@ -10,4 +10,4 @@
 
 Running the tests using `rake` (with no args) will also check for style issues in the code. Ideally all submissions would pass these checks. If the code style is causing issues (particularly the method or class size) we can work with you to correct it. Don't let it stop you from contributing.
 
-[fork]: https://github.com/orgsync/active_interaction/fork
+[fork]: https://github.com/AaronLasseigne/active_interaction/fork

data/lib/active_interaction/concerns/runnable.rb

@@ -71,24 +71,18 @@ module ActiveInteraction
 
     # @return (see #result=)
     # @return [nil]
-    def run # rubocop:disable MethodLength
-      self.result =
-        if valid?
-          run_callbacks(:execute) do
-            result_or_errors =
-              begin
-                execute
-              rescue Interrupt => interrupt
-                interrupt.errors
-              end
-
-            if result_or_errors.is_a?(ActiveInteraction::Errors)
-              errors.merge!(result_or_errors)
-            else
-              result_or_errors
-            end
+    def run
+      return self.result = nil unless valid?
+
+      run_callbacks(:execute) do
+        self.result =
+          begin
+            execute
+          rescue Interrupt => interrupt
+            errors.backtrace = interrupt.errors.backtrace || interrupt.backtrace
+            errors.merge!(interrupt.errors)
           end
-        end
+      end
     end
 
     # @return [Object]
@@ -101,6 +95,7 @@ module ActiveInteraction
 
       e = InvalidInteractionError.new(errors.full_messages.join(', '))
       e.interaction = self
+      e.set_backtrace(errors.backtrace) if errors.backtrace
       raise e
     end
 

data/lib/active_interaction/errors.rb

@@ -92,6 +92,8 @@ module ActiveInteraction
 
   # An extension that provides the ability to merge other errors into itself.
   class Errors < ActiveModel::Errors
+    attr_accessor :backtrace
+
     # Merge other errors into this one.
     #
     # @param other [Errors]

data/lib/active_interaction/version.rb

@@ -6,5 +6,5 @@ module ActiveInteraction
   # The version number.
   #
   # @return [Gem::Version]
-  VERSION = Gem::Version.new('3.8.1')
+  VERSION = Gem::Version.new('3.8.2')
 end

data/spec/active_interaction/base_spec.rb

@@ -24,6 +24,12 @@ InterruptInteraction = Class.new(TestInteraction) do
     class: Object,
     default: nil
 
+  # NOTE: the relative position between this method
+  #   and the compose line should be preserved.
+  def self.composition_location
+    "#{__FILE__}:#{__LINE__ + 4}:in `execute'"
+  end
+
   def execute
     compose(AddInteraction, x: x, y: z)
   end
@@ -371,6 +377,15 @@ describe ActiveInteraction::Base do
         expect(outcome.errors.details)
           .to eql(x: [{ error: :missing }], base: [{ error: 'Y is required' }])
       end
+
+      it 'has the correct backtrace' do
+        begin
+          described_class.run!(inputs)
+        rescue ActiveInteraction::InvalidInteractionError => e
+          expect(e.backtrace)
+            .to include(InterruptInteraction.composition_location)
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction
 version: !ruby/object:Gem::Version
-  version: 3.8.1
+  version: 3.8.2
 platform: ruby
 authors:
 - Aaron Lasseigne
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel