trailblazer-activity 0.11.5 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c765281f7fa2902f9cc47fb4a2045b54de89fb48ef536d4696a497f947b3f9bb
-  data.tar.gz: 8a4f24aacb4da6b80e12a3edcd3698cb7583e014b489293d29938a003a27d084
+  metadata.gz: f790c2cce163e21a33c31093c7d74358574f851249b810a4e776472fccc9cb4f
+  data.tar.gz: 0e78fa480306d480850ef3709871e234ece90939e9552a4ddcfe0bb26f5e2853
 SHA512:
-  metadata.gz: 4388f3be8e6c4f902537b5febdec0b36b5a15e143f2da5f1a9b0aba4a0cb73e0066ef825ca4f285e040e36d25ff77ce9031114f85198e70779dee9359e75df2d
-  data.tar.gz: 71c58c25da986267e69c37e50a5a1b0de0083c58cf47def17b2c63eb44af7f8498d0f4f2b121be1d46b545b7c937bb85cf0156e32d642c73750e086232b96c98
+  metadata.gz: 35b942b116679ad0aae0793fc102ad274f2aef584dd91a9d808d0abf50f3ca62ba0e20b9eca9590063bf97096ed177c119d41e18c964d4f33730f9719e30836b
+  data.tar.gz: 63596947b49ca3bfd44d3cd567bf6abfdefbc086cea31da14716654a920caaa443c49071828114a2e7fa99905d3d5810ef9b19087b27b1782a7b1bdcdcddd410

data/.travis.yml

@@ -3,6 +3,7 @@ before_install: gem install bundler
 cache: bundler
 rvm:
   - ruby-head
+  - 3.0
   - 2.7
   - 2.6
   - 2.5

data/CHANGES.md

@@ -1,3 +1,7 @@
+# 0.12.0
+
+* Support for Ruby 3.0.
+
 # 0.11.5
 
 * Bug fix: `:output` filter from `TaskWrap::VariableMapping` wasn't returning the correct `flow_options`. If the wrapped task changed

data/Gemfile

@@ -1,10 +1,5 @@
 source "https://rubygems.org"
-
-# Specify your gem's dependencies in workflow.gemspec
 gemspec
 
-gem "benchmark-ips"
-gem "minitest-line"
-
-# gem "trailblazer-context", path: "../trailblazer-context"
 # gem "trailblazer-developer", path: "../trailblazer-developer"
+# gem "trailblazer-context", github: "trailblazer/trailblazer-context", branch: "ruby-3"

data/lib/trailblazer/activity/introspect.rb

@@ -68,6 +68,20 @@ module Trailblazer
       def self.Graph(*args)
         Graph.new(*args)
       end
+
+      def self.render_task(proc)
+        if proc.is_a?(Method)
+
+          receiver = proc.receiver
+          receiver = receiver.is_a?(Class) ? (receiver.name || "#<Class:0x>") : (receiver.name || "#<Module:0x>") #"#<Class:0x>"
+
+          return "#<Method: #{receiver}.#{proc.name}>"
+        elsif proc.is_a?(Symbol)
+          return proc.to_s
+        end
+
+        proc.inspect
+      end
     end # Introspect
   end
 end

data/lib/trailblazer/activity/task_builder.rb

@@ -5,7 +5,7 @@ module Trailblazer
     # Output signal binary: true=>Right, false=>Left.
     # Passes through all subclasses of Direction.~~~~~~~~~~~~~~~~~
     def self.Binary(user_proc)
-      Task.new(Trailblazer::Option::KW( user_proc ), user_proc)
+      Task.new(Trailblazer::Option(user_proc), user_proc)
     end
 
     # Translates the return value of the user step into a valid signal.
@@ -28,16 +28,16 @@ module Trailblazer
 
       def call( (ctx, flow_options), **circuit_options )
         # Execute the user step with TRB's kw args.
-        result = @task.( ctx, **circuit_options ) # circuit_options contains :exec_context.
+        result = @task.(ctx, keyword_arguments: ctx.to_hash, **circuit_options) # circuit_options contains :exec_context.
 
         # Return an appropriate signal which direction to go next.
