dogviz 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42f2eba7014ad75dedbfafa7ff0e216fffdc8f46
-  data.tar.gz: da75936f1407196db7c95b62545740a0f2417c4d
+  metadata.gz: ad63138af5aec7bfff4533f7407f03f9c0c293c5
+  data.tar.gz: ad75faa51b2a4bdd297fbe28ab5a41314879a869
 SHA512:
-  metadata.gz: 75c7f38b30ed3aff4670f01097518b063c5e2dfcb86a05b13befac58020d01cfff41206d30b732951238318742f2069fac50c68e202fdfab08bb5ea6b3f7fe55
-  data.tar.gz: 469d201d3d79dc1803afbf5b9e66b83a11c77eadb7c958d14ed2467a4c5b13b3778cb338f4efb3375ae558fa242e9fe00080a7c47147aebd4f8a9fb65167b2a9
+  metadata.gz: f05df9e542952cd2208834f9531820ca0515085eedd9a3f4eba54c15c4674cd6c1b2c115c34519efc1343707ae005888feb034cf341279990411821e9dcc737f
+  data.tar.gz: 09e6f76ddd0032713df169c031d5585b03c5f0eca9037451652f9213eeec9660ff594d209e3543328ae0d1d6d562daee53fa86a59964c5b88dbc6416290b2bef

data/lib/dogviz/version.rb

@@ -1,3 +1,3 @@
 module Dogviz
-  VERSION = '0.0.13'
+  VERSION = '0.0.14'
 end

data/lib/dogviz.rb

@@ -12,6 +12,7 @@ module Dogviz
     def description
       @description
     end
+    attr_reader :processor
   end
   module Flowable
     def does(action)
@@ -402,6 +403,12 @@ module Dogviz
       @calls = []
     end
 
+    def make_connections
+      calls.each {|from, to, label|
+        thing_of(from).points_to thing_of(to), label: label
+      }
+    end
+
     def flows(*steps)
       from = nil
       to = nil
@@ -440,8 +447,15 @@ module Dogviz
       end
       renderer.rendered
     end
+
     private
-    attr_reader :calls
+
+    attr_reader :calls, :sys
+
+    def thing_of(it)
+      return it.processor if it.is_a?(Process)
+      it
+    end
   end
 
 

data/tests/graph_checking.rb

@@ -0,0 +1,33 @@
+module GraphChecking
+  def subgraph_ids
+    subgraphs.map(&:id)
+  end
+
+  def subgraph(id)
+    subgraphs.find {|sub| sub.id == id }
+  end
+
+  def subgraphs(from=graph)
+    subs = []
+    from.each_graph {|sub_name, sub|
+      subs << sub
+      subs += subgraphs(sub)
+    }
+    subs
+  end
+
+  def connections(sep=' ')
+    edges.map {|e|
+      "#{e.tail_node}->#{e.head_node}"
+    }.join sep
+  end
+
+  def edges
+    graph.each_edge
+  end
+
+  def find(name)
+    graph.find_node name
+  end
+
+end

data/tests/test_dogviz_flows.rb

@@ -0,0 +1,91 @@
+require_relative 'setup_tests'
+require_relative 'graph_checking'
+
+module Tests
+  class TestDogvizFlows < Test::Unit::TestCase
+    include GraphChecking
+
+    def outfile(ext)
+      "/tmp/dogviz_flow_test.#{ext}"
+    end
+
+    def read_outfile(ext)
+      File.read outfile(ext)
+    end
+
+    include Dogviz
+
+    def test_flow_generates_precise_sequence
+      sys = System.new 'takeaway'
+      eater = sys.thing 'eater'
+      server = sys.thing 'server'
+      cook = sys.thing 'chef'
+
+      order = sys.flow 'order'
+      order.flows eater, 'gimme burger',
+                  server, 'passes order',
+                  cook, server, eater
+
+      order.output sequence: outfile('seq.txt')
+
+      definition = read_outfile('seq.txt')
+
+      assert_equal [
+                       'eater -> server: gimme burger',
+                       'server -> chef: passes order',
+                       'chef -> server:',
+                       'server -> eater:',
+                   ].join("\n"), definition
+    end
+
+    def create_food_flow
+      @sys = System.new 'takeaway'
+      eater = sys.thing 'eater'
+      server = sys.thing 'server'
+      cook = sys.thing 'cook'
+
+      order = sys.flow 'order'
+      order.flows eater, 'orders',
+                  server, 'creates order',
+                  cook.does('cooks burger'),
+                  'burger', server,
+                  'burger', eater
+      order
+    end
+
+    def test_flow_generates_precise_sequence_with_action
+      order = create_food_flow
+
+      order.output sequence: outfile('seq.txt')
+      definition = read_outfile('seq.txt')
+
+      assert_equal([
+                       'eater -> server: orders',
+                       'server -> +cook: creates order',
+                       'note right of cook',
+                       '  cooks burger',
+                       'end note',
+                       'cook -> -server: burger',
+                       'server -> eater: burger',
+                   ].join("\n"), definition)
+    end
+
+    def test_flow_can_be_used_to_make_connections_in_dog
+      order = create_food_flow
+
+      order.make_connections
+
+      assert_equal('eater->server server->cook server->eater cook->server', connections)
+    end
+
+    private
+
+    attr_accessor :sys
+
+    def graph
+      g = sys.render
+      sys.output svg: outfile('svg')
+      g
+    end
+  end
+end

