trailblazer-macro 2.1.12 → 2.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14fa43e34517eca4e07e257fc5a172f406b88294b72f222109203156af53b684
-  data.tar.gz: 4d357be0a556d5431d7e10971e8ca1f9853e8029ecd5c1835c356d2169c9b7cb
+  metadata.gz: bdbc731c17b52586de5a713605423d506a6ea91866db65f4a04be858fa5afb1e
+  data.tar.gz: 254f4e89aca81b120e6f1392c99ac30dfe9dd70cde79e2f2a9aa669a88448bfb
 SHA512:
-  metadata.gz: 600a2b8ae99cb504a0574b929e59ca63edc219b43e219b5af3c414d0c362e323f3cb6ff276f86ce02b19466aab1723ae60bc8b34f91d94764f3b82eadeaa7c2c
-  data.tar.gz: f03b36faa58d2e0ea5c265b48194cd14bb5825cfecace98777637d44a91bb2404ebb710e1db3ce7a7b7b383158413db9f4ffac5f6bb7abf7226ea1e02749d97c
+  metadata.gz: d0b26e20fe1f14def81e30ca0a39a37cf58b6257530307bb9db1f80d914c04b8c5dfb4143f98c012a0605074f31c1cf42b91930aeaecd1cf8f820158cfac6ee4
+  data.tar.gz: cdee315a8ac8900bf438694f7320b88cd3ceb32436baf544826bb550289f56a466ef18da3142ef15e1bde8eb3fc575eadb87e6670106c6be204e921d1285ab00

data/.github/workflows/ci.yml

@@ -1,6 +1,3 @@
-## This file is managed by Terraform.
-## Do not modify this file directly, as it may be overwritten.
-## Please open an issue instead.
 name: CI
 on: [push, pull_request]
 jobs:
@@ -8,7 +5,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [2.7, '3.0', '3.1']
+        ruby: [2.5, 2.6, 2.7, '3.0', '3.1', '3.2', 'jruby']
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3

data/CHANGES.md

@@ -1,3 +1,11 @@
+# 2.1.14
+
+* Use `trailblazer-activity-dsl-linear-1.2.0` and change internal API as required.
+
+# 2.1.13
+
+* Fix an introspect bug in `Each()` where we couldn't look into `"invoke_block_activity"`.
+
 # 2.1.12
 
 ## Internals

data/Gemfile

@@ -6,12 +6,12 @@ gemspec
 # gem "trailblazer-developer", github: "trailblazer/trailblazer-developer"
 # gem "trailblazer-activity", github: "trailblazer/trailblazer-activity"
 # gem "trailblazer-activity-dsl-linear", github: "trailblazer/trailblazer-activity-dsl-linear"
-# gem "trailblazer-activity-dsl-linear", path: "../trailblazer-activity-dsl-linear"
-# gem "trailblazer-developer", path: "../trailblazer-developer"
-# gem "trailblazer-activity", path: "../trailblazer-activity"
 # gem "trailblazer-macro-contract", git: "https://github.com/trailblazer/trailblazer-macro-contract"
-# gem "trailblazer-context", path: "../trailblazer-context"
-# gem "trailblazer-option", path: "../trailblazer-option"
+
+# gem "trailblazer-activity-dsl-linear",  path: "../trailblazer-activity-dsl-linear"
+# gem "trailblazer-developer",            path: "../trailblazer-developer"
+# gem "trailblazer-activity",             path: "../trailblazer-activity"
+# gem "trailblazer-operation",            path: "../trailblazer-operation"
 
 gem "minitest-line"
 # gem "trailblazer-core-utils", path: "../trailblazer-core-utils"

data/Rakefile

@@ -3,7 +3,7 @@ require "rake/testtask"
 
 Rake::TestTask.new(:test) do |test|
   test.libs << 'test'
-  test.test_files = FileList['test/**/*_test.rb']
+  test.test_files = FileList['test/**/*_test.rb'] #- FileList['test/docs/autogenerated/*_test.rb']
   test.verbose = true
 end
 

data/lib/trailblazer/macro/each.rb

