trailblazer-developer 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bb269ead81c228effa4049dde42ad6f9cfcb0edfdc58484b0bb970eaf00e41c
-  data.tar.gz: 1a0747e8778d25a1a041ba6b86098656149a27810ee4b85444ee3af75cd467a2
+  metadata.gz: 4457d9f0cca19b8f72a8e492f8d155c5d8a3459015201d03548a71b26911f0b2
+  data.tar.gz: f6035eaca82336afb3d836f40c96910b37298e2c5eee8b90fac93a2d5c563b5f
 SHA512:
-  metadata.gz: 81a57c4cfc5e622dd60026da6463ee8c7f78f9ea8a8de6e33c58ddc1f707f17c287939414df387ae52b086be55d8cc9e93efa40b2232561a7b4fcc09e765dadf
-  data.tar.gz: b8ba48d57af764e25175225bb5f0d2c4ec710328c97334e20e5d6ea8aaed39a7ab552d2bce768e45eb9ead8d23e6c56b6c9375f4b6831146867f29aa5582ca2e
+  metadata.gz: d7c7243f9b266f750a47046e5fce4ad73c08b8e44dcf6ea5bf7b40f008565130bec440ab1c372dcfc312436c7b5ac44b9113a3411677b87954aa4d232696d804
+  data.tar.gz: ebcd6ebbf1b448a306566b07c1042324eac3291b077cafc62c389cf78533034f187fd467a33e2142ac89d3a7d9b954c873dc31915d1278c71b4ffb7b7921d44e

data/lib/trailblazer/developer/CHANGES.md

@@ -1,5 +1,12 @@
+# 0.0.6
+
+* Remove ID extraction logic from `Generate`, this is done on the server-side.
+* Print `wtf` trace in all cases (with or without exception)
+* Allow color configuration in `wtf` trace
+
 # 0.0.5
 
+* Introduce `:query` option for `Client.import`.
 * In `Generate`, added `Element.parent` field.
 * No more magic is applied when extracting the ID/semantic. We just use the plain string.
 

data/lib/trailblazer/developer/client.rb

@@ -24,14 +24,14 @@ module Trailblazer::Developer
       export_diagram(id: id, token: token, query: query, **options)
     end
 
-    def retrieve_token(email:, password:, url: "/login", **options)
-      body = JSON.generate({login: {email: email, password: password}})
+    def retrieve_token(email:, api_key:, url: "/signin", **options)
+      body = JSON.generate({email: email, api_key: api_key})
 
-      response = request(token: nil, method: :post, url: url, body: body, **options)
+      response = request(token: nil, method: :get, url: url, body: body, **options)
+      return false unless response.status == 200
 
-      return false unless response.status == 302
-
-      token = CGI::Cookie.parse(response.headers["set-cookie"])["token"][0]
+      # token = CGI::Cookie.parse(response.headers["set-cookie"])["token"][0]
+      token = JSON.parse(response.body)["token"]
     end
 
     def export_diagram(id:, query:, **options)

data/lib/trailblazer/developer/config.rb

@@ -0,0 +1,30 @@
+module Trailblazer::Developer
+  # {config} gives global settings for Developer
+  # Trailblazer::Developer.configure do |config|
+  #   config.trace_color_map[Trailblazer::Activity::Right] = :green
+  #   config.trace_color_map.default = :green
+  # end
+
+  class << self
+    def configure
+      yield config
+    end
+
+    def config
+      @config ||= Config.new
+    end
+  end
+
+  class Config
+    attr_reader :trace_color_map
+
+    def initialize
+      @trace_color_map = {
+        Trailblazer::Activity::Right => :green,
+        Trailblazer::Activity::Left  => :brown
+      }
+
+      @trace_color_map.default = :green
+    end
+  end
+end

data/lib/trailblazer/developer/generate.rb

@@ -24,14 +24,13 @@ module Trailblazer
             property :data, default: {}
 
             property :label
-            property :parent
+            property :parent # TODO: remove?
           end
         end
       end
 
       def call(hash)
         elements = transform_from_hash(hash)
-        elements = remap_ids(elements)
 
         compute_intermediate(elements)
       end
@@ -69,8 +68,6 @@ module Trailblazer
 
       # private
 
-
-
       # 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, **)
@@ -82,37 +79,6 @@ module Trailblazer
       def extract_semantic(label)
         label.to_sym
       end
-
-      def extract_string_id(label)
-        m = label.match(/"(.+)"/) or return
-        return m[1].to_sym
-      end
-
-      def extract_id(label)
-        extract_string_id(label) || extract_semantic(label)
-      end
-
-      # remap {id}
-      def remap_ids(elements)
-        map = {}
-
-        elements.collect do |el|
-          id = (el.label && semantic = extract_id(el.label)) ? semantic : el.id.to_sym
-
-          map[el.id] = id
-
-          el.id = id
-        end
-
-        # remap {linksTo}
-        elements.collect do |el|
-          el.linksTo.collect do |link|
-            link.target = map[link.target]
-          end
-        end
-
-        elements
-      end
     end
   end
 end

