trailblazer-activity 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88fdbd19ae2eb00bf9f2ad4d700cacfbb26cde7b
-  data.tar.gz: 8171eb89bc8c6d9350aeb5d1e2c8609d28987c43
+  metadata.gz: ee1dccefcc5ecdb9c4a24901de3e68ae14542b29
+  data.tar.gz: cb17a9035ef5193301f01f58659a156616c1d42e
 SHA512:
-  metadata.gz: d04ecbd89f38f8ffe7dca35a18c122e4139530640014b52a16150c560e2d4cd1bd012a93d97b9ec0a748be90f4e3f5fa2ab5b464b4a4014d28ad834ce021c151
-  data.tar.gz: 5344aef9ca3900e5482a5cd20d9e01932a2865123d2de37a9a9854b414c1634e8df931119ee0929b0fe1ce8bb3c7073324111532b073a5fb575d47c228634666
+  metadata.gz: 92fc5d5969bf80a125d284d7615152655fbeb5af46dd1cac3e9927962a88eb751504976806336cbdcab55b577504e07494a27348a60bb25b565b36e60e42f9c2
+  data.tar.gz: d58607ae4df287ed931770f30a2c6017ebf693a28d252326605940f0f6c6c03da8441c5fe66af6abf56c21c6123719b2aafbae43a820aaf27390631314817990

data/CHANGES.md

@@ -1,3 +1,10 @@
+# 0.1.2
+
+* Consistent return values for all graph operations: `node, edge`.
+* `Edge` now always gets an id.
+* `#connect_for!` always throws away the old edge, fixing a bug where graph and circuit would look different.
+* Internal simplifications for `Graph` alteration methods.
+
 # 0.1.1
 
 * Fix loading order.

data/Gemfile

@@ -5,3 +5,5 @@ gemspec
 
 gem "minitest-line"
 gem "benchmark-ips"
+
+gem "trailblazer-test", git: "https://github.com/trailblazer/trailblazer-test"

data/lib/trailblazer/activity.rb

@@ -18,7 +18,7 @@ module Trailblazer
     # Only way to build an Activity.
     def self.from_wirings(wirings, &block)
       start_evt  = Circuit::Start.new(:default)
-      start_args = [ start_evt, { type: :event, id: [:Start, :default] } ]
+      start_args = [ start_evt, { type: :event, id: "Start.default" } ]
 
       start      = block ? Graph::Start( *start_args, &block ) : Graph::Start(*start_args)
 
@@ -42,7 +42,7 @@ module Trailblazer
     #   end
     def self.from_hash(end_evt=Circuit::End.new(:default), start_evt=Circuit::Start.new(:default), &block)
       hash  = yield(start_evt, end_evt)
-      graph = Graph::Start( start_evt, id: [:Start, :default] )
+      graph = Graph::Start( start_evt, id: "Start.default" )
 
       hash.each do |source_task, connections|
         source = graph.find_all { |node| node[:_wrapped] == source_task }.first or raise "#{source_task} unknown"

data/lib/trailblazer/activity/graph.rb

@@ -9,12 +9,16 @@ module Trailblazer
     # TODO: make Edge, Node, Start Hash::Immutable ?
     class Edge
       def initialize(data)
-        @data = data
+        @data = data.freeze
       end
 
       def [](key)
         @data[key]
       end
+
+      def to_h
+        @data.to_h
+      end
     end
 
     class Node < Edge
@@ -27,53 +31,61 @@ module Trailblazer
       end
 
       # Single entry point for adding nodes and edges to the graph.
-      def connect_for!(source, edge, target)
-        # raise if find_all( source[:id] ).any?
-        self[:graph][source] ||= {}
-        self[:graph][target] ||= {} # keep references to all nodes, even when detached.
+      # @return target Node
+      # @return edge Edge the edge created connecting source and target.
+      def connect_for!(source, edge_args, target, old_edge:nil)
+        edge = Edge(source, edge_args, target)
+
         self[:graph][source][edge] = target
+
+        self[:graph][source].delete(old_edge) # FIXME: shouldn't be here
+
+        return target, edge
       end
-      private :connect_for!
 
-      # Builds a node from the provided `:node` argument array.
+      def add!(node_args)
+        new_node = Node(*node_args)
+
+        raise IllegalNodeError.new("The ID `#{new_node[:id]}` has been added before.") if find_all( new_node[:id] ).any?
+
+        self[:graph][new_node] = {}
+        new_node
+      end
+
+      private :connect_for!, :add!
+
+      # Builds a node from the provided `:target` arguments.
+      # @param target: Array wrapped, options
       def attach!(target:raise, edge:raise, source:self)
-        target = target.kind_of?(Node) ? target : Node(*target)
+        target = add!(target)
 
         connect!(target: target, edge: edge, source: source)
       end
 
       def connect!(target:raise, edge:raise, source:self)
-        target = target.kind_of?(Node) ? target : (find_all { |_target| _target[:id] == target }[0] || raise( "#{target} not found"))
+        target = target.kind_of?(Node) ? target : (find_all { |_target| _target[:id] == target }[0] || raise( "#{target} not found")) # FIXME: only needed for recompile_activity.
         source = source.kind_of?(Node) ? source : (find_all { |_source| _source[:id] == source }[0] || raise( "#{source} not found"))
 
-        edge = Edge(*edge)
-
         connect_for!(source, edge, target)
