graphdown 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b329ba5609ea9ef8ce2ac37f20d4281f03da537
-  data.tar.gz: ef617d20ca0ccac07840e32b55d15544b6a0eba2
+  metadata.gz: 25f4809d61a0512f86a702e492528795fbc3951d
+  data.tar.gz: 89940ed3e506736155d2a841d8e4f5abbcd38682
 SHA512:
-  metadata.gz: fbc79e190bde04380d98dd47db187e384c88ac38dc9d656f440283dfb3c09b74cca17dd7e3f4e2c4c7d42a6a07856e0e4a7a7b06b891815b136a3ce2e04a47fd
-  data.tar.gz: 1fee7608cea1f178ec37a8cf6f592d3846be1718b1e26abba75d468acdb095401b17098ce1ec2f2ff51ab0e9f5f3e282c98011812f9ec713fae76ca4923d1146
+  metadata.gz: d67dab59ae625d6dab02cc780f59b2326d3772d594daf24640c58ca8f2cd8b75a149a56da4167ae5c4709ed2620a29f46607785667a6aad53d3b015d1dd0a278
+  data.tar.gz: b5bfa36722e6e9cd9e3fd907bf76c7aebfb8481fbd9d669bda6c8ad6a327729f15169861bcb8ca0161a46430e4bd8c4230fb3bad5aa372b9977e434e1addd42d

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "2.0.0"
+  - "2.1.0"
+script: bundle exec rspec

data/README.md

@@ -8,11 +8,17 @@ Markdown extension for embedding graphs.
 $ gem install graphdown
 ```
 
-## Requirements
+## Usage
 
-- [Graphviz](http://www.graphviz.org/)
+### CLI
 
-## Usage
+```sh
+$ graphdown sample.md
+```
+
+This command generates `sample.html`, which is parsed into HTML with graphs in format of SVG.
+
+### Redcarpet
 
 ```rb
 require "redcarpet"
@@ -20,34 +26,42 @@ require "graphdown"
 
 class BaseRenderer < Redcarpet::Render::HTML
   include Graphdown::Renderable
-  # include other extensions
 end
 
 markdown = Redcarpet::Markdown.new(BaseRenderer, fenced_code_blocks: true)
-markdown.render(content)
 ```
 
-## Example
+## Graph notation
 
-```md
-# Views transition
+Graphdown extends following notations for graphs.
 
-\```dot
-digraph sample {
-    A [label = "index.html"];
-    B [label = "show.html"];
-    C [label = "new.html"];
+- `[label name]`: Node named "label name"
+- `[label A], [label B], ...`: Multiple nodes
+- `->`: Unidirectional edge
+- `<->`: Bidirectional edge
 
-    A -> B [dir = both];
-    A -> C;
-    C -> A [label = "redirect"];
-}
-\```
+Graphdown parses these notations into graph images in SVG format.
 
-- Users visit show.html from index.html.
-- Users visit index.html from show.html.
-- Users visit new.html from index.html.
-- Users are redirected to index.html from new.html.
-```
+### Examples
+
+<pre>
+# Servers arrangement
+
+[Load balancer] -> [Web server 1], [Web server 2], [Web server 3] -> [DB server], [Cache server]
+</pre>
+
+![Servers arrangement](examples/servers_arrangement.png)
+
+<pre>
+# Path to naoty/graphdown on GitHub
+
+[/] -> [/naoty] -> [/naoty/graphdown]
+[/] -> [/search] -> [/naoty/graphdown]
+[/] -> [/notifications] -> [/naoty/graphdown]
+</pre>
+
+![Path to graphdown](examples/path_to_graphdown.png)
+
+## References
 
-Graphdown parses block codes which language is 'dot' into img tags, which load graph PNG image. The image is generated by Graphviz.
+- Kazuo Misue, Kouzou Sugiyama, On Automatic Drowing of Compound Graphs for Computer Aided Diagrammatical Thinking, Journal of Information Processing Society of Japan, 1989, Vol.30, No.10, p1324-1334.

data/bin/graphdown

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+
+require "graphdown"
+Graphdown::CLI.start(ARGV)

data/examples/path_to_graphdown.html

@@ -0,0 +1,31 @@
+<h1>Path to naoty/graphdown on GitHub</h1>
+<svg width="395" height="275" xmlns="http://www.w3.org/2000/svg">
+  <g fill="none" stroke="black">
+    <rect x="10" y="10" width="33" height="35"/>
+    <rect x="10" y="95" width="78" height="35"/>
+    <rect x="10" y="180" width="168" height="35"/>
+    <rect x="108" y="95" width="87" height="35"/>
+    <rect x="215" y="95" width="150" height="35"/>
+  </g>
+  <g font-size="18" font-family="monospace" text-anchor="middle">
+    <text x="26" y="37">/</text>
+    <text x="49" y="122">/naoty</text>
+    <text x="94" y="207">/naoty/graphdown</text>
+    <text x="151" y="122">/search</text>
+    <text x="290" y="122">/notifications</text>
+  </g>
+  <g stroke="black" stroke-width="2">
+    <path d="M 18.25 45 L 49.0 95" fill="none"/>
+    <path d="M 49.0 95 L 40.204218667115356 90.24245538706381 L 48.72226382799822 85.00385761312086 Z" fill="black"/>
+    <path d="M 26.5 45 L 151.5 95" fill="none"/>
+    <path d="M 151.5 95 L 141.602202606946 96.42604584991292 L 145.31610937048706 87.14127894106032 Z" fill="black"/>
+    <path d="M 34.75 45 L 290.0 95" fill="none"/>
+    <path d="M 290.0 95 L 280.54010074624506 98.24196022628374 L 282.46243045910205 88.42846704214861 Z" fill="black"/>
+    <path d="M 49.0 130 L 52.0 180" fill="none"/>
+    <path d="M 52.0 180 L 46.49029332005865 171.6547539100989 L 56.47234177471645 171.05583100281942 Z" fill="black"/>
+    <path d="M 151.5 130 L 94.0 180" fill="none"/>
+    <path d="M 94.0 180 L 97.25418194567223 170.54429802370757 L 103.81596909492009 178.0903532453426 Z" fill="black"/>
+    <path d="M 290.0 130 L 136.0 180" fill="none"/>
+    <path d="M 136.0 180 L 142.69294863675958 172.57003105351723 L 145.78101617536336 182.08127907241686 Z" fill="black"/>
+  </g>
+</svg>

data/examples/path_to_graphdown.md

@@ -0,0 +1,5 @@
+# Path to naoty/graphdown on GitHub
+
+[/] -> [/naoty] -> [/naoty/graphdown]
+[/] -> [/search] -> [/naoty/graphdown]
+[/] -> [/notifications] -> [/naoty/graphdown]

data/examples/servers_arrangement.html

@@ -0,0 +1,39 @@
+<h1>Servers arrangement</h1>
+<svg width="476" height="275" xmlns="http://www.w3.org/2000/svg">
+  <g fill="none" stroke="black">
+    <rect x="10" y="10" width="141" height="35"/>
+    <rect x="10" y="95" width="132" height="35"/>
+    <rect x="162" y="95" width="132" height="35"/>
+    <rect x="314" y="95" width="132" height="35"/>
+    <rect x="10" y="180" width="105" height="35"/>
+    <rect x="135" y="180" width="132" height="35"/>
+  </g>
+  <g font-size="18" font-family="monospace" text-anchor="middle">
+    <text x="80" y="37">Load balancer</text>
+    <text x="76" y="122">Web server 1</text>
+    <text x="228" y="122">Web server 2</text>
+    <text x="380" y="122">Web server 3</text>
+    <text x="62" y="207">DB server</text>
+    <text x="201" y="207">Cache server</text>
+  </g>
+  <g stroke="black" stroke-width="2">
+    <path d="M 45.25 45 L 76.0 95" fill="none"/>
+    <path d="M 76.0 95 L 67.20421866711536 90.24245538706381 L 75.72226382799822 85.00385761312086 Z" fill="black"/>
+    <path d="M 80.5 45 L 228.0 95" fill="none"/>
+    <path d="M 228.0 95 L 218.1929724878952 96.95504766612466 L 221.4033652994742 87.48438887196666 Z" fill="black"/>
+    <path d="M 115.75 45 L 380.0 95" fill="none"/>
+    <path d="M 380.0 95 L 370.56115218759226 98.30274915399355 L 372.4203114241102 88.4770925889965 Z" fill="black"/>
+    <path d="M 54.0 130 L 36.25 180" fill="none"/>
+    <path d="M 36.25 180 L 34.435344142727494 170.16602704296648 L 43.85914247228395 173.51147544995902 Z" fill="black"/>
+    <path d="M 98.0 130 L 168.0 180" fill="none"/>
+    <path d="M 168.0 180 L 158.04667045165723 179.03499694192848 L 163.85905238884823 170.8976622298611 Z" fill="black"/>
+    <path d="M 206.0 130 L 62.5 180" fill="none"/>
+    <path d="M 62.5 180 L 69.0328881004204 172.42891202881742 L 72.3231985675411 181.87210306945383 Z" fill="black"/>
+    <path d="M 250.0 130 L 201.0 180" fill="none"/>
+    <path d="M 201.0 180 L 203.4904951358704 170.3150924641375 L 210.63262352729546 177.3143782877341 Z" fill="black"/>
+    <path d="M 358.0 130 L 88.75 180" fill="none"/>
+    <path d="M 88.75 180 L 96.3517865603404 173.50285900637604 L 98.17758243261781 183.33476977858993 Z" fill="black"/>
+    <path d="M 402.0 130 L 234.0 180" fill="none"/>
+    <path d="M 234.0 180 L 240.87417050853045 172.7373710118408 L 243.72670645627238 182.3218917962536 Z" fill="black"/>
+  </g>
+</svg>

