trailblazer-operation 0.6.2 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afed7aa7228e84255ee7930bcf57a6ca49fe70147c6906f76ebb4a0b87416ecf
-  data.tar.gz: 3d014dd0a2fd09fb1452f531261ffc5cfaddf67cd595b430494b35b4b0708718
+  metadata.gz: 5a184243cc5650f8905e96a29d4abd248f463dcf8e2c5ec28d3a68de6391ae4e
+  data.tar.gz: 8c8eeb9c36d0065096e1c9be60872254c0776ecd6dd617d439aa55c3896f020e
 SHA512:
-  metadata.gz: c753482038ce14dad0d7118b4bff634afb6d9f45b2a3e3cdab2560a0a6181e89a9473b027cf3d9bc1743408ba7cf1764f35f1303cbdeaeb68fcc1c0abe0517dd
-  data.tar.gz: 168d5b349059eb495e40691d7e92de1cf28fd290b89102db997037ec96a31e5cf343d6dd603f95082f22bc10a705055e4b786855b011bc47f5a9a0f6e61f249f
+  metadata.gz: c1abb34f87e18425f77c6189ded96dd0f02c39f9e2ce178b1d2bfff3d2b2e8c2c4dd4d37e88a770ffc8b8457613dbc4e334b8e2e7924395c07bd4a59c6bd3376
+  data.tar.gz: 68fb2740d396b174c7eaa62e0145049755ff593fbf7bdba66825b79caa7908b35b954b8508528b6a6f93883fee3f372e2043a860f968bf5699cb2bceea1c3f17

data/.gitignore

@@ -15,3 +15,4 @@ test/tmp
 test/version_tmp
 tmp
 /**/*.log
+.rubocop-*yml

data/.travis.yml

@@ -1,16 +1,11 @@
 language: ruby
-before_install:
-  - gem install bundler -v 1.17.3
-matrix:
-  include:
-    # - rvm: 2.1.0
-    #   gemfile: Gemfile
-    - rvm: 2.2.4
-      gemfile: Gemfile
-    - rvm: 2.3.3
-      gemfile: Gemfile
-    - rvm: 2.4.0
-      gemfile: Gemfile
-    - rvm: 2.5.0
-      gemfile: Gemfile
-      script: bundle exec rake test
+rvm:
+  - ruby-head
+  - 3.0
+  - 2.7
+  - 2.6
+  - 2.5
+  - 2.4
+jobs:
+  allow_failures:
+    - rvm: ruby-head

data/CHANGES.md

@@ -1,3 +1,26 @@
+## 0.7.0
+
+* Compatible with Ruby 2.4-3.0.
+* Add `Operation.wtf?`.
+* Add `Operation.call_with_flow_options` to allow using explicit aliasing in Ruby < 3.0.
+
+## 0.6.6
+
+* Rename `Operation.flow_options` to `Operation.flow_options_for_public_call`.
+* Operations can also accept `flow_options` at run-time now :beers:, giving them precedence over `Operation.flow_options_for_public_call`.
+
+## 0.6.5
+
+* Upgrade `trailblazer-activity` & `trailblazer-activity-dsl-linear` versions to utilise new `trailblazer-context` :drum:
+
+## 0.6.4
+
+* Remove container support. Containers should be part of `ctx` itself
+
+## 0.6.3
+
+* Require forwardable module from standard lib.
+
 ## 0.6.2
 
 * Fix Trace so it works with Ruby <= 2.4

data/Gemfile

@@ -10,8 +10,9 @@ gem "dry-auto_inject"
 gem "benchmark-ips"
 gem "minitest-line"
 
-# gem "trailblazer-developer", path: "../developer"
+# gem "trailblazer-developer", path: "../trailblazer-developer"
 # gem "trailblazer-developer", git: "https://github.com/trailblazer/trailblazer-developer"
 # gem "trailblazer-activity", path: "../trailblazer-activity"
+# gem "trailblazer-context", path: "../trailblazer-context"
 # gem "trailblazer-activity-dsl-linear", path: "../trailblazer-activity-dsl-linear"
 # gem "trailblazer-activity", github: "trailblazer/trailblazer-activity"

data/README.md

@@ -15,6 +15,6 @@ An operation can be used exaclty like an activity, including nesting, tracing, e
 
 ## Copyright
 
