tinydot 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50d6b9d99e10dd7f58016497498c2417ad70fd00
-  data.tar.gz: a27aa25ca0af4e4bed730a63f9a0fbcb7a4334d5
+  metadata.gz: 474db36b66a74660fee3b7252e21b28af429dea1
+  data.tar.gz: 55e2ed6fb7d9c94457d41ac7d41ba25bd499456e
 SHA512:
-  metadata.gz: 19dfe9cb26aeb923392aa1caa272e9db55daadfeda7de9f3a85dbe5fd92738f605105213f1f70eba52f768717e8027867a869e31080da1376b62317ce715c5f7
-  data.tar.gz: 9ad335ae752f82234030373b6f2947337d5f43f1c859045f61c29a0c50b2461469632ca373bb0653973ba82ec16b97ead4faced402eabeebe49c864661fc842f
+  metadata.gz: 62ac5e5552172e8c03c8a9369f18f48ca6aca6b4c4f08cd15f7213f1e15cb7995c89ae44cd683fde28e017cfad2076638bd0827a64e36889c22fdc3ca8898146
+  data.tar.gz: 309b2c1f391fae264cecfb4ac2afc54e2495c77cc23f3aba98d444c4e7ed7d441f18d1fde427d60425fe43eddd7d0b946e8569edbafac885e9f6b0e7de372b54

data/README.md

@@ -20,6 +20,8 @@ $ tinydot convert sample.tinydot
 
 ## Examples
 
