trailblazer-developer 0.0.27 → 0.0.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45cd9fac3c0701cd0e98573e27c59c80de31d5d91b306980c961d58f64161d71
-  data.tar.gz: 745d4d28834261571fdbccc9949b597bb1f17f669bc238a6bbc09925001d4594
+  metadata.gz: 2bc71f425eee589bda27a8b681b796650443e688c3dc46ddb7d12e6daf092f08
+  data.tar.gz: 2f128bcf1675ba3147db4737f348b52d9a1f96562e317feeddda79846c1ca0e8
 SHA512:
-  metadata.gz: 57bdf494ed795a80edadba06bcc011d9ee5832eb6a4f87f0c02a5a1b0a81b82be05507eb4eb593cd6476b71efb7f9a1a82eced117dcc5e41175d028f5c2c8f0e
-  data.tar.gz: 6735f1eea27c3fa7c87d394d3d0a9baf9c2218f632f8bd2d2b5b9325366a3d5ff47a5e89668bd8146429e8ef00ad814b9593fa0e8fbea7519dbe3dd345ae14bd
+  metadata.gz: 3b10040b636e96bc396ec89b41db298030552b0460ad7fa88b94ebf5a767e881cdf2c219ab573522f4226cb84d6e6d5baac786d384b7ef93d2788576dea4183f
+  data.tar.gz: 2eb0f50c4af74ab44ea0353e61b45a4645adb0f70132be92d329dd8123d0fd20561b58047be1bd9b2a25cb9e6bd5ccd2a6ac67089c7546e0041c78c24c455c62

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.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,12 @@
+# 0.0.28
+
+* Move `Introspect::Graph` over from `trailblazer-activity`. It's a data structure very specific
+  to rendering, which is not a part of pure runtime behavior.
+* Use `Introspect.Nodes` API instead of `TaskMap`.
+* Remove `:task_maps_per_activity` in `Debugger` as we don't need to cache anymore.
+* Require `trailblazer-activity-dsl-linear-1.2.0`.
+* Remove `Render::Circuit` as this is part of `trailblazer-activity` now.
+
 # 0.0.27
 
 ## Trace

data/Gemfile

@@ -3,8 +3,11 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in trailblazer-developer.gemspec
 gemspec
 
-# gem "trailblazer-activity", ">= 0.7.1"
-# gem "trailblazer-activity", path: "../trailblazer-activity"
-# gem "trailblazer-activity-dsl-linear", path: "../trailblazer-activity-dsl-linear"
-gem "trailblazer-activity-dsl-linear", github: "trailblazer/trailblazer-activity-dsl-linear"
-gem "trailblazer-activity", github: "trailblazer/trailblazer-activity"
+# gem "trailblazer-activity",             path: "../trailblazer-activity"
+# gem "trailblazer-activity-dsl-linear",  path: "../trailblazer-activity-dsl-linear"
+# gem "trailblazer-operation",            path: "../trailblazer-operation"
+# gem "trailblazer-pro",                  path: "../trailblazer-pro"
+
+# gem "trailblazer-activity",           github: "trailblazer/trailblazer-activity"
+# gem "trailblazer-activity-dsl-linear", github: "trailblazer/trailblazer-activity-dsl-linear"
+

data/lib/trailblazer/developer/introspect/graph.rb