@@ -52,6 +52,12 @@ module Trailblazer
         end
 
         return signal, [ctx, flow_options]
+      end #call
+
+      def self.to_h
+        container_activity = @state.get(:activity)
+        # FIXME: this is needed for a proper {find_path} introspect lookup.
+        container_activity.to_h.merge(activity: container_activity)
       end
 
       # This is basically Out() => {copy all mutable variables}
@@ -62,7 +68,7 @@ module Trailblazer
       # Gets included in Debugger's Normalizer. Results in IDs like {invoke_block_activity.1}.
       def self.compute_runtime_id(ctx, captured_node:, activity:, compile_id:, **)
         # activity is the host activity
-        return compile_id unless activity[:each] == true
+        return compile_id unless activity.to_h[:config][:each] == true
 
         index = captured_node.captured_input.data[:ctx_snapshot].fetch(:index)
 
@@ -88,12 +94,20 @@ module Trailblazer
       # This activity is passed into the {Runner} for each iteration of {block_activity}.
       container_activity = Activity::TaskWrap.container_activity_for(
         block_activity,
-        each:         true, # mark this activity for {compute_runtime_id}.
-        nodes:        [Activity::NodeAttributes.new("invoke_block_activity", nil, block_activity)], # TODO: use TaskMap::TaskAttributes
+        id:        "invoke_block_activity",
+        # merged into {:config}:
+          each:        true, # mark this activity for {compute_runtime_id}.
       ).merge(
-        wrap_static: Hash.new(wrap_static_for_block_activity)
+        outputs: outputs_from_block_activity,
       )
 
+      # FIXME: we can't pass {wrap_static: wrap_static_for_block_activity} into {#container_activity_for}
+      #        because when patching, the container_activity is not recompiled, so we need the Hash here
+      #        with defaulting.
+      # FIXME: this "hack" is only here to satify patching.
+      config = container_activity[:config].merge(wrap_static: Hash.new(wrap_static_for_block_activity))
+      container_activity.merge!(config: config)
+
       # DISCUSS: move to Wrap.
       termini_from_block_activity =
         outputs_from_block_activity.
@@ -111,9 +125,16 @@ module Trailblazer
         success_signal:   [termini_from_block_activity[-1][0], {}] # FIXME: when subclassing (e.g. patching) this must be recomputed.
       )
 
-      # {block_activity} looped. In the Stack, this will look as if {block_activity} is
-      # a child of {iterate_activity}, that's why we add {block_activity} as a Node in
-      # {iterate_activity}'s schema.
+      # |-- Each/composers_for_each
+      # |   |-- Start.default
+      # |   |-- Each.iterate.block            This is Class.new(Each), outputs_from_block_activity
+      # |   |   |-- invoke_block_activity.0      step :invoke_block_activity.0
+      # |   |   |   |-- Start.default
+      # |   |   |   |-- notify_composers
+      # |   |   |   `-- End.success
+      # |   |   `-- invoke_block_activity.1      step "invoke_block_activity.1"
+      # |   |       |-- Start.default
+      # |   |       |-- notify_composers
       iterate_strategy = Class.new(Each) do
         extend Macro::Strategy::State # now, the Wrap subclass can inherit its state and copy the {block_activity}.
         initialize!(state)

data/lib/trailblazer/macro/nested.rb

@@ -113,7 +113,7 @@ module Trailblazer
         def self.host_activity_for(activity:)
           Activity::TaskWrap.container_activity_for(
             activity,
-            nodes: [Trailblazer::Activity::NodeAttributes.new(activity.to_s, nil, activity)],
+            id: activity.to_s
           )
         end
 
@@ -127,7 +127,7 @@ module Trailblazer
       #       this will help when semantics overlap.
       #
       def self.Static(decider, id:, auto_wire:)
-        decider_outputs = auto_wire.collect do |activity|
+        decider_connectors = auto_wire.collect do |activity|
           [Activity::Railway.Output(activity, "decision:#{activity}"), Activity::Railway.Track(activity)]
         end.to_h
 
