trailblazer-operation 0.7.3 → 0.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b2bed59ccc4a6af470ef0413dfd4c5132c138a2ed68e1e7ed390ea7637c8db4e
-  data.tar.gz: '074982e69ce025d63cc256964b8c334ad6405f792357201778beea2694668f93'
+  metadata.gz: 3c9a1ed221f6890d00d284c9a183e5082c1611cbcfc1cf9b37ec07dc09653258
+  data.tar.gz: 186a35a1414ee1d97f76d4950732272e1e171b6a89fa265a07e529686b35b27a
 SHA512:
-  metadata.gz: 9b74fd06391e9035c5a82ff85b281e4b87445f18b0c238d5f939dfdb80e4541cd484743523a474371dfa2dd803068c6bb415732a40bea25dfa67fd777134dc3c
-  data.tar.gz: 79eb31f4211e4a6521c3c06f879df49bf32b57f5b020b0f3a4273efb8c12fc047812f9a75f0987034c78fc6952945d5e4e24d08ac820b6c31222657490d4ea68
+  metadata.gz: f914f13cd0f1126c386026b62605a99c32126d7add2b917e685a14d76344b0ab9882d4727f3d6ec42550910b8b4507fac1b0b491315d067c6b5caddba4f06df6
+  data.tar.gz: 3b70bd25571a44f791a6d693d94c67156310741642769c84948310a291be905048fd7ce099a4769f648e9fa6c98276afbe82941291e40fbea5a663676e3d6831

data/CHANGES.md

@@ -1,3 +1,7 @@
+## 0.7.4
+
+* Fix `Operation.call` being called twice before delegating to `call_with_circuit_interface`. This is done via a special `call_task` in the operation's taskWrap.
+
 ## 0.7.3
 
 * Revert trailblazer-developer to a runtime dependency.

data/lib/trailblazer/operation.rb

@@ -47,7 +47,7 @@ module Trailblazer
     end
 
     require "trailblazer/operation/public_call"      # TODO: Remove in 3.0.
-    extend PublicCall              # ::call(params, { current_user: .. })
+    extend PublicCall              # ::call(params: .., current_user: ..)
 
     require "trailblazer/operation/trace"
     extend Trace                   # ::trace

data/lib/trailblazer/operation/public_call.rb

@@ -14,7 +14,7 @@ module Trailblazer
     # @note Do not override this method as it will be removed in future versions. Also, you will break tracing.
     # @return Operation::Railway::Result binary result object
     def call(options = {}, flow_options = {}, **circuit_options)
-      return call_with_circuit_interface(options, **circuit_options) if options.is_a?(Array) # This is kind of a hack that could be well hidden if Ruby had method overloading. Goal is to simplify the call/__call__ thing as we're fading out Operation::call anyway.
+      return call_with_circuit_interface(options, **circuit_options) if options.is_a?(Array) # This is kind of a hack that could be well hidden if Ruby had method overloading. Goal is to simplify the call thing as we're fading out Operation::public_call anyway.
 
       call_with_public_interface(options, flow_options, **circuit_options)
     end
@@ -40,7 +40,8 @@ module Trailblazer
       signal, (ctx, flow_options) = invoke_class.invoke(
         self,
         [ctx, flow_options],
-        exec_context: new
+        exec_context: new,
+        wrap_static: initial_wrap_static,
       )
 
       # Result is successful if the activity ended with an End event derived from Railway::End::Success.
@@ -79,5 +80,24 @@ module Trailblazer
       raise "[Trailblazer] `Operation.call_with_flow_options is deprecated in Ruby 3.0. Use `Operation.(options, flow_options)`" if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0.0")
       call_with_public_interface(options, flow_options, {invoke_class: Activity::TaskWrap})
     end
+
+    def initial_wrap_static(*)
+      Activity::TaskWrap::Pipeline.new([["task_wrap.call_task", method(:call_task)]])
+    end
+
+    def call_task(wrap_ctx, original_args) # DISCUSS: copied from {TaskWrap.call_task}.
+      op = wrap_ctx[:task]
+
+      original_arguments, original_circuit_options = original_args
+
+      # Call the actual task we're wrapping here.
+      # puts "~~~~wrap.call: #{task}"
+      return_signal, return_args = op.call_with_circuit_interface(original_arguments, **original_circuit_options)
+
+      # DISCUSS: do we want original_args here to be passed on, or the "effective" return_args which are different to original_args now?
+      wrap_ctx = wrap_ctx.merge(return_signal: return_signal, return_args: return_args)
+
+      return wrap_ctx, original_args
+    end
   end
 end

data/lib/trailblazer/operation/version.rb

@@ -1,7 +1,7 @@
 module Trailblazer
   module Version
     module Operation
-      VERSION = "0.7.3"
+      VERSION = "0.7.4"
     end
   end
 end

data/test/operation_test.rb

@@ -1,6 +1,28 @@
 require "test_helper"
 
 class DeclarativeApiTest < Minitest::Spec
+  it "doesn't invoke {call} twice when using public interface" do
+    class MyOp < Trailblazer::Operation
+      @@GLOBAL = []
+      def self.global; @@GLOBAL; end
+
+
+      def self.call(*args)
+        @@GLOBAL << :call
+        super
+      end
+
+      pass :model
+
+      def model(ctx, **)
+        @@GLOBAL << :model
+      end
+    end
+
+    MyOp.({})
+    MyOp.global.inspect.must_equal %{[:call, :model]}
+  end
+
   #---
   #- step, pass, fail
 

data/trailblazer-operation.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "trailblazer-activity-dsl-linear", ">= 0.4.0", "< 1.0.0"
+  spec.add_dependency "trailblazer-activity", ">= 0.12.1", "< 1.0.0"
   spec.add_dependency "trailblazer-developer", ">= 0.0.21", "< 1.0.0"
 
   spec.add_development_dependency "bundler"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-operation
 version: !ruby/object:Gem::Version
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Nick Sutterer
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-12 00:00:00.000000000 Z
+date: 2021-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity-dsl-linear
@@ -30,6 +30,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: trailblazer-activity
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.12.1
+    - - "<"
+      - !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.12.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: trailblazer-developer
   requirement: !ruby/object:Gem::Requirement
@@ -161,7 +181,7 @@ homepage: http://trailblazer.to
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -177,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.8
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Trailblazer's operation object with railway flow and integrated error handling.
 test_files: