trailblazer-developer 0.0.17 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 405fb207fc4ced2cf14e18acdcc72846f0fa4ef85f010fc5d325e02c75941a06
-  data.tar.gz: 9402b32c5be680f8e9cdbfe2e0f14dc87a5b0efe695e444ff34774ba664ee772
+  metadata.gz: fabb29823b1f8422ec156cc7b8fc2878aef438281457fcaf0040dccf9cd179ed
+  data.tar.gz: dfe238f09fcd0635268ecc47112f50c99134d0a8435fd38321cf6d6de1625da8
 SHA512:
-  metadata.gz: f8a6f2deff06770afecfe29a13e010992277ea349aaa6682e3c5c55f2411f825665aa25c9b5a80e39390ad98a195062d0960ff7c9dfc624698611fabbd59c6a5
-  data.tar.gz: 17f12f3422e79e0808bacbd364fb74e0dcf1b9d894490a25e3887b7266e6085523df31a4b3b06e661e6e4e470dc32044dca0a140bfd982aa5e5f2ef4d20cc058
+  metadata.gz: d35b2029fb0165b313ef78505a356e0a3549f49fa311e52a2f4c32ae7dbba3d976b404e2d5293bbf9e55aed83d88efd57be6f0176affcfa64af9b0b93ae5f123
+  data.tar.gz: 2cc21b452b8ddd2b72338c854938f548b952dd8ab4fef59e83387194bc18cab8311593d6bce747cff34f70ed92ddde73d501154882edaa6a35d372c9818a0536

data/.github/workflows/ci.yml

@@ -0,0 +1,17 @@
+name: CI
+on: [push, pull_request]
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: [2.5, 2.6, 2.7, '3.0', head, jruby, jruby-head]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: bundle exec rake

data/CHANGES.md

@@ -1,3 +1,20 @@
+# 0.0.23
+
+* Remove `representable` dependency.
+* Moved all editor-specific code to the `pro` gem.
+
+# 0.0.22
+
+* Upgrade trb-activity, trb-activity-dsl-linear and representable versions.
+
+# 0.0.21
+
+* Ruby 3.0 support. :sunset:
+
+# 0.0.20
+
+* Ruby 2.7 support
+
 # 0.0.17
 
 * Add `Arrow.target_lane` field in the `Generate` component.

data/Gemfile

@@ -7,7 +7,3 @@ gemspec
 # 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 "representable"
-gem "faraday"
-gem "multi_json"

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018 Trailblazer GmbH
+Copyright (c) 2018-2020 Trailblazer GmbH
 
 Trailblazer is an Open Source project licensed under the terms of
 the LGPLv3 license.  Please see <http://www.gnu.org/licenses/lgpl-3.0.html>

data/gems.local.rb

@@ -6,3 +6,6 @@ gemspec
 gem "trailblazer-activity", path: "../trailblazer-activity"
 gem "trailblazer-activity-dsl-linear", path: "../trailblazer-activity-dsl-linear"
 gem "representable"
+gem 'pry-byebug'
+gem "faraday"
+gem "multi_json"

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

@@ -2,8 +2,8 @@ module Trailblazer
   module Developer
     module_function
 
-    def render(activity)
-      Render::Circuit.(activity)
+    def render(activity, **options)
+      Render::Circuit.(activity, **options)
     end
 
     module Render
@@ -28,7 +28,7 @@ module Trailblazer
 
           content = content.join("\n")
 
-          return "\n#{content}".gsub(/0x\w+/, "0x")#.gsub(/0.\d+/, "0.")
+          "\n#{content}".gsub(/0x\w+/, "0x")
         end
 
         # If Ruby had pattern matching, this function wasn't necessary.

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

@@ -1,5 +1,3 @@
-require 'hirb'
-
 module Trailblazer
   module Developer
     module Trace

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

@@ -14,7 +14,8 @@ module Trailblazer::Developer
       end
 
       def tree(stack, level, tree:, renderer:, **options)
-        tree_for(stack, level, **options.merge(tree: tree))
+        opts = options.merge(tree: tree)
+        tree_for(stack, level, **opts)
 
         nodes = tree.each_with_index.map do |task_node, position|
           renderer.(task_node: task_node, position: position, tree: tree)
@@ -27,10 +28,11 @@ module Trailblazer::Developer
         stack.each do |lvl| # always a Stack::Task[input, ..., output]
           input, output, nested = Trace::Level.input_output_nested_for_level(lvl)
 
-          tree.push(*TreeNodes.for(level, options.merge(input: input, output: output)))
+          tree.push(*TreeNodes.for(level, **options.merge(input: input, output: output)))
 
           if nested.any? # nesting
-            tree_for(nested, level + 1, **options.merge(tree: tree))
+            opts = options.merge(tree: tree)
+            tree_for(nested, level + 1, **opts)
           end
 
           tree

data/lib/trailblazer/developer/version.rb

@@ -1,7 +1,7 @@
 module Trailblazer
   module Version
     module Developer
-      VERSION = "0.0.17"
+      VERSION = "0.0.23"
     end
   end
 end

data/lib/trailblazer/developer/wtf/renderer.rb

@@ -36,6 +36,9 @@ module Trailblazer::Developer
       end
 
       def fmt(line, style)
+        if line.is_a? Method
+          line = "#<Method: #<Class:>.#{line.name}>"
+        end
         return line unless style
         String.send(style, line)
       end

data/lib/trailblazer/developer/wtf.rb

@@ -1,8 +1,8 @@
 module Trailblazer::Developer
   module_function
 
-  def wtf(activity, *args)
-    Wtf.invoke(activity, *args)
+  def wtf(activity, *args, **circuit_options)
+    Wtf.invoke(activity, *args, **circuit_options)
   end
 
   class << self
@@ -16,11 +16,11 @@ module Trailblazer::Developer
     # This allows to display the trace even when an exception happened
     def invoke(activity, (ctx, flow_options), **circuit_options)
       activity, (ctx, flow_options), circuit_options = Wtf.arguments_for_trace(
-        activity, [ctx, flow_options], circuit_options
+        activity, [ctx, flow_options], **circuit_options
       )
 
       _returned_stack, signal, (ctx, flow_options) = Trace.invoke(
-        activity, [ctx, flow_options], circuit_options
+        activity, [ctx, flow_options], **circuit_options
       )
 
       return signal, [ctx, flow_options], circuit_options
@@ -52,7 +52,7 @@ module Trailblazer::Developer
         variables: Array( flow_options.dig(:focus_on, :variables) ),
       }
 
-      return activity, [ ctx, flow_options ], circuit_options
+      [activity, [ ctx, flow_options ], circuit_options]
     end
 
     # Overring default input and output data collectors to collect/capture
@@ -61,7 +61,7 @@ module Trailblazer::Developer
     def trace_input_data_collector(wrap_config, (ctx, flow_options), circuit_options)
       data = Trace.default_input_data_collector(wrap_config, [ctx, flow_options], circuit_options)
 
-      if Wtf.caputure_variables?(step_name: data[:task_name], **flow_options)
+      if Wtf.capture_variables?(step_name: data[:task_name], **flow_options)
         data[:focused_variables] = Trace::Focusable.capture_variables_from(ctx, **flow_options)
       end
 
@@ -72,7 +72,7 @@ module Trailblazer::Developer
       data  = Trace.default_output_data_collector(wrap_config, [ctx, flow_options], circuit_options)
       input = flow_options[:stack].top
 
-      if Wtf.caputure_variables?(step_name: input.data[:task_name], **flow_options)
+      if Wtf.capture_variables?(step_name: input.data[:task_name], **flow_options)
         data[:focused_variables] = Trace::Focusable.capture_variables_from(ctx, **flow_options)
       end
 
@@ -80,10 +80,11 @@ module Trailblazer::Developer
     end
 
     # private
-    def caputure_variables?(step_name:, focus_on:, **)
+    def capture_variables?(step_name:, focus_on:, **)
       return true if focus_on[:steps].include?(step_name)                 # For given step
       return true if focus_on[:steps].empty? && focus_on[:variables].any? # For selected vars but all steps
-      return false
+
+      false
     end
   end
 end

data/lib/trailblazer/developer.rb

@@ -12,8 +12,5 @@ require "trailblazer/developer/trace"
 require "trailblazer/developer/trace/present"
 require "trailblazer/developer/trace/focusable"
 require "trailblazer/developer/trace/inspector"
-require "trailblazer/developer/generate"
 require "trailblazer/developer/render/circuit"
 require "trailblazer/developer/render/linear"
-
-# require "trailblazer/developer/client"

data/trailblazer-developer.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["apotonick@gmail.com"]
 
   spec.summary       = "Developer tools for Trailblazer."