-
-        target
       end
 
       def insert_before!(old_node, node:raise, outgoing:nil, incoming:raise)
-        old_node = find_all(old_node)[0] || raise( "#{old_node} not found") unless old_node.kind_of?(Node)
-        new_node = Node(*node)
+        old_node = find_all(old_node)[0] || raise( "#{old_node} not found") unless old_node.kind_of?(Node) # FIXME: do we really need this?
+        new_node = add!(node)
 
-        raise IllegalNodeError.new("The ID `#{new_node[:id]}` has been added before.") if find_all( new_node[:id] ).any?
-
-        incoming_tuples     = predecessors(old_node)
-        rewired_connections = incoming_tuples.find_all { |(node, edge)| incoming.(edge) }
+        incoming_tuples = predecessors(old_node)
+        rewired_incoming_connections = incoming_tuples.find_all { |(node, edge)| incoming.(edge) }
 
         # rewire old_task's predecessors to new_task.
-        if rewired_connections.size == 0 # this happens when we're inserting "before" an orphaned node.
-          self[:graph][new_node] = {} # FIXME: redundant in #connect_for!
-        else
-          rewired_connections.each { |(node, edge)| connect_for!(node, edge, new_node) }
+        if rewired_incoming_connections.any? # the opposite happens when we're inserting "before" an orphaned node.
+          rewired_incoming_connections.each { |node, edge|
+            node, edge = connect_for!(node, [edge[:_wrapped], edge.to_h], new_node, old_edge: edge)
+          }
         end
 
         # connect new_task --> old_task.
         if outgoing
-          edge = Edge(*outgoing)
-
-          connect_for!(new_node, edge, old_node)
+          node, edge = connect_for!(new_node, outgoing, old_node)
         end
 
         return new_node
@@ -83,20 +95,19 @@ module Trailblazer
         nodes = self[:graph].keys + self[:graph].values.collect(&:values).flatten
         nodes = nodes.uniq
 
-        block ||= ->(node) { node[:id] == id }
-
-        nodes.find_all(&block)
+        nodes.find_all(& block || ->(node) { node[:id] == id })
       end
 
-      def Edge(wrapped, options)
-        edge = Edge.new(options.merge( _wrapped: wrapped ))
+      def Edge(source, (wrapped, options), target) # FIXME: test required id. test source and target
+        id   = "#{source[:id]}-#{wrapped}-#{target[:id]}"
+        edge = Edge.new(options.merge( _wrapped: wrapped, id: id, source: source, target: target ))
       end
 
-      def Node(wrapped, options)
-        Node.new( options.merge( _wrapped: wrapped ) )
+      # @private
+      def Node(wrapped, id:raise("No ID was provided for #{wrapped}"), **options)
+        Node.new( options.merge( id: id, _wrapped: wrapped ) )
       end
 
-      # private
       def predecessors(target_node)
         self[:graph].each_with_object([]) do |(node, connections), ary|
           connections.each { |edge, target| target == target_node && ary << [node, edge] }
@@ -104,7 +115,7 @@ module Trailblazer
       end
 
       def successors(node)
-        ( self[:graph][node] || {} ).values
+        ( self[:graph][node] || [] ).collect { |edge, target| [target, edge] }
       end
 
       def to_h(include_leafs:true)

data/lib/trailblazer/activity/version.rb

@@ -1,5 +1,5 @@
 module Trailblazer
   class Activity
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/trailblazer/circuit/trace.rb

@@ -32,7 +32,7 @@ module Trailblazer
       def self.wirings
         [
           [ :insert_before!, "task_wrap.call_task", node: [ Trace.method(:capture_args),   id: "task_wrap.capture_args" ], outgoing: [ Right, {} ], incoming: ->(*) { true } ],
-          [ :insert_before!, [:End, :default],      node: [ Trace.method(:capture_return), id: "task_wrap.capture_return" ], outgoing: [ Right, {} ], incoming: ->(*) { true } ],
+          [ :insert_before!, "End.default",      node: [ Trace.method(:capture_return), id: "task_wrap.capture_return" ], outgoing: [ Right, {} ], incoming: ->(*) { true } ],
         ]
       end
 

data/lib/trailblazer/circuit/wrap.rb

@@ -79,8 +79,8 @@ class Trailblazer::Circuit
     def self.initial_activity
       Trailblazer::Activity.from_wirings(
         [
-          [ :attach!, target: [ End.new(:default), type: :event, id: [:End, :default] ], edge: [ Right, {} ] ],
-          [ :insert_before!, [:End, :default], node: [ Call, id: "task_wrap.call_task" ], outgoing: [ Right, {} ], incoming: ->(*) { true } ]
+          [ :attach!, target: [ End.new(:default), type: :event, id: "End.default" ], edge: [ Right, {} ] ],
+          [ :insert_before!, "End.default", node: [ Call, id: "task_wrap.call_task" ], outgoing: [ Right, {} ], incoming: ->(*) { true } ]
         ]
       )
     end

data/trailblazer-activity.gemspec

@@ -20,11 +20,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "hirb"
+
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
-
-  spec.add_dependency "hirb"
+  spec.add_development_dependency "trailblazer-test"
 
   spec.required_ruby_version = '>= 2.0.0'
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: trailblazer-activity
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nick Sutterer
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: hirb
+  requirement: !ruby/object:Gem::Requirement
+    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: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -53,13 +67,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: hirb
+  name: trailblazer-test
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: