dogviz 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f52b08f82c2ec0119948a8fbf396929b2a6acffc
-  data.tar.gz: 775a8100eff08d29605903ec9023aa0033d9bec2
+  metadata.gz: de9bdc91bf4606db04bb41206d705bf4f0678f62
+  data.tar.gz: 5053fa5daed24691e67713a7905d22a2aeac89b5
 SHA512:
-  metadata.gz: e23bb1161e281cafc883f1a0b2021b1c17863b290c6c946a55ccc55cdd2c341a0e3be6161999e37695f5444b816a741eaf89ce7ef2e57969aaf2836d0d44f84f
-  data.tar.gz: ac257f552ae52796cad6d490fbea55c27ba71b15bc182b717626387485f959467179f170a351f2c1e2eb510631f8f1a701dd421ca87822e0f9c17b05352c3038
+  metadata.gz: 89ce43e8d53a1a867ea4c82f319fe4a9d1fc4ce4bcf759fc182837f53c02734109788906f48b45072d08bb8242964df6c66396f9ff0d5ee1be1db0e8a7c3a3f1
+  data.tar.gz: 8f86cf0063de7a63ddf332f8e0988817b519d5362934bc37c022da966659199df62c073b060c5b6bfdc887f45f531d43228f63ce9650eae2b240dea2a797f68d

data/lib/dogviz/version.rb

@@ -1,3 +1,3 @@
 module Dogviz
-  VERSION = '0.0.5'
+  VERSION = '0.0.7'
 end

data/lib/dogviz.rb

@@ -42,6 +42,14 @@ module Dogviz
       @skip
     end
 
+    def in_skip?
+      skip? || under_skip?
+    end
+
+    def under_skip?
+      ancestors.any? &:skip?
+    end
+
     def under_rollup?
       ancestors.any? &:rollup?
     end
@@ -124,7 +132,7 @@ module Dogviz
     end
 
     def render(renderer)
-      do_render_node(renderer) unless in_rollup? || skip?
+      do_render_node(renderer) unless in_rollup? || in_skip?
     end
 
     def render_edges(renderer)
@@ -157,13 +165,13 @@ module Dogviz
         from = from.parent
       end
 
-      return if from.skip?
+      return if from.in_skip?
 
       return if from == self && from.in_rollup?
       return if from == other
       return if already_added_connection?(other)
 
-      if other.skip?
+      if other.in_skip?
         others = resolve_skipped_others other
       else
         others = [other]
@@ -184,7 +192,7 @@ module Dogviz
       resolved = []
       skipped.pointers.each {|pointer|
         next_in_line = pointer[:other]
-        if next_in_line.skip?
+        if next_in_line.in_skip?
           resolved += resolve_skipped_others next_in_line
         else
           resolved << next_in_line
@@ -357,7 +365,7 @@ module Dogviz
     def output(*args)
       render
       out = graph.output *args
-      puts "Created output: #{args.join ' '}"
+      puts "Created output: #{args.join ' '}" if run_from_command_line?
       out
     end
 
@@ -381,6 +389,10 @@ module Dogviz
       false
     end
 
+    def skip?
+      false
+    end
+
     def register(name, thing)
       @by_name.register name, thing
     end
@@ -391,6 +403,10 @@ module Dogviz
       now = DateTime.now
       "#{now.strftime '%H:%M'} #{name} #{now.strftime '%F'}"
     end
+
+    def run_from_command_line?
+      !ARGV.empty?
+    end
   end
 
   class LookupError < StandardError

data/tests/test_dogviz_graph.rb

@@ -52,6 +52,13 @@ class TestDogvizGraph < Test::Unit::TestCase
     assert_equal(true, a.in_rollup?)
   end
 
+  def test_nested_things_are_in_skip_if_under_one
+    g = sys.group('g').skip!
+    a = g.thing('a')
+
+    assert_equal(true, a.in_skip?)
+  end
+
   def test_nested_things_are_in_rollup_if_rolled_up_themselves
     a = sys.thing('a').rollup!
     assert_equal(true, a.in_rollup?)

data/tests/test_dogviz_graphviz_rendering.rb

@@ -255,8 +255,8 @@ class TestDogvizGraphvizRendering < Test::Unit::TestCase
     finish2 = sys.thing('finish2')
 
     start.points_to(skip1).points_to(skip2)
-    skip2.points_to(skip3).points_to(skipX).points_to finish1
-    skip2.points_to(skipY).points_to finish2
+      skip2.points_to(skip3).points_to(skipX).points_to finish1
+      skip2.points_to(skipY).points_to finish2
 
     skip1.skip!
     skip2.skip!
@@ -267,12 +267,51 @@ class TestDogvizGraphvizRendering < Test::Unit::TestCase
     assert_equal('start->finish1 start->finish2', connections)
   end
 
+  def test_skip_thing_in_skipped_container
+    start = sys.thing('start')
+    g = sys.group('g')
+    a = g.thing('a')
+    finish = sys.thing('finish')
+
+    start.points_to(a).points_to(finish)
+
+    g.skip!
+
+    assert_equal('start->finish', connections)
+  end
+
+  def test_skip_things_in_multiple_skipped_containers
+    start = sys.thing('start')
+    g1 = sys.group('g1')
+    a1 = g1.thing('a1')
+    g2 = sys.group('g2')
+    a2 = g2.thing('a2')
+
+    finish = sys.thing('finish')
+
+    start.points_to(a1).points_to(a2).points_to(finish)
+
+    g1.skip!
+    g2.skip!
+
+    assert_equal('start->finish', connections)
+  end
+
   def test_skipped_thing_will_not_be_rendered
     sys.thing('a').skip!
 
     assert_nil find('a')
   end
 
+  def test_skipped_group_of_things_will_not_be_rendered
+    g = sys.group('g').skip!
+    g.thing('a')
+    g.thing('b')
+
+    assert_nil find('g_a')
+    assert_nil find('g_b')
+  end
+
   def test_find_thing
     sys.group('top').thing('needle')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dogviz
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - damned
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-01 00:00:00.000000000 Z
+date: 2016-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler