trailblazer-activity-dsl-linear 0.2.9 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 979e2d306818d28e7dfaafbb9f312c1a1ad9e629d48466b37f1f86c11cb96263
-  data.tar.gz: 1de9bba59e9ddfa45e2c330200294c3b5b45c214ecacbc89b4e6a0bebe3c3fb5
+  metadata.gz: f64e4cda0443bb3635a41f04a79ea5f12193ace7aac22d613eb3ce0749d3d303
+  data.tar.gz: ade9350dfbf4475edb0a67190d4e9cd37cbca8f838b27c63c5be21780b9d466d
 SHA512:
-  metadata.gz: 25c6ec869be2f6802188e3ae3ea7f5db7e445fa36a3739f8224830d5543a1837b77d02a84ebd4cdc4cd5f61a99f243c1d01399afe5a82d7070289ee23e69f25b
-  data.tar.gz: 58a92185b6dc1959a0698262123798493a72e0cef542c3c197b14f628793c8a9bb52b5cb11e995a04ec2fdfcced67a65dec0c3eedfada174cddc45727f03818b
+  metadata.gz: f2ad5a07613723c38ec2a29100b33a4b983451eca8d34884da03b6a98a3441709aa8e2f4c05d7717aebcbe3b6d47b3f3a07b389469396bea8cb6befd24ea1c1b
+  data.tar.gz: 1ac0b62f981d089cec84331ccb524b20f2f7aca089ed8e944ce422de126646176f0e66752a878d124cdf828d6261fd2d52e2e9ec63c2ade7eba658fa4bb9f3da

data/CHANGES.md

@@ -1,3 +1,25 @@
+# 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.
+
+# 0.3.2
+
+* Updrading `trailblazer-activity` version to utilise new `trailblazer-context` :drum:
+
+# 0.3.1
+
+* Fixes in circuit interface normalization when given task is a {Symbol}, consider additional {task} options (like {id}) and assign {task} symbol as an {id}.
+
+# 0.3.0
+
+* Fix circuit interface callable to make `step task: :instance_method` use circuit signature.
+
 # 0.2.9
 
 * The `Path()` helper, when used with `:end_task` will now automatically _append_ the end task (or terminus) to `End.success`.

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/normalizer.rb

@@ -54,22 +54,27 @@ module Trailblazer
           # Specific to the "step DSL": if the first argument is a callable, wrap it in a {step_interface_builder}
           # since its interface expects the step interface, but the circuit will call it with circuit interface.
           def normalize_step_interface((ctx, flow_options), *)
-            options = case (step_args = ctx[:options]) # either a <#task> or {} from macro
+            options = case ctx[:options]
                       when Hash
-                        # extract task for interfaces like `step task: :instance_method_name`
-                        step_args[:task].is_a?(Symbol) ? step_args[:task] : step_args
+                        # Circuit Interface
+                        task  = ctx[:options].fetch(:task)
+                        id    = ctx[:options][:id]
+
+                        if task.is_a?(Symbol)
+                          # step task: :find, id: :load
+                          { **ctx[:options], id: (id || task), task: Trailblazer::Option( task ) }
+                        else
+                          # step task: Callable, ... (Subprocess, Proc, macros etc)
+                          ctx[:options] # NOOP
+                        end
                       else
-                        step_args
+                        # Step Interface
+                        # step :find, ...
+                        # step Callable, ... (Method, Proc etc)
+                        { task: ctx[:options], wrap_task: true }
                       end
 
-            unless options.is_a?(::Hash)
-              # task = wrap_with_step_interface(task: options, step_interface_builder: ctx[:user_options][:step_interface_builder]) # TODO: make this optional with appropriate wiring.
-              task = options
-
-              ctx = ctx.merge(options: {task: task, wrap_task: true})
-            end
-
-            return Trailblazer::Activity::Right, [ctx, flow_options]
+            return Trailblazer::Activity::Right, [ctx.merge(options: options), flow_options]
           end
 
           def wrap_task_with_step_interface((ctx, flow_options), **)

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/variable_mapping.rb

@@ -68,10 +68,10 @@ module Trailblazer
               end
 
               def call((original_ctx, flow_options), **circuit_options)
-                Trailblazer::Context.for_circuit(
+                Trailblazer::Context(
                   @filter.(original_ctx, **circuit_options),
                   {},
-                  [original_ctx, flow_options], circuit_options # these options for {Context.for} are currently unused.
+                  flow_options[:context_options]
                 )
               end
             end

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

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

data/lib/trailblazer/activity/fast_track.rb

@@ -63,6 +63,11 @@ module Trailblazer
         def pass_fast_option((ctx, flow_options), *)
           ctx = merge_connections_for(ctx, ctx, :pass_fast, :success)
 
+          ctx = merge_connections_for(ctx, ctx, :pass_fast, :pass_fast, :pass_fast)
+          ctx = merge_outputs_for(ctx,
+            pass_fast: Activity.Output(Activity::FastTrack::PassFast, :pass_fast),
+          )
+
           return Right, [ctx, flow_options]
         end
 
@@ -76,6 +81,11 @@ module Trailblazer
         def fail_fast_option((ctx, flow_options), *)
           ctx = merge_connections_for(ctx, ctx, :fail_fast, :failure)
 
+          ctx = merge_connections_for(ctx, ctx, :fail_fast, :fail_fast, :fail_fast)
+          ctx = merge_outputs_for(ctx,
+            fail_fast: Activity.Output(Activity::FastTrack::FailFast, :fail_fast),
+          )
+
           return Right, [ctx, flow_options]
         end
 

data/trailblazer-activity-dsl-linear.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "trailblazer-activity", ">= 0.9.1", "< 1.0.0"
+  spec.add_dependency "trailblazer-activity", ">= 0.11.3", "< 1.0.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest", "~> 5.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-activity-dsl-linear
 version: !ruby/object:Gem::Version
-  version: 0.2.9
+  version: 0.3.4
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-02 00:00:00.000000000 Z
+date: 2020-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.11.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.11.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Simple DSL to define Trailblazer activities.