@@ -136,7 +136,7 @@ module Trailblazer
             {
               task: Static.method(:return_route_signal),
               id:   :route_to_nested_activity, # returns the {nested_activity} signal
-            }.merge(decider_outputs)
+            }.merge(decider_connectors)
           )
 
           auto_wire.each do |activity|

data/lib/trailblazer/macro/version.rb

@@ -1,7 +1,7 @@
 module Trailblazer
   module Version
     module Macro
-      VERSION = "2.1.12"
+      VERSION = "2.1.14"
     end
   end
 end

data/test/docs/each_test.rb

@@ -54,10 +54,11 @@ class EachTest < Minitest::Spec
         def composers_for_each(ctx, model:, **)
           model.composers
         end
-
+        #:iterated-value
         def notify_composers(ctx, index:, item:, **)
           ctx[:value] = [index, item.full_name]
         end
+        #:iterated-value end
 
         #~meths
         def model(ctx, params:, **)
@@ -590,9 +591,10 @@ class EachStrategyComplianceTest < Minitest::Spec
     EachPureTest::Mailer.send_options = []
 
     #:patch
-    cover_patched = Trailblazer::Activity::DSL::Linear.Patch(
+    cover_patched = Trailblazer::Activity::DSL::Linear::Patch.(
       Song::Activity::Cover,
-      ["Each/composers_for_each", "Each.iterate.block"] => -> { step :log_email }
+      ["Each/composers_for_each", "Each.iterate.block"],
+      -> { step :log_email }
     )
     #:patch end
     cover_patched.include(T.def_steps(:log_email, :notify_composers))
@@ -616,20 +618,53 @@ class EachStrategyComplianceTest < Minitest::Spec
 
   it "find_path" do
     assert_equal Trailblazer::Developer::Introspect.find_path(Song::Activity::Cover,
-      ["Each/composers_for_each", "Each.iterate.block", :notify_composers])[0].task.inspect,
+      ["Each/composers_for_each", "Each.iterate.block", "invoke_block_activity", :notify_composers])[0].task.inspect,
       %{#<Trailblazer::Activity::TaskBuilder::Task user_proc=notify_composers>}
 
 =begin
 #:find_path
 node, _ = Trailblazer::Developer::Introspect.find_path(
   Song::Activity::Cover,
-  ["Each/composers_for_each", "Each.iterate.block", :notify_composers])
+  ["Each/composers_for_each", "Each.iterate.block", "invoke_block_activity", :notify_composers])
 #=> #<Node ...>
 #:find_path end
 =end
 
   end
 
