trailblazer-macro 2.1.4 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4da758ccf1b9e9ff6fa413c687fe09c6df11449b84a775c65280a73d1b80f72
-  data.tar.gz: 23bd67cc32f045487ca761e15227fe562e87b7cde3616e7335a8ee3126c51217
+  metadata.gz: 4d1d66ce0e6bf576b852792bdee95a0d67148cee1fbb21fdb791e83984154b1f
+  data.tar.gz: d274da669e987828fbfbf8b45b677d5596558e22e7729f882a35546fd3244e74
 SHA512:
-  metadata.gz: 4671b91a21144afc728dba8397282a49f6517d183349179a357da87e57a223cb4f5cb81f3d29f0bda0e3013db7581367e02a6de28a19bfbc7b83dd286a3f0d9a
-  data.tar.gz: 339a312f0c7f7bee0afe5f74b06d3694ff826daff2e5bbfe4190a3238252cd92feb36ab14cf2429814eaf5b18e50abdac18bee594b7229c37fc64df8856e18b8
+  metadata.gz: 10aac4d11e1b286e27101955722ff1ae581df1608dd268f40dcfb8a559db0b91f2cc2a0a72ace708a9a83f34ec3c55efb059d0117e3605df012fd81800714a84
+  data.tar.gz: 6227e472b59a584de223884a8111b7da5b43bfa3e5f07a5522caef1ff7cf765fb1801aff192f070214513d61cfe0d23b0c66cf2298e6532a9fb04dc6fd06efd0

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 2.1.5
+
+* Support for Ruby 3.0.
+
 # 2.1.4
 
 * Upgrade DSL version to fix step's circuit interface eating passed arguments

data/Gemfile

@@ -5,11 +5,11 @@ gemspec
 
 # gem "trailblazer", github: "trailblazer/trailblazer"
 # gem "trailblazer-activity", path: "../trailblazer-activity"
-# gem "trailblazer-activity-dsl-linear", github: "trailblazer/trailblazer-activity-dsl-linear", branch: 'master'
 # gem "trailblazer-activity-dsl-linear", path: "../trailblazer-activity-dsl-linear"
-# gem "trailblazer-operation", github: "trailblazer/trailblazer-operation", branch: 'linear'
-# gem "trailblazer-activity"#, github: "trailblazer/trailblazer-activity"
 # gem "trailblazer-macro-contract", git: "https://github.com/trailblazer/trailblazer-macro-contract"
+# gem "trailblazer-context", path: "../trailblazer-context"
+# gem "trailblazer-operation", path: "../trailblazer-operation"
+
 
 gem "minitest-line"
 gem "rubocop", require: false

data/lib/trailblazer/macro/guard.rb

@@ -6,11 +6,11 @@ module Trailblazer::Macro
 
     module Guard
       def self.build(callable)
-        option = Trailblazer::Option::KW(callable)
+        option = Trailblazer::Option(callable)
 
         # this gets wrapped in a Operation::Result object.
-        ->((options, *), circuit_args) do
-          Trailblazer::Operation::Result.new(!!option.call(options, circuit_args), {})
+        ->((ctx, *), **circuit_args) do
+          Trailblazer::Operation::Result.new(!!option.call(ctx, keyword_arguments: ctx.to_hash, **circuit_args), {})
         end
       end
     end

data/lib/trailblazer/macro/nested.rb

@@ -38,7 +38,7 @@ module Trailblazer
       # This is what {Nested} in 2.0 used to do, where the outcome could only be true/false (or success/failure).
       class Dynamic
         def initialize(nested_activity_decider)
-          @nested_activity_decider = Option::KW(nested_activity_decider)
+          @nested_activity_decider = Trailblazer::Option(nested_activity_decider)
 
           @outputs         = {
             :success => Activity::Output(Activity::Railway::End::Success.new(semantic: :success), :success),
@@ -53,7 +53,7 @@ module Trailblazer
           (ctx, _), original_circuit_options = original_args
 
           # TODO: evaluate the option to get the actual "object" to call.
-          activity = @nested_activity_decider.(ctx, original_circuit_options)
+          activity = @nested_activity_decider.(ctx, keyword_arguments: ctx.to_hash, **original_circuit_options)
 
           # 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.

data/lib/trailblazer/macro/version.rb

@@ -1,7 +1,7 @@
 module Trailblazer
   module Version
     module Macro
-      VERSION = "2.1.4"
+      VERSION = "2.1.5"
     end
   end
 end

data/lib/trailblazer/macro/wrap.rb

@@ -48,7 +48,7 @@ module Trailblazer
 
         def call((ctx, flow_options), **circuit_options)
           block_calling_wrapped = -> {
-            call_wrapped_activity([ctx, flow_options], circuit_options)
+            call_wrapped_activity([ctx, flow_options], **circuit_options)
           }
 
           # call the user's Wrap {} block in the operation.

data/test/docs/guard_test.rb

@@ -108,6 +108,27 @@ class DocsGuardNamedTest < Minitest::Spec
   }
 end
 
+#---
+# dependency injection
+class DocsGuardInjectionTest < Minitest::Spec
+  #:di-op
+  class Create < Trailblazer::Operation
+    step Policy::Guard( ->(options, current_user:, **) { current_user == Module } )
+  end
+  #:di-op end
+
+  it { Create.(:current_user => Module).inspect("").must_equal %{<Result:true [nil] >} }
+  it {
+    result =
+  #:di-call
+  Create.(
+    :current_user           => Module,
+    :"policy.default.eval"  => Trailblazer::Operation::Policy::Guard.build(->(options, **) { false })
+  )
+  #:di-call end
+    result.inspect("").must_equal %{<Result:false [nil] >} }
+end
+
 #---
 # missing current_user throws exception
 class DocsGuardMissingKeywordTest < Minitest::Spec

data/trailblazer-macro.gemspec

@@ -25,9 +25,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "roar"
   spec.add_development_dependency "trailblazer-developer"
 
-  spec.add_dependency "trailblazer-activity", ">= 0.11.2", "< 1.0.0"
-  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 0.3.3", "< 1.0.0"
-  spec.add_dependency "trailblazer-operation", ">= 0.6.5" # TODO: this dependency will be removed.
+  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 0.4.0", "< 0.5.0"
+  spec.add_dependency "trailblazer-operation", ">= 0.7.0" # TODO: this dependency will be removed.
 
   spec.required_ruby_version = ">= 2.2.0"
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-macro
 version: !ruby/object:Gem::Version
-  version: 2.1.4
+  version: 2.1.5
 platform: ruby
 authors:
 - Nick Sutterer
 - Marc Tich
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-06 00:00:00.000000000 Z
+date: 2021-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -95,60 +95,40 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: trailblazer-activity
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.11.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity-dsl-linear
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.3
+        version: 0.4.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: trailblazer-operation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.5
+        version: 0.7.0
 description: Macros for Trailblazer's operation
 email:
 - apotonick@gmail.com
@@ -192,7 +172,7 @@ homepage: http://trailblazer.to
 licenses:
 - LGPL-3.0
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -207,8 +187,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key:
+rubygems_version: 3.2.3
+signing_key: 
 specification_version: 4
 summary: 'Macros for Trailblazer''s operation: Policy, Wrap, Rescue and more.'
 test_files: