GraphvizR 0.2.0 → 0.3.0

data/History.txt

@@ -1,3 +1,7 @@
+== 0.3.0 / 2007-02-17
+
+* rdot view template for rails
+
 == 0.2.0 / 2007-02-16
 
 * rails plugin

data/Manifest.txt

@@ -6,11 +6,15 @@ bin/graphviz_r
 lib/graphviz_r.rb
 test/test_graphviz_r.rb
 vendor/plugins/rdot
+vendor/plugins/rdot/config
+vendor/plugins/rdot/config/database.yml
 vendor/plugins/rdot/lib
 vendor/plugins/rdot/lib/rdot.rb
+vendor/plugins/rdot/lib/rdot_template.rb
 vendor/plugins/rdot/tasks
 vendor/plugins/rdot/tasks/rdot_tasks.rake
 vendor/plugins/rdot/test/rdot_test.rb
+vendor/plugins/rdot/test/log
 vendor/plugins/rdot/README
 vendor/plugins/rdot/Rakefile
 vendor/plugins/rdot/init.rb

data/lib/graphviz_r.rb

@@ -1,5 +1,5 @@
 class GraphvizR
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
   INDENT_UNIT = '  '
 
   class Attributes
@@ -248,12 +248,19 @@ class GraphvizR
   end
 
   def data(format='png')
-    gv = IO.popen "dot -q -T#{format || 'png'}", "w+"
-    gv.puts to_dot
-    gv.close_write
-    gv.read
-  ensure
-    gv.close
+    format = format.to_s
+    if format == 'dot'
+      to_dot
+    else
+      begin
+        gv = IO.popen "dot -q -T#{format || 'png'}", "w+"
+        gv.puts to_dot
+        gv.close_write
+        gv.read
+      ensure
+        gv.close
+      end
+    end
   end
 
   def output(filename=nil, format='png')

data/test/test_graphviz_r.rb

@@ -28,7 +28,7 @@ class TestGraphvizR < Test::Unit::TestCase
                         :beta => :delta,
                         :delta => 'size'
                         )
