trailblazer 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22aa58ebd31de1635012c1ef3af5758a7279d99f
-  data.tar.gz: bb3362c26f6efc71d04d97e156f59e89829aac3d
+  metadata.gz: 239150501ea57b15601c6e0a79ea03f383b0a0c8
+  data.tar.gz: 8bae46c25cd0f90ca228020c9e0344ddfb0bcaea
 SHA512:
-  metadata.gz: 0397f1c22e99920dffedcbd093f2cc2da8300aea8e07cd711b89defdb91a2600639ef304f9c57dafdc7afed4bc2f5d319387ec94a408ca407a23f9842017c381
-  data.tar.gz: c07b96c34bed66eee22f12477976010ddd9e094b7c0bb7581502abc79004afadf35f8b3d4351e79e1b89aac478c19e15aaef5ab1ebbcaf6434613e6843cba2e0
+  metadata.gz: a347bb971628f17168ba9d4ba826939da82d0a5bc536e837bbc97a413e64244526ac65de1be1c3da3e9054a5b2acd98e5481cca542aebca35c272e87af3e7629
+  data.tar.gz: a9fd02ed273e2ab581a053b1b3772a1035cef6e2e8f7f9810f0d7d32112c41c335bbae1e928547d4601f66378f59ac30c42a69b2b8ec5f2d07843399867883fa

data/CHANGES.md

@@ -1,3 +1,14 @@
+# 2.0.2
+
+* Remove `uber` dependency as we use our own `Option::KW` now.
+* In `Contract::Build( builder: )` you now also have access to the `name:` keyword. Note that you need to double-splat in builders.
+
+        ```ruby
+        Contract::Build( builder: ->(options, constant:, **) )
+        ```
+  Same for `:method` and `Callable`.
+* `Policy::Guard( :method )` now works.
+
 # 2.0.1
 
 * Add `fail_fast: true` for `step` and `failure` to short-circuit the pipe. Note that more "eloquent" semantics are coming in `trailblazer-bpmn`.

data/Rakefile

