trailblazer 2.0.0.beta3 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 36d5743aefbaa5f3164a9d247adfcef5a4acd3ad
-  data.tar.gz: 4d263f2e11657140bccbd98e90915896b00d39db
+  metadata.gz: cb0eb777dc5afb25cb6200169ca06bf75a18db94
+  data.tar.gz: 8ca6d1c9b0a5491ea9fa282cf5766552fcf8462a
 SHA512:
-  metadata.gz: 92afde635725edbf16f2c3705fc9f3e1462ab955c5fbb273754f58fc1c79bff1916cb5ad4aeb319784d6a1589b8dc1371283469b74a540922e1bfeda2730f3f7
-  data.tar.gz: e323a24a729b87ae7fcb50ecc8a2483c237f0f7f2edf0e6025185d8787b26abda307d176f3b0b884fd642d04dc0c958e01b1e8ba2b60cdd6b562707569829b33
+  metadata.gz: 939adb355c6875cf922f6dda5056ee2d13664c386149c3afd7d62c5f0a0b77b51d1c487e62ac4ea1c5af39aa481e9d1b7bef891bca55a0dc6af92fb5d764786a
+  data.tar.gz: 5e1f1f2de36e85c4f6a0c84e655c329e22073027130c079e6f3b776de84c1046867056a8fb40aa915919ac83a6ec74300428d45c24a1b65eb06031c8d20d3296

data/CHANGES.md

@@ -102,6 +102,10 @@ You can now inject the following objects via `::call`:
 
 * You can't call `Create.().contract` anymore. The contract instance(s) are available through the `Result` object.
 
+# 2.0.0.rc1
+
+* `consider` got removed since `step` now evaluates the step's result and deviates (or not).
+
 # 2.0.0.beta3
 
 * New, very slick keyword arguments for steps.

data/lib/trailblazer/version.rb

@@ -1,3 +1,3 @@
 module Trailblazer
-  VERSION = "2.0.0.beta3"
+  VERSION = "2.0.0.rc1"
 end

data/test/docs/contract_test.rb

@@ -166,7 +166,7 @@ class DocsContractSeparateKeyTest < Minitest::Spec
 
     step Model( Song, :new )
     step Contract::Build()
-    consider :extract_params!
+    step :extract_params!
     step Contract::Validate( skip_extract: true )
     step Contract::Persist( method: :sync )
 

data/test/docs/guard_test.rb

@@ -32,7 +32,7 @@ class DocsGuardProcTest < Minitest::Spec
     override Policy::Guard( ->(options) { options["current_user"] } )
   end
 
-  it { New["pipetree"].inspect.must_equal %{[>>operation.new,&policy.default.eval,>process]} }
+  it { New["pipetree"].inspect.must_equal %{[>>operation.new,&policy.default.eval,&process]} }
 end
 
 #---

data/test/docs/operation_test.rb

@@ -4,8 +4,8 @@ class DocsOperationExampleTest < Minitest::Spec
   Song = Struct.new(:id, :title, :created_by) do
     def save; true; end
   end
-  #:op
 
+  #:op
   class Song::Create < Trailblazer::Operation
     extend Contract::DSL
 
@@ -15,7 +15,7 @@ class DocsOperationExampleTest < Minitest::Spec
     end
 
     step     Model( Song, :new )
-    consider :assign_current_user!
+    step     :assign_current_user!
     step     Contract::Build()
     step     Contract::Validate( )
     failure  :log_error!
@@ -38,9 +38,9 @@ end
 
 class DndTest < Minitest::Spec
   class Create < Trailblazer::Operation
-    consider :authorize!
+    step     :authorize!
     failure  :auth_err!
-    consider :save!
+    step     :save!
     self.< Wrap
   end
 end
@@ -54,7 +54,7 @@ class DocsResultTest < Minitest::Spec
   class Song::Create < Trailblazer::Operation
     step     :model!
     step     :assign!
-    consider :validate!
+    step     :validate!
 
     def model!(options, current_user:, **)
       options["model"] = Song.new
@@ -98,3 +98,87 @@ class DocsResultTest < Minitest::Spec
   #:step-inspect end
   end
 end
+
+class DocsDependencyTest < Minitest::Spec
+  Song = Struct.new(:id, :title, :created_by) do
+    def save; true; end
+  end
+  Hit = Struct.new(:id)
+
+  #:dep-op
+  class Song::Create < Trailblazer::Operation
+    self["my.model.class"] = Song
+
+    #~dep-pipe
+    step :model!
+
+    def model!(options, **)
+      options["my.model"] =           # setting runtime data.
+        options["my.model.class"].new # reading class data at runtime.
+    end
+    #~dep-pipe end
+  end
+  #:dep-op end
+
+  it do
+    #:dep-op-class
+    Song::Create["my.model.class"] #=> Song
+    #:dep-op-class end
+
+    #:dep-op-res
+    result = Song::Create.({})
+
+    result["my.model.class"] #=> Song
+    result["my.model"] #=> #<Song title=nil>
+    #:dep-op-res end
+
+    Song::Create["my.model.class"].must_equal Song
+    result["my.model.class"].must_equal Song
+    result["my.model"].inspect.must_equal %{#<struct DocsDependencyTest::Song id=nil, title=nil, created_by=nil>}
+  end
+
+  it do
+    #:dep-di
+    result = Song::Create.({}, "my.model.class" => Hit)
+
+    result["my.model"] #=> #<Hit id=nil>
+    #:dep-di end
+    result["my.model"].inspect.must_equal %{#<struct DocsDependencyTest::Hit id=nil>}
+  end
+end
+
+
+
+class DocsOperationAPIExampleTest < Minitest::Spec
+  Song = Struct.new(:id, :title, :created_by) do
+    def save; true; end
+  end
+
+  class MyContract < Reform::Form
+    property :title
+    validates :title, presence: true
+  end
+
+  #:op-api
+  class Song::Create < Trailblazer::Operation
+    step    Model( Song, :new )
+    step    :assign_current_user!
+    step    Contract::Build( constant: MyContract )
+    step    Contract::Validate()
+    failure :log_error!
+    step    Contract::Persist()
+
+    def log_error!(options)
+      # ..
+    end
+
+    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>] >} }
+end

