trailblazer 2.1.0.beta1 → 2.1.0.beta2

data/lib/trailblazer/operation/wrap.rb

@@ -3,7 +3,7 @@ class Trailblazer::Operation
   # false is automatically connected to End.failure.
 
   def self.Wrap(user_wrap, id: "Wrap/#{rand(100)}", &block)
-    operation_class = Wrap.Operation(block)
+    operation_class = Wrap.create_operation(block)
     wrapped         = Wrap::Wrapped.new(operation_class, user_wrap)
 
     # connect `false` as an end event, when an exception stopped the wrap, for example.
@@ -13,7 +13,7 @@ class Trailblazer::Operation
   end
 
   module Wrap
-    def self.Operation(block)
+    def self.create_operation(block)
       Class.new( Nested.operation_class, &block ) # Usually resolves to Trailblazer::Operation.
     end
 
@@ -28,10 +28,9 @@ class Trailblazer::Operation
 
       def call( (options, flow_options), **circuit_options )
         block_calling_wrapped = -> {
-          args, circuit_options_with_wrap_static = Railway::TaskWrap.arguments_for_call( @operation, [options, flow_options], **circuit_options )
+          activity = @operation.decompose[:activity]
 
-          # TODO: this is not so nice, still working out how to separate all those bits and pieces.
-          @operation.instance_variable_get(:@process).( args, **circuit_options.merge(circuit_options_with_wrap_static) ) # FIXME: arguments_for_call don't return the full circuit_options, :exec_context gets lost.
+          activity.( [options, flow_options], **circuit_options )
         }
 
         # call the user's Wrap {} block in the operation.

data/lib/trailblazer/task.rb

@@ -1,20 +1,20 @@
-module Trailblazer
-  class Activity
-    module Task
-      # Convenience functions for tasks. Totally optional.
+# module Trailblazer
+#   class Activity
+#     module Task
+#       # Convenience functions for tasks. Totally optional.
 
-      # Task::Binary aka "step"
-      # Step is binary task: true=> Right, false=>Left.
-      # Step call proc.(options, flow_options)
-      # Step is supposed to run Option::KW, so `step` should be Option::KW.
-      #
-      # Returns task to call the proc with (options, flow_options), omitting `direction`.
-      # When called, the task always returns a direction signal.
-      def self.Binary(step, on_true=Activity::Right, on_false=Activity::Left)
-        ->(*args) do # Activity/Task interface.
-          [ step.(*args) ? on_true : on_false, *args ] # <=> Activity/Task interface
-        end
-      end
-    end
-  end
-end
+#       # Task::Binary aka "step"
+#       # Step is binary task: true=> Right, false=>Left.
+#       # Step call proc.(options, flow_options)
+#       # Step is supposed to run Option::KW, so `step` should be Option::KW.
+#       #
+#       # Returns task to call the proc with (options, flow_options), omitting `direction`.
+#       # When called, the task always returns a direction signal.
+#       def self.Binary(step, on_true=Activity::Right, on_false=Activity::Left)
+#         ->(*args) do # Activity/Task interface.
+#           [ step.(*args) ? on_true : on_false, *args ] # <=> Activity/Task interface
+#         end
+#       end
+#     end
+#   end
+# end

data/lib/trailblazer/version.rb

@@ -1,3 +1,3 @@
 module Trailblazer
-  VERSION = "2.1.0.beta1"
+  VERSION = "2.1.0.beta2"
 end

data/test/docs/nested_test.rb

@@ -49,11 +49,6 @@ class DocsNestedOperationTest < Minitest::Spec
     result["contract.default"].model.must_equal result[:model]
   end
 
-  it "provides all steps for Introspect" do
-     Trailblazer::Activity::Trace.compute_debug( Edit ).values.must_equal [{:id=>"model.build"}, {:id=>"contract.build"}]
-    Trailblazer::Activity::Trace.compute_debug( Update ).values.must_equal [{:id=>"Nested(DocsNestedOperationTest::Edit)"}, {:id=>"contract.default.validate"}, {:id=>"persist.save"}, {:id=>"model.build"}, {:id=>"contract.build"}, {:id=>"contract.default.params_extract"}, {:id=>"contract.default.call"}]
-  end
-
 #- test Edit circuit-level.
 it do
   signal, (result, _) = Edit.__call__( [Trailblazer::Context( params: {id: 1} ), {}] )
