trailblazer-operation 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9a083756bde5a10353633b2a91b40cb84fe5970a41d626e9ad1602359ed5bc7
-  data.tar.gz: c3a07f086acbb070d540078f5abaf6046b06a63347eb9ac5b602bbfdc0f320a2
+  metadata.gz: 974fc7c8a10331b0e1e3f2b2303a2ae38fbc3accecae4ac691fc07de8b86094e
+  data.tar.gz: 899f31b5d0d5d554263444eb6b63dded2c368befb43a4902e43374a77eb7eb1f
 SHA512:
-  metadata.gz: 3af0ad462ec4085e622431ddbd752739b5e44ac3eb8c61547933e3e1cc76a6a3cdb2eb34130f0bf4f248639d7bd46c64d7b08b3c2cef6724705507c9550c3599
-  data.tar.gz: 19b63e1cb5778279b4d4dbc0cbe3deccaf935e60c724a2ccec35e99ea6018b586293edaa874a8f417b1a54a98d9c245d6a210c650fb95f9e9718ae10307aef96
+  metadata.gz: 77e1b44bbf35fb63a846dc13d1cfacaa92020a8091af074ae7674b1d9d82f2a777fa1f644758a019588290eaca1e3a3cb1d9898939816f5c275c101369505f8e
+  data.tar.gz: acb3c46ce31b0497d0c2f73036f827f3fe7efc33b3c8e5519790df71585fa6d6d6de5ef55e4143e0332a3abe3b249e3beb24cdb56d17b33ee979b5e3d6ff0eea

data/CHANGES.md

@@ -14,6 +14,10 @@ lots of work on the DSL specific parts.
 
 params:, rest: ..
 
+## 0.3.1
+
+* Moved `VariableMapping` to the `activity` gem.
+
 ## 0.3.0
 
 * Use `activity` 0.6.0.

data/Gemfile

@@ -12,4 +12,4 @@ gem "benchmark-ips"
 
 # gem "trailblazer-developer", path: "../developer"
 # gem "trailblazer-developer", git: "https://github.com/trailblazer/trailblazer-developer"
-gem "trailblazer-activity", path: "../trailblazer-activity"
+# gem "trailblazer-activity", path: "../trailblazer-activity"

data/lib/trailblazer/operation.rb

@@ -9,7 +9,6 @@ require "trailblazer/activity"
 require "trailblazer/activity/dsl/magnetic"
 
 
-require "trailblazer/operation/variable_mapping"
 require "trailblazer/operation/callable"
 
 require "trailblazer/operation/heritage"

data/lib/trailblazer/operation/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   class Operation
-    VERSION = "0.3.0"
+    VERSION = "0.3.1"
   end
 end

data/trailblazer-operation.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "trailblazer-activity", ">= 0.6.0", "< 0.7.0"
+  spec.add_dependency "trailblazer-activity", ">= 0.6.1", "< 0.7.0"
   spec.add_dependency "trailblazer-context", ">= 0.1.1", "< 0.3.0"
 
   spec.add_development_dependency "bundler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-operation
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Nick Sutterer
 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: trailblazer-activity
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.7.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.6.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.7.0
@@ -120,7 +120,6 @@ files:
 - lib/trailblazer/operation/railway/task_builder.rb
 - lib/trailblazer/operation/result.rb
 - lib/trailblazer/operation/trace.rb
-- lib/trailblazer/operation/variable_mapping.rb
 - lib/trailblazer/operation/version.rb
 - test/benchmark/skill_resolver_benchmark.rb
 - test/call_test.rb
@@ -149,7 +148,6 @@ files:
 - test/task_wrap_test.rb
 - test/test_helper.rb
 - test/trace_test.rb
-- test/variable_mapping_test.rb
 - test/wire_test.rb
 - test/wiring/defaults_test.rb
 - test/wiring/subprocess_test.rb
@@ -206,7 +204,6 @@ test_files:
 - test/task_wrap_test.rb
 - test/test_helper.rb
 - test/trace_test.rb
-- test/variable_mapping_test.rb
 - test/wire_test.rb
 - test/wiring/defaults_test.rb
 - test/wiring/subprocess_test.rb

data/lib/trailblazer/operation/variable_mapping.rb

