trailblazer-macro 2.1.0.rc1 → 2.1.0.rc11

data/test/operation/pundit_test.rb

@@ -1,5 +1,4 @@
 require "test_helper"
-require "trailblazer/operation/policy"
 
 class PolicyTest < Minitest::Spec
   Song = Struct.new(:id) do

data/test/test_helper.rb

@@ -1,8 +1,9 @@
-require "pp"
 require "delegate" # Ruby 2.2
-require "trailblazer/macro"
 require "minitest/autorun"
 
+require "trailblazer/macro"
+
+
 module Mock
   class Result
     def initialize(bool); @bool = bool end
@@ -22,7 +23,7 @@ end
 
 require "pp"
 
-Minitest::Spec::Operation = Trailblazer::Operation
+# Minitest::Spec::Operation = Trailblazer::Operation
 
 Memo = Struct.new(:id, :body) do
   def self.find(id)
@@ -31,4 +32,13 @@ Memo = Struct.new(:id, :body) do
   end
 end
 
-require_relative "lib/methods"
+require "trailblazer/activity/testing"
+T = Trailblazer::Activity::Testing
+
+module Rehash
+  def rehash(ctx, seq:, rehash_raise: false, **)
+    seq << :rehash
+    raise if rehash_raise
+    true
+  end
+end

data/trailblazer-macro.gemspec

@@ -4,7 +4,7 @@ require 'trailblazer/macro/version'
 
 Gem::Specification.new do |spec|
   spec.name          = "trailblazer-macro"
-  spec.version       = Trailblazer::Macro::VERSION
+  spec.version       = Trailblazer::Version::Macro::VERSION
   spec.authors       = ["Nick Sutterer", "Marc Tich"]
   spec.email         = ["apotonick@gmail.com", "marc@mudsu.com"]
   spec.description   = "Macros for Trailblazer's operation"
@@ -19,13 +19,16 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler"
 
-  spec.add_development_dependency "trailblazer-operation", ">= 0.4.1", "< 0.5.0"
+  # spec.add_development_dependency "trailblazer-operation", ">= 0.4.1", "< 0.5.0"
 
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"
 
-  spec.add_development_dependency "roar"
   spec.add_development_dependency "multi_json"
+  spec.add_development_dependency "roar"
+
+  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 0.1.5", "< 0.2.0"  # TODO: this dependency will be removed.
+  spec.add_dependency "trailblazer-operation", ">= 0.5.0" # TODO: this dependency will be removed.
 
   spec.required_ruby_version = ">= 2.0.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-macro
 version: !ruby/object:Gem::Version
-  version: 2.1.0.rc1
+  version: 2.1.0.rc11
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-18 00:00:00.000000000 Z
+date: 2019-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -26,27 +26,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: trailblazer-operation
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -60,7 +54,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -88,19 +82,39 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: trailblazer-activity-dsl-linear
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 0.1.5
+    - - "<"
+      - !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'
+        version: 0.1.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+- !ruby/object:Gem::Dependency
+  name: trailblazer-operation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 description: Macros for Trailblazer's operation
 email:
 - apotonick@gmail.com
@@ -120,14 +134,14 @@ files:
 - Rakefile
 - lib/trailblazer-macro.rb
 - lib/trailblazer/macro.rb
+- lib/trailblazer/macro/guard.rb
+- lib/trailblazer/macro/model.rb
+- lib/trailblazer/macro/nested.rb
+- lib/trailblazer/macro/policy.rb
+- lib/trailblazer/macro/pundit.rb
+- lib/trailblazer/macro/rescue.rb
 - lib/trailblazer/macro/version.rb
-- lib/trailblazer/operation/guard.rb
-- lib/trailblazer/operation/model.rb
-- lib/trailblazer/operation/nested.rb
-- lib/trailblazer/operation/policy.rb
-- lib/trailblazer/operation/pundit.rb
-- lib/trailblazer/operation/rescue.rb
-- lib/trailblazer/operation/wrap.rb
+- lib/trailblazer/macro/wrap.rb
 - test/docs/guard_test.rb
 - test/docs/macro_test.rb
 - test/docs/model_test.rb
@@ -135,9 +149,8 @@ files:
 - test/docs/pundit_test.rb
 - test/docs/rescue_test.rb
 - test/docs/wrap_test.rb
-- test/lib/methods.rb
+- test/operation/integration_test.rb
 - test/operation/model_test.rb
-- test/operation/nested_test.rb
 - test/operation/pundit_test.rb
 - test/test_helper.rb
 - trailblazer-macro.gemspec
@@ -173,8 +186,7 @@ test_files:
 - test/docs/pundit_test.rb
 - test/docs/rescue_test.rb
 - test/docs/wrap_test.rb