-        signal = Activity::TaskBuilder.binary_signal_for( result, Activity::Right, Activity::Left )
+        signal = Activity::TaskBuilder.binary_signal_for(result, Activity::Right, Activity::Left)
 
-        return signal, [ ctx, flow_options ]
+        return signal, [ctx, flow_options]
       end
 
-      def inspect
-        %{#<Trailblazer::Activity::TaskBuilder::Task user_proc=#{@user_proc}>}
+      def inspect # TODO: make me private!
+        %{#<Trailblazer::Activity::TaskBuilder::Task user_proc=#{Trailblazer::Activity::Introspect.render_task(@user_proc)}>}
       end
       alias_method :to_s, :inspect
     end

data/lib/trailblazer/activity/task_wrap/call_task.rb

@@ -6,9 +6,11 @@ class Trailblazer::Activity
     def self.call_task(wrap_ctx, original_args)
       task = 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 = task.(*original_args)
+      return_signal, return_args = task.(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 )

data/lib/trailblazer/activity/task_wrap/variable_mapping.rb

@@ -57,7 +57,7 @@ class Trailblazer::Activity
 
       # Invoke the @filter callable with the original circuit interface.
       def apply_filter((ctx, original_flow_options), original_circuit_options)
-        @filter.([ctx, original_flow_options], original_circuit_options) # returns {new_ctx}.
+        @filter.([ctx, original_flow_options], **original_circuit_options) # returns {new_ctx}.
       end
     end
 
@@ -78,7 +78,7 @@ class Trailblazer::Activity
         returned_ctx, returned_flow_options = wrap_ctx[:return_args]  # this is the Context returned from {call}ing the wrapped user task.
         original_ctx                        = wrap_ctx[@id]           # grab the original ctx from before which was set in the {:input} filter.
         # let user compute the output.
-        output_ctx = @filter.(returned_ctx, [original_ctx, returned_flow_options], original_circuit_options) # FIXME: shouldn't we pass {returned_ctx} instead of {original_ctx}?
+        output_ctx = @filter.(returned_ctx, [original_ctx, returned_flow_options], **original_circuit_options)
 
         wrap_ctx = wrap_ctx.merge( return_args: [output_ctx, returned_flow_options] )
 

data/lib/trailblazer/activity/testing.rb

@@ -62,10 +62,6 @@ module Trailblazer
           Success = Activity::End(:success)
         end
 
-        def Cct(activity)
-          Trailblazer::Developer::Render::Circuit.(activity)
-        end
-
         # TODO: Remove this once all it's references are removed
         def implementing
           Implementing
@@ -143,9 +139,19 @@ module Trailblazer
 
         def assert_circuit(schema, circuit)
           cct = Cct(schema)
+
           cct = cct.gsub("#<Trailblazer::Activity::TaskBuilder::Task user_proc=", "<*")
           assert_equal %{#{circuit}}, cct
         end
+
+      def Cct(activity)
+        Trailblazer::Developer::Render::Circuit.(activity, inspect_task: Trailblazer::Activity::Testing.method(:render_task))
+      end
+    end
+
+    # Use this in {#Cct}.
+    def self.render_task(proc)
+      Activity::Introspect.render_task(proc)
     end
   end
 end

data/lib/trailblazer/activity/version.rb

@@ -1,7 +1,7 @@
 module Trailblazer
   module Version
     module Activity
-      VERSION = '0.11.5'.freeze
+      VERSION = '0.12.0'.freeze
     end
   end
 end

data/trailblazer-activity.gemspec

@@ -17,10 +17,11 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "trailblazer-context", ">= 0.3.1", "< 0.4.0"
+  spec.add_dependency "trailblazer-context", ">= 0.4.0", "< 0.5.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency "minitest-line"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "trailblazer-developer", ">= 0.0.7"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-activity
 version: !ruby/object:Gem::Version
-  version: 0.11.5
+  version: 0.12.0
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-03 00:00:00.000000000 Z
+date: 2021-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trailblazer-context
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: minitest-line
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -139,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Runtime code for Trailblazer activities.