-  spec.description   = "Developer tools for Trailblazer: debugger, tracing, visual editor integration."
+  spec.description   = "Developer tools for Trailblazer: debugger, activity visualizer and tracing."
   spec.homepage      = "http://trailblazer.to"
   spec.license       = "LGPL-3.0"
 
@@ -23,8 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest-line"
   spec.add_development_dependency "rake"
 
-  spec.add_dependency "trailblazer-activity", ">= 0.11.0", "< 1.0.0"
-  spec.add_dependency "trailblazer-activity-dsl-linear"
-  spec.add_dependency "representable"
+  spec.add_dependency "trailblazer-activity", ">= 0.12.2", "< 1.0.0"
+  spec.add_dependency "trailblazer-activity-dsl-linear", ">= 0.4.1", "< 1.0.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.17
+  version: 0.0.23
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-12 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,7 +72,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.12.2
     - - "<"
       - !ruby/object:Gem::Version
         version: 1.0.0
@@ -92,28 +92,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: representable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
+        version: 0.4.1
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: hirb
   requirement: !ruby/object:Gem::Requirement
@@ -128,15 +120,15 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 'Developer tools for Trailblazer: debugger, tracing, visual editor integration.'
+description: 'Developer tools for Trailblazer: debugger, activity visualizer and tracing.'
 email:
 - apotonick@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGES.md
 - Gemfile
 - LICENSE
@@ -146,8 +138,6 @@ files:
 - bin/setup
 - gems.local.rb
 - lib/trailblazer/developer.rb
-- lib/trailblazer/developer/client.rb
-- lib/trailblazer/developer/generate.rb
 - lib/trailblazer/developer/render/circuit.rb
 - lib/trailblazer/developer/render/linear.rb
 - lib/trailblazer/developer/trace.rb
@@ -178,7 +168,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: Developer tools for Trailblazer.

data/.travis.yml

@@ -1,7 +0,0 @@
-language: ruby
-rvm:
-  - 2.6
-  - 2.5
-  - 2.4
-
-cache: bundler

data/lib/trailblazer/developer/client.rb

@@ -1,95 +0,0 @@
-require "faraday"
-require "base64"
-require "json"
-require "representable/json"
-
-module Trailblazer::Developer
-  module Client
-    Diagram = Struct.new(:id, :body)
-
-    class Diagram::Representer < Representable::Decorator
-      include Representable::JSON
-      property :id
-      property :body, as: :diagram
-    end
-
-    module_function
-
-    def Diagram(id, body)
-      Diagram.new(id, body).freeze
-    end
-
-    def import(id:, query:"", **options)
-      token = retrieve_token(**options)
-      export_diagram(id: id, token: token, query: query, **options)
-    end
-
-    def retrieve_token(email:, api_key:, url: "/signin", **options)
-      body = JSON.generate({email: email, api_key: api_key})
-
-      response = request(token: nil, method: :get, url: url, body: body, **options)
-      return false unless response.status == 200
-
-      # token = CGI::Cookie.parse(response.headers["set-cookie"])["token"][0]
-      JSON.parse(response.body)["token"]
-    end
-
-    def export_diagram(id:, query:, **options)
-      response = request(body: nil, url: "/api/v1/diagrams/#{id}/export#{query}", method: :get, **options)
-
-#      parse_response(response)
-      response.body
-    end
-
-    def duplicate(id:, **options)
-      token = retrieve_token(**options)
-
-      response = request(body: nil, token: token, url: "/api/v1/diagrams/#{id}/duplicate", method: :get, **options)
-      parse_response(response)
-    end
-
-    # DISCUSS: do we need that?
-    def new_diagram(token:, **options)
-      response = request(body: nil, url: "/api/v1/diagrams/new", method: :get, token: token, **options)
-
-      # TODO: use Dry::Struct
-      # TODO: handle unauthorized/errors
-      parse_response(response)
-    end
-
-    def request(host:, url:, method:, token:, body:, **)
-      conn = Faraday.new(url: host)
-
-      conn.send(method) do |req|
-        req.url url
-        req.headers["Content-Type"] = "application/json"
-        req.body = body
-        req.headers["Authorization"] = token
-      end
-    end
-
-    def parse_response(response)
-      diagram = Diagram.new
-      Diagram::Representer.new(diagram).from_json(response.body) # a parsed hash would be cooler?
-
-      diagram
-    end
-
-    # TODO: remove me!
-    def self.push(operation:, name:)
-      xml = Trailblazer::Diagram::BPMN.to_xml(operation["__activity__"], operation["__sequence__"].map(&:id))
-      token = "Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJub25lIn0.eyJpZCI6MywidXNlcm5hbWUiOiJhcG90b25pY2siLCJlbWFpbCI6Im5pY2tAdHJhaWxibGF6ZXIudG8ifQ." # rubocop:disable Metrics/LineLength
-      conn = Faraday.new(url: "https://api.trb.to")
-      response = conn.post do |req|
-        req.url "/dev/v1/import"
-        req.headers["Content-Type"] = "application/json"
-        req.headers["Authorization"] = token
-        require "base64"
-
-        req.body = %({ "name": "#{name}", "xml":"#{Base64.strict_encode64(xml)}" })
-      end
-
-      puts response.status.inspect
-    end
-  end
-end

