trailblazer 2.1.0.beta3 → 2.1.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 36d27170113024b0c2af51f22fc1abc6042c6a68
-  data.tar.gz: 7483dd6c7482d06e332dd4b0ff9b74dd6afe4d91
+SHA256:
+  metadata.gz: 044bf54cdca3624c8e6bc5da16773c89de007343daa9312144a64699e7e4be01
+  data.tar.gz: ef916032a3a00776e16e743f443b3ce6a7388f1b3ae39e87d6014223e896a897
 SHA512:
-  metadata.gz: b05d29959550818ae9103231ac9716f3ebb8a074139d1b4a0e5b0f3a8e48e724dfe348e09fc18356412b9874dd4be930ba91148736b49c930946316fa54e358a
-  data.tar.gz: e5d373cd46eb4b2823df61256e03aa68ed98df9ad84a58b6ac96add3520fafc5577cfbcfa9adcf1dd460698db6219f9aa4136430f2ff8d632eaa0a01f6b6d744
+  metadata.gz: c18bec78e4bf2dd29865bf0644f8aad697e32066144a56c4ebda7fa52d9736a9991e2807da38bb2b0d07da51e1de8714a8a937f212141a8955a59c9c03e1342c
+  data.tar.gz: 9e8a51483076587ff6b495d46597f38f624dbbfe718517c93cd9a94a4fabee7d224ab415a8e913986bffeee76dd1c4255e94ceb73e12b7f96bb4fbb47484e8a0

data/.travis.yml

@@ -11,3 +11,5 @@ matrix:
       gemfile: Gemfile
     - rvm: 2.3.1
       gemfile: Gemfile
+    - rvm: 2.4.1
+      gemfile: Gemfile

data/CHANGES.md

@@ -7,6 +7,7 @@
 * Wrap
   dropped the `pipe` option. This is now `options, flow_options, *`
   `false` is now automatically connected to End.failure.
+* remove `Uber::Callable`.
 
 * `operation.new` step removed.
 * Undocumented step behavior removed. You can't write to `self` anymore.
@@ -29,6 +30,10 @@ document Task API and define step API
 deprecate step->(options) ?
 injectable, per-operation step arguments strategy?
 
+# 2.1.0.beta4
+
+* Simple maintenance release to establish `activity-0.5.0`.
+
 # 2.1.0.beta3
 
 * More simplifications because of `activity`.

data/Gemfile

@@ -14,7 +14,7 @@ gem "dry-auto_inject"
 gem "dry-matcher"
 gem "dry-validation"
 
-# gem "trailblazer-operation", path: "../operation"
+gem "trailblazer-operation", path: "../operation"
 # gem "trailblazer-operation", github: "trailblazer/trailblazer-operation"
 
 gem "minitest-line"

data/README.md

