trailblazer-macro 2.1.4 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4da758ccf1b9e9ff6fa413c687fe09c6df11449b84a775c65280a73d1b80f72
-  data.tar.gz: 23bd67cc32f045487ca761e15227fe562e87b7cde3616e7335a8ee3126c51217
+  metadata.gz: 639ab06bc834f5258e404d9c87e1e53db434884225e6f6c222afcb9df9597154
+  data.tar.gz: b5f08c21b83529cd8a12fed2e6ef3e638a9db546b2d57d651f3a9f9adec8ff3c
 SHA512:
-  metadata.gz: 4671b91a21144afc728dba8397282a49f6517d183349179a357da87e57a223cb4f5cb81f3d29f0bda0e3013db7581367e02a6de28a19bfbc7b83dd286a3f0d9a
-  data.tar.gz: 339a312f0c7f7bee0afe5f74b06d3694ff826daff2e5bbfe4190a3238252cd92feb36ab14cf2429814eaf5b18e50abdac18bee594b7229c37fc64df8856e18b8
+  metadata.gz: ebf4969c76b10be6b3e842376ebbb6bb5fd73bd7a3c8fe1f6c61ab1efb9e8d945b3bb13404fcf6cdbead3590deb5cf9aeaf0150a32209d14107e2019981732ed
+  data.tar.gz: 5d485adedac0da50b68f3528ddaf80329f9d33a06cd6768e7a7c1d430c4f7ff05bf5daafbf14eb174fd821bbb5d1108150bbb278fbc7eacb960c26fd8f058cca

data/.github/workflows/ci.yml

@@ -0,0 +1,17 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: [2.5, 2.6, 2.7, '3.0', head, jruby, jruby-head]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: bundle exec rake

data/CHANGES.md

@@ -1,3 +1,25 @@
+# 2.1.9
+
+* Allow omitting `:params` when calling the operation by defaulting it to `{}` in `Model()`.
+* Use `dsl-linear` 0.5.0 and above, which allows removing `Inject()` uses.
+
+# 2.1.8
+
+Yanked due to inconsistency.
+
+# 2.1.7
+
+* Improve `Nested()` warning message.
+* Fix exception in `Rescue()` macro when it's handler is a `Module`.
+
+# 2.1.6
+
+* Allow connecting ends of the dynamically selected activity for `Nested()` using `:auto_wire`.
+
+# 2.1.5
+
+* Support for Ruby 3.0.
+
 # 2.1.4
 
 * Upgrade DSL version to fix step's circuit interface eating passed arguments

data/Gemfile

@@ -5,11 +5,11 @@ gemspec
 
 # gem "trailblazer", github: "trailblazer/trailblazer"
 # gem "trailblazer-activity", path: "../trailblazer-activity"
-# gem "trailblazer-activity-dsl-linear", github: "trailblazer/trailblazer-activity-dsl-linear", branch: 'master'
 # gem "trailblazer-activity-dsl-linear", path: "../trailblazer-activity-dsl-linear"
-# gem "trailblazer-operation", github: "trailblazer/trailblazer-operation", branch: 'linear'
-# gem "trailblazer-activity"#, github: "trailblazer/trailblazer-activity"
 # gem "trailblazer-macro-contract", git: "https://github.com/trailblazer/trailblazer-macro-contract"
+# gem "trailblazer-context", path: "../trailblazer-context"
+# gem "trailblazer-operation", path: "../trailblazer-operation"
+
 
 gem "minitest-line"
 gem "rubocop", require: false

data/README.md

@@ -2,7 +2,7 @@
 All common Macro's for Trailblazer::Operation, will come here
 
 ## TODO
-Describe the following Macro's:
+Describe the following Macros:
 - Nested
 - Rescue
 - Wrap

data/lib/trailblazer/macro/guard.rb

@@ -6,11 +6,10 @@ module Trailblazer::Macro
 
     module Guard
       def self.build(callable)
-        option = Trailblazer::Option::KW(callable)
+        option = Trailblazer::Option(callable)
 