@@ -145,10 +140,10 @@ class NestedOutput < Minitest::Spec
 
   #:output
   class Update < Trailblazer::Operation
-    step Nested( Edit, output: ->(options, **) do
+    step Nested( Edit, output: ->( ctx, ** ) do
       {
-        "contract.my" => options["contract.default"],
-        model:           options[:model]
+        "contract.my" => ctx["contract.default"],
+        model:           ctx[:model]
       }
     end )
     step Contract::Validate( name: "my" )
@@ -171,11 +166,9 @@ end
 class NestedWithCallableTest < Minitest::Spec
   Song = Struct.new(:id, :title)
 
-  class Song
-    module Contract
-      class Create < Reform::Form
-        property :title
-      end
+  module Song::Contract
+    class Create < Reform::Form
+      property :title
     end
   end
 
@@ -229,8 +222,6 @@ class NestedWithCallableTest < Minitest::Spec
   #---
   #:callable-builder
   class MyBuilder
-    extend Uber::Callable
-
     def self.call(options, current_user:nil, **)
       current_user.admin? ? Create::Admin : Create::NeedsModeration
     end
@@ -248,6 +239,49 @@ class NestedWithCallableTest < Minitest::Spec
   it { Delete.(params: {}, current_user: admin)    .inspect("x").must_equal %{<Result:true [nil] >} }
 end
 
+class NestedWithCallableAndInputTest < Minitest::Spec
+  Memo = Struct.new(:title, :text, :created_by)
+
+  class Memo::Upsert < Trailblazer::Operation
+    step Nested( :operation_class, input: :input_for_create )
+
+    def operation_class( ctx, ** )
+      ctx[:id] ? Update : Create
+    end
+
+    # only let :title pass through.
+    def input_for_create( ctx )
+      { title: ctx[:title] }
+    end
+
+    class Create < Trailblazer::Operation
+      step :create_memo
+
+      def create_memo( ctx, ** )
+        ctx[:model] = Memo.new(ctx[:title], ctx[:text], :create)
+      end
+    end
+
+    class Update < Trailblazer::Operation
+      step :find_by_title
+
+      def find_by_title( ctx, ** )
+        ctx[:model] = Memo.new(ctx[:title], ctx[:text], :update)
+      end
+    end
+  end
+
+  it "runs Create without :id" do
+    Memo::Upsert.( title: "Yay!" ).inspect(:model).
+      must_equal %{<Result:true [#<struct NestedWithCallableAndInputTest::Memo title=\"Yay!\", text=nil, created_by=:create>] >}
+  end
+
+  it "runs Update without :id" do
+    Memo::Upsert.( id: 1, title: "Yay!" ).inspect(:model).
+      must_equal %{<Result:true [#<struct NestedWithCallableAndInputTest::Memo title=\"Yay!\", text=nil, created_by=:update>] >}
+  end
+end
+
 # builder: Nested + deviate to left if nil / skip_track if true
 
 #---

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+require "pp"
 require "trailblazer"
 require "minitest/autorun"
 

data/trailblazer.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-operation", ">= 0.1.2", "< 0.2.0"
+  spec.add_dependency "trailblazer-operation", ">= 0.2.0", "< 0.3.0"
   spec.add_dependency "reform", ">= 2.2.0", "< 3.0.0"
   spec.add_dependency "declarative"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta1
+  version: 2.1.0.beta2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer-operation
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: reform
   requirement: !ruby/object:Gem::Requirement
@@ -157,6 +157,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
+- ".rubocop_todo.yml"
 - ".travis.yml"
 - CHANGES.md
 - COMM-LICENSE
@@ -176,6 +178,7 @@ files:
 - lib/trailblazer/operation/contract.rb
 - lib/trailblazer/operation/deprecations.rb
 - lib/trailblazer/operation/guard.rb
+- lib/trailblazer/operation/input_output.rb
 - lib/trailblazer/operation/model.rb
 - lib/trailblazer/operation/module.rb
 - lib/trailblazer/operation/nested.rb