data/lib/trailblazer/developer/version.rb

@@ -1,7 +1,7 @@
 module Trailblazer
   module Version
     module Developer
-      VERSION = "0.0.5"
+      VERSION = "0.0.6"
     end
   end
 end

data/lib/trailblazer/developer/wtf.rb

@@ -1,3 +1,5 @@
+require 'trailblazer/activity'
+
 module Trailblazer::Developer
   module_function
 
@@ -12,6 +14,8 @@ module Trailblazer::Developer
   module Wtf
     module_function
 
+    COLOR_MAP = Trailblazer::Developer.config.trace_color_map
+
     # Run {activity} with tracing enabled and inject a mutable {Stack} instance.
     # This allows to display the trace even when an exception happened
     def invoke(activity, (ctx, flow_options), *args)
@@ -22,45 +26,35 @@ module Trailblazer::Developer
       stack = Trailblazer::Activity::Trace::Stack.new
 
       begin
-        _returned_stack, *returned = Trailblazer::Activity::Trace.invoke( activity,
+        _returned_stack, *returned = Trailblazer::Activity::Trace.invoke(
+          activity,
           [
             ctx,
             flow_options.merge(stack: stack)
           ],
           *args
         )
-      rescue
-        # DISCUSS: we shouldn't use internal knowledge of the Stack/Level API here.
-        closest = stack.to_a
-        while closest.is_a?(Trailblazer::Activity::Trace::Level) && closest = closest.last do # FIXME: deep-dive via Stack API.
-        end
-
-        # pp closest.task # this was the last executed task
+        puts Trailblazer::Activity::Trace::Present.(stack, renderer: method(:renderer))
 
-        handle(stack, $!, closest.task, activity, [ctx, flow_options])
+      rescue => exception
+        puts Trailblazer::Activity::Trace::Present.(stack, renderer: method(:renderer))
+        raise(exception)
       end
 
-puts Trailblazer::Activity::Trace::Present.(stack)
-
-      returned # FIXME: test me
-    end
-
-    def exception_renderer(stack:, level:, input:, name:, closest_task:)
-      return [ level, %{#{fmt(fmt(name, :red), :bold)}} ] if input.task == closest_task
-      [ level, %{#{name}} ]
+      returned
     end
 
-    # TODO: make this injectable
-    def handle(stack, exception, closest_task, activity, *args)
-      puts "[Trailblazer] Exception tracing"
-      puts "#{fmt(exception.inspect, :bold)}"
-      puts "    #{exception.backtrace[0]}"
-      puts "    #{exception.backtrace[1]}"
-      puts
-      puts Trailblazer::Activity::Trace::Present.(stack, closest_task: closest_task, renderer: method(:exception_renderer))
-    end
+    def renderer(task_node:, position:, tree:)
+      if task_node[:output].nil? && tree[position.next].nil? # i.e. when exception raised
+        return [ task_node[:level], %{#{fmt(fmt(task_node[:name], :red), :bold)}} ]
+      end
 
+      if task_node[:output].nil? # i.e. on entry/exit point of activity
+        return [ task_node[:level], %{#{fmt(task_node[:name], COLOR_MAP.default)}} ]
+      end
 
+      [ task_node[:level], %{#{fmt(task_node[:name], COLOR_MAP[task_node[:output].data])}} ]
+    end
 
     def fmt(line, style)
       String.send(style, line)

data/lib/trailblazer/developer.rb

@@ -6,6 +6,7 @@ module Trailblazer
   end
 end
 
+require "trailblazer/developer/config"
 require "trailblazer/developer/wtf"
 require "trailblazer/developer/generate"
 require "trailblazer/developer/render/circuit"

data/trailblazer-developer.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rubocop"
 
-  spec.add_dependency "trailblazer-activity", "~> 0.8"
+  spec.add_dependency "trailblazer-activity", ">= 0.8.4"
   spec.add_dependency "trailblazer-activity-dsl-linear"
   spec.add_dependency "representable"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-developer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-13 00:00:00.000000000 Z
+date: 2019-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,16 +84,16 @@ dependencies:
   name: trailblazer-activity
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: 0.8.4
 - !ruby/object:Gem::Dependency
   name: trailblazer-activity-dsl-linear
   requirement: !ruby/object:Gem::Requirement
@@ -142,6 +142,7 @@ files:
 - lib/trailblazer/developer/CHANGES.md
 - lib/trailblazer/developer/activity.rb
 - lib/trailblazer/developer/client.rb
+- lib/trailblazer/developer/config.rb
 - lib/trailblazer/developer/generate.rb
 - lib/trailblazer/developer/render/circuit.rb
 - lib/trailblazer/developer/render/linear.rb