@@ -7,7 +7,6 @@ Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
   # test.test_files = FileList['test/**/*_test.rb']
   test_files = FileList[%w{
-    test/operation/guard_test.rb
     test/operation/pundit_test.rb
     test/operation/model_test.rb
     test/operation/contract_test.rb

data/lib/trailblazer/operation/contract.rb

@@ -20,10 +20,11 @@ class Trailblazer::Operation
         # TODO: we could probably clean this up a bit at some point.
         contract_class = constant || options["contract.#{name}.class"]
         model          = options["model"] # FIXME: model.default
+        name           = "contract.#{name}"
 
-        return options["contract.#{name}"] = Uber::Option[builder].(operation, constant: contract_class, model: model) if builder
+        return options[name] = Option::KW.(builder).(operation, options, constant: contract_class, name: name) if builder
 
-        options["contract.#{name}"] = contract_class.new(model)
+        options[name] = contract_class.new(model)
       end
     end
 

data/lib/trailblazer/operation/guard.rb

@@ -1,5 +1,4 @@
 require "trailblazer/operation/policy"
-require "uber/option"
 
 class Trailblazer::Operation
   module Policy
@@ -9,11 +8,10 @@ class Trailblazer::Operation
 
     module Guard
       def self.build(callable)
-        value = Uber::Option[callable]
+        value = Option.(callable) # Operation::Option
 
-        # call'ing the Uber::Option will run either proc or block.
         # this gets wrapped in a Operation::Result object.
-        ->(options) { Result.new( !!value.(options), {} ) }
+        ->(input, options) { Result.new( !!value.(input, options), {} ) }
       end
     end # Guard
   end

data/lib/trailblazer/operation/policy.rb

@@ -10,7 +10,7 @@ class Trailblazer::Operation
 
       def call(input, options)
         condition = options[@path] # this allows dependency injection.
-        result    = condition.(options)
+        result    = condition.(input, options)
 
         options["policy.#{@name}"]        = result["policy"] # assign the policy as a skill.
         options["result.policy.#{@name}"] = result

data/lib/trailblazer/operation/pundit.rb

@@ -16,7 +16,7 @@ class Trailblazer::Operation
         end
 
         # Instantiate the actual policy object, and call it.
-        def call(options)
+        def call(input, options)
           policy = build_policy(options)          # this translates to Pundit interface.
           result!(policy.send(@action), policy)
         end

data/lib/trailblazer/version.rb

@@ -1,3 +1,3 @@
 module Trailblazer
-  VERSION = "2.0.1"
+  VERSION = "2.0.2"
 end

data/test/docs/contract_test.rb

@@ -353,7 +353,7 @@ class DocContractBuilderTest < Minitest::Spec
     step Contract::Validate()
     step Contract::Persist( method: :sync )
 
-    def default_contract!(constant:, model:)
+    def default_contract!(options, constant:, model:, **)
       constant.new(model, current_user: self["current_user"])
     end
   end
@@ -374,8 +374,8 @@ class DocContractBuilderTest < Minitest::Spec
 
     step Model( Song, :new )
     #:builder-proc
-    step Contract::Build( builder: ->(operation, constant:, model:) {
-      constant.new(model, current_user: operation["current_user"])
+    step Contract::Build( builder: ->(options, constant:, model:, **) {
+      constant.new(model, current_user: options["current_user"])
     })
     #:builder-proc end
     step Contract::Validate()

data/test/docs/guard_test.rb

@@ -64,20 +64,21 @@ end
 
 #---
 # with method
-# class DocsGuardMethodTest < Minitest::Spec
-#   #:method
-#   class Create < Trailblazer::Operation
-#     step Policy::Guard[ : ]
-#     step :process
-#     #~pipe-only
-#     def process(*); self[:x] = true; end
-#     #~pipe-only end
-#   end
-#   #:method end
-
-#   it { Create.(pass: false)[:x].must_equal nil }
-#   it { Create.(pass: true)[:x].must_equal true }
-# end
+class DocsGuardMethodTest < Minitest::Spec
+  #:method
+  class Create < Trailblazer::Operation
+    step Policy::Guard( :pass? )
+    step :process
+    #~pipe-only
+    def pass?(options, *); options["params"][:pass] end
+    def process(*); self["x"] = true; end
+    #~pipe-only end
+  end
+  #:method end
+
+  it { Create.(pass: false).inspect("x").must_equal %{<Result:false [nil] >} }
+  it { Create.(pass: true).inspect("x").must_equal %{<Result:true [true] >} }
+end
 
 #---
 # with name:

data/trailblazer.gemspec

@@ -17,8 +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.0.10", "< 0.1.0"
-  spec.add_dependency "uber", ">= 0.1.0", "< 0.2.0"
+  spec.add_dependency "trailblazer-operation", ">= 0.0.12", "< 0.1.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.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-19 00:00:00.000000000 Z
+date: 2017-01-21 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.0.10
+        version: 0.0.12
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.1.0
@@ -26,30 +26,10 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.12
     - - "<"
       - !ruby/object:Gem::Version
         version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: uber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: reform
   requirement: !ruby/object:Gem::Requirement
@@ -230,7 +210,6 @@ files:
 - test/operation/dsl/callback_test.rb
 - test/operation/dsl/contract_test.rb
 - test/operation/dsl/representer_test.rb
-- test/operation/guard_test.rb
 - test/operation/model_test.rb
 - test/operation/params_test.rb
 - test/operation/persist_test.rb
@@ -291,7 +270,6 @@ test_files:
 - test/operation/dsl/callback_test.rb
 - test/operation/dsl/contract_test.rb
 - test/operation/dsl/representer_test.rb
-- test/operation/guard_test.rb
 - test/operation/model_test.rb
 - test/operation/params_test.rb
 - test/operation/persist_test.rb

data/test/operation/guard_test.rb

@@ -1,6 +0,0 @@
-require "test_helper"
-
-
-
-
-# FIXME: what about block passed to ::policy?