trailblazer-macro 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d789d88096949c41a15147feed363efab5c86e586b4f76c819e12f6e8f2d4a70
-  data.tar.gz: fbe7775b4330bc7b607058da66c896fe461e73b1337e747c23eb87acb04b8d30
+  metadata.gz: 2b94581daf3c1a0afeea2d8a3d9f470393b15fbfe57fe01dc29c5d1f247beb7c
+  data.tar.gz: dff368470d21d9fb0f9522bf610ef1e62b51eebf59f9c41f371298d12d11b8e5
 SHA512:
-  metadata.gz: df7f0de0c1107ea8c9b3803e8343907c0deb78e943ac2298a114db9fedb6de88252f5055a247b516fa3c80a2432f52913fd6d84ceb189779b58c87da6204a20f
-  data.tar.gz: a1e7a11851d02b26badfbff8aa6932810bc2e32ae3d1f4ce5fd73f2bf26284bff62a88b1fd27d29f5b82a7962e61fd0655b97f483483ff6df5cffdb3326f51e0
+  metadata.gz: 0a2547701dec5fd643a229313dfeab1d047b1b469208ba54c950cf6f496ef07aa950e6674fb96221fea898dcaff8329f2f3d2ff1f9bec7fa0b758599a96e6329
+  data.tar.gz: a0fb745ffb5a9a313764a08972f5271f66e2f07c097759bd5cccb0521b1f80cf72eadaf3c71ae1dc5abdc8bd311abf0aabf6aed4dbea728328a9c590249d9e24

data/CHANGES.md

@@ -1,3 +1,8 @@
+# 2.1.7
+
+* Improve `Nested()` warning message.
+* Fix exception in `Rescue()` macro when it's handler is a `Module`.
+
 # 2.1.6
 
 * Allow connecting ends of the dynamically selected activity for `Nested()` using `:auto_wire`.

data/lib/trailblazer/macro/nested.rb

@@ -4,7 +4,11 @@ module Trailblazer
     # {Nested} macro.
     def self.Nested(callable, id: "Nested(#{callable})", auto_wire: [])
       if callable.is_a?(Class) && callable < Nested.operation_class
-        warn %{[Trailblazer] Using the `Nested()` macro with operations and activities is deprecated. Replace `Nested(Create)` with `Subprocess(Create)`.}
+        caller_location = caller_locations(2, 1)[0]
+        warn "[Trailblazer]#{caller_location.absolute_path}: " \
+             "Using the `Nested()` macro with operations and activities is deprecated. " \
+             "Replace `Nested(#{callable})` with `Subprocess(#{callable})`."
+
         return Nested.operation_class.Subprocess(callable)
       end
 

data/lib/trailblazer/macro/rescue.rb

@@ -28,11 +28,8 @@ module Trailblazer
     # TODO: remove me in 2.2.
     module Rescue
       def self.deprecate_positional_handler_signature(handler)
-        return handler if handler.is_a?(Symbol) # can't do nutting about this.
-
-        arity = handler.is_a?(Class) ? handler.method(:call).arity : handler.arity
-
-        return handler if arity != 2 # means (exception, (ctx, flow_options), *, &block), "new style"
+        return handler if handler.is_a?(Symbol) # can't do nothing about this.
+        return handler if handler.method(:call).arity != 2 # means (exception, (ctx, flow_options), *, &block), "new style"
 
         ->(exception, (ctx, flow_options), **circuit_options, &block) do
           warn "[Trailblazer] Rescue handlers have a new signature: (exception, *, &block)"

data/lib/trailblazer/macro/version.rb

@@ -1,7 +1,7 @@
 module Trailblazer
   module Version
     module Macro
-      VERSION = "2.1.6"
+      VERSION = "2.1.7"
     end
   end
 end

data/test/docs/model_test.rb

@@ -16,7 +16,7 @@ class DocsModelTest < Minitest::Spec
 
   #:op
   class Create < Trailblazer::Operation
-    step Model( Song, :new )
+    step Model(Song, :new)
     # ..
   end
   #:op end
@@ -121,4 +121,18 @@ class DocsModelTest < Minitest::Spec
     result.success?.must_equal true
     result[:model].inspect.must_equal %{#<struct DocsModelTest::Song id=100, title=nil>}
   end
+
+  it "allows injecting {:model.class} and friends" do
+    class Hit < Song
+    end
+
+    result = Create.(params: {}, :"model.class" => Hit)
+
+    result[:model].inspect.must_equal %{#<struct DocsModelTest::Hit id=nil, title=nil>}
+
+  # inject all variables
+    result = Create.(params: {title: "Olympia"}, "model.class": Hit, "model.action": :find_by, "model.find_by_key": :title)
+
+    result[:model].inspect.must_equal %{#<struct DocsModelTest::Hit id=2, title="Olympia">}
+  end
 end

data/test/docs/rescue_test.rb

@@ -66,7 +66,7 @@ plain Rescue()
 =begin
 Rescue( handler: X )
 =end
-  class RescueWithHandlerTest < Minitest::Spec
+  class RescueWithClassHandlerTest < Minitest::Spec
     Memo = Class.new
 
     #:rescue-handler
@@ -97,10 +97,35 @@ Rescue( handler: X )
     it { Memo::Create.( { seq: [], rehash_raise: true } ).inspect(:seq, :exception_class).must_equal %{<Result:false [[:find_model, :update, :rehash, :log_error], RuntimeError] >} }
   end
 
+  class RescueWithModuleHandlerTest < Minitest::Spec
+    Memo = Class.new
+
+    module MyHandler
+      def self.call(exception, (ctx), *)
+        ctx[:exception_class] = exception.class
+      end
+    end
+
+    class Memo::Create < Trailblazer::Operation
+      step :find_model
+      step Rescue( RuntimeError, handler: MyHandler ) {
+        step :update
+        step :rehash
+      }
+      step :notify
+      fail :log_error
+      include T.def_steps(:find_model, :update, :notify, :log_error)
+      include Rehash
+    end
+
+    it { Memo::Create.( { seq: [], } ).inspect(:seq, :exception_class).must_equal %{<Result:true [[:find_model, :update, :rehash, :notify], nil] >} }
+    it { Memo::Create.( { seq: [], rehash_raise: true } ).inspect(:seq, :exception_class).must_equal %{<Result:false [[:find_model, :update, :rehash, :log_error], RuntimeError] >} }
+  end
+
 =begin
 Rescue( handler: :instance_method )
 =end
-  class RescueWithHandlerTest < Minitest::Spec
+  class RescueWithMethodHandlerTest < Minitest::Spec
     Memo = Class.new
 
     #:rescue-method

data/test/operation/nested_test.rb

@@ -62,4 +62,15 @@ class NestedTest < Minitest::Spec
 
     exception.inspect.must_match 'No `db_error` output found'
   end
+
+  it "shows warning if `Nested()` is being used instead of `Subprocess()` for static activities" do
+    _, warnings = capture_io do
+      Class.new(Trailblazer::Operation) do
+        step Nested(SignUp)
+      end
+    end
+
+    warnings.must_equal %Q{[Trailblazer]#{__FILE__}: Using the `Nested()` macro with operations and activities is deprecated. Replace `Nested(NestedTest::SignUp)` with `Subprocess(NestedTest::SignUp)`.
+}
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-macro
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-11 00:00:00.000000000 Z
+date: 2021-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -188,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.0.8
 signing_key:
 specification_version: 4
 summary: 'Macros for Trailblazer''s operation: Policy, Wrap, Rescue and more.'