data/examples/servers_arrangement.md

@@ -0,0 +1,3 @@
+# Servers arrangement
+
+[Load balancer] -> [Web server 1], [Web server 2], [Web server 3] -> [DB server], [Cache server]

data/graphdown.gemspec

@@ -1,9 +1,11 @@
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
+require "graphdown/version"
+
 Gem::Specification.new do |spec|
   spec.name          = "graphdown"
-  spec.version       = "0.0.1"
+  spec.version       = Graphdown::VERSION
   spec.authors       = ["Naoto Kaneko"]
   spec.email         = ["naoty.k@gmail.com"]
   spec.summary       = %q{Markdown extension for embedding graphs.}
@@ -15,6 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "svgen"
+  spec.add_dependency "thor", "~> 0.18.1"
   spec.add_dependency "redcarpet", "~> 3.0.0"
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"

data/lib/graphdown/cli.rb

@@ -0,0 +1,47 @@
+require "redcarpet"
+require "pathname"
+require "optparse"
+
+module Graphdown
+  class CLI
+    def self.start(args)
+      method_name = args.shift
+      new.send(method_name, *args)
+    end
+
+    def initialize
+      @options = {}
+      @option_parser = OptionParser.new
+    end
+
+    def parse(name, *args)
+      @option_parser.on("-o", "--output FILENAME") { |filename| @options[:output] = filename }
+      @option_parser.parse!(args)
+
+      markdown_path = Pathname.new(name).expand_path
+      output_filename = @options[:output] || File.basename(name, ".md") + ".html"
+      html_path = markdown_path.dirname.join(output_filename)
+
+      renderer = Class.new(Redcarpet::Render::HTML)
+      renderer.send(:include, Graphdown::Renderable)
+      markdown = Redcarpet::Markdown.new(renderer)
+
+      html = markdown.render(markdown_path.read)
+      html_path.open("wb") { |file| file.write(html) }
+    end
+
+    def method_missing(name, *args)
+      case name.to_s
+      when /\.md$/
+        parse(name.to_s, *args)
+      when "-h", "--help"
+        args << "--help"
+        parse(name.to_s, *args)
+      when "-v", "--version"
+        puts Graphdown::VERSION
+      else
+        super
+      end
+    end
+  end
+end

data/lib/graphdown/edge.rb