data/tests/test_dogviz_functionally.rb

@@ -52,77 +52,5 @@ module Tests
       assert_equal ['chases', 'follows', 'parents', 'ignores'], graph.names_of.edges
     end
 
-    def test_flow_generates_precise_sequence
-      sys = System.new 'takeaway'
-      eater = sys.thing 'eater'
-      server = sys.thing 'server'
-      cook = sys.thing 'chef'
-
-      order = sys.flow 'order'
-      order.flows eater, 'gimme burger',
-                  server, 'passes order',
-                  cook, server, eater
-
-      order.output sequence: outfile('seq.txt')
-
-      definition = read_outfile('seq.txt')
-
-      assert_equal [
-                       'eater -> server: gimme burger',
-                       'server -> chef: passes order',
-                       'chef -> server:',
-                       'server -> eater:',
-                   ].join("\n"), definition
-    end
-
-    def test_flow_generates_precise_sequence_with_action
-      sys = System.new 'takeaway'
-      eater = sys.thing 'eater'
-      server = sys.thing 'server'
-      cook = sys.thing 'cook'
-
-      order = sys.flow 'order'
-      order.flows eater, 'orders',
-                  server, 'creates order',
-                  cook.does('cooks burger'),
-                  'burger', server,
-                  'burger', eater
-
-      order.output sequence: outfile('seq.txt')
-      definition = read_outfile('seq.txt')
-
-      assert_equal([
-                       'eater -> server: orders',
-                       'server -> +cook: creates order',
-                       'note right of cook',
-                       '  cooks burger',
-                       'end note',
-                       'cook -> -server: burger',
-                       'server -> eater: burger',
-                   ].join("\n"), definition)
-    end
-
-    def xtest_flows_render_sequence_diagrams_and_form_edges
-
-      sys = System.new 'service'
-
-      organisation = sys.container 'organisation'
-
-      customer = sys.thing 'customer'
-
-      support = organisation.thing 'support phone line'
-      ivr = organisation.thing 'ivr'
-      first = organisation.thing 'first level support'
-      second = organisation.thing 'second level support'
-
-      complaint = sys.flow 'complaint'
-
-      complain.flows customer, 'calls',
-          support, 'connects to',
-          ivr, ''
-
-
-    end
-
   end
 end

data/tests/test_dogviz_graphviz_rendering.rb

@@ -1,7 +1,9 @@
 require_relative 'setup_tests'
+require_relative 'graph_checking'
 
 class TestDogvizGraphvizRendering < Test::Unit::TestCase
   include Dogviz
+  include GraphChecking
 
   attr_reader :sys
 
@@ -346,38 +348,4 @@ class TestDogvizGraphvizRendering < Test::Unit::TestCase
     assert_equal('thread->haystack_nested_hidden_away_needle', connections)
   end
 
-
-  private
-
-  def subgraph_ids
-    subgraphs.map(&:id)
-  end
-
-  def subgraph(id)
-    subgraphs.find {|sub| sub.id == id }
-  end
-
-  def subgraphs(from=graph)
-    subs = []
-    from.each_graph {|sub_name, sub|
-      subs << sub
-      subs += subgraphs(sub)
-    }
-    subs
-  end
-
-  def connections(sep=' ')
-    edges.map {|e|
-      "#{e.tail_node}->#{e.head_node}"
-    }.join sep
-  end
-
-  def edges
-    graph.each_edge
-  end
-
-  def find(name)
-    graph.find_node name
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dogviz
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - damned
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,8 +113,10 @@ files:
 - examples/website_domain.rb
 - lib/dogviz.rb
 - lib/dogviz/version.rb
+- tests/graph_checking.rb
 - tests/setup_tests.rb
 - tests/svg_graph.rb
+- tests/test_dogviz_flows.rb
 - tests/test_dogviz_functionally.rb
 - tests/test_dogviz_graph.rb
 - tests/test_dogviz_graphviz_rendering.rb