data/test/docs/rescue_test.rb

@@ -11,11 +11,11 @@ class NestedRescueTest < Minitest::Spec
       step ->(options) { options["a"] = true }
       step Rescue {
         step ->(options) { options["y"] = true }
-        step ->(options) { raise Y if options["raise-y"] }
+        success ->(options) { raise Y if options["raise-y"] }
         step ->(options) { options["z"] = true }
       }
       step ->(options) { options["b"] = true }
-      step ->(options) { raise A if options["raise-a"] }
+      success ->(options) { raise A if options["raise-a"] }
       step ->(options) { options["c"] = true }
       self.< ->(options) { options["inner-err"] = true }
     }
@@ -23,7 +23,7 @@ class NestedRescueTest < Minitest::Spec
     failure ->(options) { options["outer-err"] = true }
   end
 
-  it { NestedInsanity["pipetree"].inspect.must_equal %{[>>operation.new,&Rescue:10,>:22,<NestedRescueTest::NestedInsanity:23]} }
+  it { NestedInsanity["pipetree"].inspect.must_equal %{[>>operation.new,&Rescue:10,&:22,<NestedRescueTest::NestedInsanity: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] >} }
@@ -47,6 +47,7 @@ class RescueTest < Minitest::Spec
     end
 
     def lock!
+      true
     end
   end
 

data/test/docs/wrap_test.rb

@@ -35,7 +35,7 @@ class WrapTest < Minitest::Spec
     class Create < Trailblazer::Operation
       step Wrap ->(options, *, &block) { options["yield?"] ? block.call : false } {
         step ->(options) { options["x"] = true }
-        step :noop!
+        success :noop!
         # ...
       }
 
@@ -87,6 +87,10 @@ class WrapTest < Minitest::Spec
       end
     end
 
+    module MyNotifier
+      def self.mail; true; end
+    end
+
   #:sequel-transaction
   class Create < Trailblazer::Operation
     #~wrap-only
@@ -112,7 +116,7 @@ class WrapTest < Minitest::Spec
     end
 
     def notify!(options)
-      # send emails, because success...
+      MyNotifier.mail
     end
     #~wrap-only end
   end
@@ -128,6 +132,10 @@ class WrapTest < Minitest::Spec
       end
     end
 
+    module MyNotifier
+      def self.mail; true; end
+    end
+
   #:callable-t
   class MyTransaction
     extend Uber::Callable
@@ -162,7 +170,7 @@ class WrapTest < Minitest::Spec
     end
 
     def notify!(options)
-      # send emails, because success...
+      MyNotifier.mail # send emails, because success...
     end
     #~wrap-onlyy end
   end

data/test/operation/builder_test.rb

@@ -41,7 +41,7 @@ class BuilderTest < MiniTest::Spec
   class B < A
   end
 
-  it { B["pipetree"].inspect.must_equal %{[>>operation.new,>process]} }
+  it { B["pipetree"].inspect.must_equal %{[>>operation.new,&process]} }
 
   #---
   # use Builder DSL

data/test/operation/pundit_test.rb

@@ -53,7 +53,7 @@ class PolicyTest < Minitest::Spec
     self.| Model( Song, :new ), before: "policy.default.eval"
   end
 
-  it { Show["pipetree"].inspect.must_equal %{[>>operation.new,&model.build,&policy.default.eval,>process]} }
+  it { Show["pipetree"].inspect.must_equal %{[>>operation.new,&model.build,&policy.default.eval,&process]} }
 
   # invalid because user AND model.
   it do

data/test/operation/resolver_test.rb

@@ -35,7 +35,7 @@ class ResolverTest < Minitest::Spec
     def process(*); self["x"] = self.class end
   end
 
-  it { A["pipetree"].inspect.must_equal %{[&model.build,&policy.default.eval,>>builder.call,>>operation.new,>process]} }
+  it { A["pipetree"].inspect.must_equal %{[&model.build,&policy.default.eval,>>builder.call,>>operation.new,&process]} }
 
   it { r=A.({ some: "params", id: 1 }, { "current_user" => Module })
     puts r.inspect

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"
+  spec.add_dependency "trailblazer-operation", ">= 0.0.9"
   spec.add_dependency "uber", ">= 0.1.0", "< 0.2.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.0.0.beta3
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-12 00:00:00.000000000 Z
+date: 2016-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer-operation
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: uber
   requirement: !ruby/object:Gem::Requirement