dogviz 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c139e3de9b60c343ea816c730a3e88667a3e79d2
-  data.tar.gz: 0329e13153d5fa3079f2783a3c32370209e99d5d
+  metadata.gz: b2f28cea79616735c3ff115295186438f33407ff
+  data.tar.gz: afbe975455318158f50c85cf236f8308e385ed21
 SHA512:
-  metadata.gz: cfc8beaad531936c0f9b9cb7ded8d0ae84999c4ef027ded83276adb1a91ebf8e994f60c12e90774f6722c3b55fb5ecaddf070bceabb49e74f91215da75b7f48f
-  data.tar.gz: aee0a0735f84f82c45d54a1da12e53b69d8bb4480920f9b2b7722e04eda67c07ee04e8c18e14dddc261c77586c0282b89ca16ef41b08d7918b0eb1d08c5ce648
+  metadata.gz: 5facef62f26a853f1569cafe84b9c66724830d461816f1ed264c66d9d379da95670e959a89512bf74baa35bd5bd08d8e6bf8e3a571c16799ad006c2a12c61b84
+  data.tar.gz: c1eac0792f9a326575726b4d321c615c331526c30081bb1fe04d3b4afac463c8851d8bf4409fdeed04be5eb952bc0e6bec0f995b5269f29dcc0b8e3c18067ef3

data/lib/dogviz/version.rb

@@ -1,3 +1,3 @@
 module Dogviz
-  VERSION = '0.0.16'
+  VERSION = '0.0.17'
 end

data/lib/dogviz.rb

@@ -103,6 +103,11 @@ module Dogviz
     def on_top_rollup?
       rollup? && !under_rollup?
     end
+    def inherited_render_options
+      inherited = {}
+      inherited[:fontname] = parent.render_options[:fontname] if parent.render_options.include?(:fontname)
+      inherited
+    end
   end
   module Parent
     def find_all(&matcher)
@@ -135,6 +140,30 @@ module Dogviz
     end
   end
 