@@ -0,0 +1,118 @@
+require "matrix"
+
+module Graphdown
+  class Edge
+    attr_accessor :origin, :target
+    attr_reader :direction
+
+    DIRECTION = [:forward, :backward, :two_way].freeze
+    ARROW_SIDE_LENGTH = 10
+
+    def initialize(origin_node, target_node, direction = :forward)
+      @origin_node = origin_node
+      @target_node = target_node
+      @direction = DIRECTION.include?(direction) ? direction : :forward
+      @origin = Point.new
+      @target = Point.new
+    end
+
+    def forward?
+      @direction == :forward || @direction == :two_way
+    end
+
+    def backward?
+      @direction == :backward || @direction == :two_way
+    end
+
+    def parent
+      case @direction
+      when :forward  then @origin_node
+      when :backward then @target_node
+      when :two_way  then @origin_node
+      end
+    end
+
+    def child
+      case @direction
+      when :forward  then @target_node
+      when :backward then @origin_node
+      when :two_way  then @target_node
+      end
+    end
+
+    def line_d
+      "M #{@origin.x} #{@origin.y} L #{@target.x} #{@target.y}"
+    end
+
+    def arrow_d
+      ratio = ARROW_SIDE_LENGTH / length
+
+      v1 = Graphdown::Edge::Vector.new(@target.x - @origin.x, @target.y - @origin.y)
+      p1 = v1.scale(ratio).rotate(Math::PI / 6 * 5).point
+
+      v2 = Graphdown::Edge::Vector.new(@target.x - @origin.x, @target.y - @origin.y)
+      p2 = v2.scale(ratio).rotate(-Math::PI / 6 * 5).point
+
+      p1.x += @target.x
+      p1.y += @target.y
+      p2.x += @target.x
+      p2.y += @target.y
+
+      "M #{@target.x} #{@target.y} L #{p1.x} #{p1.y} L #{p2.x} #{p2.y} Z"
+    end
+
+    def reverse_arrow_d
+      ratio = ARROW_SIDE_LENGTH / length
+
+      v1 = Graphdown::Edge::Vector.new(@origin.x - @target.x, @origin.y - @target.y)
+      p1 = v1.scale(ratio).rotate(Math::PI / 6 * 5).point
+
+      v2 = Graphdown::Edge::Vector.new(@origin.x - @target.x, @origin.y - @target.y)
+      p2 = v2.scale(ratio).rotate(-Math::PI / 6 * 5).point
+
+      p1.x += @origin.x
+      p1.y += @origin.y
+      p2.x += @origin.x
+      p2.y += @origin.y
+
+      "M #{@origin.x} #{@origin.y} L #{p1.x} #{p1.y} L #{p2.x} #{p2.y} Z"
+    end
+
+    private
+
+    def length
+      dx = @target.x - @origin.x
+      dy = @target.y - @origin.y
+      Math.sqrt(dx ** 2 + dy ** 2)
+    end
+
+    class Vector
+      def initialize(x, y)
+        @v = Matrix[[x, y]]
+        @matrices = []
+      end
+
+      def point
+        @matrices.each { |matrix| @v *= matrix }
+        x, y = @v.row(0).to_a
+        Point.new(x, y)
+      end
+
+      def scale(ratio)
+        unit_vector = @v.row(0).normalize
+        nx, ny = unit_vector.map(&:to_f).to_a
+        scaling_matrix = Matrix[[1 + (ratio - 1) * nx ** 2, (ratio - 1) * nx * ny],
+                                [(ratio - 1) * nx * ny, 1 + (ratio - 1) * ny ** 2]]
+        @matrices << scaling_matrix
+        self
+      end
+
+      def rotate(radian)
+        rotation_matrix = Matrix[[Math.cos(radian), Math.sin(radian)],
+                                 [-Math.sin(radian), Math.cos(radian)]]
+        @matrices << rotation_matrix
+        self
+      end
+    end
+  end
+end

data/lib/graphdown/graph.rb

