gviz 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 111365e7127ce64d1645957d112c7ea204dd6aed
-  data.tar.gz: 5784cd73f99d927fa79378d020e176f742717546
+  metadata.gz: b24e07887d8c7f4d4337ec7de04cfdec4f1ea10d
+  data.tar.gz: 79ca3e661bc0e17025907bb475d08d854ec75dfa
 SHA512:
-  metadata.gz: a239468f16cbbb6583724c8752da66b29227551b51727607ad69dfef87137e22f0ad0ce9c5f02dc53e66a66e2df7d03c606d2ea4841f1157cdafc1a03b1fe7d1
-  data.tar.gz: 1daf776b599733172e81f856eec100039d0a2083a2f8731547cae76a21e2695489cc39f794b0a598affc9e9b02caf3fe8ed7cc5110edce30dddfefd3956279a7
+  metadata.gz: d489810c365bf0159f82a09832c49e03ee39e8df515264b029069044befb31033a7d5fb4b0c76b7a809718aac5b582fae97cb287e9726cec25e5383dd8fc69c8
+  data.tar.gz: 96f0516da3abf0f01bd6d6e789f08984255b37b42554287be871ecba4eba3261f186f65508b7baefebafe81140e204e18d8308af9fbe523cc2ab2befdb00ff08

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.0.0

data/README.md

@@ -1,5 +1,7 @@
 # Gviz
 