-- test/lib/methods.rb
+- test/operation/integration_test.rb
 - test/operation/model_test.rb
-- test/operation/nested_test.rb
 - test/operation/pundit_test.rb
 - test/test_helper.rb

data/lib/trailblazer/operation/nested.rb

@@ -1,98 +0,0 @@
-# per default, everything we pass into a circuit is immutable. it's the ops/act's job to allow writing (via a Context)
-module Trailblazer
-  class Operation
-    # {Nested} macro.
-    def self.Nested(callable, id: "Nested(#{callable})", input: nil, output: nil)
-      task_wrap_extensions        = Module.new do
-        extend Activity::Path::Plan()
-      end
-
-      input_output = Nested.input_output_extensions_for(input, output) # TODO: deprecate this?
-
-      task, operation, is_dynamic = Nested.build(callable)
-
-      if is_dynamic
-        task_wrap_extensions.task task.method(:compute_nested_activity), id: ".compute_nested_activity",  after: "Start.default", group: :start
-        task_wrap_extensions.task task.method(:compute_return_signal),   id: ".compute_return_signal",    after: "task_wrap.call_task"
-      end
-
-      options = {
-        task:      task,
-        id:        id,
-        Trailblazer::Activity::DSL::Extension.new(Trailblazer::Activity::TaskWrap::Merge.new(task_wrap_extensions)) => true,
-        outputs:   operation.outputs,
-      }.merge(input_output)
-    end
-
-    # @private
-    module Nested
-      def self.input_output_extensions_for(input, output)
-        return {} unless input || output
-
-        input  = input  || ->(original_ctx, **) { original_ctx }
-        output = output || ->(new_ctx, **)      { new_ctx.decompose.last } # merges "mutable" part into original, since it's in Unscoped.
-
-        {
-          Activity::TaskWrap::VariableMapping(input: input, output: output) => true
-        }
-      end
-
-      # DISCUSS: use builders here?
-      def self.build(nested_operation)
-        return dynamic = Dynamic.new(nested_operation), dynamic, true unless nestable_object?(nested_operation)
-
-        # The returned {Nested} instance is a valid circuit element and will be `call`ed in the circuit.
-        # It simply returns the nested activity's `signal,options,flow_options` return set.
-        # The actual wiring - where to go with that - is done by the step DSL.
-        return nested_operation, nested_operation, false
-      end
-
-      def self.nestable_object?(object)
-        object.is_a?( Trailblazer::Activity::Interface )
-      end
-
-      def self.operation_class
-        Operation
-      end
-
-      # For dynamic `Nested`s that do not expose an {Activity} interface.
-      # Since we do not know its outputs, we have to map them to :success and :failure, only.
-      #
-      # 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)
-          @nested_activity = Trailblazer::Option::KW(nested_activity)
-          @outputs         = {
-            :success => Activity::Output( Railway::End::Success.new(semantic: :success), :success ),
-            :failure => Activity::Output( Railway::End::Failure.new(semantic: :failure), :failure ),
-          }
-        end
-
-        attr_reader :outputs
-
-        # TaskWrap step.
-        def compute_nested_activity((wrap_ctx, original_args), **circuit_options)
-          (ctx,), original_circuit_options = original_args
-
-          # TODO: evaluate the option to get the actual "object" to call.
-          activity = @nested_activity.call(ctx, 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.
-          wrap_ctx[:task] = activity
-
-          return Activity::Right, [wrap_ctx, original_args]
-        end
-
-        def compute_return_signal((wrap_ctx, original_args), **circuit_options)
-          # Translate the genuine nested signal to the generic Dynamic end (success/failure, only).
-          # Note that here we lose information about what specific event was emitted.
-          wrap_ctx[:return_signal] = wrap_ctx[:return_signal].kind_of?(Railway::End::Success) ?
-            @outputs[:success].signal : @outputs[:failure].signal
-
-          return Activity::Right, [wrap_ctx, original_args]
-        end
-      end
-    end
-  end
-end

data/lib/trailblazer/operation/rescue.rb

@@ -1,42 +0,0 @@
-class Trailblazer::Operation
-  NoopHandler = lambda { |*| }
-
-  def self.Rescue(*exceptions, handler: NoopHandler, &block)
-    exceptions = [StandardError] unless exceptions.any?
-
-    handler    = Rescue.deprecate_positional_handler_signature(handler)
-    handler    = Trailblazer::Option(handler)
-
-    # This block is evaluated by {Wrap}.
-    rescue_block = ->((ctx, flow_options), **circuit_options, &nested_activity) do
-      begin
-        nested_activity.call
-      rescue *exceptions => exception
-        # DISCUSS: should we deprecate this signature and rather apply the Task API here?
-        handler.call(exception, ctx, **circuit_options) # FIXME: when there's an error here, it shows the wrong exception!
-
-        [ Trailblazer::Operation::Railway.fail!, [ctx, flow_options] ]
-      end
-    end
-
-    Wrap( rescue_block, id: "Rescue(#{rand(100)})", &block )
-    # FIXME: name
-    # [ step, name: "Rescue:#{block.source_location.last}" ]
-  end
-
-  # 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"
-
-      ->(exception, (ctx, flow_options), **circuit_options, &block) do
-        warn "[Trailblazer] Rescue handlers have a new signature: (exception, *, &block)"
-        handler.(exception, ctx, &block)
-      end
-    end
-  end
-end

data/lib/trailblazer/operation/wrap.rb

@@ -1,83 +0,0 @@
-class Trailblazer::Operation
-  def self.Wrap(user_wrap, id: "Wrap/#{rand(100)}", &block)
-    operation_class = Wrap.create_operation(block)
-    wrapped         = Wrap::Wrapped.new(operation_class, user_wrap)
-
-    { task: wrapped, id: id, outputs: operation_class.outputs }
-  end
-
-  module Wrap
-    def self.create_operation(block)
-      Class.new( Nested.operation_class, &block ) # Usually resolves to Trailblazer::Operation.
-    end
-
-    # behaves like an operation so it plays with Nested and simply calls the operation in the user-provided block.
-    class Wrapped #< Trailblazer::Operation # FIXME: the inheritance is only to satisfy Nested( Wrapped.new )
-      include Trailblazer::Activity::Interface
-
-      private def deprecate_positional_wrap_signature(user_wrap)
-        parameters = user_wrap.is_a?(Module) ? user_wrap.method(:call).parameters : user_wrap.parameters
-
-        return user_wrap if parameters[0] == [:req] # means ((ctx, flow_options), *, &block), "new style"
-
-        ->((ctx, flow_options), **circuit_options, &block) do
-          warn "[Trailblazer] Wrap handlers have a new signature: ((ctx), *, &block)"
-          user_wrap.(ctx, &block)
-        end
-      end
-
-      def initialize(operation, user_wrap)
-        user_wrap = deprecate_positional_wrap_signature(user_wrap)
-
-        @operation  = operation
-        @user_wrap  = user_wrap
-
-        # Since in the user block, you can return Railway.pass! etc, we need to map
-        # those to the actual wrapped operation's end.
-        outputs           = @operation.outputs
-        @signal_to_output = {
-          Railway.pass!      => outputs[:success].signal,
-          Railway.fail!      => outputs[:failure].signal,
-          Railway.pass_fast! => outputs[:pass_fast].signal,
-          Railway.fail_fast! => outputs[:fail_fast].signal,
-          true               => outputs[:success].signal,
-          false              => outputs[:failure].signal,
-          nil                => outputs[:failure].signal,
-        }
-      end
-
-      def call( (ctx, flow_options), **circuit_options )
-        block_calling_wrapped = -> {
-          activity = @operation.to_h[:activity]
-
-          activity.( [ctx, flow_options], **circuit_options )
-        }
-
-        # call the user's Wrap {} block in the operation.
-        # This will invoke block_calling_wrapped above if the user block yields.
-        returned = @user_wrap.( [ctx, flow_options], **circuit_options, &block_calling_wrapped )
-
-        # {returned} can be
-        #   1. {circuit interface return} from the begin block, because the wrapped OP passed
-        #   2. {task interface return} because the user block returns "customized" signals, true of fale
-
-        if returned.is_a?(Array) # 1. {circuit interface return}, new style.
-          signal, (ctx, flow_options) = returned
-        else                     # 2. {task interface return}, only a signal (or true/false)
-          # TODO: deprecate this?
-          signal = returned
-        end
-
-        # Use the original {signal} if there's no mapping.
-        # This usually means signal is an End instance or a custom signal.
-        signal = @signal_to_output.fetch(signal, signal)
-
-        return signal, [ctx, flow_options]
-      end
-
-      def outputs
-        @operation.outputs
-      end
-    end
-  end # Wrap
-end

data/test/lib/methods.rb

@@ -1,25 +0,0 @@
-module Test
-  module Methods
-    def find_model(ctx, seq:, **)
-      seq << :find_model
-    end
-
-    def update(ctx, seq:, **)
-      seq << :update
-    end
-
-    def notify(ctx, seq:, **)
-      seq << :notify
-    end
-
-    def rehash(ctx, seq:, rehash_raise:false, **)
-      seq << :rehash
-      raise if rehash_raise
-      true
-    end
-
-    def log_error(ctx, seq:, **)
-      seq << :log_error
-    end
-  end
-end