@@ -0,0 +1,104 @@
+require "svgen"
+
+module Graphdown
+  class Graph
+    attr_reader :nodes
+
+    PADDING = 10
+
+    def initialize
+      @nodes = []
+      @width = 0
+      @height = 0
+    end
+
+    def <<(node)
+      labels = @nodes.map(&:label)
+      @nodes << node unless labels.include?(node.label)
+    end
+
+    def find_node_by_label(label)
+      (@nodes || []).select { |node| node.label == label }.first
+    end
+
+    def layered_nodes
+      @layered_nodes ||= @nodes.sort_by(&:level).group_by(&:level).values
+    end
+
+    def layer_nodes
+      nodes_with_level = @nodes.select { |node| node.level >= 1 }
+      begin
+        diff_total = 0
+        nodes_with_level.each do |node|
+          node.children.each do |child|
+            if node.level >= child.level
+              child.level += node.level + 1
+              diff_total += node.level + 1
+            end
+          end
+        end
+      end while diff_total != 0
+    end
+
+    def layout_nodes
+      layer_widths = []
+      layer_offset = PADDING
+      layered_nodes.each do |nodes|
+        node_offset = PADDING
+        nodes.each do |node|
+          node.x = node_offset
+          node.y = layer_offset
+          node_offset += node.width + Node::MARGIN_RIGHT
+        end
+        layer_widths << node_offset + PADDING
+        layer_offset += nodes.map(&:height).max + Node::MARGIN_BOTTOM
+      end
+      @width = layer_widths.max
+      @height = layer_offset + PADDING
+    end
+
+    def layout_edges
+      @nodes.each do |node|
+        node.child_edges.each_with_index do |edge, index|
+          edge.origin.x = node.x + (node.width.to_f * (index + 1) / (node.child_edges.count + 1))
+          edge.origin.y = node.y + node.height
+        end
+
+        node.parent_edges.each_with_index do |edge, index|
+          edge.target.x = node.x + (node.width.to_f * (index + 1) / (node.parent_edges.count + 1))
+          edge.target.y = node.y
+        end
+      end
+    end
+
+    def to_svg
+      svg = SVGen::SVG.new(width: @width, height: @height) do |svg|
+        # nodes
+        svg.g(fill: "none", stroke: "black") do |g|
+          @nodes.each do |node|
+            g.rect(x: node.x, y: node.y, width: node.width, height: node.height)
+          end
+        end
+
+        # texts
+        svg.g("font-size" => Node::FONT_SIZE, "font-family" => Node::FONT_FAMILY, "text-anchor" => "middle") do |g|
+          @nodes.each do |node|
+            g.text(node.label, x: node.x + node.width / 2, y: node.y + Node::WORD_HEIGHT + Node::PADDING_TOP / 2)
+          end
+        end
+
+        # edges
+        svg.g(stroke: "black", "stroke-width" => 2) do |g|
+          @nodes.each do |node|
+            node.child_edges.each do |edge|
+              g.path(d: edge.line_d, fill: "none")
+              g.path(d: edge.arrow_d, fill: "black") if edge.forward?
+              g.path(d: edge.reverse_arrow_d, fill: "black") if edge.backward?
+            end
+          end
+        end
+      end
+      svg.generate
+    end
+  end
+end

data/lib/graphdown/node.rb

@@ -0,0 +1,76 @@
+module Graphdown
+  class Node
+    attr_accessor :x, :y, :level
+    attr_reader :label, :parent_edges, :child_edges
+
+    FONT_SIZE = 18
+    FONT_FAMILY = "monospace"
+
+    WORD_HEIGHT = 25
+    PADDING_TOP = 5
+    PADDING_LEFT = 10
+    MARGIN_RIGHT = 20
+    MARGIN_BOTTOM = 50
+
+    def initialize(label)
+      @x = 0
+      @y = 0
+      @level = 0
+      @label = label
+      @parent_edges = []
+      @child_edges = []
+    end
+
+    def width
+      text_width = 13 + (@label.length - 1) * 9
+      text_width + PADDING_LEFT * 2
+    end
+
+    def height
+      WORD_HEIGHT + PADDING_TOP  * 2
+    end
+
+    def connect(child, direction = :forward)
+      child.level = 1
+
+      # Prevent closed path
+      direction = ancestors.include?(child) ? :backward : direction
+      edge = Edge.new(self, child, direction)
+      if direction == :backward
+        self.parent_edges << edge
+        child.child_edges << edge
+      else
+        self.child_edges << edge
+        child.parent_edges << edge
+      end
+    end
+
+    def parents
+      parent_edges.map(&:parent)
+    end
+
+    def ancestors
+      ancestors = []
+      ascend = ->(node) do
+        ancestors << node
+        node.parents.each { |parent| ascend.call(parent) }
+      end
+      parents.each { |parent| ascend.call(parent) }
+      ancestors
+    end
+
+    def children
+      child_edges.map(&:child)
+    end
+
+    def descendants
+      descendants = []
+      descend = ->(node) do
+        descendants << node
+        node.children.each { |child| descend.call(child) }
+      end
+      children.each { |child| descend.call(child) }
+      descendants
+    end
+  end
+end

data/lib/graphdown/parser.rb

@@ -0,0 +1,43 @@
+module Graphdown
+  class Parser
+    attr_reader :graph
+
+    def initialize
+      @graph = Graph.new
+    end
+
+    def parse(text)
+      tokens = text.split(/(?<=[\]>])\s+/)
+      2.step(tokens.size, 2) do |n|
+        # origins
+        origin_labels = tokens[n - 2].scan(/(?<=\[).+?(?=\])/)
+        origins = origin_labels.map do |label|
+          @graph.find_node_by_label(label) || Node.new(label)
+        end
+
+        # targets
+        target_labels = tokens[n].scan(/(?<=\[).+?(?=\])/)
+        targets = target_labels.map do |label|
+          @graph.find_node_by_label(label) || Node.new(label)
+        end
+
+        # edges
+        direction = (tokens[n - 1] == "<->") ? :two_way : :forward
+        origins.each do |origin|
+          @graph << origin
+          targets.each do |target|
+            origin.connect(target, direction)
+            @graph << target
+          end
+        end
+      end
+    end
+
+    def output
+      @graph.layer_nodes
+      @graph.layout_nodes
+      @graph.layout_edges
+      @graph.to_svg
+    end
+  end
+end

