atp 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 30f27f563d7be5bb5ac2fdadeb075aff8254e631
-  data.tar.gz: 116ddc493b873bb4680a559e488de2e65cb62698
+  metadata.gz: 69803282c2ed5e47a0166e8dd0a7a505d6752ed0
+  data.tar.gz: a8230d4c6ee3f1944ef89067ea0fa24d245c2343
 SHA512:
-  metadata.gz: 1183ef2bc0e85b638c5d50c75b2dd9f433017ea71cdef4c92d7eadaf084d361448b3e36ba91fb674a1a145a1ca80e85bfaeec4d5be291b7cada572699813db15
-  data.tar.gz: b4b41aca1916c7053bc91b5851caf18d4a47aeba3e25e0c794d6f79b9c45d5cf52db9ac75e2ba223bb73d844074cbdd13c24a7f8f6effbb355745daf81a5af6a
+  metadata.gz: 8d28660d722cf5f95d5d5ed748ceca675d8ce1e1a6582c0c6b257a3fac90e7256f510bee29aec489429acf634d68f13993cb0a32ca12e0f26e8d36ea7ccf251c
+  data.tar.gz: 65a339b165d89a1a73618999176f2735e1555c659a9bbf03c84b9a2e4bad1b0ca8f5a923d787cca7cd9cc93a6a2fa270eb2e445f5e553d4c6ecd0e855cfa895e

data/config/version.rb

@@ -1,7 +1,7 @@
 module ATP
   MAJOR = 1
   MINOR = 1
-  BUGFIX = 1
+  BUGFIX = 2
   DEV = nil
 
   VERSION = [MAJOR, MINOR, BUGFIX].join(".") + (DEV ? ".pre#{DEV}" : '')

data/lib/atp/flow.rb

@@ -239,6 +239,12 @@ module ATP
     def test(instance, options = {})
       extract_meta!(options) do
         apply_conditions(options) do
+          if options[:on_fail].is_a?(Proc)
+            before_on_fail = options.delete(:on_fail)
+          end
+          if options[:on_pass].is_a?(Proc)
+            before_on_pass = options.delete(:on_pass)
+          end
           # Allows any continue, bin, or soft bin argument passed in at the options top-level to be assumed
           # to be the action to take if the test fails
           if b = options.delete(:bin)
@@ -356,8 +362,25 @@ module ATP
             end
           end
 
-          children << on_fail(options[:on_fail]) if options[:on_fail]
-          children << on_pass(options[:on_pass]) if options[:on_pass]
+          if before_on_fail
+            on_fail_node = on_fail(before_on_fail)
+            if options[:on_fail]
+              on_fail_node = on_fail_node.updated(nil, on_fail_node.children + on_fail(options[:on_fail]).children)
+            end
+            children << on_fail_node
+          else
+            children << on_fail(options[:on_fail]) if options[:on_fail]
+          end
+
+          if before_on_pass
+            on_pass_node = on_pass(before_on_pass)
+            if options[:on_pass]
+              on_pass_node = on_pass_node.updated(nil, on_pass_node.children + on_pass(options[:on_pass]).children)
+            end
+            children << on_pass_node
+          else
+            children << on_pass(options[:on_pass]) if options[:on_pass]
+          end
 
           save_conditions
           n(:test, children)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: atp
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Stephen McGinty
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-23 00:00:00.000000000 Z
+date: 2018-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: origen
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: An abstract test program model for Origen