-    #assert_equal <<-end_of_string.gsub(/\s/, ''), gvr.gsub(/\s/, '')
+
     assert_equal <<-end_of_string, gvr
 digraph sample {
   graph [label = "example", size = "1.5, 2.5"];
@@ -79,7 +79,7 @@ digraph sample {
                         :node2 => [:node1, :p_center],
                         {:node2 => [:node1, :p_right]} => {:label => 'record'}
                         )
-    #assert_equal <<-end_of_string.gsub(/\s/, ''), gvr.gsub(/\s/, '')
+
     assert_equal <<-end_of_string, gvr
 digraph sample {
   graph [size = "1.5, 2.5"];
@@ -146,7 +146,7 @@ digraph sample {
                         {:c => :f} => {:lhead => :cluster1},
                         {:a => :f} => {:ltail => :cluster0, :lhead => :cluster1}
                         )
-    #assert_equal <<-end_of_string.gsub(/\s/, ''), gvr.gsub(/\s/, '')
+
     assert_equal <<-end_of_string, gvr
 digraph sample {
   subgraph cluster0 {
@@ -219,7 +219,6 @@ digraph sample {
     (gvr.beta - gvr.delta) [:label => 'label2']
     gvr.delta - gvr[:size]
 
-    #assert_equal <<-end_of_string.gsub(/\s/, ''), gvr.to_dot.gsub(/\s/, '')
     assert_equal <<-end_of_string, gvr.to_dot
 graph sample {
   graph [label = "example", size = "1.5, 2.5"];
@@ -249,7 +248,6 @@ graph sample {
     (gvr.c - gvr.d) [:ltail => :cluster0]
     (gvr.c - gvr.f) [:lhead => :cluster1]
 
-    #assert_equal <<-end_of_string.gsub(/\s/, ''), gvr.to_dot.gsub(/\s/, '')
     assert_equal <<-end_of_string, gvr.to_dot
 graph sample {
   subgraph cluster0 {
@@ -266,6 +264,27 @@ graph sample {
   b -- d;
   c -- d [ltail = cluster0];
   c -- f [lhead = cluster1];
+}
+    end_of_string
+  end
+
+  def test_data
+    gvr = GraphvizR.new 'sample'
+    gvr.graph [:label => 'example', :size => '1.5, 2.5'] 
+    gvr.beta [:shape => :box]                            
+    gvr.alpha >> gvr.beta
+    (gvr.alpha >> gvr.gamma) [:label => 'label1']
+    (gvr.beta >> gvr.delta) [:label => 'label2']
+    gvr.delta >> gvr[:size]
+
+    assert_equal <<-end_of_string, gvr.data(:dot)
+digraph sample {
+  graph [label = "example", size = "1.5, 2.5"];
+  beta [shape = box];
+  alpha -> beta;
+  alpha -> gamma [label = "label1"];
+  beta -> delta [label = "label2"];
+  delta -> size;
 }
     end_of_string
   end

data/vendor/plugins/rdot/config/database.yml

@@ -0,0 +1,20 @@
+development:
+  database: hoge
+  adapter: mysql
+  username: hoge
+  password: root
+  host: localhost
+
+test:
+  database: hoge
+  adapter: mysql
+  username: hoge
+  password: hoge
+  host: localhost
+
+production:
+  database: hoge
+  adapter: mysql
+  username: hoge
+  password: hoge
+  host: localhost

data/vendor/plugins/rdot/init.rb

@@ -1 +1,4 @@
 require 'rdot'
+require 'rdot_template'
+
+ActionView::Base.register_template_handler 'rdot', RdotTemplate

data/vendor/plugins/rdot/lib/rdot.rb

@@ -15,9 +15,33 @@ class ActionController::Base
   def render_rdot(options=nil, &block)
     options ||= {}
     format = options[:format] || 'png'
-    content_type = format == 'svg' ? 'application/xml' : "image/#{format}"
+    content_type = 
+      case format
+      when 'svg'
+        'application/xml'
+      when 'dot'
+        'text/plain'
+      else
+        "image/#{format}"
+      end
     gvr = GraphvizR.new 'generated'
-    gvr.instance_eval &block
+    if block.arity == 1
+      block.call gvr
+    else
+      copy_instance_variables block, gvr
+      gvr.instance_eval &block
+    end
     send_data gvr.data(format), :type => content_type #,disposition => 'inline'
   end
+
+private
+
+  def copy_instance_variables(from_block, to_obj)
+    block_instance_variables = eval 'instance_variables', from_block.binding
+    block_instance_variables.each do |name|
+      to_obj.instance_variable_set name.to_sym, eval(name, from_block.binding)
+      #to_obj.class.__send__ :attr_accessor, name[1..-1]
+      #to_obj.send "#{name[1..-1]}=", eval(name, from_block.binding)
+    end
+  end
 end

data/vendor/plugins/rdot/lib/rdot_template.rb

@@ -0,0 +1,19 @@
+class RdotTemplate
+  def initialize(view)
+    @view = view
+  end
+
+  def render(template, local_assigns)
+    params = @view.assigns['params']
+    format = params['format'] || 'png'
+    content_type = params['content_type'] || "image/#{format}"
+
+    gvr = GraphvizR.new 'generated'
+    @view.assigns.each do |name, value|
+      gvr.instance_variable_set(('@' + name).to_sym, value)
+    end
+    gvr.instance_eval template
+    @view.controller.__send__ :send_data, gvr.data(format), :type => content_type
+  end
+end
+

data/vendor/plugins/rdot/test/rdot_test.rb

@@ -1,8 +1,56 @@
+require File.dirname(__FILE__) + '/test_helper'
 require 'test/unit'
 
+class RdotGenController < ActionController::Base
+  def call_with_gvr
+    local_var = 'node1_label'
+
+    render :rdot do |gvr|
+      gvr.graph [:size => '1.5, 2.5']
+      gvr.node1 [:label => local_var]
+      gvr.node2 [:label => 'node2_label']
+      gvr.node1 >> gvr.node2
+    end
+  end
+
+  def call_with_nothing
+    local_var = 'node1_label'
+    @instance_var = 'node2_label'
+
+    render :rdot do
+      graph [:size => '1.5, 2.5']
+      node1 [:label => local_var]
+      node2 [:label => @instance_var]
+      node1 >> node2
+    end
+  end
+end
+
 class RdotTest < Test::Unit::TestCase
-  # Replace this with your real tests.
-  def test_this_plugin
-    flunk
+  def setup
+    @controller = RdotGenController.new
+    @request = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
+  end
+
+  def test_call_with_gvr
+    get_and_assert :call_with_gvr
+  end
+  
+  def test_call_with_nothing
+    get_and_assert :call_with_nothing
+  end
+
+  def get_and_assert(action)
+    get action, :format => 'dot'
+    assert_response :success
+    assert <<-end_of_string, @response.body
+generated {
+  graph [];
+  node1 [label = 'node1_label'];
+  node2 [label = 'node2_label'];
+  node1 -> node2;
+}
+    end_of_string
   end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: GraphvizR
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-02-15 00:00:00 +09:00
+  version: 0.3.0
+date: 2007-02-16 00:00:00 +09:00
 summary: The author was too lazy to write a summary
 require_paths: 
   - lib
@@ -38,11 +38,15 @@ files:
   - lib/graphviz_r.rb
   - test/test_graphviz_r.rb
   - vendor/plugins/rdot
+  - vendor/plugins/rdot/config
+  - vendor/plugins/rdot/config/database.yml
   - vendor/plugins/rdot/lib
   - vendor/plugins/rdot/lib/rdot.rb
+  - vendor/plugins/rdot/lib/rdot_template.rb
   - vendor/plugins/rdot/tasks
   - vendor/plugins/rdot/tasks/rdot_tasks.rake
   - vendor/plugins/rdot/test/rdot_test.rb
+  - vendor/plugins/rdot/test/log
   - vendor/plugins/rdot/README
   - vendor/plugins/rdot/Rakefile
   - vendor/plugins/rdot/init.rb