data/lib/graphdown/point.rb

@@ -0,0 +1,10 @@
+module Graphdown
+  class Point
+    attr_accessor :x, :y
+
+    def initialize(x = 0, y = 0)
+      @x = x
+      @y = y
+    end
+  end
+end

data/lib/graphdown/renderable.rb

@@ -1,38 +1,16 @@
-require "pathname"
-require "pry"
+require "cgi"
 
 module Graphdown
   module Renderable
-    if defined?(block_code)
-      alias block_code_without_graphdown block_code
-    else
-      def block_code_without_graphdown(code, language)
-        %(<p><code>#{code}</code></p>)
-      end
-    end
-
-    def block_code_with_graphdown(code, language)
-      if language == "dot"
-        if code =~ /digraph\s+(\w+)\s+{/
-          dot_path = Pathname.pwd.join("#{$1}.dot")
-          dot_path.open("wb") { |f| f.write(code) }
-          graph_path = Pathname.pwd.join("#{$1}.png")
-          generate_graph(dot_path.to_s, graph_path.to_s)
-          dot_path.delete
-          %(<img src="#{graph_path.to_s}"/>)
-        else
-          %(<img src="#"/>)
-        end
+    def paragraph(text)
+      if text =~ /^\s?\[.+\]\s?$/
+        parser = Parser.new
+        unescaped_text = CGI.unescape_html(text)
+        unescaped_text.split($/).each { |line| parser.parse(line) }
+        parser.output
       else
-        block_code_without_graphdown(code, language)
+        %(<p>#{text}</p>)
       end
     end
-    alias block_code block_code_with_graphdown
-
-    private
-
-    def generate_graph(source, output)
-      system %(dot -Tpng -o #{output} #{source})
-    end
   end
 end

data/lib/graphdown/version.rb

@@ -0,0 +1,3 @@
+module Graphdown
+  VERSION = "0.1.0"
+end

data/lib/graphdown.rb

@@ -1,5 +1,8 @@
-lib = File.dirname(__FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-
-require "redcarpet"
+require "graphdown/version"
 require "graphdown/renderable"
+require "graphdown/cli"
+require "graphdown/parser"
+require "graphdown/graph"
+require "graphdown/node"
+require "graphdown/edge"
+require "graphdown/point"

data/spec/fixtures/sample.md

@@ -1,18 +1 @@
-# Views transition
-
-```dot
-digraph sample {
-    A [label = "index.html"];
-    B [label = "show.html"];
-    C [label = "new.html"];
-
-    A -> B [dir = both];
-    A -> C;
-    C -> A [label = "redirect"];
-}
-```
-
-- Users visit show.html from index.html.
-- Users visit index.html from show.html.
-- Users visit new.html from index.html.
-- Users are redirected to index.html from new.html.
+[a] -> [b] <-> [c]

data/spec/fixtures/sample.svg

@@ -0,0 +1,18 @@
+<svg width="73" height="275" xmlns="http://www.w3.org/2000/svg">
+  <g fill="none" stroke="black">
+    <rect x="10" y="10" width="33" height="35"/>
+    <rect x="10" y="95" width="33" height="35"/>
+    <rect x="10" y="180" width="33" height="35"/>
+  </g>
+  <g font-size="18" font-family="monospace" text-anchor="middle">
+    <text x="26" y="37">a</text>
+    <text x="26" y="122">b</text>
+    <text x="26" y="207">c</text>
+  </g>
+  <g stroke="black" stroke-width="2">
+    <path d="M 26.5 45 L 26.5 95" fill="none"/>
+    <path d="M 26.5 95 L 31.5 85 L 21.5 85 Z" fill="black"/>
+    <path d="M 26.5 130 L 26.5 180" fill="none"/>
+    <path d="M 26.5 180 L 31.5 170 L 21.5 170 Z" fill="black"/>
+  </g>
+</svg>

data/spec/fixtures/sample_without_graph.md

@@ -1,7 +1,3 @@
-# Routing
+# Sample markdown
 
-```rb
-SampleApp::Application.routes.draw do
-  resources :contents
-end
-```
+Consectetur amet amet deserunt eos ducimus possimus rem nam esse eaque repudiandae? Nemo recusandae vero nesciunt maxime voluptatum accusamus laborum reiciendis soluta! Earum deleniti quaerat quia quisquam commodi dolores facere.

data/spec/graphdown/graph_spec.rb

@@ -0,0 +1,32 @@
+require "spec_helper"
+
+describe Graphdown::Graph do
+  let(:graph) { Graphdown::Graph.new }
+  let(:a) { Graphdown::Node.new("a") }
+  let(:b) { Graphdown::Node.new("b") }
+  let(:c) { Graphdown::Node.new("c") }
+  let(:d) { Graphdown::Node.new("d") }
+  let(:e) { Graphdown::Node.new("e") }
+
+  before do
+    [a, b, c, d, e].each { |node| graph << node }
+  end
+
+  describe "#find_node_by_label" do
+    it "finds node" do
+      node = graph.find_node_by_label("a")
+      expect(node).to equal a
+    end
+  end
+
+  describe "#layered_nodes" do
+    it "returns layered nodes" do
+      e.connect(d)
+      e.connect(c)
+      d.connect(b)
+      b.connect(a)
+      graph.layer_nodes
+      expect(graph.layered_nodes).to match_array [[e], [d, c], [b], [a]]
+    end
+  end
+end

data/spec/graphdown/node_spec.rb

@@ -0,0 +1,35 @@
+require "spec_helper"
+
+describe Graphdown::Node do
+  let(:a) { Graphdown::Node.new("a") }
+  let(:b) { Graphdown::Node.new("b") }
+  let(:c) { Graphdown::Node.new("c") }
+
+  describe "#connect" do
+    it "connects node forward" do
+      a.connect(b)
+      expect(a.children).to be_include(b)
+    end
+
+    it "connects node backward" do
+      a.connect(b, :backward)
+      expect(a.parents).to be_include(b)
+    end
+
+    it "prevents closed path" do
+      a.connect(b)
+      b.connect(c)
+      c.connect(a)
+      expect(a.ancestors).to match_array []
+      expect(a.descendants).to match_array [b, c, c]
+    end
+  end
+
+  describe "#ancestors" do
+    it "returns parents of parents" do
+      a.connect(b)
+      b.connect(c)
+      expect(c.ancestors).to match_array [a, b]
+    end
+  end
+end

data/spec/graphdown/parser_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+
+describe Graphdown::Parser do
+  let(:parser) { Graphdown::Parser.new }
+
+  describe "#parse" do
+    let(:content) { "[a] -> [b] <-> [c]" }
+
+    before do
+      parser.parse(content)
+    end
+
+    it "parses text into nodes" do
+      labels = parser.graph.nodes.map(&:label)
+      expect(labels).to eq ["a", "b", "c"]
+    end
+
+    it "parses arrows into edges" do
+      edges = parser.graph.nodes.map(&:child_edges).flatten
+      directions = edges.map(&:direction)
+      expect(directions).to eq [:forward, :two_way]
+    end
+
+    context "when a node group is given" do
+      let(:content) { "[a] -> [b], [c], [d] -> [e]" }
+
+      it "parses text into nodes" do
+        labels = parser.graph.nodes.map(&:label)
+        expect(labels).to eq ["a", "b", "c", "d", "e"]
+      end
+    end
+  end
+end

data/spec/graphdown/renderable_spec.rb

@@ -1,38 +1,26 @@
 require "spec_helper"
 
-class BaseRenderer < Redcarpet::Render::HTML
-  include Graphdown::Renderable
-end
-
 describe Graphdown::Renderable do
-  let(:markdown) { Redcarpet::Markdown.new(BaseRenderer, fenced_code_blocks: true) }
-  let(:fixtures_path) { Pathname.new("spec/fixtures") }
-  let(:dot_path)      { Pathname.pwd.join("sample.dot") }
-  let(:graph_path)    { Pathname.pwd.join("sample.png") }
-
-  context "when the language of block code is dot" do
-    let(:content) { fixtures_path.join("sample.md").read }
-    after do
-      graph_path.delete if graph_path.exist?
-    end
+  let(:markdown) do
+    renderer = Class.new(Redcarpet::Render::HTML)
+    renderer.send(:include, Graphdown::Renderable)
+    Redcarpet::Markdown.new(renderer)
+  end
+  let(:fixtures_path) { Pathname.new("./spec/fixtures") }
 
-    it "generates img tag" do
+  context "when graph text is passed" do
+    it "generates svg tag" do
+      content = fixtures_path.join("sample.md").read
       html = markdown.render(content)
-      expect(html).to match /<img src="#{graph_path.to_s}"\/>/
-    end
-
-    it "generates graph image file" do
-      markdown.render(content)
-      expect(graph_path).to be_exist
+      expect(html).to match /<svg.+>.+<\/svg>/m
     end
   end
 
-  context "when the language of block code isn't dot" do
-    let(:content) { fixtures_path.join("sample_without_graph.md").read }
-
-    it "generates code tag" do
+  context "when normal text is passed" do
+    it "generates p tag" do
+      content = fixtures_path.join("sample_without_graph.md").read
       html = markdown.render(content)
-      expect(html).to match /<code>.+<\/code>/m
+      expect(html).to match /<p>.+<\/p>/
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require File.expand_path("../lib/graphdown", File.dirname(__FILE__))
 require "pathname"
+require "redcarpet"
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true

metadata

@@ -1,92 +1,136 @@
 --- !ruby/object:Gem::Specification
 name: graphdown
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Naoto Kaneko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-02-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: svgen
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  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
+    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: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.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: 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: 
 email:
 - naoty.k@gmail.com
-executables: []
+executables:
+- graphdown
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
-- examples/parser.rb
-- examples/sample.html
-- examples/sample.md
-- examples/sample.png
+- bin/graphdown
+- examples/path_to_graphdown.html
+- examples/path_to_graphdown.md
+- examples/path_to_graphdown.png
+- examples/servers_arrangement.html
+- examples/servers_arrangement.md
+- examples/servers_arrangement.png
 - graphdown.gemspec
 - lib/graphdown.rb
+- lib/graphdown/cli.rb
+- lib/graphdown/edge.rb
+- lib/graphdown/graph.rb
+- lib/graphdown/node.rb
+- lib/graphdown/parser.rb
+- lib/graphdown/point.rb
 - lib/graphdown/renderable.rb
+- lib/graphdown/version.rb
 - spec/fixtures/sample.md
+- spec/fixtures/sample.svg
 - spec/fixtures/sample_without_graph.md
+- spec/graphdown/graph_spec.rb
+- spec/graphdown/node_spec.rb
+- spec/graphdown/parser_spec.rb
 - spec/graphdown/renderable_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/naoty/graphdown
@@ -99,22 +143,26 @@ 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.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Markdown extension for embedding graphs.
 test_files:
 - spec/fixtures/sample.md
+- spec/fixtures/sample.svg
 - spec/fixtures/sample_without_graph.md
+- spec/graphdown/graph_spec.rb
+- spec/graphdown/node_spec.rb
+- spec/graphdown/parser_spec.rb
 - spec/graphdown/renderable_spec.rb
 - spec/spec_helper.rb

data/examples/parser.rb

@@ -1,13 +0,0 @@
-require "redcarpet"
-require "graphdown"
-
-class BaseRenderer < Redcarpet::Render::HTML
-  include Graphdown::Renderable
-end
-
-markdown = Redcarpet::Markdown.new(BaseRenderer, fenced_code_blocks: true)
-File.open("sample.md", "rb") do |file|
-  content = file.read
-  html = markdown.render(content)
-  File.open("sample.html", "wb") { |file| file.write(html) }
-end

data/examples/sample.html

@@ -1,8 +0,0 @@
-<h1>Views transition</h1>
-<img src="/Users/naoty/workspace/ruby/graphdown/examples/sample.png"/>
-<ul>
-<li>Users visit show.html from index.html.</li>
-<li>Users visit index.html from show.html.</li>
-<li>Users visit new.html from index.html.</li>
-<li>Users are redirected to index.html from new.html.</li>
-</ul>

data/examples/sample.md

@@ -1,18 +0,0 @@
-# Views transition
-
-```dot
-digraph sample {
-    A [label = "index.html"];
-    B [label = "show.html"];
-    C [label = "new.html"];
-
-    A -> B [dir = both];
-    A -> C;
-    C -> A [label = "redirect"];
-}
-```
-
-- Users visit show.html from index.html.
-- Users visit index.html from show.html.
-- Users visit new.html from index.html.
-- Users are redirected to index.html from new.html.