trailblazer-activity-dsl-linear 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7741680df8be738f51b14cbebc68d19b82fea3b0464f3ab40a665c66271625d
-  data.tar.gz: edd0e20d30c0b3ff3d89b7f87debcdeed0f6d1750e74615b77ed84e237ad5cee
+  metadata.gz: f64e4cda0443bb3635a41f04a79ea5f12193ace7aac22d613eb3ce0749d3d303
+  data.tar.gz: ade9350dfbf4475edb0a67190d4e9cd37cbca8f838b27c63c5be21780b9d466d
 SHA512:
-  metadata.gz: 89a399c069191179de81b7ddecfb42981369e5a9fb648e058c4303fe73e2de1eed581a121a2f1aa99a34985f6616a79602ce6b5bbf0e769df82b26f08e18196f
-  data.tar.gz: 14de736b4f569bcb2c258039b45ca100e99bc9e280d5cf7fca809ff180420d8ab6ff05041d9b12f3b3844ebb74934655f989124e08deecdb2179dd673b19a88a
+  metadata.gz: f2ad5a07613723c38ec2a29100b33a4b983451eca8d34884da03b6a98a3441709aa8e2f4c05d7717aebcbe3b6d47b3f3a07b389469396bea8cb6befd24ea1c1b
+  data.tar.gz: 1ac0b62f981d089cec84331ccb524b20f2f7aca089ed8e944ce422de126646176f0e66752a878d124cdf828d6261fd2d52e2e9ec63c2ade7eba658fa4bb9f3da

data/CHANGES.md

@@ -1,3 +1,9 @@
+# 0.3.4
+
+* Allow DSL helpers such as `End()` in `Path()`.
+* Introduce `Path(..., before: )` option to insert all path member steps before a certain element.
+* Allow `Path(..., connect_to: Track(..))`.
+
 # 0.3.3
 
 * Fix for registering `PassFast` & `FailFast` ends in `FastTrack` to fix circuit interface callables which emits those signals.

data/lib/trailblazer/activity/dsl/linear/helper.rb

@@ -43,33 +43,16 @@ module Trailblazer
               Id.new(id).freeze
             end
 
-            def Path(track_color: "track_#{rand}", end_id:"path_end_#{rand}", connect_to:nil, **options, &block)
-              # DISCUSS: here, we use the global normalizer and don't allow injection.
-              state = Activity::Path::DSL::State.new(Activity::Path::DSL.OptionsForState(track_name: track_color, end_id: end_id, **options)) # TODO: test injecting {:normalizers}.
+            def Path(track_color: "track_#{rand}", connect_to: nil, before: false, **options, &block)
+              path      = Activity::Path(track_name: track_color, **options)
+              activity  = Class.new(path) { self.instance_exec(&block) }
 
-              # seq = block.call(state) # state changes.
-              state.instance_exec(&block)
-
-              seq = state.to_h[:sequence]
-
-              _end_id =
-                if connect_to
-                  end_id
-                else
-                  nil
-                end
-
-              seq = strip_start_and_ends(seq, end_id: _end_id) # don't cut off end unless {:connect_to} is set.
+              seq = activity.instance_variable_get(:@state).to_h[:sequence] # TODO: fix @state interface
+              # Strip default ends `Start.default` and `End.success` (if present).
+              seq = seq[1..-1].reject{ |row| row[3][:stop_event] && row[3][:id] == 'End.success' }
 
               if connect_to
-                output, _ = seq[-1][2][0].(seq, seq[-1]) # FIXME: the Forward() proc contains the row's Output, and the only current way to retrieve it is calling the search strategy. It should be Forward#to_h
-
-                searches = [Search.ById(output, connect_to.value)]
-
-                row = seq[-1]
-                row = row[0..1] + [searches] + [row[3]] # FIXME: not mutating an array is so hard: we only want to replace the "searches" element, index 2
-
-                seq = seq[0..-2] + [row]
+                seq = connect_for_sequence(seq, connect_to: connect_to)
               end
 
               # Add the path elements before {End.success}.
@@ -80,9 +63,12 @@ module Trailblazer
                 # the terminus of the path goes _after_ {End.success} into the "end group".
                 insert_method = options[:stop_event] ? Insert.method(:Append) : Insert.method(:Prepend)
 
+                insert_target = "End.success" # insert before/after
+                insert_target = before if before && connect_to.instance_of?(Trailblazer::Activity::DSL::Linear::Helper::Track) # FIXME: this is a bit hacky, of course!
+
                 {
                   row:    row,
-                  insert: [insert_method, "End.success"]
+                  insert: [insert_method, insert_target]
                 }
               end
 
@@ -90,6 +76,23 @@ module Trailblazer
               return Track.new(track_color, adds, {})
             end
 
+            # Connect last row of the {sequence} to the given step via its {Id}
+            # Useful when steps needs to be inserted in between {Start} and {connect Id()}.
+            private def connect_for_sequence(sequence, connect_to:)
+              output, _ = sequence[-1][2][0].(sequence, sequence[-1]) # FIXME: the Forward() proc contains the row's Output, and the only current way to retrieve it is calling the search strategy. It should be Forward#to_h
+
+              # searches = [Search.ById(output, connect_to.value)]
+              searches = [Search.ById(output, connect_to.value)] if connect_to.instance_of?(Trailblazer::Activity::DSL::Linear::Helper::Id)
+              searches = [Search.Forward(output, connect_to.color)] if connect_to.instance_of?(Trailblazer::Activity::DSL::Linear::Helper::Track) # FIXME: use existing mapping logic!
+
+              row = sequence[-1]
+              row = row[0..1] + [searches] + [row[3]] # FIXME: not mutating an array is so hard: we only want to replace the "searches" element, index 2
+
+              sequence = sequence[0..-2] + [row]
+
+              sequence
+            end
+
             # Computes the {:outputs} options for {activity}.
             def Subprocess(activity, patch: {})
               activity = Patch.customize(activity, options: patch)

data/lib/trailblazer/activity/dsl/linear/strategy.rb

@@ -74,7 +74,7 @@ module Trailblazer
             return args[0], options.merge(evaluated_options)
           end
 
-          def Path(options, &block) # syntactically, we can't access the {do ... end} block here.
+          def Path(**options, &block) # syntactically, we can't access the {do ... end} block here.
             BlockProxy.new(options, block)
           end
 

data/lib/trailblazer/activity/dsl/linear/version.rb

@@ -3,7 +3,7 @@ module Trailblazer
     module Activity
       module DSL
         module Linear
-          VERSION = "0.3.3"
+          VERSION = "0.3.4"
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-activity-dsl-linear
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Nick Sutterer
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity
@@ -120,7 +120,7 @@ homepage: http://trailblazer.to
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -135,8 +135,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.7.3
+signing_key: 
 specification_version: 4
 summary: Simple DSL to define Trailblazer activities.
 test_files: []