-        # this gets wrapped in a Operation::Result object.
-        ->((options, *), circuit_args) do
-          Trailblazer::Operation::Result.new(!!option.call(options, circuit_args), {})
+        ->((ctx, *), **circuit_args) do
+          Trailblazer::Operation::Result.new(!!option.call(ctx, keyword_arguments: ctx.to_hash, **circuit_args), {})
         end
       end
     end

data/lib/trailblazer/macro/model.rb

@@ -2,38 +2,39 @@ module Trailblazer::Macro
 
   Linear = Trailblazer::Activity::DSL::Linear
 
-  def self.Model(model_class, action = nil, find_by_key = nil, id: 'model.build', not_found_terminus: false)
+  def self.Model(model_class = nil, action = :new, find_by_key = :id, id: 'model.build', not_found_terminus: false)
     task = Trailblazer::Activity::TaskBuilder::Binary(Model.new)
 
-    injection = Trailblazer::Activity::TaskWrap::Inject::Defaults::Extension(
-      :"model.class"          => model_class,
-      :"model.action"         => action,
-      :"model.find_by_key"    => find_by_key
-    )
+    injections = { # defaulting as per `:inject` API.
+      :"model.class"          => ->(*) { model_class },
+      :"model.action"         => ->(*) { action },
+      :"model.find_by_key"    => ->(*) { find_by_key },
+    }
+
+    options = {task: task, id: id, inject: [:params, injections]} # pass-through {:params} if it's in ctx.
 
-    options = { task: task, id: id, extensions: [injection] }
     options = options.merge(Linear::Output(:failure) => Linear::End(:not_found)) if not_found_terminus
 
     options
   end
 
   class Model
-    def call(options, params: nil,  **)
+    def call(ctx, params: {}, **)
       builder                 = Model::Builder.new
-      options[:model]         = model = builder.call(options, params)
-      options[:"result.model"] = result = Trailblazer::Operation::Result.new(!model.nil?, {})
+      ctx[:model]         = model = builder.call(ctx, params)
+      ctx[:"result.model"] = result = Trailblazer::Operation::Result.new(!model.nil?, {})
 
       result.success?
     end
 
     class Builder
-      def call(options, params)
-        action        = options[:"model.action"] || :new
-        model_class   = options[:"model.class"]
-        find_by_key   = options[:"model.find_by_key"] || :id
+      def call(ctx, params)
+        action        = ctx[:"model.action"]
+        model_class   = ctx[:"model.class"]
+        find_by_key   = ctx[:"model.find_by_key"]
         action        = :pass_through unless %i[new find_by].include?(action)
 
-        send("#{action}!", model_class, params, options[:"model.action"], find_by_key)
+        send("#{action}!", model_class, params, ctx[:"model.action"], find_by_key)
       end
 
       def new!(model_class, params, *)

data/lib/trailblazer/macro/nested.rb

@@ -2,14 +2,18 @@
 module Trailblazer
   module Macro
     # {Nested} macro.
-    def self.Nested(callable, id: "Nested(#{callable})")
+    def self.Nested(callable, id: "Nested(#{callable})", auto_wire: [])
       if callable.is_a?(Class) && callable < Nested.operation_class
-        warn %{[Trailblazer] Using the `Nested()` macro with operations and activities is deprecated. Replace `Nested(Create)` with `Subprocess(Create)`.}
+        caller_location = caller_locations(2, 1)[0]
+        warn "[Trailblazer]#{caller_location.absolute_path}: " \
+             "Using the `Nested()` macro with operations and activities is deprecated. " \
+             "Replace `Nested(#{callable})` with `Subprocess(#{callable})`."
+
         return Nested.operation_class.Subprocess(callable)
       end
 
       # dynamic