data/lib/trailblazer/developer/generate.rb

@@ -1,98 +0,0 @@
-require "representable/hash"
-require "trailblazer/activity/dsl/linear" # Railway.
-
-module Trailblazer
-  module Developer
-    # Computes an {Intermediate} data structure from a TRB-editor.js file.
-    module Generate
-      module_function
-
-      Element = Struct.new(:id, :type, :linksTo, :data, :label, :parent)
-      Arrow   = Struct.new(:target, :label, :message, :target_lane)
-
-      module Representer
-        class Activity < Representable::Decorator
-          include Representable::Hash
-
-          collection :elements, class: Element do
-            property :id
-            property :type
-            collection :linksTo, class: Arrow, default: ::Declarative::Variables::Append([]) do
-              property :target
-              property :label
-              property :message
-              property :target_lane
-            end
-            property :data, default: {}
-
-            property :label
-            property :parent # TODO: remove?
-          end
-        end
-      end
-
-      def call(hash)
-        _, (ctx, _) = Activity::TaskWrap.invoke(Pipeline, hash: hash)
-        ctx[:intermediate]
-      end
-
-      def transform_from_hash(ctx, hash:, parser: Representer::Activity, **)
-        ctx[:elements] = parser.new(OpenStruct.new).from_hash(hash).elements
-      end
-
-      def find_start_events(ctx, elements:, **)
-        ctx[:start_events] = elements.find_all { |el| el.type == "Event" }
-      end
-
-      def compute_intermediate(ctx, elements:, start_events:, **)
-        end_events   = elements.find_all { |el| el.type == "EndEventTerminate" } # DISCUSS: is it really called TERMINATE?
-
-        inter = Activity::Schema::Intermediate
-
-        wiring = elements.collect { |el|
-          data = data_for(el)
-
-          [inter.TaskRef(el.id, data), el.linksTo.collect { |arrow| inter.Out(semantic_for(**arrow.to_h), arrow.target) } ] }
-        wiring = Hash[wiring]
-
-        # end events need this stupid special handling
-        # DISCUSS: currently, the END-SEMANTIC is read from the event's label.
-        wiring = wiring.merge(Hash[
-          end_events.collect do |_end|
-            ref, = wiring.find { |ref, _| ref.id == _end.id }
-
-            [ref, [inter.Out(semantic_for(**_end.to_h)|| raise, nil)]] # TODO: test the raise, happens when the semantic of an End can't be distinguished. # TODO: don't extract semantic from :label but from :data.
-          end
-        ])
-        # pp wiring
-
-        ctx[:intermediate] = inter.new(wiring, end_events.collect(&:id), start_events.collect(&:id))
-      end
-
-      # private
-
-      def data_for(element)
-        {type: element.type}.merge(element.data)
-      end
-
-      # We currently use the {:label} field of an arrow to encode an output semantic.
-      # The {:symbol_style} part will be filtered out as semantic. Defaults to {:success}.
-      def semantic_for(label:nil, **)
-        return :success unless label
-
-        extract_semantic(label)
-      end
-
-      def extract_semantic(label)
-        label.to_sym
-      end
-
-      class Pipeline < Trailblazer::Activity::Railway
-        step Generate.method(:transform_from_hash),   id: :transform_from_hash
-        step Generate.method(:find_start_events),     id: :find_start_events
-        step Generate.method(:compute_intermediate),  id: :compute_intermediate
-      end
-    end
-  end
-end
-# [Inter::Out(:success, nil)]