+### Nodes, Edges
+
 ```rb
 digraph "sample" do
   a >> b >> c
@@ -43,3 +45,48 @@ and converted into a following graph.
 
 ![sample](examples/sample.png "sample")
 
+### Attributes
+
+```rb
+digraph "sample2", rankdir: "LR" do
+  node shape: "record", style: "filled", fontname: "Osaka", fillcolor: "#ECF0F1"
+
+  a "Label 1"
+  b "Label 2"
+  c "Label 3", fillcolor: "#27AE60"
+  d "Label 4", fillcolor: "#F1C40F"
+  e "Label 5", fillcolor: "#E74C3C"
+
+  a <=> b
+  a <=> c
+  b >> d
+  d <=> e
+  d >> a
+end
+```
+
+is equivalent to
+
+```dot
+digraph sample2 {
+  graph [rankdir = LR];
+  node [shape = record, style = filled, fontname = "Osaka", fillcolor = "#ECF0F1"];
+
+  a [label = "Label 1"];
+  b [label = "Label 2"];
+  c [label = "Label 3", fillcolor = "#27AE60"];
+  d [label = "Label 4", fillcolor = "#F1C40F"];
+  e [label = "Label 5", fillcolor = "#E74C3C"];
+
+  a -> b [dir = both];
+  a -> c [dir = both];
+  b -> d;
+  d -> e [dir = both];
+  d -> a;
+}
+```
+
+and converted into a following graph.
+
+![sample2](examples/sample2.png "sample2")
+

data/examples/sample2.tinydot

@@ -0,0 +1,15 @@
+digraph "sample2", rankdir: "LR" do
+  node shape: "record", style: "filled", fontname: "Osaka", fillcolor: "#ECF0F1"
+
+  a "Label 1"
+  b "Label 2"
+  c "Label 3", fillcolor: "#27AE60"
+  d "Label 4", fillcolor: "#F1C40F"
+  e "Label 5", fillcolor: "#E74C3C"
+
+  a <=> b
+  a <=> c
+  b >> d
+  d <=> e
+  d >> a
+end

data/lib/tinydot/digraph.rb

@@ -2,9 +2,15 @@ require "erb"
 
 module Tinydot
   class Digraph
-    def initialize(name)
+    def initialize(name, attrs = {})
       @name = name
+      @attrs = attrs
       @nodes = []
+      @node_attrs = {}
+    end
+
+    def node(attrs = {})
+      @node_attrs = attrs
     end
 
     def to_dot
@@ -16,10 +22,34 @@ module Tinydot
     def method_missing(name, *args)
       node = @nodes.select { |node| node.name == name }.first
       if node.nil?
-        node = Node.new(name)
+        attrs = {}
+        args.each do |arg|
+          case arg
+          when String then attrs[:label] = arg
+          when Hash   then attrs.merge!(arg)
+          end
+        end
+
+        node = Node.new(name, attrs)
         @nodes << node
       end
       node
     end
+
+    private
+
+    def attrs_to_dot
+      quoted_attrs = %i(size label bgcolor fillcolor fontname)
+      @attrs.map do |k, v|
+        quoted_attrs.include?(k) ? %(#{k} = "#{v}") : %(#{k} = #{v})
+      end.join(", ")
+    end
+
+    def node_attrs_to_dot
+      quoted_attrs = %i(color fillcolor fillcolor fontname)
+      @node_attrs.map do |k, v|
+        quoted_attrs.include?(k) ? %(#{k} = "#{v}") : %(#{k} = #{v})
+      end.join(", ")
+    end
   end
 end

data/lib/tinydot/node.rb

@@ -1,10 +1,11 @@
 module Tinydot
   class Node
-    attr_reader :name, :edges
+    attr_reader :name, :edges, :attrs
 
-    def initialize(name)
+    def initialize(name, attrs)
       @name = name
       @edges = []
+      @attrs = attrs || {}
     end
 
     def >>(other)
@@ -16,5 +17,12 @@ module Tinydot
       @edges << Edge.new(self, other, dir: "both")
       other
     end
+
+    def to_dot
+      quoted_attrs = %i(label color fillcolor fontname)
+      @attrs.map do |k, v|
+        quoted_attrs.include?(k) ? %(#{k} = "#{v}") : %(#{k} = #{v})
+      end.join(", ")
+    end
   end
 end

data/lib/tinydot/parser.rb

@@ -6,8 +6,8 @@ module Tinydot
       graph.to_dot
     end
 
-    def digraph(title, &block)
-      digraph = Digraph.new(title)
+    def digraph(title, attrs = {}, &block)
+      digraph = Digraph.new(title, attrs)
       digraph.instance_eval(&block)
       digraph
     end

data/lib/tinydot/template.dot.erb

@@ -1,4 +1,19 @@
 digraph <%= @name %> {
+  <%- unless @attrs.empty? -%>
+  <%= "graph [#{attrs_to_dot}];" %>
+  <%- end -%>
+  <%- unless @node_attrs.empty? -%>
+  <%= "node [#{node_attrs_to_dot}];" %>
+  <%- end -%>
+  <%- if !(@attrs.empty? && @node_attrs.empty?) -%>
+
+  <%- end -%>
+  <%- @nodes.select { |node| !node.attrs.empty? }.each do |node| -%>
+  <%= "#{node.name} [#{node.to_dot}];" %>
+  <%- end -%>
+  <%- if !@nodes.select { |node| !node.attrs.empty? }.empty? -%>
+
+  <%- end -%>
   <%- @nodes.each do |node| -%>
   <%- node.edges.each do |edge| -%>
   <%= edge.to_dot %>

data/spec/fixtures/all_nodes_attributes.dot

@@ -0,0 +1,6 @@
+digraph sample {
+  node [shape = box, fontname = "Osaka", style = styled, fillcolor = "#ECF0F1"];
+
+  a -> b;
+  b -> c;
+}

data/spec/fixtures/all_nodes_attributes.tinydot

@@ -0,0 +1,4 @@
+digraph "sample" do
+  node shape: "box", fontname: "Osaka", style: "styled", fillcolor: "#ECF0F1"
+  a >> b >> c
+end

data/spec/fixtures/digraph_attributes.dot

@@ -0,0 +1,6 @@
+digraph sample {
+  graph [rankdir = LR];
+
+  a -> b;
+  b -> c;
+}

data/spec/fixtures/digraph_attributes.tinydot

@@ -0,0 +1,3 @@
+digraph "sample", rankdir: "LR" do
+  a >> b >> c
+end

data/spec/fixtures/node_attributes.dot

@@ -0,0 +1,8 @@
+digraph sample {
+  a [label = "index.html"];
+  b [label = "show.html"];
+  c [label = "new.html", fillcolor = "#E74C3C"];
+
+  a -> b [dir = both];
+  a -> c;
+}

data/spec/fixtures/node_attributes.tinydot

@@ -0,0 +1,8 @@
+digraph "sample" do
+  a "index.html"
+  b "show.html"
+  c "new.html", fillcolor: "#E74C3C"
+
+  a <=> b
+  a >> c
+end

data/spec/tinydot/parser_spec.rb

@@ -14,4 +14,22 @@ describe Tinydot::Parser do
     dot = Tinydot::Parser.parse(tinydot)
     expect(dot).to eq fixtures_path.join("bidirectional_edge.dot").read
   end
+
+  it "parses attributes of digraph" do
+    tinydot = fixtures_path.join("digraph_attributes.tinydot").read
+    dot = Tinydot::Parser.parse(tinydot)
+    expect(dot).to eq fixtures_path.join("digraph_attributes.dot").read
+  end
+
+  it "parses attributes of all nodes" do
+    tinydot = fixtures_path.join("all_nodes_attributes.tinydot").read
+    dot = Tinydot::Parser.parse(tinydot)
+    expect(dot).to eq fixtures_path.join("all_nodes_attributes.dot").read
+  end
+
+  it "parses attributes of each node" do
+    tinydot = fixtures_path.join("node_attributes.tinydot").read
+    dot = Tinydot::Parser.parse(tinydot)
+    expect(dot).to eq fixtures_path.join("node_attributes.dot").read
+  end
 end

data/tinydot.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "tinydot"
-  spec.version       = "0.0.1"
+  spec.version       = "0.0.2"
   spec.authors       = ["Naoto Kaneko"]
   spec.email         = ["naoty.k@gmail.com"]
   spec.summary       = %q{Tiny language alternative to DOT.}

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: tinydot
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Naoto Kaneko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-23 00:00:00.000000000 Z
+date: 2014-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.18.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.18.1
 - !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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
 description: 
@@ -74,7 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -82,6 +82,8 @@ files:
 - bin/tinydot
 - examples/sample.png
 - examples/sample.tinydot
+- examples/sample2.png
+- examples/sample2.tinydot
 - lib/tinydot.rb
 - lib/tinydot/command.rb
 - lib/tinydot/digraph.rb
@@ -89,8 +91,14 @@ files:
 - lib/tinydot/node.rb
 - lib/tinydot/parser.rb
 - lib/tinydot/template.dot.erb
+- spec/fixtures/all_nodes_attributes.dot
+- spec/fixtures/all_nodes_attributes.tinydot
 - spec/fixtures/bidirectional_edge.dot
 - spec/fixtures/bidirectional_edge.tinydot
+- spec/fixtures/digraph_attributes.dot
+- spec/fixtures/digraph_attributes.tinydot
+- spec/fixtures/node_attributes.dot
+- spec/fixtures/node_attributes.tinydot
 - spec/fixtures/unidirectional_edges.dot
 - spec/fixtures/unidirectional_edges.tinydot
 - spec/spec_helper.rb
@@ -106,23 +114,29 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Tiny language alternative to DOT.
 test_files:
+- spec/fixtures/all_nodes_attributes.dot
+- spec/fixtures/all_nodes_attributes.tinydot
 - spec/fixtures/bidirectional_edge.dot
 - spec/fixtures/bidirectional_edge.tinydot
+- spec/fixtures/digraph_attributes.dot
+- spec/fixtures/digraph_attributes.tinydot
+- spec/fixtures/node_attributes.dot
+- spec/fixtures/node_attributes.tinydot
 - spec/fixtures/unidirectional_edges.dot
 - spec/fixtures/unidirectional_edges.tinydot
 - spec/spec_helper.rb