+  it "{#find_path} for Each(Activity) with anonymous class" do
+    id = nil
+
+    activity = Class.new(Trailblazer::Activity::Railway) do
+      sub_activity = Class.new(Trailblazer::Activity::Railway) do
+        step :notify_composers
+      end
+      id = sub_activity.to_s
+
+      step :model
+      step Each(sub_activity, dataset_from: :composers_for_each)
+      step :rearrange
+
+      def composers_for_each(ctx, model:, **)
+        model.composers
+      end
+      # include CoverMethods
+    end
+
+    node, _activity = Trailblazer::Developer::Introspect.find_path(activity,
+      [%{Each/#{id}}, "Each.iterate.#{id}", "invoke_block_activity"])
+
+    assert_equal _activity.class.inspect, "Hash" # container_activity
+
+    #@ inside {invoke_block_activity}
+    node, _activity = Trailblazer::Developer::Introspect.find_path(activity,
+      [%{Each/#{id}}, "Each.iterate.#{id}", "invoke_block_activity", :notify_composers])
+
+    assert_equal node.task.inspect,
+      %{#<Trailblazer::Activity::TaskBuilder::Task user_proc=notify_composers>}
+    assert_equal _activity.class.inspect, "Trailblazer::Activity"
+  end
+
 
   it "tracing" do
     EachPureTest::Mailer.send_options = []
@@ -674,7 +709,7 @@ class EachIDTest < Minitest::Spec
     assert_equal Trailblazer::Developer::Introspect.find_path(activity, ["Each-1"])[0].id,                    "Each-1"
     assert_equal Trailblazer::Developer::Introspect.find_path(activity, ["Each/composers_for_each"])[0].id,   "Each/composers_for_each"
 
-    assert_match /Each\/\w+/, Trailblazer::Activity::Introspect::TaskMap(activity).values[1].id
+    assert_match /Each\/\w+/, Trailblazer::Activity::Introspect::Nodes(activity).values[1].id # FIXME: this test sucks.
   end
 end
 
@@ -731,7 +766,7 @@ class DocsEachUnitTest < Minitest::Spec
   #@ compile time
   #@ make sure we can find tasks/compile-time artifacts in Each by using their {compile_id}.
     assert_equal Trailblazer::Developer::Introspect.find_path(activity,
-      ["Each/1", "Each.iterate.block", :compute_item])[0].task.inspect,
+      ["Each/1", "Each.iterate.block", "invoke_block_activity", :compute_item])[0].task.inspect,
       %{#<Trailblazer::Activity::TaskBuilder::Task user_proc=compute_item>}
     # puts Trailblazer::Developer::Render::TaskWrap.(activity, ["Each/1", "Each.iterate.block", "invoke_block_activity", :compute_item])
 

data/test/docs/wrap_test.rb

@@ -650,9 +650,10 @@ class WrapUnitTest < Minitest::Spec
       %{#<Trailblazer::Activity::TaskBuilder::Task user_proc=validate>}
 
     #@ Patch interface
-    patched_activity = Trailblazer::Activity::DSL::Linear.Patch(
+    patched_activity = Trailblazer::Activity::DSL::Linear::Patch.call(
       activity,
-      ["Wrap/WrapUnitTest::HandleUnsafeProcess"] => -> { step mock_validation, replace: :validation, id: :validation }
+      ["Wrap/WrapUnitTest::HandleUnsafeProcess"],
+      -> { step mock_validation, replace: :validation, id: :validation }
     )
 
     #@ the original activity with Wrap is unchanged.
@@ -668,9 +669,10 @@ class WrapStrategyComplianceTest < Minitest::Spec
 
   it do
     #:patch
-    upload_with_upsert = Trailblazer::Activity::DSL::Linear.Patch(
+    upload_with_upsert = Trailblazer::Activity::DSL::Linear::Patch.call(
       Song::Activity::Upload,
-      ["Wrap/MyTransaction"] => -> { step :upsert, replace: :update }
+      ["Wrap/MyTransaction"],
+      -> { step :upsert, replace: :update }
     )
     #:patch end
     upload_with_upsert.include(T.def_steps(:upsert))

data/test/test_helper.rb

@@ -1,31 +1,11 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require "trailblazer/macro"
-
-require "delegate" # Ruby 2.2
 require "minitest/autorun"
 
+require "trailblazer/macro"
 require "trailblazer/developer"
+require "trailblazer/activity/testing"
 
-module Mock
-  class Result
-    def initialize(bool); @bool = bool end
-    def success?; @bool end
-    def errors; ["hihi"] end
-  end
-end
-
-module Test
-  module ReturnCall
-    def self.included(includer)
-      includer._insert :_insert, ReturnResult, {replace: Trailblazer::Operation::Result::Build}, ReturnResult, ""
-    end
-  end
-  ReturnResult = ->(last, input, options) { input }
-end
-
-require "pp"
-
-# Minitest::Spec::Operation = Trailblazer::Operation
+T = Trailblazer::Activity::Testing
 
 Memo = Struct.new(:id, :body) do
   def self.find(id)
@@ -34,9 +14,6 @@ Memo = Struct.new(:id, :body) do
   end
 end
 
-require "trailblazer/activity/testing"
-T = Trailblazer::Activity::Testing
-
 module Rehash
   def rehash(ctx, seq:, rehash_raise: false, **)
     seq << :rehash
@@ -53,23 +30,3 @@ Minitest::Spec.class_eval do
     return Trailblazer::Developer::Trace::Present.(stack, node_options: {stack.to_a[0]=>{label: "TOP"}}).gsub(/:\d+/, ""), signal, ctx
   end
 end
-
-
-
-# signal, (ctx, _) = Trailblazer::Activity.(Song::Activity::Create,
-#       params:               {title: "Olympia"}, # some random variable.
-#       "model.class":        Hit,
-#       "model.action":       :find_by,
-#       "model.find_by_key":  :title, seq: []
-#     )
-
-# #:update-ok
-#     signal, (ctx, _) = Trailblazer::Activity.(Song::Activity::Update, params: {id: 1}, seq: [])
-#     ctx[:model] #=> #<Song id=1, ...>
-#     puts signal #=> #<Trailblazer::Activity::End semantic=:success>
-# #:update-ok end
-
-
-# require "trailblazer/core"
-# Trailblazer::Core.convert_operation_test("test/docs/model_test.rb")
-# Trailblazer::Core.convert_operation_test("test/docs/each_test.rb")

data/trailblazer-macro.gemspec

@@ -5,8 +5,8 @@ require 'trailblazer/macro/version'
 Gem::Specification.new do |spec|
   spec.name          = "trailblazer-macro"
   spec.version       = Trailblazer::Version::Macro::VERSION
-  spec.authors       = ["Nick Sutterer", "Marc Tich"]
-  spec.email         = ["apotonick@gmail.com", "marc@mudsu.com"]
+  spec.authors       = ["Nick Sutterer"]
+  spec.email         = ["apotonick@gmail.com"]
   spec.description   = "Macros for Trailblazer's operation"
   spec.summary       = "Macros for Trailblazer's operation: Policy, Wrap, Rescue and more."
   spec.homepage      = "http://trailblazer.to"
@@ -20,9 +20,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "trailblazer-developer"
+  spec.add_dependency "trailblazer-operation", ">= 0.10.0" # TODO: this dependency will be removed. currently needed for tests and for Guard::Result
 
-  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 1.1.0", "< 1.2.0"
-  spec.add_dependency "trailblazer-operation", ">= 0.9.0" # TODO: this dependency will be removed. currently needed for tests?!
+  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 1.2.0", "< 1.3.0"
 
-  spec.required_ruby_version = ">= 2.2.0"
+  spec.required_ruby_version = ">= 2.5.0"
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-macro
 version: !ruby/object:Gem::Version
-  version: 2.1.12
+  version: 2.1.14
 platform: ruby
 authors:
 - Nick Sutterer
-- Marc Tich
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -54,51 +53,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: trailblazer-activity-dsl-linear
+  name: trailblazer-operation
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: trailblazer-operation
+  name: trailblazer-activity-dsl-linear
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: Macros for Trailblazer's operation
 email:
 - apotonick@gmail.com
-- marc@mudsu.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/ci.yml"
-- ".github/workflows/ci_jruby.yml"
-- ".github/workflows/ci_legacy.yml"
-- ".github/workflows/ci_truffleruby.yml"
 - ".gitignore"
 - CHANGES.md
 - Gemfile
@@ -143,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/.github/workflows/ci_jruby.yml

@@ -1,19 +0,0 @@
-## This file is managed by Terraform.
-## Do not modify this file directly, as it may be overwritten.
-## Please open an issue instead.
-name: CI JRuby
-on: [push, pull_request]
-jobs:
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [jruby, jruby-head]
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - run: bundle exec rake

data/.github/workflows/ci_legacy.yml

@@ -1,19 +0,0 @@
-## This file is managed by Terraform.
-## Do not modify this file directly, as it may be overwritten.
-## Please open an issue instead.
-name: CI with EOL ruby versions
-on: [push, pull_request]
-jobs:
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [2.5, 2.6]
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - run: bundle exec rake

data/.github/workflows/ci_truffleruby.yml

@@ -1,19 +0,0 @@
-## This file is managed by Terraform.
-## Do not modify this file directly, as it may be overwritten.
-## Please open an issue instead.
-name: CI TruffleRuby
-on: [push, pull_request]
-jobs:
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [truffleruby, truffleruby-head]
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-        bundler-cache: true
-    - run: bundle exec rake