@@ -5,6 +5,7 @@ _Trailblazer provides new high-level abstractions for Ruby frameworks. It gently
 [![Gitter Chat](https://badges.gitter.im/trailblazer/chat.svg)](https://gitter.im/trailblazer/chat)
 [![TRB Newsletter](https://img.shields.io/badge/TRB-newsletter-lightgrey.svg)](http://trailblazer.to/newsletter/)
 [![Gem Version](https://badge.fury.io/rb/trailblazer.svg)](http://badge.fury.io/rb/trailblazer)
+[![Open Source Helpers](https://www.codetriage.com/trailblazer/trailblazer/badges/users.svg)](https://www.codetriage.com/trailblazer/trailblazer)
 
 **This document discusses Trailblazer 2.1.** An overview about the additions are [on our website](http://trailblazer.to/blog/2017-12-trailblazer-2-1-what-you-need-to-know.html).
 

data/lib/trailblazer/operation/auto_inject.rb

@@ -29,12 +29,12 @@ class Trailblazer::Operation
 
       def define_call
         class_mod.class_exec(container, dependency_map) do |container, dependency_map|
-          define_method :call do |params={}, options={}, *dependencies|
-            options_with_deps = dependency_map.to_h.each_with_object({}) { |(name, identifier), obj|
-              obj[name] = options[name] || container[identifier]
-            }.merge(options)
+          define_method :call do |ctx={}, *dependencies|
+            ctx_with_deps = dependency_map.to_h.each_with_object({}) { |(name, identifier), obj|
+              obj[name] = ctx[name] || container[identifier]
+            }.merge(ctx)
 
-            super(params, options_with_deps, *dependencies)
+            super(ctx_with_deps, *dependencies)
           end
         end
       end

data/lib/trailblazer/operation/nested.rb

@@ -1,6 +1,7 @@
 # per default, everything we pass into a circuit is immutable. it's the ops/act's job to allow writing (via a Context)
 module Trailblazer
   class Operation
+    # {Nested} macro.
     def self.Nested(callable, input:nil, output:nil, id: "Nested(#{callable})")
       task_wrap_extensions        = Module.new do
         extend Activity::Path::Plan()
@@ -35,7 +36,7 @@ module Trailblazer
         # The returned {Nested} instance is a valid circuit element and will be `call`ed in the circuit.
         # It simply returns the nested activity's `signal,options,flow_options` return set.
         # The actual wiring - where to go with that - is done by the step DSL.
-        return Trailblazer::Activity::Subprocess(nested_operation, call: :__call__), nested_operation, false
+        return Trailblazer::Operation::Callable(nested_operation, call: :__call__), nested_operation, false
       end
 
       def self.nestable_object?(object)
@@ -71,7 +72,7 @@ module Trailblazer
 
           # 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.
-          wrap_ctx[:task] = Trailblazer::Activity::Subprocess( activity, call: :__call__ )
+          wrap_ctx[:task] = Trailblazer::Operation::Callable( activity, call: :__call__ )
 
           return Activity::Right, [ wrap_ctx, original_args ]
         end

data/lib/trailblazer/operation/wrap.rb

@@ -46,6 +46,8 @@ class Trailblazer::Operation
         # FIXME: we *might* return some "older version" of options here!
         if returned === false
           return @operation.outputs[:failure].signal, [options, flow_options]
+        elsif returned === true
+          return @operation.outputs[:success].signal, [options, flow_options]
         end
 
         returned # let's hope returned is one of activity's Ends.

data/lib/trailblazer/version.rb

@@ -1,3 +1,3 @@
 module Trailblazer
-  VERSION = "2.1.0.beta3"
+  VERSION = "2.1.0.beta4"
 end

data/test/docs/auto_inject_test.rb

@@ -10,15 +10,22 @@ class DryAutoInjectTest < Minitest::Spec
 
   class Create < Trailblazer::Operation
     include AutoInject[:user_repository]
+
+    pass :use_it!
+
+    def use_it!(ctx, user_repository:, **)
+      ctx[:my_repo] = user_repository
+    end
   end
 
   it "auto-injects user_repository" do
-    res = Create.({})
+    res = Create.(params: {})
     res[:user_repository].must_equal Object
+    res[:my_repo].must_equal Object
   end
 
   it "allows dependency injection via ::call" do
-    Create.({}, user_repository: String)[:user_repository].must_equal String
+    Create.(params: {}, user_repository: String)[:user_repository].must_equal String
   end
 
   describe "inheritance" do

data/test/docs/fast_test.rb

@@ -231,7 +231,7 @@ class FastTrackWithNestedTest < Minitest::Spec
     #:ft-rewire
     class Memo::Create < Trailblazer::Operation
       step :validate
-      step Nested( Lib::Authenticate ), Output(:fail_fast) => :failure
+      step Nested( Lib::Authenticate ), Output(:fail_fast) => Track(:failure)
       step :create_model
       step :save
       #~ignrw

data/test/docs/input_output_test.rb

@@ -0,0 +1,7 @@
+require "test_helper"
+
+class DocsInputOutputTest < Minitest::Spec
+  class NoMappingTest < Minitest::Spec
+    Memo = Class.new(Memo)
+  end
+end

data/test/docs/pundit_test.rb

@@ -122,9 +122,9 @@ end
 #   end
 #   #:class-level end
 
-#   it { Create.(); Create["result.policy"].must_equal nil }
+#   it { Create.(); Create["result.policy"].must_be_nil }
 #   it { Create.(params: {}, current_user: Module)["x"].must_equal true }
-#   it { Create.(params: {}                          )["x"].must_equal nil }
+#   it { Create.(params: {}                          )["x"].must_be_nil }
 # end
 
 

data/test/docs/rescue_test.rb

@@ -118,7 +118,7 @@ class RescueTest < Minitest::Spec
     end
 
     step Rescue( RecordNotFound, handler: :rollback! ) {
-      step Wrap ->(*, &block) { Sequel.transaction do block.call end } {
+      step Wrap (->(*, &block) { Sequel.transaction do block.call end }) {
         step Model( Song, :find )
         step ->(options, *) { options[:model].lock! } # lock the model.
         step Contract::Build( constant: MyContract )

data/test/docs/wrap_test.rb

@@ -37,18 +37,21 @@ class WrapTest < Minitest::Spec
     end
   end
 
+# it allows returning legacy true/false
   class Create < Trailblazer::Operation
     class MyContract < Reform::Form
       property :title
     end
 
-    step Wrap ->(options, *, &block) {
+    step Wrap( ->(options, *, &block) {
       begin
         block.call
       rescue => exception
         options["result.model.find"] = "argh! because #{exception.class}"
-        false
-      end } {
+        return false
+      end
+      true
+      }) {
       step Model( Song, :find )
       step Contract::Build( constant: MyContract )
     }
@@ -63,7 +66,7 @@ class WrapTest < Minitest::Spec
   # Wrap return
   class WrapReturnTest < Minitest::Spec
     class Create < Trailblazer::Operation
-      step Wrap ->(options, *, &block) { options["yield?"] ? block.call : false } {
+      step Wrap( ->(options, *, &block) { options["yield?"] ? block.call : false }) {
         step ->(options, **) { options["x"] = true }
         success :noop!
         # ...
@@ -118,7 +121,7 @@ class WrapTest < Minitest::Spec
     end
 
     #~wrap-only end
-    step Wrap ->(*, &block) { Sequel.transaction do block.call end } {
+    step Wrap( ->(*, &block) { Sequel.transaction do block.call end } ) {
       step Model( Song, :new )
       #~wrap-only
       step Contract::Build( constant: MyContract )
@@ -200,7 +203,7 @@ class WrapTest < Minitest::Spec
   class WrapWithMethodTest < Minitest::Spec
     class Create < Trailblazer::Operation
       step Model( Song, :new )
-      step Wrap ->(options, *, &block) { block.call } {
+      step Wrap( ->(options, *, &block) { block.call } ) {
         step :check_model!
 
       }

data/test/module_test.rb

@@ -86,7 +86,7 @@
 #     op["dispatched"].must_equal [:notify_me!]
 #     op["model"].name.must_equal "Feelings"
 #     op["model"].artist.id.must_equal 1
-#     op["model"].artist.full_name.must_equal nil # property not declared.
+#     op["model"].artist.full_name.must_be_nil # property not declared.
 #   end
 
 #   it do

data/test/nested_test.rb

@@ -169,7 +169,7 @@ class NestedTest < Minitest::Spec
     result["can.B.see.params?"].must_be_nil
     if is_successful
       result["can.B.see.A.mutable.data?"].must_equal "from A!"
-      result["can.B.see.A.class.data?"].must_equal nil # we don't look for it.
+      result["can.B.see.A.class.data?"].must_be_nil # we don't look for it.
       result["can.A.see.B.mutable.data?"].must_equal "from AlmostB!"
     else
       result["can.B.see.A.mutable.data?"].must_be_nil
@@ -267,7 +267,7 @@ class NestedWithFastTrackTest < Minitest::Spec
   #- Nested, :pass_fast => :failure
   it "attaches :pass_fast => :failure" do
     op = Class.new(Trailblazer::Operation) do
-      step Nested( Edit ), Output(:pass_fast) => :failure
+      step Nested( Edit ), Output(:pass_fast) => Track(:failure)
       step :b
       fail :f
 

data/test/operation/dsl/contract_test.rb

@@ -38,7 +38,7 @@ class DslContractTest < MiniTest::Spec
   end
 
   # no inheritance with setter.
-  it { CreateOrFind["contract.default.class"].must_equal nil }
+  it { CreateOrFind["contract.default.class"].must_be_nil }
 
   # ---
   # Op::contract Constant
@@ -197,7 +197,7 @@ class DslContractTest < MiniTest::Spec
       form.sync
 
       song.genre.must_equal "Punkrock"
-      song.band.must_equal nil
+      song.band.must_be_nil
     end
   end
 

data/test/test_helper.rb

@@ -31,3 +31,10 @@ end
 require "pp"
 
 Minitest::Spec::Operation = Trailblazer::Operation
+
+Memo = Struct.new(:id, :body) do
+  def self.find(id)
+    return new(id, "Yo!") if id
+    nil
+  end
+end

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.2.0", "< 0.3.0"
+  spec.add_dependency "trailblazer-operation", ">= 0.2.3", "< 0.3.0"
   spec.add_dependency "trailblazer-activity",  ">= 0.4.3", "< 0.6.0"
 
   spec.add_dependency "reform", ">= 2.2.0", "< 3.0.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer
 version: !ruby/object:Gem::Version
-  version: 2.1.0.beta3
+  version: 2.1.0.beta4
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-02 00:00:00.000000000 Z
+date: 2018-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer-operation
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.3.0
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.3
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.3.0
@@ -220,6 +220,7 @@ files:
 - test/docs/dry_test.rb
 - test/docs/fast_test.rb
 - test/docs/guard_test.rb
+- test/docs/input_output_test.rb
 - test/docs/macro_test.rb
 - test/docs/model_test.rb
 - test/docs/nested_test.rb
@@ -266,7 +267,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: A high-level architecture for Ruby and Rails.
@@ -279,6 +280,7 @@ test_files:
 - test/docs/dry_test.rb
 - test/docs/fast_test.rb
 - test/docs/guard_test.rb
+- test/docs/input_output_test.rb
 - test/docs/macro_test.rb
 - test/docs/model_test.rb
 - test/docs/nested_test.rb