-      task = Nested::Dynamic.new(callable)
+      task = Nested::Dynamic.new(callable, auto_wire: auto_wire)
 
       merge = [
         [Activity::TaskWrap::Pipeline.method(:insert_before), "task_wrap.call_task", ["Nested.compute_nested_activity", task.method(:compute_nested_activity)]],
@@ -33,17 +37,24 @@ module Trailblazer
       end
 
       # For dynamic `Nested`s that do not expose an {Activity} interface.
-      # Since we do not know its outputs, we have to map them to :success and :failure, only.
       #
-      # This is what {Nested} in 2.0 used to do, where the outcome could only be true/false (or success/failure).
+      # Dynamic doesn't automatically connect outputs of runtime {Activity}
+      # at compile time (as we don't know which activity will be nested, obviously).
+      # So by default, it only connects good old success/failure ends. But it is also
+      # possible to connect all the ends of all possible dynamic activities
+      # by passing their list to {:auto_wire} option.
+      #
+      # step Nested(:compute_nested, auto_wire: [Create, Update])
       class Dynamic
-        def initialize(nested_activity_decider)
-          @nested_activity_decider = Option::KW(nested_activity_decider)
+        STATIC_OUTPUTS = {
+          :success => Activity::Output(Activity::Railway::End::Success.new(semantic: :success), :success),
+          :failure => Activity::Output(Activity::Railway::End::Failure.new(semantic: :failure), :failure),
+        }
 
-          @outputs         = {
-            :success => Activity::Output(Activity::Railway::End::Success.new(semantic: :success), :success),
-            :failure => Activity::Output(Activity::Railway::End::Failure.new(semantic: :failure), :failure)
-          }
+        def initialize(nested_activity_decider, auto_wire: [])
+          @nested_activity_decider  = Trailblazer::Option(nested_activity_decider)
+          @known_activities         = Array(auto_wire)
+          @outputs                  = compute_task_outputs
         end
 
         attr_reader :outputs
@@ -53,7 +64,7 @@ module Trailblazer
           (ctx, _), original_circuit_options = original_args
 
           # TODO: evaluate the option to get the actual "object" to call.
-          activity = @nested_activity_decider.(ctx, original_circuit_options)
+          activity = @nested_activity_decider.(ctx, keyword_arguments: ctx.to_hash, **original_circuit_options)
 
           # Overwrite :task so task_wrap.call_task will call this activity.
           # This is a trick so we don't have to repeat logic from #call_task here.
@@ -63,13 +74,28 @@ module Trailblazer
         end
 
         def compute_return_signal(wrap_ctx, original_args)
-          # Translate the genuine nested signal to the generic Dynamic end (success/failure, only).
-          # Note that here we lose information about what specific event was emitted.
-          wrap_ctx[:return_signal] = wrap_ctx[:return_signal].kind_of?(Activity::Railway::End::Success) ?
-            @outputs[:success].signal : @outputs[:failure].signal
+          # NOOP when @known_activities are present as all possible signals have been registered already.
+          if @known_activities.empty?
+            # Translate the genuine nested signal to the generic Dynamic end (success/failure, only).
+            # Note that here we lose information about what specific event was emitted.
+            wrap_ctx[:return_signal] = wrap_ctx[:return_signal].kind_of?(Activity::Railway::End::Success) ?
+              @outputs[:success].signal : @outputs[:failure].signal
+          end
 
           return wrap_ctx, original_args
         end
+
+        private def compute_task_outputs
+          # If :auto_wire is empty, we map outputs to :success and :failure only, for backward compatibility.
+          # This is what {Nested} in 2.0 used to do, where the outcome could only be true/false (or success/failure).
+          return STATIC_OUTPUTS if @known_activities.empty?
+
+          # Merge activity#outputs from all given auto_wirable activities to wire up for this dynamic task.
+          @known_activities.map do |activity|
+            # TODO: Replace this when it's helper gets added.
+            Hash[activity.to_h[:outputs].collect{ |output| [output.semantic, output] }]
+          end.inject(:merge)
+        end
       end
     end
   end

data/lib/trailblazer/macro/policy.rb

@@ -8,35 +8,36 @@ module Trailblazer::Macro
         @path = path
       end
 
-      # incoming low-level {Task API}.
+      # incoming low-level {circuit interface}.
       # outgoing Task::Binary API.
-      def call((options, flow_options), **circuit_options)
-        condition = options[@path] # this allows dependency injection.
-        result    = condition.([options, flow_options], **circuit_options)
+      #
+      # Retrieve the injectable {condition}, execute it and interpret its {Result} object.
+      def call((ctx, flow_options), **circuit_options)
+        condition = ctx[@path] # this allows dependency injection.
+        result    = condition.([ctx, flow_options], **circuit_options)
 
-        options[:"policy.#{@name}"]        = result[:policy] # assign the policy as a skill.
-        options[:"result.policy.#{@name}"] = result
+        ctx[:"policy.#{@name}"]        = result[:policy] # assign the policy as a ctx variable.
+        ctx[:"result.policy.#{@name}"] = result
 
         # flow control
-        signal = result.success? ? Trailblazer::Activity::Right : Trailblazer::Activity::Left # since we & this, it's only executed OnRight and the return boolean decides the direction, input is passed straight through.
+        signal = result.success? ? Trailblazer::Activity::Right : Trailblazer::Activity::Left
 
-        return signal, [options, flow_options]
+        return signal, [ctx, flow_options]
       end
     end
 
-    # Adds the `yield` result to the pipe and treats it like a
+    # Adds the `yield` result to the Railway and treats it like a
     # policy-compatible  object at runtime.
-    def self.step(condition, options, &block)
-      name = options[:name]
+    def self.step(condition, name: nil, &block)
       path = :"policy.#{name}.eval"
-
       task = Eval.new(name: name, path: path)
 
-      injection = Trailblazer::Activity::TaskWrap::Inject::Defaults::Extension(
-        path => condition
-      )
+      injections = {
+        # :"policy.default.eval"
+        path => ->(*) { condition }
+      }
 
-      {task: task, id: path, extensions: [injection]}
+      {task: task, id: path, inject: [injections]}
     end
   end
 end

data/lib/trailblazer/macro/rescue.rb

@@ -28,11 +28,8 @@ module Trailblazer
     # TODO: remove me in 2.2.
     module Rescue
       def self.deprecate_positional_handler_signature(handler)
-        return handler if handler.is_a?(Symbol) # can't do nutting about this.
-
-        arity = handler.is_a?(Class) ? handler.method(:call).arity : handler.arity
-
-        return handler if arity != 2 # means (exception, (ctx, flow_options), *, &block), "new style"
+        return handler if handler.is_a?(Symbol) # can't do nothing about this.
+        return handler if handler.method(:call).arity != 2 # means (exception, (ctx, flow_options), *, &block), "new style"
 
         ->(exception, (ctx, flow_options), **circuit_options, &block) do
           warn "[Trailblazer] Rescue handlers have a new signature: (exception, *, &block)"

data/lib/trailblazer/macro/version.rb

@@ -1,7 +1,7 @@
 module Trailblazer
   module Version
     module Macro
-      VERSION = "2.1.4"
+      VERSION = "2.1.9"
     end
   end
 end

data/lib/trailblazer/macro/wrap.rb

@@ -48,7 +48,7 @@ module Trailblazer
 
         def call((ctx, flow_options), **circuit_options)
           block_calling_wrapped = -> {
-            call_wrapped_activity([ctx, flow_options], circuit_options)
+            call_wrapped_activity([ctx, flow_options], **circuit_options)
           }
 
           # call the user's Wrap {} block in the operation.

data/test/docs/guard_test.rb

@@ -108,6 +108,27 @@ class DocsGuardNamedTest < Minitest::Spec
   }
 end
 
