trailblazer-macro 2.1.0.beta6 → 2.1.0.beta7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00614cb0bcb127cf89ff6c1e199fa6fc8f080ac7492a41155adfb9c90a4b55bd
-  data.tar.gz: 84d68e15a27452b1833679ff80f898f3158f908222ed2aa6a8fa288dc22b474d
+  metadata.gz: 8b28fce36bb1ae4a995432b091624dfc319e60a216c0ee277cba94b7f17fcdf1
+  data.tar.gz: f50322231cf78170aa11c57698ac3e7bd629c40f7961960d21f5ba0aca9144de
 SHA512:
-  metadata.gz: c348fb564c7d873c716886c4764a7297d654acb1f31bfadc3568e5b2110ad01a3d6f12ade831db98c4ceae9e44a7fcd02a29ed8ab0aea533a6a546ab344d16f8
-  data.tar.gz: cc6be5f0b0b0ec3f5499dcfaaa846e4ef0d9afb8aa818e7ccaf02798a997f0b796d396acd2de05be4a1f7de16e4da975f603cf1a9e859e4c6d8523575c8c38dc
+  metadata.gz: e0a7db056ec5573d1ad883387dd1d32a3c035d509aec54e023317d1e5061c73f88a098d13758d7fdbc4cc8101873ef4ad583ebef7116f9abd94fe7f5c1146f0a
+  data.tar.gz: d6ca9fc728a873a2f01ca832b4dbc4d21a48da02af2fe6a5d4790d11f267ad15f92b40f3b755ce71702d98e0055ae960dbafa0c9bd647493e05c90175430fa67

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 2.1.0.beta7
+
+* Nested :input, :output now uses activity's VariableMapping.
+
 # 2.1.0.beta6
 
 * Use newest operation.

data/Gemfile

@@ -4,8 +4,8 @@ source 'https://rubygems.org'
 gemspec
 
 # gem "trailblazer", github: "trailblazer/trailblazer"
-# gem "trailblazer-activity", path: "../trailblazer-activity"
-# gem "trailblazer-operation", path: "../operation"
+gem "trailblazer-activity", path: "../trailblazer-activity"
+gem "trailblazer-operation", path: "../operation"
 # gem "trailblazer-activity"#, github: "trailblazer/trailblazer-activity"
 # gem "trailblazer-macro-contract", git: "https://github.com/trailblazer/trailblazer-macro-contract"
 

data/lib/trailblazer/macro.rb

@@ -1,7 +1,6 @@
 require "trailblazer/operation"
 
 require "trailblazer/operation/inject"
-require "trailblazer/operation/input_output"
 
 require "trailblazer/operation/model"
 require "trailblazer/operation/policy"

data/lib/trailblazer/macro/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   module Macro
-    VERSION = "2.1.0.beta6".freeze
+    VERSION = "2.1.0.beta7".freeze
   end
 end

data/lib/trailblazer/operation/nested.rb

@@ -2,33 +2,41 @@
 module Trailblazer
   class Operation
     # {Nested} macro.
-    def self.Nested(callable, input:nil, output:nil, id: "Nested(#{callable})")
+    def self.Nested(callable, id: "Nested(#{callable})", input: nil, output: nil)
       task_wrap_extensions        = Module.new do
         extend Activity::Path::Plan()
       end
 
-      task, operation, is_dynamic = Nested.build(callable)
+      input_output = Nested.input_output_extensions_for(input, output) # TODO: deprecate this?
 
-      # TODO: move this to the generic step DSL
-      if input || output
-        task_wrap_extensions = InputOutput.plan( input, output )
-      end
+      task, operation, is_dynamic = Nested.build(callable)
 
       if is_dynamic
         task_wrap_extensions.task task.method(:compute_nested_activity), id: ".compute_nested_activity",  after: "Start.default", group: :start
         task_wrap_extensions.task task.method(:compute_return_signal),   id: ".compute_return_signal",    after: "task_wrap.call_task"
       end
 
-      {
+      options = {
         task:      task,
         id:        id,
         Trailblazer::Activity::DSL::Extension.new(Trailblazer::Activity::TaskWrap::Merge.new(task_wrap_extensions)) => true,
-        outputs:   operation.outputs
-      }
+        outputs:   operation.outputs,
+      }.merge(input_output)
     end
 
     # @private
     module Nested
+      def self.input_output_extensions_for(input, output)
+        return {} unless input || output
+
+        input  = input  || ->(original_ctx, **) { original_ctx }
+        output = output || ->(new_ctx, **)      { new_ctx.decompose.last } # merges "mutable" part into original, since it's in Unscoped.
+
+        {
+          Activity::TaskWrap::VariableMapping(input: input, output: output) => true
+        }
+      end
+
       # DISCUSS: use builders here?
       def self.build(nested_operation)
         return dynamic = Dynamic.new(nested_operation), dynamic, true unless nestable_object?(nested_operation)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-macro
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta6
+  version: 2.1.0.beta7
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -123,7 +123,6 @@ files:
 - lib/trailblazer/macro.rb
 - lib/trailblazer/macro/version.rb
 - lib/trailblazer/operation/guard.rb
-- lib/trailblazer/operation/input_output.rb
 - lib/trailblazer/operation/model.rb
 - lib/trailblazer/operation/nested.rb
 - lib/trailblazer/operation/policy.rb

data/lib/trailblazer/operation/input_output.rb

@@ -1,28 +0,0 @@
-module Trailblazer
-  # Add an input and output filter for a task, allowing to control what a task "sees"
-  # (receives as input) and returns (or, what the outer caller "sees").
-  #
-  # This works by adding two variable mappers to the taskWrap.
-  # One before the actual task gets called (input) and one before the end (output).
-  module Operation::InputOutput
-  # naming: Macaroni, VariableMapping
-    def self.plan(input, output)
-      default_input_filter  = ->(options, *) { ctx = options }
-      default_output_filter = ->(options, *) { options }
-
-      input  ||= default_input_filter
-      output ||= default_output_filter
-
-      input_filter  = Activity::TaskWrap::Input.new(input)
-      output_filter = Activity::TaskWrap::Output.new(output)
-
-      # taskWrap extensions
-      Module.new do
-        extend Activity::Path::Plan()
-
-        task input_filter,  id: ".input",  before: "task_wrap.call_task"
-        task output_filter, id: ".output", before: "End.success", group: :end # DISCUSS: position
-      end
-    end
-  end
-end