@@ -0,0 +1,83 @@
+# NOTE: The Graph API might get deprecated and replaced.
+module Trailblazer
+  module Developer
+    module Introspect
+      # TODO: order of step/fail/pass in Node would be cool to have
+
+      # TODO: Remove Graph. This is only useful to render the full circuit
+      # Some thoughts here:
+      # * where do we need Schema.outputs? and where task.outputs?
+      #
+      #
+      # @private This API is still under construction.
+      class Graph
+        def initialize(activity)
+          @schema   = activity.to_h or raise
+          @circuit  = @schema[:circuit]
+          @map      = @circuit.to_h[:map]
+          @configs  = @schema[:nodes]
+        end
+
+        def find(id = nil, &block)
+          return find_by_id(id) unless block_given?
+
+          find_with_block(&block)
+        end
+
+        # TODO: convert to {#to_a}.
+        def collect(strategy: :circuit)
+          @map.keys.each_with_index.collect { |task, i| yield find_with_block { |node| node.task == task }, i }
+        end
+
+        def stop_events
+          @circuit.to_h[:end_events]
+        end
+
+        private
+
+        def find_by_id(id)
+          node = @configs.find { |_, _node| _node.id == id } or return
+          node_for(node[1])
+        end
+
+        def find_with_block
+          existing = @configs.find { |_, node| yield Node(node.task, node.id, node.outputs, node.data) } or return
+
+          node_for(existing[1])
+        end
+
+        # Build a {Graph::Node} with outputs etc.
+        def node_for(node_attributes)
+          Node(
+            node_attributes.task,
+            node_attributes.id,
+            node_attributes.outputs, # [#<struct Trailblazer::Activity::Output signal=Trailblazer::Activity::Right, semantic=:success>]
+            outgoings_for(node_attributes),
+            node_attributes.data,
+          )
+        end
+
+        def Node(*args)
+          Node.new(*args).freeze
+        end
+
+        Node     = Struct.new(:task, :id, :outputs, :outgoings, :data)
+        Outgoing = Struct.new(:output, :task)
+
+        def outgoings_for(node)
+          outputs     = node.outputs
+          connections = @map[node.task]
+
+          connections.collect do |signal, target|
+            output = outputs.find { |out| out.signal == signal }
+            Outgoing.new(output, target)
+          end
+        end
+      end
+
+      def self.Graph(*args)
+        Graph.new(*args)
+      end
+    end # Graph
+  end
+end

data/lib/trailblazer/developer/render/circuit.rb

@@ -2,61 +2,13 @@ module Trailblazer
   module Developer
     module_function
 
-    def render(activity, **options)
-      Render::Circuit.(activity, **options)
-    end
-
-    module Render
-      module Circuit
-        module_function
-
-        # Render an {Activity}'s circuit as a simple hash.
-        def call(activity, path: nil, **options)
-          if path # TODO: move to place where all renderers can use this logic!
-            node, _, graph   = Developer::Introspect.find_path(activity, path)
-            activity  = node.task
-          end
-
-          graph = Activity::Introspect::Graph(activity)
-
-          circuit_hash(graph, **options)
-        end
-
-        def circuit_hash(graph, **options)
-          content = graph.collect do |node|
-            conns = node.outgoings.collect do |outgoing|
-              " {#{outgoing.output.signal}} => #{inspect_with_matcher(outgoing.task, **options)}"
-            end
-
-            [ inspect_with_matcher(node.task, **options), conns.join("\n") ]
-          end
-
-          content = content.join("\n")
-
-          "\n#{content}".gsub(/0x\w+/, "0x")
-        end
-
-        # If Ruby had pattern matching, this function wasn't necessary.
-        def inspect_with_matcher(task, inspect_task: method(:inspect_task), inspect_end: method(:inspect_end))
-          return inspect_task.(task) unless task.kind_of?(Trailblazer::Activity::End)
-          inspect_end.(task)
-        end
-
-        def inspect_task(task)
-          task.inspect
-        end
-
-        def inspect_end(task)
-          class_name = Render::Circuit.strip(task.class)
-          options    = task.to_h
-
-          "#<#{class_name}/#{options[:semantic].inspect}>"
-        end
-
-        def self.strip(string)
-          string.to_s.sub("Trailblazer::Activity::", "")
-        end
+    def render(activity, path: nil, **options)
+      if path # TODO: move to place where all renderers can use this logic!
+        node, _, graph   = Developer::Introspect.find_path(activity, path)
+        activity = node.task
       end
+
+      Activity::Introspect::Render.(activity, **options)
     end
   end
 end

data/lib/trailblazer/developer/render/linear.rb

@@ -15,7 +15,7 @@ module Trailblazer
         module_function
 
         def call(operation, style: :line)
-          graph = Activity::Introspect::Graph(operation)
+          graph = Introspect::Graph(operation)
 
           rows = graph.collect do |node, i|
             next if node[:data][:stop_event] # DISCUSS: show this?

data/lib/trailblazer/developer/render/task_wrap.rb

@@ -18,7 +18,7 @@ module Trailblazer
 
         # @param activity Activity
         def self.task_wrap_for_activity(activity, **)
-          activity[:wrap_static]
+          activity.to_h[:config][:wrap_static]
         end
 
         def self.render_pipeline(pipeline, level)

data/lib/trailblazer/developer/trace/debugger/normalizer.rb