@@ -1,91 +0,0 @@
-class Trailblazer::Activity < Module
-  module TaskWrap
-    # TaskWrap step to compute the incoming {Context} for the wrapped task.
-    # This allows renaming, filtering, hiding, of the options passed into the wrapped task.
-    #
-    # 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.
-    class Input
-      def initialize(filter)
-        @filter = Trailblazer::Option(filter)
-      end
-
-      # `original_args` are the actual args passed to the wrapped task: [ [options, ..], circuit_options ]
-      #
-      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.
-        # TODO: make this unnecessary.
-        # wrap user's hash in Context if it's not one, already (in case user used options.merge).
-        # DISCUSS: should we restrict user to .merge and options.Context?
-        input_ctx = Trailblazer.Context(input_ctx) if !input_ctx.instance_of?(Trailblazer::Context) || input_ctx==original_args[0][0]
-
-        wrap_ctx = wrap_ctx.merge( vm_original_args: original_args )
-
-        # decompose the original_args since we want to modify them.
-        (original_ctx, original_flow_options), original_circuit_options = original_args
-
-        # instead of the original Context, pass on the filtered `input_ctx` in the wrap.
-        return Trailblazer::Activity::Right, [ wrap_ctx, [[input_ctx, original_flow_options], original_circuit_options] ]
-      end
-
-      private
-
-      def apply_filter((original_ctx, original_flow_options), original_circuit_options)
-        @filter.( original_ctx, **original_circuit_options )
-      end
-    end
-
-    # TaskWrap step to compute the outgoing {Context} from the wrapped task.
-    # This allows renaming, filtering, hiding, of the options returned from the wrapped task.
-    class Output
-      def initialize(filter, strategy=CopyMutableToOriginal)
-        @filter   = Trailblazer::Option(filter)
-        @strategy = strategy
-      end
-
-      # Runs the user 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.
-
-        # returned_ctx is the Context object from the nested operation. In <=2.1, this might be a completely different one
-        # than "ours" we created in Input. We now need to compile a list of all added values. This is time-intensive and should
-        # be optimized by removing as many Context creations as possible (e.g. the one adding self[] stuff in Operation.__call__).
-        _, mutable_data = returned_ctx.decompose # DISCUSS: this is a weak assumption. What if the task returns a deeply nested Context?
-
-        # let user compute the output.
-        output = apply_filter(mutable_data, original_flow_options, original_circuit_options)
-
-        original_ctx = wrap_ctx[:vm_original_args][0][0]
-
-        new_ctx = @strategy.( original_ctx, output ) # here, we compute the "new" options {Context}.
-
-        wrap_ctx = wrap_ctx.merge( return_args: [new_ctx, original_flow_options] )
-
-        # and then pass on the "new" context.
-        return Trailblazer::Activity::Right, [ wrap_ctx, original_args ]
-      end
-
-      private
-
-      # @note API not stable
-      def apply_filter(mutable_data, original_flow_options, original_circuit_options)
-        @filter.(mutable_data, **original_circuit_options)
-      end
-
-      # "merge" Strategy
-      module CopyMutableToOriginal
-        # @param original Context
-        # @param options  Context The object returned from a (nested) {Activity}.
-        def self.call(original, mutable)
-          mutable.each { |k,v| original[k] = v }
-
-          original
-        end
-      end
-    end
-  end # Wrap
-end

data/test/variable_mapping_test.rb

@@ -1,70 +0,0 @@
-require "test_helper"
-
-# Test input- and output filter for specific tasks.
-# These are task wrap steps added before and after the task.
-class VariableMappingTest < Minitest::Spec
-  # first task
-  Model = ->((options, flow), **o) do
-    options["a"]        = options["a"] * 2 # rename to model.a
-    options["model.nonsense"] = true       # filter me out
-
-    [Activity::Right, [options, flow]]
-  end
-
-  # second task
-  Uuid = ->((options, flow), **o) do
-    options["a"]             = options["a"] + options["model.a"] # rename to uuid.a
-    options["uuid.nonsense"] = false                             # filter me out
-
-    [Activity::Right, [options, flow]]
-  end
-
-  let (:activity) do
-    Module.new do
-      extend Activity::Path()
-
-      task task: Model
-      task task: Uuid
-    end
-  end
-
-  describe "input/output" do
-
-    it do
-      model_input  = ->(options) { { "a"       => options["a"]+1 } }
-      model_output = ->(options) { { "model.a" => options["a"] } }
-      uuid_input   = ->(options) { { "a"       => options["a"]*3, "model.a" => options["model.a"] } }
-      uuid_output  = ->(options) { { "uuid.a"  => options["a"] } }
-
-      runtime = {}
-
-      # add filters around Model.
-      runtime[ Model ] = Module.new do
-        extend Activity::Path::Plan()
-
-        task Activity::TaskWrap::Input.new( model_input ),   id: "task_wrap.input", before: "task_wrap.call_task"
-        task Activity::TaskWrap::Output.new( model_output ), id: "task_wrap.output", before: "End.success", group: :end
-      end
-
-      # add filters around Uuid.
-      runtime[ Uuid ] = Module.new do
-        extend Activity::Path::Plan()
-
-        task Activity::TaskWrap::Input.new( uuid_input ),   id: "task_wrap.input", before: "task_wrap.call_task"
-        task Activity::TaskWrap::Output.new( uuid_output ), id: "task_wrap.output", before: "End.success", group: :end
-      end
-
-      signal, (options, flow_options) = Activity::TaskWrap.invoke(activity,
-        [
-          options = { "a" => 1 },
-          {},
-        ],
-
-        wrap_runtime: runtime, # dynamic additions from the outside (e.g. tracing), also per task.
-      )
-
-      signal.must_equal activity.outputs[:success].signal
-      options.must_equal({"a"=>1, "model.a"=>4, "uuid.a" => 7 })
-    end
-  end
-end