trailblazer 2.0.7 → 2.1.0.beta1

data/test/docs/operation_test.rb

@@ -11,8 +11,8 @@ class DocsOperationExampleTest < Minitest::Spec
     step     Model( Song, :new )
     step     :assign_current_user!
     # ..
-    def assign_current_user!(options)
-      options["model"].created_by = options["current_user"]
+    def assign_current_user!(options, **)
+      options[:model].created_by = options[:current_user]
     end
   end
   #:invocation-dep end
@@ -20,46 +20,44 @@ class DocsOperationExampleTest < Minitest::Spec
   it do
     current_user = User.new("Ema")
   #:invocation-dep-call
-  result = Create.( { title: "Roxanne" }, "current_user" => current_user )
+  result = Create.( params: { title: "Roxanne" }, :current_user => current_user )
   #:invocation-dep-call end
 
   #:invocation-dep-res
-  result["current_user"] #=> #<User name="Ema">
-  result["model"]        #=> #<Song id=nil, title=nil, created_by=#<User name="Ema">>
+  result[:current_user] #=> #<User name="Ema">
+  result[:model]        #=> #<Song id=nil, title=nil, created_by=#<User name="Ema">>
   #:invocation-dep-res end
   end
 
-  it { Create.({ title: "Roxanne" }, "current_user" => Module).inspect("model").must_equal %{<Result:true [#<struct DocsOperationExampleTest::Song id=nil, title=nil, created_by=Module>] >} }
+  it { Create.(params: { title: "Roxanne" }, :current_user => Module).inspect(:model).must_equal %{<Result:true [#<struct DocsOperationExampleTest::Song id=nil, title=nil, created_by=Module>] >} }
 
   #:op
   class Song::Create < Trailblazer::Operation
-    extend Contract::DSL
-
-    contract do
+    class Form < Reform::Form
       property :title
       validates :title, presence: true
     end
 
     step     Model( Song, :new )
     step     :assign_current_user!
-    step     Contract::Build()
+    step     Contract::Build( constant: Form )
     step     Contract::Validate( )
     failure  :log_error!
     step     Contract::Persist(  )
 
-    def log_error!(options)
+    def log_error!(options, **)
       # ..
     end
 
-    def assign_current_user!(options)
-      options["model"].created_by =
-        options["current_user"]
+    def assign_current_user!(options, **)
+      options[:model].created_by =
+        options[:current_user]
     end
   end
   #:op end
 
-  it { Song::Create.({ }).inspect("model").must_equal %{<Result:false [#<struct DocsOperationExampleTest::Song id=nil, title=nil, created_by=nil>] >} }
-  it { Song::Create.({ title: "Nothin'" }, "current_user"=>Module).inspect("model").must_equal %{<Result:true [#<struct DocsOperationExampleTest::Song id=nil, title="Nothin'", created_by=Module>] >} }
+  it { Song::Create.(params: { }).inspect(:model).must_equal %{<Result:false [#<struct DocsOperationExampleTest::Song id=nil, title=nil, created_by=nil>] >} }
+  it { Song::Create.(params: { title: "Nothin'" }, :current_user=>Module).inspect(:model).must_equal %{<Result:true [#<struct DocsOperationExampleTest::Song id=nil, title="Nothin'", created_by=Module>] >} }
 end
 
 class DndTest < Minitest::Spec
@@ -83,8 +81,8 @@ class DocsResultTest < Minitest::Spec
     step     :validate!
 
     def model!(options, current_user:, **)
-      options["model"] = Song.new
-      options["model"].created_by = current_user
+      options[:model] = Song.new
+      options[:model].created_by = current_user
     end
 
     def assign!(*, params:, model:, **)
@@ -102,13 +100,13 @@ class DocsResultTest < Minitest::Spec
   it do
     current_user = Struct.new(:email).new("nick@trailblazer.to")
   #:step-res
-  result = Song::Create.({ title: "Roxanne" }, "current_user" => current_user)
+  result = Song::Create.(params: { title: "Roxanne" }, :current_user => current_user)
 
-  result["model"] #=> #<Song title="Roxanne", "created_by"=<User ...>
+  result[:model] #=> #<Song title="Roxanne", "created_by"=<User ...>
   result["result.validate"] #=> true
   #:step-res end
 
-    result.inspect("current_user", "model").must_equal %{<Result:true [#<struct email=\"nick@trailblazer.to\">, #<struct DocsResultTest::Song id=nil, title="Roxanne", created_by=#<struct email=\"nick@trailblazer.to\">>] >}
+    result.inspect(:current_user, :model).must_equal %{<Result:true [#<struct email=\"nick@trailblazer.to\">, #<struct DocsResultTest::Song id=nil, title="Roxanne", created_by=#<struct email=\"nick@trailblazer.to\">>] >}
 
   #:step-binary
   result.success? #=> true
@@ -116,11 +114,11 @@ class DocsResultTest < Minitest::Spec
   #:step-binary end
 
   #:step-dep
-  result["current_user"] #=> <User ...>
+  result[:current_user] #=> <User ...>
   #:step-dep end
 
   #:step-inspect
-  result.inspect("current_user", "model") #=> "<Result:true [#<User email=\"nick@tra... "
+  result.inspect(:current_user, :model) #=> "<Result:true [#<User email=\"nick@tra... "
   #:step-inspect end
   end
 end
@@ -133,6 +131,7 @@ class DocsDependencyTest < Minitest::Spec
 
   #:dep-op
   class Song::Create < Trailblazer::Operation
+    extend ClassDependencies
     self["my.model.class"] = Song
 
     #~dep-pipe
@@ -194,19 +193,19 @@ class DocsOperationAPIExampleTest < Minitest::Spec
     failure :log_error!
     step    Contract::Persist()
 
-    def log_error!(options)
+    def log_error!(options, **)
       # ..
     end
 
-    def assign_current_user!(options)
-      options["model"].created_by =
-        options["current_user"]
+    def assign_current_user!(options, **)
+      options[:model].created_by =
+        options[:current_user]
     end
   end
   #:op-api end
 
-  it { Song::Create.({ }).inspect("model").must_equal %{<Result:false [#<struct DocsOperationAPIExampleTest::Song id=nil, title=nil, created_by=nil>] >} }
-  it { Song::Create.({ title: "Nothin'" }, "current_user"=>Module).inspect("model").must_equal %{<Result:true [#<struct DocsOperationAPIExampleTest::Song id=nil, title="Nothin'", created_by=Module>] >} }
+  it { Song::Create.(params: {}).inspect(:model).must_equal %{<Result:false [#<struct DocsOperationAPIExampleTest::Song id=nil, title=nil, created_by=nil>] >} }
+  it { Song::Create.(params: { title: "Nothin'" }, :current_user=>Module).inspect(:model).must_equal %{<Result:true [#<struct DocsOperationAPIExampleTest::Song id=nil, title="Nothin'", created_by=Module>] >} }
 end
 
 
@@ -227,7 +226,7 @@ class DocsOperationInheritanceTest < Minitest::Spec
   end
   #:inh-new end
 
-  puts New["pipetree"].inspect(style: :row)
+  puts Trailblazer::Operation::Inspect.(New, style: :row)
 =begin
   #:inh-new-pipe
    0 =======================>>operation.new
@@ -243,7 +242,7 @@ class DocsOperationInheritanceTest < Minitest::Spec
   end
   #:inh-create end
 
-  puts Create["pipetree"].inspect(style: :row)
+  puts Trailblazer::Operation::Inspect.(Create, style: :row)
 =begin
   #:inh-create-pipe
    0 =======================>>operation.new
@@ -279,7 +278,7 @@ class DocsOperationInheritanceTest < Minitest::Spec
   end
   #:override-new end
 
-  puts Song::New["pipetree"].inspect(style: :row)
+  puts Trailblazer::Operation::Inspect.(Song::New, style: :row)
 =begin
   #:override-pipe
   Song::New["pipetree"].inspect(style: :row)
@@ -290,8 +289,8 @@ class DocsOperationInheritanceTest < Minitest::Spec
 =end
 
   it do
-    Song::New["pipetree"].inspect.must_equal %{[>operation.new,>model.build,>contract.build]}
-    Song::New.().inspect("model").must_equal %{<Result:true [#<struct DocsOperationInheritanceTest::Song id=nil, title=nil, created_by=nil>] >}
+    Trailblazer::Operation::Inspect.(Song::New).must_equal %{[>model.build,>contract.build]}
+    Song::New.(params: {}).inspect(:model).must_equal %{<Result:true [#<struct DocsOperationInheritanceTest::Song id=nil, title=nil, created_by=nil>] >}
   end
 end
 
@@ -309,7 +308,7 @@ class DocsOperationStepOptionsTest < Minitest::Spec
     end
     #:name-auto end
 
-    puts New["pipetree"].inspect(style: :row)
+    puts Trailblazer::Operation::Inspect.(New, style: :row)
 =begin
   #:name-auto-pipe
    0 =======================>>operation.new
@@ -323,7 +322,7 @@ class DocsOperationStepOptionsTest < Minitest::Spec
     end
     #:replace-inh end
 
-    puts Update["pipetree"].inspect(style: :row)
+    puts Trailblazer::Operation::Inspect.(Update, style: :row)
 =begin
   #:replace-inh-pipe
    0 =======================>>operation.new
@@ -331,7 +330,7 @@ class DocsOperationStepOptionsTest < Minitest::Spec
   #:replace-inh-pipe end
 =end
 
-    it { Update.({}).inspect("model").must_equal %{<Result:false [nil] >} }
+    it { Update.(params: {}).inspect(:model).must_equal %{<Result:false [nil] >} }
 
 
 #     #:delete-inh
@@ -349,19 +348,19 @@ class DocsOperationStepOptionsTest < Minitest::Spec
 #   #:delete-inh-pipe end
 # =end
 
-#     it { Noop.({}).inspect("model").must_equal %{<Result:false [nil] >} }
+#     it { Noop.({}).inspect(:model).must_equal %{<Result:false [nil] >} }
   end
 
   class ManualNameTest < Minitest::Spec
     #:name-manu
     class New < Trailblazer::Operation
-      step Model( Song, :new ), name: "build.song.model"
+      step(Model( Song, :new ), {name: "build.song.model"})
       step :validate_params!,   name: "my.params.validate"
       # ..
     end
     #:name-manu end
 
-    puts New["pipetree"].inspect(style: :row)
+    puts Trailblazer::Operation::Inspect.(New, style: :row)
 =begin
   #:name-manu-pipe
    0 =======================>>operation.new
@@ -380,7 +379,7 @@ class DocsOperationStepOptionsTest < Minitest::Spec
     end
     #:pos-before end
 
-    puts New["pipetree"].inspect(style: :row)
+    puts Trailblazer::Operation::Inspect.(New, style: :row)
 =begin
   #:pos-before-pipe
    0 =======================>>operation.new
@@ -391,11 +390,11 @@ class DocsOperationStepOptionsTest < Minitest::Spec
 
     #:pos-inh
     class Create < New
-      step :policy!, after: "operation.new"
+      step :policy!, before: "model.build"
     end
     #:pos-inh end
 
-    puts Create["pipetree"].inspect(style: :row)
+    puts Trailblazer::Operation::Inspect.(Create, style: :row)
 =begin
   #:pos-inh-pipe
    0 =======================>>operation.new

data/test/docs/pundit_test.rb

@@ -29,13 +29,13 @@ class DocsPunditProcTest < Minitest::Spec
   end
   #:pundit end
 
-  it { Create["pipetree"].inspect.must_equal %{[>operation.new,>model.build,>policy.default.eval]} }
-  it { Create.({}, "current_user" => Module).inspect("model").must_equal %{<Result:true [#<struct DocsPunditProcTest::Song id=nil>] >} }
-  it { Create.({}                          ).inspect("model").must_equal %{<Result:false [#<struct DocsPunditProcTest::Song id=nil>] >} }
+  it { Trailblazer::Operation::Inspect.(Create).must_equal %{[>model.build,>policy.default.eval]} }
+  it { Create.(params: {}, current_user: Module).inspect(:model).must_equal %{<Result:true [#<struct DocsPunditProcTest::Song id=nil>] >} }
+  it { Create.(params: {}                          ).inspect(:model).must_equal %{<Result:false [#<struct DocsPunditProcTest::Song id=nil>] >} }
 
   it do
   #:pundit-result
-  result = Create.({}, "current_user" => Module)
+  result = Create.(params: {}, current_user: Module)
   result["result.policy.default"].success? #=> true
   result["result.policy.default"]["policy"] #=> #<MyPolicy ...>
   #:pundit-result end
@@ -49,9 +49,9 @@ class DocsPunditProcTest < Minitest::Spec
     step Policy::Pundit( MyPolicy, :new? ), override: true
   end
 
-  it { New["pipetree"].inspect.must_equal %{[>operation.new,>model.build,>policy.default.eval]} }
-  it { New.({}, "current_user" => Class ).inspect("model").must_equal %{<Result:true [#<struct DocsPunditProcTest::Song id=nil>] >} }
-  it { New.({}, "current_user" => nil ).inspect("model").must_equal %{<Result:false [#<struct DocsPunditProcTest::Song id=nil>] >} }
+  it { Trailblazer::Operation::Inspect.(New).must_equal %{[>model.build,>policy.default.eval]} }
+  it { New.(params: {}, current_user: Class ).inspect(:model).must_equal %{<Result:true [#<struct DocsPunditProcTest::Song id=nil>] >} }
+  it { New.(params: {}, current_user: nil ).inspect(:model).must_equal %{<Result:false [#<struct DocsPunditProcTest::Song id=nil>] >} }
 
   #---
   #- override with :name
@@ -64,10 +64,10 @@ class DocsPunditProcTest < Minitest::Spec
     step Policy::Pundit( MyPolicy, :new?, name: "first" ), override: true
   end
 
-  it { Edit["pipetree"].inspect.must_equal %{[>operation.new,>policy.first.eval,>policy.second.eval]} }
-  it { Edit.({}, "current_user" => Class).inspect("model").must_equal %{<Result:false [nil] >} }
-  it { Update["pipetree"].inspect.must_equal %{[>operation.new,>policy.first.eval,>policy.second.eval]} }
-  it { Update.({}, "current_user" => Class).inspect("model").must_equal %{<Result:true [nil] >} }
+  it { Trailblazer::Operation::Inspect.(Edit).must_equal %{[>policy.first.eval,>policy.second.eval]} }
+  it { Edit.(params: {}, current_user: Class).inspect(:model).must_equal %{<Result:false [nil] >} }
+  it { Trailblazer::Operation::Inspect.(Update).must_equal %{[>policy.first.eval,>policy.second.eval]} }
+  it { Update.(params: {}, current_user: Class).inspect(:model).must_equal %{<Result:true [nil] >} }
 
   #---
   # dependency injection
@@ -80,8 +80,8 @@ class DocsPunditProcTest < Minitest::Spec
   it {
     result =
   #:di-call
-  Create.({},
-    "current_user"        => Module,
+  Create.(params: {},
+    current_user:            Module,
     "policy.default.eval" => Trailblazer::Operation::Policy::Pundit.build(AnotherPolicy, :create?)
   )
   #:di-call end
@@ -103,7 +103,7 @@ class PunditWithNameTest < Minitest::Spec
 
   it {
   #:name-call
-  result = Create.({}, "current_user" => Module)
+  result = Create.(params: {}, current_user: Module)
   result["result.policy.after_model"].success? #=> true
   #:name-call end
     result["result.policy.after_model"].success?.must_equal true }
@@ -123,8 +123,8 @@ end
 #   #:class-level end
 
 #   it { Create.(); Create["result.policy"].must_equal nil }
-#   it { Create.({}, "current_user" => Module)["x"].must_equal true }
-#   it { Create.({}                          )["x"].must_equal nil }
+#   it { Create.(params: {}, current_user: Module)["x"].must_equal true }
+#   it { Create.(params: {}                          )["x"].must_equal nil }
 # end
 
 

data/test/docs/representer_test.rb

@@ -20,7 +20,7 @@ class DocsRepresenterInferTest < Minitest::Spec
   #:infer end
 
   let (:json) { MultiJson.dump(id: 1) }
-  it { Create.({}, "document" => json).inspect("model").must_equal %{<Result:true [#<struct DocsRepresenterInferTest::Song id=1, title=nil>] >} }
+  it { Create.( params: {}, document: json ).inspect(:model).must_equal %{<Result:true [#<struct DocsRepresenterInferTest::Song id=1, title=nil>] >} }
 end
 
 #---
@@ -49,18 +49,18 @@ class DocsRepresenterExplicitTest < Minitest::Spec
   #:explicit-op end
 
   let (:json) { MultiJson.dump(id: 1) }
-  it { Create.({}, "document" => json).inspect("model").must_equal %{<Result:true [#<struct DocsRepresenterExplicitTest::Song id=1, title=nil>] >} }
+  it { Create.(params: {}, document: json).inspect(:model).must_equal %{<Result:true [#<struct DocsRepresenterExplicitTest::Song id=1, title=nil>] >} }
   it do
   #:explicit-call
-  Create.({}, "document" => '{"id": 1}')
+  Create.(params: {}, document: '{"id": 1}')
   #:explicit-call end
   end
 
   #- render
   it do
   #:render
-  result = Create.({}, "document" => '{"id": 1}')
-  json   = result["representer.default.class"].new(result["model"]).to_json
+  result = Create.( params: {}, document: '{"id": 1}' )
+  json   = result["representer.default.class"].new(result[:model]).to_json
   json #=> '{"id":1}'
   #:render end
   json.must_equal '{"id":1}'
@@ -81,12 +81,12 @@ class DocsRepresenterExplicitTest < Minitest::Spec
   let (:xml) { %{<body><id>1</id></body>} }
   it do
   #:di-call
-  result = Create.({},
-    "document" => '<body><id>1</id></body>',
+  result = Create.(params: {},
+    document: '<body><id>1</id></body>',
     "representer.default.class" => MyXMLRepresenter # injection
   )
   #:di-call end
-    result.inspect("model").must_equal %{<Result:true [#<struct DocsRepresenterExplicitTest::Song id="1", title=nil>] >}
+    result.inspect(:model).must_equal %{<Result:true [#<struct DocsRepresenterExplicitTest::Song id="1", title=nil>] >}
   end
 end
 
@@ -112,8 +112,8 @@ class DocsRepresenterDITest < Minitest::Spec
   end
 
   let (:json) { MultiJson.dump(id: 1) }
-  it { Create.({}, "document" => json,
-    "representer.default.class" => MyRepresenter).inspect("model").must_equal %{<Result:true [#<struct DocsRepresenterDITest::Song id=1, title=nil>] >} }
+  it { Create.(params: {}, document: json,
+    "representer.default.class" => MyRepresenter).inspect(:model).must_equal %{<Result:true [#<struct DocsRepresenterDITest::Song id=1, title=nil>] >} }
 end
 
 #---
@@ -141,7 +141,7 @@ class DocsRepresenterInlineTest < Minitest::Spec
   #:inline end
 
   let (:json) { MultiJson.dump(id: 1) }
-  it { Create.({}, "document" => json).inspect("model").must_equal %{<Result:true [#<struct DocsRepresenterInlineTest::Song id=1, title=nil>] >} }
+  it { Create.(params: {}, document: json).inspect(:model).must_equal %{<Result:true [#<struct DocsRepresenterInlineTest::Song id=1, title=nil>] >} }
 end
 
 #---
@@ -163,8 +163,8 @@ class DocsRepresenterManualRenderTest < Minitest::Spec
   end
 
   it do
-    result =Show.({ id: 1 })
-    json = result["representer.default.class"].new(result["model"]).to_json
+    result =Show.(params: { id: 1 })
+    json = result["representer.default.class"].new(result[:model]).to_json
     json.must_equal %{{"id":1}}
   end
 end
@@ -236,19 +236,19 @@ class DocsRepresenterFullExampleTest < Minitest::Spec
   #:full end
 
   it do
-    result =Create.({}, "document" => '{"title": "Tested"}')
+    result =Create.(params: {}, document: '{"title": "Tested"}')
 
-    json = result["representer.render.class"].new(result["model"]).to_json
+    json = result["representer.render.class"].new(result[:model]).to_json
 
     json.must_equal %{{"id":1,"title":"Tested","_links":{"self":{"href":"/songs/1"}}}}
 
 
   #:full-call
   def create
-    result = Create.(params, "document" => request.body.read)
+    result = Create.(params, document: request.body.read)
 
     if result.success?
-      result["representer.render.class"].new(result["model"]).to_json
+      result["representer.render.class"].new(result[:model]).to_json
     else
       result["representer.errors.class"].new(result["result.contract.default"]).to_json
     end
@@ -257,7 +257,7 @@ class DocsRepresenterFullExampleTest < Minitest::Spec
   end
 
   it do
-    result =Create.({}, "document" => '{"title": ""}')
+    result =Create.(params: {}, document: '{"title": ""}')
 
     if result.failure?
        json = result["representer.errors.class"].new(result["result.contract.default"]).to_json

data/test/docs/rescue_test.rb

@@ -8,33 +8,33 @@ class NestedRescueTest < Minitest::Spec
 
   class NestedInsanity < Trailblazer::Operation
     step Rescue {
-      step ->(options) { options["a"] = true }
+      step ->(options, **) { options["a"] = true }
       step Rescue {
-        step ->(options) { options["y"] = true }
-        success ->(options) { raise Y if options["raise-y"] }
-        step ->(options) { options["z"] = true }
+        step ->(options, **) { options["y"] = true }
+        success ->(options, **) { raise Y if options["raise-y"] }
+        step ->(options, **) { options["z"] = true }
       }
-      step ->(options) { options["b"] = true }
-      success ->(options) { raise A if options["raise-a"] }
-      step ->(options) { options["c"] = true }
-      failure ->(options) { options["inner-err"] = true }
+      step ->(options, **) { options["b"] = true }
+      success ->(options, **) { raise A if options["raise-a"] }
+      step ->(options, **) { options["c"] = true }
+      failure ->(options, **) { options["inner-err"] = true }
     }
-    step ->(options) { options["e"] = true }
-    failure ->(options) { options["outer-err"] = true }
+    step ->(options, **) { options["e"] = true }, name: "nested/e"
+    failure ->(options, **) { options["outer-err"] = true }, name: "nested/failure"
   end
 
-  it { NestedInsanity["pipetree"].inspect.must_equal %{[>operation.new,>Rescue:10,>rescue_test.rb:22,<rescue_test.rb:23]} }
-  it { NestedInsanity.({}).inspect("a", "y", "z", "b", "c", "e", "inner-err", "outer-err").must_equal %{<Result:true [true, true, true, true, true, true, nil, nil] >} }
-  it { NestedInsanity.({}, "raise-y" => true).inspect("a", "y", "z", "b", "c", "e", "inner-err", "outer-err").must_equal %{<Result:false [true, true, nil, nil, nil, nil, true, true] >} }
-  it { NestedInsanity.({}, "raise-a" => true).inspect("a", "y", "z", "b", "c", "e", "inner-err", "outer-err").must_equal %{<Result:false [true, true, true, true, nil, nil, nil, true] >} }
+  it { Trailblazer::Operation::Inspect.(NestedInsanity).must_match /\[>Rescue\(\d+\),>nested/ } # FIXME: better introspect tests for all id-generating macros.
+  it { NestedInsanity.().inspect("a", "y", "z", "b", "c", "e", "inner-err", "outer-err").must_equal %{<Result:true [true, true, true, true, true, true, nil, nil] >} }
+  it { NestedInsanity.( "raise-y" => true).inspect("a", "y", "z", "b", "c", "e", "inner-err", "outer-err").must_equal %{<Result:false [true, true, nil, nil, nil, nil, true, true] >} }
+  it { NestedInsanity.( "raise-a" => true).inspect("a", "y", "z", "b", "c", "e", "inner-err", "outer-err").must_equal %{<Result:false [true, true, true, true, nil, nil, nil, true] >} }
 
   #-
   # inheritance
   class UbernestedInsanity < NestedInsanity
   end
 
-  it { UbernestedInsanity.({}).inspect("a", "y", "z", "b", "c", "e", "inner-err", "outer-err").must_equal %{<Result:true [true, true, true, true, true, true, nil, nil] >} }
-  it { UbernestedInsanity.({}, "raise-a" => true).inspect("a", "y", "z", "b", "c", "e", "inner-err", "outer-err").must_equal %{<Result:false [true, true, true, true, nil, nil, nil, true] >} }
+  it { UbernestedInsanity.().inspect("a", "y", "z", "b", "c", "e", "inner-err", "outer-err").must_equal %{<Result:true [true, true, true, true, true, true, nil, nil] >} }
+  it { UbernestedInsanity.( "raise-a" => true).inspect("a", "y", "z", "b", "c", "e", "inner-err", "outer-err").must_equal %{<Result:false [true, true, true, true, nil, nil, nil, true] >} }
 end
 
 class RescueTest < Minitest::Spec
@@ -66,8 +66,8 @@ class RescueTest < Minitest::Spec
   end
   #:simple end
 
-  it { Create.( id: 1, title: "Prodigal Son" )["contract.default"].model.inspect.must_equal %{#<struct RescueTest::Song id=1, title="Prodigal Son">} }
-  it { Create.( id: nil ).inspect("model").must_equal %{<Result:false [nil] >} }
+  it { Create.( params: {id: 1, title: "Prodigal Son"} )["contract.default"].model.inspect.must_equal %{#<struct RescueTest::Song id=1, title="Prodigal Son">} }
+  it { Create.( params: {id: nil} ).inspect(:model).must_equal %{<Result:false [nil] >} }
 
   #-
   # Rescue ExceptionClass, handler: ->(*) { }
@@ -91,10 +91,10 @@ class RescueTest < Minitest::Spec
   end
   #:name end
 
-    it { Create.( id: 1, title: "Prodigal Son" )["contract.default"].model.inspect.must_equal %{#<struct RescueTest::Song id=1, title="Prodigal Son">} }
-    it { Create.( id: 1, title: "Prodigal Son" ).inspect("x").must_equal %{<Result:true [nil] >} }
-    it { Create.( id: nil ).inspect("model", "x").must_equal %{<Result:false [nil, RescueTest::RecordNotFound] >} }
-    it { assert_raises(RuntimeError) { Create.( id: "RuntimeError!" ) } }
+    it { Create.( params: {id: 1, title: "Prodigal Son"} )["contract.default"].model.inspect.must_equal %{#<struct RescueTest::Song id=1, title="Prodigal Son">} }
+    it { Create.( params: {id: 1, title: "Prodigal Son"} ).inspect("x").must_equal %{<Result:true [nil] >} }
+    it { Create.( params: {id: nil} ).inspect(:model, "x").must_equal %{<Result:false [nil, RescueTest::RecordNotFound] >} }
+    it { assert_raises(RuntimeError) { Create.( params: {id: "RuntimeError!"} ) } }
   end
 
 
@@ -120,7 +120,7 @@ class RescueTest < Minitest::Spec
     step Rescue( RecordNotFound, handler: :rollback! ) {
       step Wrap ->(*, &block) { Sequel.transaction do block.call end } {
         step Model( Song, :find )
-        step ->(options) { options["model"].lock! } # lock the model.
+        step ->(options, *) { options[:model].lock! } # lock the model.
         step Contract::Build( constant: MyContract )
         step Contract::Validate( )
         step Contract::Persist( method: :sync )
@@ -134,7 +134,7 @@ class RescueTest < Minitest::Spec
       #~ex end
     end
 
-    def error!(options)
+    def error!(options, *)
       #~ex
       options["err"] = true
       #~ex end
@@ -142,13 +142,13 @@ class RescueTest < Minitest::Spec
   end
   #:example end
 
-    it { Create.( id: 1, title: "Pie" ).inspect("model", "x", "err").must_equal %{<Result:true [#<struct RescueTest::Song id=1, title=\"Pie\">, nil, nil] >} }
+    it { Create.( params: {id: 1, title: "Pie"} ).inspect(:model, "x", "err").must_equal %{<Result:true [#<struct RescueTest::Song id=1, title=\"Pie\">, nil, nil] >} }
     # raise exceptions in Model:
-    it { Create.( id: nil ).inspect("model", "x").must_equal %{<Result:false [nil, RescueTest::RecordNotFound] >} }
-    it { assert_raises(RuntimeError) { Create.( id: "RuntimeError!" ) } }
+    it { Create.( params: {id: nil} ).inspect(:model, "x").must_equal %{<Result:false [nil, RescueTest::RecordNotFound] >} }
+    it { assert_raises(RuntimeError) { Create.( params: {id: "RuntimeError!"} ) } }
     it do
-      Create.( id: 1, title: "Pie" )
-      Sequel.result.first.must_equal Pipetree::Railway::Right
+      Create.( params: {id: 1, title: "Pie"} )
+      Sequel.result.first.must_be_kind_of Trailblazer::Operation::Railway::End::Success
     end
   end
 end