+#---
+# dependency injection
+class DocsGuardInjectionTest < Minitest::Spec
+  #:di-op
+  class Create < Trailblazer::Operation
+    step Policy::Guard( ->(options, current_user:, **) { current_user == Module } )
+  end
+  #:di-op end
+
+  it { Create.(:current_user => Module).inspect("").must_equal %{<Result:true [nil] >} }
+  it {
+    result =
+  #:di-call
+  Create.(
+    :current_user           => Module,
+    :"policy.default.eval"  => Trailblazer::Operation::Policy::Guard.build(->(options, **) { false })
+  )
+  #:di-call end
+    result.inspect("").must_equal %{<Result:false [nil] >} }
+end
+
 #---
 # missing current_user throws exception
 class DocsGuardMissingKeywordTest < Minitest::Spec

data/test/docs/model_test.rb

@@ -16,11 +16,22 @@ class DocsModelTest < Minitest::Spec
 
   #:op
   class Create < Trailblazer::Operation
-    step Model( Song, :new )
+    step Model(Song, :new)
     # ..
   end
   #:op end
 
+
+  it "defaults {:params} to empty hash when not passed" do
+    result = Create.({})
+    assert_equal true, result.success?
+    assert_equal %{#<struct DocsModelTest::Song id=nil, title=nil>}, result[:model].inspect
+
+    result = Update.({})
+    assert_equal false, result.success?
+    assert_equal "nil", result[:model].inspect
+  end
+
   it do
     #:create
     result = Create.(params: {})
@@ -121,4 +132,43 @@ class DocsModelTest < Minitest::Spec
     result.success?.must_equal true
     result[:model].inspect.must_equal %{#<struct DocsModelTest::Song id=100, title=nil>}
   end
+
+  it "allows injecting {:model.class} and friends" do
+    class Hit < Song
+    end
+
+    #:di-model-class
+    result = Create.(params: {}, :"model.class" => Hit)
+    #:di-model-class end
+
+    result[:model].inspect.must_equal %{#<struct DocsModelTest::Hit id=nil, title=nil>}
+
+  # inject all variables
+    #:di-all
+    result = Create.(
+      params:               {title: "Olympia"}, # some random variable.
+      "model.class":        Hit,
+      "model.action":       :find_by,
+      "model.find_by_key": :title
+    )
+    #:di-all end
+
+    result[:model].inspect.must_equal %{#<struct DocsModelTest::Hit id=2, title="Olympia">}
+
+  # use empty Model() and inject {model.class} and {model.action}
+    module A
+      #:op-model-empty
+      class Create < Trailblazer::Operation
+        step Model()
+        # ..
+      end
+      #:op-model-empty end
+    end # A
+
+    result = A::Create.(params: {}, :"model.class" => Hit)
+
+    result[:model].inspect.must_equal %{#<struct DocsModelTest::Hit id=nil, title=nil>}
+
+
+  end
 end

data/test/docs/nested_test.rb

@@ -22,6 +22,11 @@ class NestedInput < Minitest::Spec
     include T.def_steps(:validate)
   end
 
+  class JsonValidate < Validate
+    step :json
+    include T.def_steps(:json)
+  end
+
   it "Nested(Edit), without any options" do
       module A
 
@@ -79,11 +84,6 @@ class NestedInput < Minitest::Spec
         #~meths end
       end
       #:nested-dynamic end
-
-      class JsonValidate < Validate
-        step :json
-        include T.def_steps(:json)
-      end
     # `edit` and `update` can be called from Nested()
 
   # edit/success
@@ -119,11 +119,6 @@ class NestedInput < Minitest::Spec
       end
       #:nested-dynamic end
 
-      class JsonValidate < Validate
-        step :json
-        include T.def_steps(:json)
-      end
-
     # `edit` and `update` can be called from Nested()
     end
 
@@ -161,29 +156,34 @@ class NestedInput < Minitest::Spec
     end
   end
 
-  let(:compute_edit) {
-    ->(ctx, what:, **) { what }
-  }
-
-  it "Nested(:method), :pass_fast => :fail_fast doesn't work with standard wiring" do
-    skip "we need to allow adding :outputs"
+  it "Nested(:method, auto_wire: *activities) with :pass_fast => End()" do
+    module E
+      class JsonValidate < Trailblazer::Operation
+        step :validate, Output(:success) => End(:json_validate)
+        include T.def_steps(:validate)
+      end
 
-    compute_edit = self.compute_edit
+      #:nested-with-auto-wire
+      class Create < Trailblazer::Operation
+        step :create
+        step Nested(:compute_nested, auto_wire: [Validate, JsonValidate]),
+          Output(:json_validate) => End(:jsoned)
 
-    pass_fast = Class.new(Trailblazer::Operation) do
-      step :p, pass_fast: true
-      include T.def_steps(:p)
-    end
+        #~meths
+        def compute_nested(ctx, what:, **)
+          what
+        end
 
-    create = Class.new(Trailblazer::Operation) do
-      step :a
-      step Nested(compute_edit, auto_wire: [pass_fast]), Output(:pass_fast) => Track(:fail_fast)
-      step :b
-      include T.def_steps(:a, :b)
-    end
+        include T.def_steps(:create)
+        #~meths end
+      end
+      #:nested-with-auto-wire end
 
+      result = Create.(seq: [], what: JsonValidate)
 
-    create.(seq: [], what: pass_fast).inspect(:seq).must_equal %{<Result:false [[:a, :c]] >}
+      result.inspect(:seq).must_equal %{<Result:false [[:create, :validate]] >}
+      result.event.inspect.must_equal %{#<Trailblazer::Activity::End semantic=:jsoned>}
+    end
   end
 end
 

data/test/docs/rescue_test.rb

@@ -66,7 +66,7 @@ plain Rescue()
 =begin
 Rescue( handler: X )
 =end
-  class RescueWithHandlerTest < Minitest::Spec
+  class RescueWithClassHandlerTest < Minitest::Spec
     Memo = Class.new
 
     #:rescue-handler
@@ -97,10 +97,35 @@ Rescue( handler: X )
     it { Memo::Create.( { seq: [], rehash_raise: true } ).inspect(:seq, :exception_class).must_equal %{<Result:false [[:find_model, :update, :rehash, :log_error], RuntimeError] >} }
   end
 
+  class RescueWithModuleHandlerTest < Minitest::Spec
+    Memo = Class.new
+
+    module MyHandler
+      def self.call(exception, (ctx), *)
+        ctx[:exception_class] = exception.class
+      end
+    end
+
+    class Memo::Create < Trailblazer::Operation
+      step :find_model
+      step Rescue( RuntimeError, handler: MyHandler ) {
+        step :update
+        step :rehash
+      }
+      step :notify
+      fail :log_error
+      include T.def_steps(:find_model, :update, :notify, :log_error)
+      include Rehash
+    end
+
+    it { Memo::Create.( { seq: [], } ).inspect(:seq, :exception_class).must_equal %{<Result:true [[:find_model, :update, :rehash, :notify], nil] >} }
+    it { Memo::Create.( { seq: [], rehash_raise: true } ).inspect(:seq, :exception_class).must_equal %{<Result:false [[:find_model, :update, :rehash, :log_error], RuntimeError] >} }
+  end
+
 =begin
 Rescue( handler: :instance_method )
 =end
-  class RescueWithHandlerTest < Minitest::Spec
+  class RescueWithMethodHandlerTest < Minitest::Spec
     Memo = Class.new
 
     #:rescue-method

data/test/operation/nested_test.rb

@@ -0,0 +1,76 @@
+require 'test_helper'
+
+class NestedTest < Minitest::Spec
+  DatabaseError = Class.new(Trailblazer::Activity::Signal)
+
+  class SignUp < Trailblazer::Operation
+    def self.b(ctx, **)
+      ctx[:seq] << :b
+      return DatabaseError
+    end
+
+    step method(:b), Output(DatabaseError, :db_error) => End(:db_error)
+  end
+
+  class SignIn < Trailblazer::Operation
+    include T.def_steps(:c)
+    step :c
+  end
+
+  it "allows connection with custom output of a nested activity" do
+    create = Class.new(Trailblazer::Operation) do
+      include T.def_steps(:a, :d)
+
+      step :a
+      step Nested(SignUp), Output(:db_error) => Track(:no_user)
+      step :d, magnetic_to: :no_user
+    end
+
+    result = create.(seq: [])
+    result.inspect(:seq).must_equal %{<Result:true [[:a, :b, :d]] >}
+    result.event.inspect.must_equal %{#<Trailblazer::Activity::Railway::End::Success semantic=:success>}
+  end
+
+  it "allows connecting dynamically nested activities with custom output when auto wired" do
+    create = Class.new(Trailblazer::Operation) do
+      def compute_nested(ctx, what:, **)
+        what
+      end
+
+      include T.def_steps(:a, :d)
+
+      step :a
+      step Nested(:compute_nested, auto_wire: [SignUp, SignIn]), Output(:db_error) => Track(:no_user)
+      step :d, magnetic_to: :no_user
+    end
+
+    result = create.(seq: [], what: SignUp)
+    result.inspect(:seq).must_equal %{<Result:true [[:a, :b, :d]] >}
+    result.event.inspect.must_equal %{#<Trailblazer::Activity::Railway::End::Success semantic=:success>}
+  end
+
+  it "raises RuntimeError if dynamically nested activities with custom output are not auto wired" do
+    exception = assert_raises RuntimeError do
+      Class.new(Trailblazer::Operation) do
+        def compute_nested(ctx, what:, **)
+          what
+        end
+
+        step Nested(:compute_nested), Output(:db_error) => Track(:no_user)
+      end
+    end
+
+    exception.inspect.must_match 'No `db_error` output found'
+  end
+
+  it "shows warning if `Nested()` is being used instead of `Subprocess()` for static activities" do
+    _, warnings = capture_io do
+      Class.new(Trailblazer::Operation) do
+        step Nested(SignUp)
+      end
+    end
+
+    warnings.must_equal %Q{[Trailblazer]#{__FILE__}: Using the `Nested()` macro with operations and activities is deprecated. Replace `Nested(NestedTest::SignUp)` with `Subprocess(NestedTest::SignUp)`.
+}
+  end
+end

data/trailblazer-macro.gemspec

@@ -25,9 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "roar"
   spec.add_development_dependency "trailblazer-developer"
 
-  spec.add_dependency "trailblazer-activity", ">= 0.11.2", "< 1.0.0"
-  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 0.3.3", "< 1.0.0"
-  spec.add_dependency "trailblazer-operation", ">= 0.6.5" # TODO: this dependency will be removed.
+  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 0.5.0", "< 0.6.0"
+  spec.add_dependency "trailblazer-operation", ">= 0.7.0" # TODO: this dependency will be removed.
 
   spec.required_ruby_version = ">= 2.2.0"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-macro
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.9
 platform: ruby
 authors:
 - Nick Sutterer
 - Marc Tich
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-06 00:00:00.000000000 Z
+date: 2021-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,60 +95,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: trailblazer-activity
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity-dsl-linear
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.5.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.5.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: trailblazer-operation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.0
 description: Macros for Trailblazer's operation
 email:
 - apotonick@gmail.com
@@ -157,10 +137,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -185,6 +165,7 @@ files:
 - test/docs/wrap_test.rb
 - test/operation/integration_test.rb
 - test/operation/model_test.rb
+- test/operation/nested_test.rb
 - test/operation/pundit_test.rb
 - test/test_helper.rb
 - trailblazer-macro.gemspec
@@ -192,7 +173,7 @@ homepage: http://trailblazer.to
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -207,8 +188,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.2.3
+signing_key: 
 specification_version: 4
 summary: 'Macros for Trailblazer''s operation: Policy, Wrap, Rescue and more.'
 test_files:
@@ -221,5 +202,6 @@ test_files:
 - test/docs/wrap_test.rb
 - test/operation/integration_test.rb
 - test/operation/model_test.rb
+- test/operation/nested_test.rb
 - test/operation/pundit_test.rb
 - test/test_helper.rb

data/.travis.yml

@@ -1,12 +0,0 @@
-language: ruby
-rvm:
-  - ruby-head
-  - 2.7
-  - 2.6
-  - 2.5
-  - 2.4
-cache: bundler
-jobs:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: 2.7