@@ -23,8 +23,8 @@ module Trailblazer
 
           # Default steps for the Debugger::Node options pipeline, following the step-interface.
           module Default
-            def self.compile_id(ctx, task_map_for_activity:, task:, **)
-              ctx[:compile_id] = task_map_for_activity.fetch(task)[:id]
+            def self.compile_id(ctx, activity:, task:, **)
+              ctx[:compile_id] = Activity::Introspect.Nodes(activity, task: task)[:id]
             end
 
             def self.compile_path(ctx, parent_map:, captured_node:, **)

data/lib/trailblazer/developer/trace/debugger.rb

@@ -16,13 +16,8 @@ module Trailblazer
 
             container_activity = enumerable_tree[0].captured_input.activity # TODO: any other way to grab the container_activity? Maybe via {activity.container_activity}?
 
-  # TODO: cache activity graph
             top_activity = enumerable_tree[0].captured_input.task
 
-            task_maps_per_activity = {
-              container_activity => {top_activity => {id: nil}} # exposes {Introspect::TaskMap}-compatible interface.
-            }
-
             # DISCUSS: this might change if we introduce a new Node type for Trace.
             debugger_nodes = enumerable_tree[0..-1].collect do |node|
               activity      = node.captured_input.activity
@@ -31,22 +26,18 @@ module Trailblazer
               options       = node_options[node.captured_input] || {}
 
 
-
-              task_map_for_activity = task_maps_per_activity[activity] || Activity::Introspect.TaskMap(activity)
-
               options_for_debugger_node, _ = normalizer.(
                 {
                   captured_node:          node,
                   task:                   task,
                   activity:               activity,
                   parent_map:             parent_map,
-                  task_map_for_activity:  task_map_for_activity,
                   **options
                 },
                 []
               )
 
-              options_for_debugger_node = options_for_debugger_node.slice(*(options_for_debugger_node.keys - [:parent_map, :task_map_for_activity]))
+              options_for_debugger_node = options_for_debugger_node.slice(*(options_for_debugger_node.keys - [:parent_map]))
 
               # these attributes are not changing with the presentation
               Debugger::Node.new(

data/lib/trailblazer/developer/trace/tree.rb

@@ -29,7 +29,7 @@ module Trailblazer
             path = []
 
             while parent = parent_map[node] # DISCUSS: what if the graphs are cached and present, already?
-              node_id = Activity::Introspect::TaskMap(node.captured_input.activity)[node.captured_input.task][:id]
+              node_id = Activity::Introspect.Nodes(node.captured_input.activity, task: node.captured_input.task).id
               path << node_id
 
               node = parent

data/lib/trailblazer/developer/version.rb

@@ -1,7 +1,7 @@
 module Trailblazer
   module Version
     module Developer
-      VERSION = "0.0.27"
+      VERSION = "0.0.28"
     end
   end
 end

data/lib/trailblazer/developer.rb

@@ -19,3 +19,4 @@ require "trailblazer/developer/render/linear"
 require "trailblazer/developer/render/task_wrap"
 require "trailblazer/developer/introspect" # TODO: might get removed, again.
 require "trailblazer/developer/trace/debugger/normalizer"
+require "trailblazer/developer/introspect/graph"

data/trailblazer-developer.gemspec

@@ -22,9 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "minitest-line"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "trailblazer-operation"
+  spec.add_development_dependency "trailblazer-operation", ">= 0.10.0"
 
-  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 1.1.0", "< 1.2.0"
-  # FIXME: Activity 0.14.1
+  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 1.2.0", "< 1.3.0"
   spec.add_dependency "hirb"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-developer
 version: !ruby/object:Gem::Version
-  version: 0.0.27
+  version: 0.0.28
 platform: ruby
 authors:
 - Nick Sutterer
 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: bundler
@@ -72,34 +72,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity-dsl-linear
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
@@ -122,9 +122,6 @@ 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
@@ -135,6 +132,7 @@ files:
 - bin/setup
 - lib/trailblazer/developer.rb
 - lib/trailblazer/developer/introspect.rb
+- lib/trailblazer/developer/introspect/graph.rb
 - lib/trailblazer/developer/render/circuit.rb
 - lib/trailblazer/developer/render/linear.rb
 - lib/trailblazer/developer/render/task_wrap.rb

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