+[![Build Status](https://travis-ci.org/melborne/Gviz.png?branch=master)](https://travis-ci.org/melborne/Gviz)
+
 Ruby's interface of graphviz. It generate a dot file with simple ruby's syntax. Some implementations of `Gviz` are inspired by Ryan Davis's [Graph](https://github.com/seattlerb/graph 'seattlerb/graph').
 
 ## Installation

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/gviz.gemspec

@@ -18,5 +18,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.required_ruby_version = '>=2.0.0'
   gem.add_development_dependency 'rspec'
+  gem.add_development_dependency "bundler", "~> 1.5"
+  gem.add_development_dependency "rake"
   gem.add_dependency 'thor'
 end

data/lib/gviz.rb

@@ -11,6 +11,10 @@ def Graph(name=:G, type=:digraph, &blk)
   Gviz.new(name, type).graph(&blk)
 end
 
+# This value will be changed to ':graph' only when Graph initiate with :graph type.
+# then effect globally to edge connectors from '->' to '--'.
+$graph_type = :digraph
+
 %w(core node edge version system_extension command).each do |lib|
   require 'gviz/' + lib
 end

data/lib/gviz/core.rb

@@ -1,7 +1,8 @@
 class Gviz
-  attr_reader :gnode_attrs, :gedge_attrs, :graph_attrs, :subgraphs, :ranks
+  attr_reader :gnode_attrs, :gedge_attrs, :graph_attrs, :subgraphs, :ranks, :name
   def initialize(name=:G, type=:digraph)
     @name, @type = name, type
+    $graph_type = type.intern if type.intern==:graph
     @edges = {}
     @nodes = {}
     @gnode_attrs = {}
@@ -10,7 +11,7 @@ class Gviz
     @subgraphs = []
     @ranks = []
   end
-  
+
   # Access to all defined node objects.
   def nodeset
     @nodes.values
@@ -108,8 +109,8 @@ class Gviz
   #     add :a => :b
   #   end
   #
-  def subgraph(&blk)
-    Gviz.new("cluster#{subgraphs.size}", :subgraph).tap do |graph|
+  def subgraph(name=:"cluster#{subgraphs.size}", &blk)
+    Gviz.new(name, :subgraph).tap do |graph|
       subgraphs << graph
       graph.instance_eval &blk
     end

data/lib/gviz/edge.rb

@@ -9,7 +9,8 @@ class Gviz::Edge < Struct.new(:id, :attrs)
   def to_s
     stp = ":#{st_port}" if st_port
     edp = ":#{ed_port}" if ed_port
-    "#{st}#{stp} -> #{ed}#{edp}"
+    edge = $graph_type==:graph ? "--" : "->"
+    "#{st}#{stp} #{edge} #{ed}#{edp}"
   end
 
   def nodes

data/lib/gviz/version.rb

@@ -1,3 +1,3 @@
 class Gviz
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/spec/gviz_command_spec.rb

@@ -66,7 +66,7 @@ describe Gviz::Command do
           graph G {
             a;
             b;
-            a -> b;
+            a -- b;
           }
           EOS
       end

data/spec/gviz_edge_spec.rb

@@ -84,4 +84,18 @@ describe Gviz::Edge do
       end
     end
   end
+
+  describe "#to_s" do
+    context "when type of graph is 'graph'" do
+      before do
+        $graph_type = :graph
+      end
+      it "returns undirected graph edges" do
+        expect(Gviz::Edge.new('a_b').to_s).to eq "a -- b"
+      end
+      after() do
+        $graph_type = :digraph
+      end
+    end
+  end
 end

data/spec/gviz_spec.rb

@@ -195,7 +195,7 @@ describe Gviz do
       its(:size) { should eq 1 }
     end
 
-    context "when add one" do
+    context "when add two" do
       before do
         gv.subgraph { add :main => [:a, :b] }
         gv.subgraph { add :main => [:a, :b] }
@@ -204,9 +204,31 @@ describe Gviz do
       its(:size) { should eq 2 }
     end
 
+    context "without name" do
+      before do
+        @sub1 = gv.subgraph { add :main => [:a, :b] }
+        @sub2 = gv.subgraph { add :main => [:a, :b] }
+      end
+      it "returns a default name" do
+        expect(@sub1.name).to eq :cluster0
+        expect(@sub2.name).to eq :cluster1
+      end
+    end
+
+    context "with a name" do
+      before do
+        @sub1 = gv.subgraph(:cluA) { add :main => [:a, :b] }
+        @sub2 = gv.subgraph(:cluB) { add :main => [:a, :b] }
+      end
+      it "returns passed name" do
+        expect(@sub1.name).to eq :cluA
+        expect(@sub2.name).to eq :cluB
+      end
+    end
+
     context "it has a name other than `cluster**`" do
-      it "raise an error" do
-        ->{ gv.subgraph(:clu) {} }.should raise_error
+      it "not raise an error" do
+        ->{ gv.subgraph(:clu) {} }.should_not raise_error
       end
     end
   end
@@ -507,6 +529,51 @@ describe Gviz do
           EOS
       end
     end
+
+    context "for undirected graph" do
+      before do
+        @gv = Gviz.new(:G, :graph)
+        @gv.add :main => [:init, :parse]
+        @gv.add :init => :printf
+      end
+      subject { @gv.to_s }
+      it do
+        should eq ~<<-EOS
+          graph G {
+            main;
+            init;
+            parse;
+            printf;
+            main -- init;
+            main -- parse;
+            init -- printf;
+          }
+          EOS
+      end
+
+      context "with subgraph" do
+        before do
+          @gv = Gviz.new(:G, :graph)
+          @gv.route(:a => :b)
+          @gv.subgraph { route :c => :d }
+        end
+        subject { @gv.to_s }
+        it do
+          should eql ~<<-EOS
+            graph G {
+              subgraph cluster0 {
+                c;
+                d;
+                c -- d;
+              }
+              a;
+              b;
+              a -- b;
+            }
+            EOS
+        end
+      end
+    end
   end
 end
 

data/spec/spec_helper.rb

@@ -10,4 +10,7 @@ end
 
 RSpec.configure do |c|
   c.include Helpers
+  c.before do
+    $graph_type = :digraph
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gviz
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - kyoendo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-01 00:00:00.000000000 Z
+date: 2014-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,6 +24,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -47,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md