trailblazer-activity 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65286a1dcb00e4928ebad6db7bdfd52eaaeb225436a715ea3b1c15d142b15819
-  data.tar.gz: 1bed34667414ac73686040941fbd17e37f2963b46366b98fd6e8b323bbea0563
+  metadata.gz: be148af716c8a5bd21b666b22bf75bf2210854b4c710cfa69a26505b1725710d
+  data.tar.gz: 39f836d460d3dae33f9905103b4f6efdd57049ebdc9290ed21e441cefd0cb9dd
 SHA512:
-  metadata.gz: 52ce7e8fc9500aa1646852f653e68cbe86f06ec8327bcb1b833ba00b838694999495a0b98822bacd3ee88616fd5fb3d46af41a4144429bd1fb8c08df282407d7
-  data.tar.gz: 74cc1e25042edca7c358ec783a0bb79af2d56f975076c6bfb68cde2df5ed09af058ca84d963602ffaa9e1683a65234e82059db8eface16445848975be0712ecf
+  metadata.gz: 1dc6d49f7436922ea378c4af9604242dec98ff08aa29d5c2f156b7569cbf2e2704380f6050a659dec7d9f28471d3194b3c2c4bd61ef4dfecf3657d1e6a98dfbc
+  data.tar.gz: 8b214a0952c72650665bd2413254d526bbab9fce4920b3b2fa25aced774994ca49a96bed66ef1ef4d6adc09c63d78ef604abef94205d1ee5edb09bcd544d66fe

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.7.0
+
+* Remove `DSL::Helper`, "helper" methods now sit directly in the `DSL` namespace.
+
 # 0.6.2
 
 * Allow all `Option` types for input/output.

data/lib/trailblazer/activity.rb

@@ -38,7 +38,7 @@ module Trailblazer
     module DSLHelper
       extend Forwardable
       def_delegators :@builder, :Path
-      def_delegators DSL::Helper, :Output, :End, :Subprocess, :Track
+      def_delegators DSL, :Output, :End, :Subprocess, :Track
 
       def Path(*args, &block)
         self[:builder].Path(*args, &block)

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

@@ -22,49 +22,47 @@ module Trailblazer
     end
 
     # Shortcut functions for the DSL. These have no state.
-    module Helper
-      module_function
+    module_function
 
-      #   Output( Left, :failure )
-      #   Output( :failure ) #=> Output::Semantic
-      def Output(signal, semantic=nil)
-        return OutputSemantic.new(signal) if semantic.nil?
+    #   Output( Left, :failure )
+    #   Output( :failure ) #=> Output::Semantic
+    def Output(signal, semantic=nil)
+      return OutputSemantic.new(signal) if semantic.nil?
 
-        Activity.Output(signal, semantic)
-      end
+      Activity.Output(signal, semantic)
+    end
 
-      def End(semantic)
-        Activity.End(semantic)
-      end
+    def End(semantic)
+      Activity.End(semantic)
+    end
 
-      def Track(color)
-        Track.new(color).freeze
-      end
+    def Track(color)
+      Track.new(color).freeze
+    end
 
-      def Path(normalizer, track_color: "track_#{rand}", end_semantic: track_color, **options)
-        options = options.merge(track_color: track_color, end_semantic: end_semantic)
+    def Path(normalizer, track_color: "track_#{rand}", end_semantic: track_color, **options)
+      options = options.merge(track_color: track_color, end_semantic: end_semantic)
 
-        # Build an anonymous class which will be where the block is evaluated in.
-        # We use the same normalizer here, so DSL calls in the inner block have the same behavior.
-        path = Module.new do
-          extend Activity::Path( options.merge( normalizer: normalizer ) )
-        end
+      # Build an anonymous class which will be where the block is evaluated in.
+      # We use the same normalizer here, so DSL calls in the inner block have the same behavior.
+      path = Module.new do
+        extend Activity::Path( options.merge( normalizer: normalizer ) )
+      end
 
-        # this block is called in DSL::ProcessTuples. This could be improved somehow.
-        ->(block) {
-          path.instance_exec(&block)
+      # this block is called in DSL::ProcessTuples. This could be improved somehow.
+      ->(block) {
+        path.instance_exec(&block)
 
-          [ track_color, path ]
-        }
-      end
+        [ track_color, path ]
+      }
+    end
 
-      # Computes the :outputs options for {activity}
-      def Subprocess(activity)
-        {
-          task:    activity,
-          outputs: activity.outputs
-        }
-      end
+    # Computes the :outputs options for {activity}
+    def Subprocess(activity)
+      {
+        task:    activity,
+        outputs: activity.outputs
+      }
     end
   end
 end

data/lib/trailblazer/activity/dsl/magnetic/builder.rb

@@ -35,7 +35,7 @@ module Trailblazer
       #
       # Output(:success) => Path() {}
       def Path(*args)
-        Activity::DSL::Helper.Path(@normalizer, *args)
+        Activity::DSL.Path(@normalizer, *args)
       end
 
       # Public top-level entry point.

data/lib/trailblazer/activity/task_wrap/variable_mapping.rb

@@ -19,6 +19,20 @@ class Trailblazer::Activity < Module
         ctx[:options] = options # without :input and :output
         ctx[:options] = options.merge(Trailblazer::Activity::TaskWrap::VariableMapping(io_config) => true)
       end
+
+      # The taskWrap extension that's included into the static taskWrap for a task.
+      def self.extension_for(input, output)
+        Trailblazer::Activity::DSL::Extension.new(
+          Merge.new(
+            Module.new do
+              extend Path::Plan()
+
+              task input,  id: "task_wrap.input", before: "task_wrap.call_task"
+              task output, id: "task_wrap.output", before: "End.success", group: :end
+            end
+          )
+        )
+      end
     end
 
     # @private
@@ -30,6 +44,7 @@ class Trailblazer::Activity < Module
       end
     end
 
+
     # Returns an Extension instance to be thrown into the `step` DSL arguments.
     def self.VariableMapping(input:, output:)
       input  = Input.new(
@@ -40,16 +55,7 @@ class Trailblazer::Activity < Module
                 Output::Unscoped.new(
                   Trailblazer::Option::KW( filter_for(output) ) ) )
 
-      Trailblazer::Activity::DSL::Extension.new(
-        Merge.new(
-          Module.new do
-            extend Path::Plan()
-
-            task input,  id: "task_wrap.input", before: "task_wrap.call_task"
-            task output, id: "task_wrap.output", before: "End.success", group: :end
-          end
-        )
-      )
+      VariableMapping.extension_for(input, output)
     end
 
     # TaskWrap step to compute the incoming {Context} for the wrapped task.
@@ -58,6 +64,8 @@ class Trailblazer::Activity < Module
     # Both Input and Output are typically to be added before and after task_wrap.call_task.
     #
     # @note Assumption: we always have :input _and_ :output, where :input produces a Context and :output decomposes it.
+
+    # Calls your {@filter} and replaces the original ctx with your returned one.
     class Input
       def initialize(filter)
         @filter = filter
@@ -67,7 +75,7 @@ class Trailblazer::Activity < Module
       #
       def call( (wrap_ctx, original_args), circuit_options )
         # let user compute new ctx for the wrapped task.
-        input_ctx = apply_filter(*original_args) # FIXME: THIS SHOULD ALWAYS BE A _NEW_ Context.
+        input_ctx = apply_filter(*original_args)
 
         wrap_ctx = wrap_ctx.merge( vm_original_ctx: original_args[0][0] ) # remember the original ctx
 
@@ -119,13 +127,12 @@ class Trailblazer::Activity < Module
         @filter = filter
       end
 
-      # Runs the user filter and replaces the ctx in `wrap_ctx[:return_args]` with the filtered one.
+      # Runs your filter and replaces the ctx in `wrap_ctx[:return_args]` with the filtered one.
       def call( (wrap_ctx, original_args), **circuit_options )
         (original_ctx, original_flow_options), original_circuit_options = original_args
 
         returned_ctx, _ = wrap_ctx[:return_args] # this is the Context returned from `call`ing the task.
         original_ctx    = wrap_ctx[:vm_original_ctx]
-
         # let user compute the output.
         output_ctx = @filter.(original_ctx, returned_ctx, **original_circuit_options)
 

data/lib/trailblazer/activity/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   class Activity < Module
-    VERSION = "0.6.2"
+    VERSION = "0.7.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-activity
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-05-14 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hirb