+  class Colorizer
+    def initialize
+      @i = 0
+      @colors = %w(#9e0142
+#d53e4f
+#e45d33
+#ed9e61
+#762a83
+#9970ab
+#c6f578
+#abdda4
+#66c2a5
+#3288bd
+#5e4fa2)
+    end
+
+    def next
+      color = @colors[@i]
+      @i += 1
+      @i = 0 unless @i < @colors.length
+      color
+    end
+  end
+
   class Thing
     include Common
     include Nominator
@@ -142,6 +171,8 @@ module Dogviz
     attr_reader :parent
     attr_reader :name, :id, :pointers, :edge_heads
 
+    @@colorizer = Colorizer.new
+
     def initialize(parent, name, options = {})
       @parent = parent
       @name = name
@@ -156,17 +187,11 @@ module Dogviz
       options.delete(:rollup)
 
       @render_options = options
-      setup_render_attributes label: name
+      setup_render_attributes({label: name}.merge inherited_render_options)
 
       parent.register name, self
     end
 
-    def do_render_node(renderer)
-      render_options = @render_options
-      attributes = @attributes
-      renderer.render_node(parent, id, render_options, attributes)
-    end
-
     def points_to_all(*others)
       others.each {|other|
         points_to other
@@ -180,7 +205,7 @@ module Dogviz
 
     def render(renderer)
       do_render_node(renderer) unless in_rollup? || in_skip?
-    end
+      end
 
     def render_edges(renderer)
       pointers.each {|p|
@@ -190,14 +215,29 @@ module Dogviz
 
     private
 
+    def do_render_node(renderer)
+      render_options = @render_options
+      attributes = @attributes
+      renderer.render_node(parent, id, render_options, attributes)
+    end
+
     def setup_render_edge(other, options)
       pointers << {
           other: other,
           options: {
-              label: options[:name],
+              xlabel: options[:name],
               style: options[:style]
-          }
+          }.merge(inherited_render_options)
       }
+
+      if options[:colorize] || root.colorize_edges?
+        edge_color = next_colorizer_color
+        pointers.last[:options].merge!({
+          color: edge_color,
+          fontcolor: edge_color
+        })
+      end
+
     end
 
     def render_pointer(pointer, renderer)
@@ -247,6 +287,10 @@ module Dogviz
       }
       resolved
     end
+
+    def next_colorizer_color
+      @@colorizer.next
+    end
   end
 
   class Container
@@ -269,7 +313,7 @@ module Dogviz
 
       setup_render_attributes label: name
 
-      @render_options = options
+      @render_options = options.merge inherited_render_options
 
       parent.register name, self
     end
@@ -519,10 +563,12 @@ module Dogviz
     attr_reader :render_hints, :title, :children, :graph
 
     alias :name :title
+    alias :render_options :render_hints
 
     def initialize(name, hints = {splines: 'line'})
       @children = []
       @by_name = Registry.new name
+      @non_render_hints = remove_dogviz_hints!(hints)
       @render_hints = hints
       @title = create_title(name)
       @rendered = false
@@ -567,8 +613,20 @@ module Dogviz
       @by_name.register name, thing
     end
 
+    def colorize_edges?
+      @non_render_hints[:colorize_edges]
+    end
+
     private
 
+    def remove_dogviz_hints!(hints)
+      dogviz_only_hints = {}
+      %i(colorize_edges).each {|k|
+        dogviz_only_hints[k] = hints.delete k
+      }
+      dogviz_only_hints
+    end
+
     def create_title(name)
       now = DateTime.now
       "#{now.strftime '%H:%M'} #{name} #{now.strftime '%F'}"

data/tests/test_container.rb

@@ -0,0 +1,36 @@
+require_relative 'setup_tests'
+require_relative 'svg_graph'
+
+module Tests
+  class TestContainer < Test::Unit::TestCase
+    include Dogviz
+
+    class StubParent
+      attr_accessor :render_options
+      def register(name, thing)
+
+      end
+      def colorize_edges?
+        false
+      end
+      def rollup?
+        false
+      end
+      def skip?
+        false
+      end
+    end
+
+    def setup
+      @parent = StubParent.new
+    end
+
+    attr_reader :parent
+
+    def test_container_exposes_inherited_render_options_from_parent
+      inheritable_options = {fontname: 'glyphoz'}
+      parent.render_options = inheritable_options
+      assert_equal inheritable_options, Container.new(parent, 'container').render_options
+    end
+  end
+end

data/tests/test_thing.rb

@@ -0,0 +1,63 @@
+require_relative 'setup_tests'
+require_relative 'svg_graph'
+
+module Tests
+  class TestThing < Test::Unit::TestCase
+    include Dogviz
+
+    class StubRenderer
+      attr_reader :last_node_options, :last_edge_options
+      def render_node(parent, id, render_options, attributes)
+        @last_node_options = render_options.merge attributes
+      end
+      def render_edge(from, other, options)
+        @last_edge_options = options
+      end
+    end
+
+    class StubParent
+      attr_accessor :render_options
+      def register(name, thing)
+
+      end
+      def colorize_edges?
+        false
+      end
+      def rollup?
+        false
+      end
+      def skip?
+        false
+      end
+    end
+
+    def setup
+      @parent = StubParent.new
+      @renderer = StubRenderer.new
+    end
+
+    attr_reader :parent, :renderer
+
+    def test_thing_name_rendered_with_inherited_fontname
+      parent.render_options = {fontname: 'funky-font'}
+
+      thing = Thing.new parent, 'thing'
+
+      thing.render renderer
+
+      assert_equal 'funky-font', renderer.last_node_options[:fontname]
+    end
+
+    def test_thing_edges_rendered_with_inherited_fontname
+      parent.render_options = {fontname: 'crazy-font'}
+
+      thing = Thing.new parent, 'thing'
+      thing.points_to Thing.new parent, 'other thing'
+
+      thing.render_edges renderer
+
+      assert_equal 'crazy-font', renderer.last_edge_options[:fontname]
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dogviz
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - damned
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,10 +119,12 @@ files:
 - tests/graph_checking.rb
 - tests/setup_tests.rb
 - tests/svg_graph.rb
+- tests/test_container.rb
 - tests/test_dogviz_flows.rb
 - tests/test_dogviz_functionally.rb
 - tests/test_dogviz_graph.rb
 - tests/test_dogviz_graphviz_rendering.rb
+- tests/test_thing.rb
 homepage: https://github.com/damned/dogviz
 licenses:
 - MIT