-Copyright (c) 2016 Nick Sutterer <apotonick@gmail.com>
+Copyright (c) 2016-2020 Nick Sutterer <apotonick@gmail.com>
 
 `trailblazer-operation` is released under the [MIT License](http://www.opensource.org/licenses/MIT).

data/Rakefile

@@ -4,18 +4,7 @@ require "rake/testtask"
 Rake::TestTask.new(:test) do |test|
   test.libs << "test"
   test.verbose = true
-
-  test_files = FileList["test/**/*_test.rb"]
-
-  if RUBY_VERSION == "2.0.0"
-    # test_files = test_files - %w{test/dry_container_test.rb test/2.1.0-pipetree_test.rb}
-    test_files = test_files - %w{test/step_test.rb}      + %w{test/ruby-2.0.0/step_test.rb}
-    test_files = test_files - %w{test/operation_test.rb} + %w{test/ruby-2.0.0/operation_test.rb}
-  else
-    test_files -= FileList["test/ruby-2.0.0/*"]
-  end
-
-  test.test_files = test_files
+  test.test_files = FileList["test/**/*_test.rb"]
 end
 
 task :default => %i[test]

data/lib/trailblazer/operation.rb

@@ -1,10 +1,10 @@
+require 'forwardable'
+require 'trailblazer/operation/version'
 require "trailblazer/option"
 require "trailblazer/context"
-require "trailblazer/container_chain"
 
 require "trailblazer/activity/dsl/linear"
 
-
 module Trailblazer
   # DISCUSS: I don't know where else to put this. It's not part of the {Activity} concept
   class Activity
@@ -51,13 +51,6 @@ module Trailblazer
 
     require "trailblazer/operation/trace"
     extend Trace                   # ::trace
-
-    module Railway
-      def self.fail!     ; Activity::Left  end
-      def self.pass!     ; Activity::Right end
-      def self.fail_fast!; Activity::FastTrack::FailFast end
-      def self.pass_fast!; Activity::FastTrack::PassFast end
-    end
   end
 end
 
@@ -67,9 +60,4 @@ require "trailblazer/operation/deprecated_macro" # TODO: remove in 2.2.
 require "trailblazer/operation/result"
 require "trailblazer/operation/railway"
 
-require "trailblazer/developer"
-require "trailblazer/operation/trace"
-
 require "trailblazer/operation/railway/macaroni"
-
-require "trailblazer/operation/container"

data/lib/trailblazer/operation/class_dependencies.rb

@@ -12,23 +12,23 @@ class Trailblazer::Operation
       @state.update_options(options)
     end
 
-    def options_for_public_call(options, *)
+    def options_for_public_call(options, flow_options)
       ctx = super
-      context_for_fields(class_fields, ctx)
+      context_for_fields(class_fields, [ctx, flow_options])
     end
 
     private def class_fields
       @state.to_h[:fields]
     end
 
-    private def context_for_fields(fields, ctx)
-      ctx_with_fields = Trailblazer::Context.implementation.build(fields, ctx, [ctx, {}], {}) # TODO: redundant to otions_for_public_call. how to inject aliasing etc?
+    private def context_for_fields(fields, (ctx, flow_options), **)
+      ctx_with_fields = Trailblazer::Context(fields, ctx, flow_options[:context_options]) # TODO: redundant to otions_for_public_call.
     end
 
     def call_with_circuit_interface((ctx, flow_options), **circuit_options)
-      ctx_with_fields = context_for_fields(class_fields, ctx)
+      ctx_with_fields = context_for_fields(class_fields, [ctx, flow_options], **circuit_options)
 
-      super([ctx_with_fields, flow_options], circuit_options) # FIXME: should we unwrap here?
+      super([ctx_with_fields, flow_options], **circuit_options) # FIXME: should we unwrap here?
     end
   end
 end

data/lib/trailblazer/operation/public_call.rb

@@ -13,21 +13,32 @@ module Trailblazer
     #
     # @note Do not override this method as it will be removed in future versions. Also, you will break tracing.
     # @return Operation::Railway::Result binary result object
-    def call(options = {}, *args)
-      return call_with_circuit_interface(options, *args) if options.is_a?(Array) # This is kind of a hack that could be well hidden if Ruby had method overloading. Goal is to simplify the call/__call__ thing as we're fading out Operation::call anyway.
+    def call(options = {}, flow_options = {}, **circuit_options)
+      return call_with_circuit_interface(options, **circuit_options) if options.is_a?(Array) # This is kind of a hack that could be well hidden if Ruby had method overloading. Goal is to simplify the call/__call__ thing as we're fading out Operation::call anyway.
 
-      call_with_public_interface(options, *args)
+      call_with_public_interface(options, flow_options, **circuit_options)
     end
 
-    def call_with_public_interface(*args)
-      ctx = options_for_public_call(*args, flow_options())
+    # Default {@activity} call interface which doesn't accept {circuit_options}
+    #
+    # @param [Array] args => [ctx, flow_options]
+    #
+    # @return [Operation::Railway::Result]
+    #
+    # @private
+    def call_with_public_interface(options, flow_options, invoke_class: Activity::TaskWrap, **circuit_options)
+      flow_options  = flow_options_for_public_call(flow_options)
+
+      options       = circuit_options.any? ? circuit_options : options # This is needed in Ruby 3 for {Create.(params: {})} calls.
+
+
+      ctx           = options_for_public_call(options, flow_options)
 
       # call the activity.
       # This will result in invoking {::call_with_circuit_interface}.
-      # last_signal, (options, flow_options) = Activity::TaskWrap.invoke(self, [ctx, {}], {})
-      signal, (ctx, flow_options) = Activity::TaskWrap.invoke(
+      signal, (ctx, flow_options) = invoke_class.invoke(
         @activity,
-        [ctx, flow_options()],
+        [ctx, flow_options],
         exec_context: new
       )
 
@@ -36,8 +47,15 @@ module Trailblazer
     end
 
     # This interface is used for all nested OPs (and the outer-most, too).
-    def call_with_circuit_interface(args, circuit_options)
-      strategy_call(args, circuit_options) # FastTrack#call
+    #
+    # @param [Array] args - Contains [ctx, flow_options]
+    # @param [Hash]  circuit_options - Options to configure activity circuit
+    #
+    # @return [signal, [ctx, flow_options]]
+    #
+    # @private
+    def call_with_circuit_interface(args, **circuit_options)
+      strategy_call(args, **circuit_options) # FastTrack#call
     end
 
     def options_for_public_call(*args)
@@ -46,13 +64,19 @@ module Trailblazer
 
     # Compile a Context object to be passed into the Activity::call.
     # @private
-    def self.options_for_public_call(options, **flow_options)
-      Trailblazer::Context.for_circuit(options, {}, [options, flow_options], {})
+    def self.options_for_public_call(options, flow_options = {})
+      Trailblazer::Context(options, {}, flow_options[:context_options])
     end
 
     # @semi=public
-    def flow_options
-      {context_alias: {}}
+    def flow_options_for_public_call(options = {})
+      options
+    end
+
+    # TODO: remove when we stop supporting < 3.0.
+    def call_with_flow_options(options, flow_options)
+      raise "[Trailblazer] `Operation.call_with_flow_options is deprecated in Ruby 3.0. Use `Operation.(options, flow_options)`" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0.0")
+      call_with_public_interface(options, flow_options, {invoke_class: Activity::TaskWrap})
     end
   end
 end

data/lib/trailblazer/operation/railway.rb

@@ -5,6 +5,10 @@ module Trailblazer
   class Operation
     # End event: All subclasses of End:::Success are interpreted as "success".
     module Railway
+      def self.fail!     ; Activity::Left  end
+      def self.pass!     ; Activity::Right end
+      def self.fail_fast!; Activity::FastTrack::FailFast end
+      def self.pass_fast!; Activity::FastTrack::PassFast end
       # @param options Context
       # @param end_event The last emitted signal in a circuit is usually the end event.
       def self.Result(end_event, options, *)

data/lib/trailblazer/operation/trace.rb

@@ -1,10 +1,12 @@
 require 'delegate'
+require "trailblazer/developer"
 
 module Trailblazer
   class Operation
     module Trace
       # @note The problem in this method is, we have redundancy with Operation::PublicCall
       def self.call(operation, options)
+        # warn %{Trailblazer: `Operation.trace` is deprecated. Please use `Operation.wtf?`.} # DISCUSS: should this be deprecated?
         ctx = PublicCall.options_for_public_call(options) # redundant with PublicCall::call.
 
         stack, signal, (ctx, _flow_options) = Developer::Trace.(operation, [ctx, {}])
@@ -24,6 +26,10 @@ module Trailblazer
         Trace.(self, options)
       end
 
+      def wtf?(options)
+        call_with_public_interface(options, {}, invoke_class: Developer::Wtf)
+      end
+
       # Presentation of the traced stack via the returned result object.
       # This object is wrapped around the original result in {Trace.call}.
       class Result < ::SimpleDelegator
@@ -33,7 +39,7 @@ module Trailblazer
         end
 
         def wtf
-          Trailblazer::Developer::Trace::Present.(@stack)
+          Developer::Trace::Present.(@stack)
         end
 
         def wtf?

data/lib/trailblazer/operation/version.rb

@@ -1,7 +1,7 @@
 module Trailblazer
   module Version
     module Operation
-      VERSION = "0.6.2"
+      VERSION = "0.7.0"
     end
   end
 end

data/test/docs/macaroni_test.rb

@@ -1,31 +1,31 @@
-require "test_helper"
+# require "test_helper"
 
-class MacaroniTaskBuilderTest < Minitest::Spec
-  Memo = Struct.new(:title) do
-    def save
-      self.title = title[:title].reverse
-    end
-  end
+# class MacaroniTaskBuilderTest < Minitest::Spec
+#   Memo = Struct.new(:title) do
+#     def save
+#       self.title = title[:title].reverse
+#     end
+#   end
 
-  #:create
-  class Memo::Create < Trailblazer::Operation(step_interface_builder: Trailblazer::Operation::Railway::KwSignature)
-    #~ign
-    step :create_model
-    step :save
-    #~ign end
-    #~methods
-    def create_model(params:, options:, **)
-      options[:model] = Memo.new(title: params[:title])
-    end
+#   #:create
+#   class Memo::Create < Trailblazer::Operation(step_interface_builder: Trailblazer::Operation::Railway::KwSignature)
+#     #~ign
+#     step :create_model
+#     step :save
+#     #~ign end
+#     #~methods
+#     def create_model(params:, options:, **)
+#       options[:model] = Memo.new(title: params[:title])
+#     end
 
-    def save(model:, **)
-      model.save
-    end
-    #~methods end
-  end
-  #:create end
+#     def save(model:, **)
+#       model.save
+#     end
+#     #~methods end
+#   end
+#   #:create end
 
-  it "allows optional macaroni call style" do
-    Memo::Create.(params: {title: "Wow!"}).inspect(:model).must_equal %{<Result:true [#<struct MacaroniTaskBuilderTest::Memo title=\"!woW\">] >}
-  end
-end
+#   it "allows optional macaroni call style" do
+#     Memo::Create.(params: {title: "Wow!"}).inspect(:model).must_equal %{<Result:true [#<struct MacaroniTaskBuilderTest::Memo title=\"!woW\">] >}
+#   end
+# end

data/test/docs/operation_test.rb

@@ -24,7 +24,6 @@ class DocsActivityTest < Minitest::Spec
     signal.inspect.must_equal %{#<Trailblazer::Activity::Railway::End::Success semantic=:success>}
   end
 
-  #:describe
   describe Memo::Create do
     it "creates a sane Memo instance" do
       #:call-public
@@ -39,8 +38,69 @@ class DocsActivityTest < Minitest::Spec
       result.success?.must_equal true
       result[:model].text.must_equal "Enjoy an IPA"
     end
+
+    it "allows indifferent access for ctx keys" do
+      #:ctx-indifferent-access
+      result = Memo::Create.(params: { text: "Enjoy an IPA" })
+
+      result[:params]     # => { text: "Enjoy an IPA" }
+      result['params']    # => { text: "Enjoy an IPA" }
+      #:ctx-indifferent-access end
+
+      result.success?.must_equal true
+      result[:params].must_equal({ text: "Enjoy an IPA" })
+      result['params'].must_equal({ text: "Enjoy an IPA" })
+    end
+
+    it "allows defining aliases for ctx keys" do
+      module AliasesExample
+        Memo = Struct.new(:text)
+
+        module Memo::Contract
+          Create = Struct.new(:sync)
+        end
+
+        #:ctx-aliases-step
+        class Memo::Create < Trailblazer::Operation
+          #~flow
+          step ->(ctx, **) { ctx[:'contract.default'] = Memo::Contract::Create.new }
+          #~flow end
+
+          pass :sync
+
+          def sync(ctx, contract:, **)
+            # ctx['contract.default'] == ctx[:contract]
+            contract.sync
+          end
+        end
+        #:ctx-aliases-step end
+      end
+
+      #:ctx-aliases
+      options = { params: { text: "Enjoy an IPA" } }
+      flow_options = {
+        context_options: {
+          aliases: { 'contract.default': :contract, 'policy.default': :policy },
+          container_class: Trailblazer::Context::Container::WithAliases,
+        }
+      }
+
+      # Sorry, this feature is only reliable in Ruby > 2.7
+      if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0.0")
+        result = AliasesExample::Memo::Create.(options, flow_options)
+      else # Ruby 2.6 etc
+        result = AliasesExample::Memo::Create.call_with_flow_options(options, flow_options)
+      end
+
+      result['contract.default']  # => Memo::Contract::Create
+      result[:contract]           # => Memo::Contract::Create
+      #:ctx-aliases end
+
+      result.success?.must_equal true
+      _(result[:contract].class).must_equal AliasesExample::Memo::Contract::Create
+      _(result['contract.default']).must_equal result[:contract]
+    end
   end
-  #:describe end
 
   it do
     module J

data/test/docs/wiring_test.rb

@@ -245,9 +245,8 @@ describe all options :pass_fast, :fast_track and emiting signals directly, like
   end
 
   it "runs #create_model, only" do
-    Memo = FastTrack::Memo
     #:ft-call
-    result = Memo::Create.(create_empty_model: true)
+    result = FastTrack::Memo::Create.(create_empty_model: true)
     puts result.success?        #=> true
     puts result[:model].inspect #=> #<Memo text=nil>
     #:ft-call end
@@ -257,9 +256,8 @@ describe all options :pass_fast, :fast_track and emiting signals directly, like
   end
 
   it "fast-tracks in #assign_errors" do
-    Memo = FastTrack::Memo
     #:ft-call-err
-    result = Memo::Create.({})
+    result = FastTrack::Memo::Create.({})
     puts result.success?          #=> false
     puts result[:model].inspect   #=> #<Memo text=nil>
     puts result[:errors].inspect  #=> "Something went wrong!"
@@ -271,16 +269,15 @@ describe all options :pass_fast, :fast_track and emiting signals directly, like
   end
 
   it "goes till #save by emitting signals directly" do
-    Memo = FastTrack::Memo
-    result = Memo::Create.(params: {text: "Punk is not dead!"})
+    result = FastTrack::Memo::Create.(params: {text: "Punk is not dead!"})
     result.success?.must_equal true
     result[:model].id.must_equal 1
     result[:errors].must_be_nil
   end
 
+
   it "goes till #save by using signal helper" do
-    Memo = FastTrack::Memo
-    result = Memo::Create2.(params: {text: "Punk is not dead!"})
+    result = FastTrack::Memo::Create2.(params: {text: "Punk is not dead!"})
     result.success?.must_equal true
     result[:model].id.must_equal 1
     result[:errors].must_be_nil

data/test/operation_test.rb

@@ -79,8 +79,63 @@ class DeclarativeApiTest < Minitest::Spec
     step ->(options, **) { options["e"] = 2 }
   end
 
+  class Aliases < Update
+    def self.flow_options_for_public_call(*)
+      {
+        context_options: {
+          aliases: { 'b' => :settle },
+          container_class: Trailblazer::Context::Container::WithAliases,
+        }
+      }
+    end
+  end
+
   it "allows to inherit" do
     Upsert.("params" => {decide: true}).inspect("a", "b", "c", "d", "e").must_equal %{<Result:true [false, true, nil, 1, nil] >}
     Unset. ("params" => {decide: true}).inspect("a", "b", "c", "d", "e").must_equal %{<Result:true [false, true, nil, 1, 2] >}
   end
+
+  #---
+  #- ctx container
+  it do
+    options = { "params" => {decide: true} }
+
+    # Default call
+    result = Update.(options)
+    result.inspect("a", "b", "c").must_equal %{<Result:true [false, true, nil] >}
+
+    # Circuit interface call
+    signal, (ctx, _) = Update.([Update.options_for_public_call(options), {}], **{})
+
+    signal.inspect.must_equal %{#<Trailblazer::Activity::Railway::End::Success semantic=:success>}
+    ctx.inspect.must_equal %{#<Trailblazer::Context::Container wrapped_options={\"params\"=>{:decide=>true}} mutable_options={\"a\"=>false, \"b\"=>true}>}
+
+    # Call by passing aliases as an argument.
+    if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0.0")
+      result = Update.(
+        options,
+        {
+          context_options: {
+            aliases: { 'b' => :settle },
+            container_class: Trailblazer::Context::Container::WithAliases,
+          }
+        }
+      )
+    else
+      result = Update.call_with_flow_options(
+        options,
+        {
+          context_options: {
+            aliases: { 'b' => :settle },
+            container_class: Trailblazer::Context::Container::WithAliases,
+          }
+        },
+      )
+    end
+
+    result[:settle].must_equal true
+    # Set aliases by overriding `flow_options` at the compile time.
+    result = Aliases.(options)
+    result[:settle].must_equal true
+  end
 end

data/test/step_test.rb

@@ -40,7 +40,11 @@ class StepTest < Minitest::Spec
 
   it { Create.(a: 1, b: 2, c: 3, d: 4, e: 5).inspect("a", "b", "c", "d", "e").must_equal "<Result:true [1, 2, 3, 4, 5] >" }
 
-  it { Trailblazer::Developer.railway(Create).gsub(/0x.+?step_test.rb/, "").must_equal %{[>#<Proc::30 (lambda)>,>StepTest::Callable,>#<Method: StepTest::Implementation.c>,>d,>MyMacro]} }
+  if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.7.0")
+    it { Trailblazer::Developer.railway(Create).gsub(/0x.+?step_test.rb/, "").gsub(/\)\s.+?step_test.rb/, ") test/step_test.rb").must_equal %{[>#<Proc::30 (lambda)>,>StepTest::Callable,>#<Method: StepTest::Implementation.c(options, c: ..., **) test/step_test.rb:18>,>d,>MyMacro]} }
+  else
+    it { Trailblazer::Developer.railway(Create).gsub(/0x.+?step_test.rb/, "").must_equal %{[>#<Proc::30 (lambda)>,>StepTest::Callable,>#<Method: StepTest::Implementation.c>,>d,>MyMacro]} }
+  end
 
   #---
   #- :before, :after, :replace, :delete, :override
@@ -173,11 +177,13 @@ class StepTest < Minitest::Spec
   #-
   # not existent :name
   it do
-    assert_raises Trailblazer::Activity::DSL::Linear::Sequence::IndexError do
+    op = assert_raises Trailblazer::Activity::DSL::Linear::Sequence::IndexError do
       Class.new(Trailblazer::Operation) do
         step :a, before: "I don't exist!"
       end
-    end.inspect.must_equal %{#<Trailblazer::Activity::DSL::Linear::Sequence::IndexError: "I don't exist!">}
+    end
+    assert_equal Trailblazer::Activity::DSL::Linear::Sequence::IndexError, op.class
+    # assert_match /<Trailblazer::Activity::DSL::Linear::Sequence::IndexError: .+ is not a valid step ID. Did you mean any of these ?/, op.inspect
   end
 
   #---
@@ -194,16 +200,16 @@ class StepTest < Minitest::Spec
 
   #---
   #- inheritance
-  class New < Create
+  class New < Index
   end
 
-  it { Trailblazer::Developer.railway(New).gsub(/0x.+?step_test.rb/, "").must_equal %{[>#<Proc::30 (lambda)>,>StepTest::Callable,>#<Method: StepTest::Implementation.c>,>d,>MyMacro]} }
+  it { Trailblazer::Developer.railway(New).must_equal %{[>my validate,>persist!,>I win!,>No, I do!]} }
 
-  class Update < Create
-    step :after_save!
+  class Update < Index
+    step :after_save
   end
 
-  it { Trailblazer::Developer.railway(Update).gsub(/0x.+?step_test.rb/, "").must_equal %{[>#<Proc::30 (lambda)>,>StepTest::Callable,>#<Method: StepTest::Implementation.c>,>d,>MyMacro,>after_save!]} }
+  it { Trailblazer::Developer.railway(Update).must_equal %{[>my validate,>persist!,>I win!,>No, I do!,>after_save]} }
 end
 
 #---

data/test/trace_test.rb

@@ -49,4 +49,28 @@ class TraceTest < Minitest::Spec
     |-- Create.task.params
     `-- End.success}
   end
+
+  it "Operation.wtf?" do
+    result = nil
+    output, = capture_io do
+      result = Create.wtf?(params: {x: 1}, a_return: true)
+    end
+
+    output.gsub(/0x\w+/, "").gsub(/@.+_test/, "").must_equal %{`-- #<Trailblazer::Activity:>
+    |-- \e[32mStart.default\e[0m
+    |-- \e[32mCreate.task.a\e[0m
+    |-- MyNested
+    |   |-- \e[32mStart.default\e[0m
+    |   |-- \e[32mB.task.b\e[0m
+    |   |-- \e[32mB.task.e\e[0m
+    |   `-- End.success
+    |-- \e[32mCreate.task.c\e[0m
+    |-- \e[32mCreate.task.params\e[0m
+    `-- End.success
+}
+
+    result.success?.must_equal true
+    result[:a_return].must_equal true
+    result[:params].inspect.must_equal %{{:x=>1}}
+  end
 end

data/trailblazer-operation.gemspec

@@ -14,17 +14,16 @@ Gem::Specification.new do |spec|
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.test_files    = spec.files.grep(%r{^(test)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 0.2.6", "< 1.0.0"
-  spec.add_dependency "trailblazer-activity", ">= 0.10.0", "< 1.0.0"
-  spec.add_dependency "trailblazer-developer", ">= 0.0.8"
+  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 0.4.0", "< 1.0.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "trailblazer-developer"
 
   spec.required_ruby_version = ">= 2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-operation
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-21 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity-dsl-linear
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.4.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -26,46 +26,26 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.6
+        version: 0.4.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
-  name: trailblazer-activity
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.0
-    - - "<"
-      - !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.10.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-- !ruby/object:Gem::Dependency
-  name: trailblazer-developer
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.8
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.8
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -79,7 +59,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -93,7 +73,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -107,7 +87,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubocop
+  name: trailblazer-developer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -138,7 +118,6 @@ files:
 - lib/trailblazer/operation.rb
 - lib/trailblazer/operation/callable.rb
 - lib/trailblazer/operation/class_dependencies.rb
-- lib/trailblazer/operation/container.rb
 - lib/trailblazer/operation/deprecated_macro.rb
 - lib/trailblazer/operation/public_call.rb
 - lib/trailblazer/operation/railway.rb
@@ -155,7 +134,6 @@ files:
 - test/docs/macaroni_test.rb
 - test/docs/operation_test.rb
 - test/docs/wiring_test.rb
-- test/dry_container_test.rb
 - test/fast_track_test.rb
 - test/gemfiles/Gemfile.ruby-1.9
 - test/gemfiles/Gemfile.ruby-2.0
@@ -165,8 +143,6 @@ files:
 - test/introspect_test.rb
 - test/operation_test.rb
 - test/result_test.rb
-- test/ruby-2.0.0/operation_test.rb
-- test/ruby-2.0.0/step_test.rb
 - test/skill_test.rb
 - test/step_test.rb
 - test/test_helper.rb
@@ -194,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Trailblazer's operation object with railway flow and integrated error handling.
@@ -208,7 +184,6 @@ test_files:
 - test/docs/macaroni_test.rb
 - test/docs/operation_test.rb
 - test/docs/wiring_test.rb
-- test/dry_container_test.rb
 - test/fast_track_test.rb
 - test/gemfiles/Gemfile.ruby-1.9
 - test/gemfiles/Gemfile.ruby-2.0
@@ -218,8 +193,6 @@ test_files:
 - test/introspect_test.rb
 - test/operation_test.rb
 - test/result_test.rb
-- test/ruby-2.0.0/operation_test.rb
-- test/ruby-2.0.0/step_test.rb
 - test/skill_test.rb
 - test/step_test.rb
 - test/test_helper.rb

data/lib/trailblazer/operation/container.rb

@@ -1,14 +0,0 @@
-module Trailblazer
-  module Operation::Container
-    def options_for_public_call(options={}, *containers)
-      # generate the skill hash that embraces runtime options plus potential containers, the so called Runtime options.
-      # This wrapping is supposed to happen once in the entire system.
-
-      hash_transformer = ->(containers) { containers[0].to_hash } # FIXME: don't transform any containers into kw args.
-
-      immutable_options = Trailblazer::Context::ContainerChain.new([options, *containers], to_hash: hash_transformer)
-
-      Trailblazer::Context(immutable_options)
-    end
-  end
-end

data/test/dry_container_test.rb

@@ -1,25 +0,0 @@
-require "test_helper"
-require "dry/container"
-
-class DryContainerTest < Minitest::Spec
-  my_container = Dry::Container.new
-  my_container.register("user_repository", -> { Object })
-  my_container.namespace("contract") do
-    register("create") { Array }
-  end
-
-  class Create < Trailblazer::Operation
-    extend Trailblazer::Operation::Container
-  end
-
-  it "allows 2.2 call style" do
-    Create.({}, my_container)["user_repository"].must_equal Object
-  end
-
-  it { Create.({}, {}, my_container)["user_repository"].must_equal Object }
-  it { Create.({}, {}, my_container)["contract.create"].must_equal Array }
-  # also allows our own options PLUS containers.
-  it { Create.({}, {"model" => String}, my_container)["model"].must_equal String }
-  it { Create.({}, {"model" => String}, my_container)["user_repository"].must_equal Object }
-  it { Create.({}, {"user_repository" => Integer}, my_container)["user_repository"].must_equal Integer }
-end

data/test/ruby-2.0.0/operation_test.rb

@@ -1,61 +0,0 @@
-require "test_helper"
-
-class DeclarativeApiTest < Minitest::Spec
-  #---
-  #- step, pass, fail
-
-  # Test: step/pass/fail
-  # * do they deviate properly?
-  class Create < Trailblazer::Operation
-    step :decide!
-    success :wasnt_ok!
-    success :was_ok!
-    failure :return_true!
-    failure :return_false!
-
-    def decide!(options, decide: raise, **_o)
-      options["a"] = true
-      decide
-    end
-
-    def wasnt_ok!(options, **_o)
-      options["y"] = false
-    end
-
-    def was_ok!(options, **_o)
-      options["x"] = true
-    end
-
-    def return_true!(options, **_o); options["b"] = true end
-
-    def return_false!(options, **_o); options["c"] = false end
-  end
-
-  it { Create.({}, decide: true).inspect("a", "x", "y", "b", "c").must_equal %{<Result:true [true, true, false, nil, nil] >} }
-  it { Create.({}, decide: false).inspect("a", "x", "y", "b", "c").must_equal %{<Result:false [true, nil, nil, true, false] >} }
-
-  #---
-  #- trace
-
-  it do
-  end
-
-  #---
-  #- empty class
-  class Noop < Trailblazer::Operation
-  end
-
-  it { Noop.().inspect("params").must_equal %{<Result:true [{}] >} }
-
-  #---
-  #- pass
-  #- fail
-  class Update < Trailblazer::Operation
-    pass ->(options, **_o) { options["a"] = false }
-    step ->(options, params: raise, **_o) { options["b"] = params[:decide] }
-    fail ->(options, **_o) { options["c"] = true }
-  end
-
-  it { Update.(decide: true).inspect("a", "b", "c").must_equal %{<Result:true [false, true, nil] >} }
-  it { Update.(decide: false).inspect("a", "b", "c").must_equal %{<Result:false [false, false, true] >} }
-end

data/test/ruby-2.0.0/step_test.rb

@@ -1,137 +0,0 @@
-require "test_helper"
-
-# Tests
-# ---  step ->(*o) { snippet }
-# ---  step Callable
-# ---  step :method
-# ---  step MyMacro
-class StepTest < Minitest::Spec
-  class Callable
-    def self.call(options, b: nil, **_o)
-      options["b"] = b
-    end
-  end
-
-  module Implementation
-    module_function
-
-    def c(options, c: nil, **_o)
-      options["c"] = c
-    end
-  end
-
-  MyMacro = ->(direction, options, flow_options) do
-    options["e"] = options[:e]
-
-    [direction, options, flow_options]
-  end
-
-  class Create < Trailblazer::Operation
-    step ->(options, a: nil, **_o) { options["a"] = a }
-    step Callable
-    step Implementation.method(:c)
-    step :d
-    step [MyMacro, {}] # doesn't provide runner_options.
-
-    def d(options, d: nil, **_o)
-      options["d"] = d
-    end
-  end
-
-  it { Create.({}, a: 1, b: 2, c: 3, d: 4, e: 5).inspect("a", "b", "c", "d", "e").must_equal "<Result:true [1, 2, 3, 4, 5] >" }
-
-  it { Trailblazer::Operation::Inspect.(Create).gsub(/0x.+?step_test.rb/, "").must_equal %{[>#<Proc::29 (lambda)>,>StepTest::Callable,>#<Method: StepTest::Implementation.c>,>d,>[#<Proc::22 (lambda)>, {}]]} }
-  # poor test to make sure we pass debug information to Activity.
-  it { Create["__activity__"].graph.find_all(:d).first[:id].must_equal :d }
-
-  #---
-  #- :before, :after, :replace, :delete, :override
-  class A < Trailblazer::Operation
-    step :a!
-    def a!(options, **_o); options["a"] = 1; end
-    def a!(options, **_o); options["a"] = 1; end if RUBY_VERSION == "2.0.0"
-  end
-
-  class B < A
-    step :b!, before: :a!
-    step :c!, before: :a!
-    step :d!, after:  :b!
-  end
-
-  it { Trailblazer::Operation::Inspect.(B).must_equal %{[>b!,>d!,>c!,>a!]} }
-
-  class C < B
-    step :e!, replace: :c!
-    step nil, delete: :d!
-  end
-
-  it { Trailblazer::Operation::Inspect.(C).must_equal %{[>b!,>e!,>a!]} }
-
-  class D < Trailblazer::Operation
-    step :a!
-    step :b!
-    step :b!, override: true
-  end
-
-  it { Trailblazer::Operation::Inspect.(D).must_equal %{[>a!,>b!]} }
-
-  # not existent :name
-  it do
-    err = assert_raises Trailblazer::Operation::Railway::Sequence::IndexError do
-      class E < Trailblazer::Operation
-        step :a, before: "I don't exist!"
-      end
-    end
-
-    err.inspect.must_equal "#<Trailblazer::Operation::Railway::Sequence::IndexError: I don't exist!>"
-  end
-
-  #---
-  #- :name
-  #-   step :whatever, name: :validate
-  class Index < Trailblazer::Operation
-    step :validate!, name: "my validate"
-    step :persist!
-    step [MyMacro, name: "I win!"]
-    step [MyMacro, name: "I win!"], name: "No, I do!"
-  end
-
-  it { Trailblazer::Operation::Inspect.(Index).must_equal %{[>my validate,>persist!,>I win!,>No, I do!]} }
-
-  #---
-  #- inheritance
-  class New < Create
-  end
-
-  it { Trailblazer::Operation::Inspect.(New).gsub(/0x.+?step_test.rb/, "").must_equal %{[>#<Proc::29 (lambda)>,>StepTest::Callable,>#<Method: StepTest::Implementation.c>,>d,>[#<Proc::22 (lambda)>, {}]]} }
-
-  class Update < Create
-    step :after_save!
-  end
-
-  it { Trailblazer::Operation::Inspect.(Update).gsub(/0x.+?step_test.rb/, "").must_equal %{[>#<Proc::29 (lambda)>,>StepTest::Callable,>#<Method: StepTest::Implementation.c>,>d,>[#<Proc::22 (lambda)>, {}],>after_save!]} }
-end
-
-#---
-#- Macros with the old `input` arg.
-#  step [ ->(input, options) { } ]
-# TODO: remove me in 2.2.
-class StepWithDeprecatedMacroTest < Minitest::Spec
-  class Create < Trailblazer::Operation
-    MyOutdatedMacro = ->(input, options) {
-      options["x"] = input.class
-    }
-
-    class AnotherOldMacro
-      def self.call(input, options)
-        options["y"] = input.class
-      end
-    end
-
-    step [MyOutdatedMacro, name: :outdated]
-    step [AnotherOldMacro, name: :oldie]
-  end
-
-  it { Trailblazer::Operation::Inspect.(Create).gsub(/0x.+?step_test.rb/, "").must_equal %{[>outdated,>oldie]} }
-  it { Create.().inspect("x", "y").must_equal %{<Result:true [StepWithDeprecatedMacroTest::Create, StepWithDeprecatedMacroTest::Create] >} }
-end