ruby-graphviz 0.9.4 → 0.9.5

data/AUTHORS

@@ -1,6 +1,7 @@
 Gregoire Lejeune <glejeune.lejeune@free.fr>
 Brandon Coleman <metrix1978@gmail.com>
 Dave Burt <http://github.com/dburt>
+Miguel Cabrera <http://mfcabrera.com>
 
 Thanks to :
 

data/ChangeLog

@@ -1,3 +1,8 @@
+0.9.5 :
+* Remove 'mkmf' dependency
+* GraphViz::Edge#[] modification
+* Small correction to escape the dot ('.') character (by Miguel Cabrera)
+
 0.9.4 :
 * Escape nodes and edges attributs
 * GraphViz::escape corrections (by Dave Burt)

data/examples/sample26.rb

@@ -0,0 +1,8 @@
+#!/usr/bin/ruby
+
+$:.unshift( "../lib" );
+require "graphviz"
+
+GraphViz.new(:G){ |g|
+	(g.hello - g.world) [:style => :bold, :label => " axgle says"]
+}.save( :png => "#{$0}.png" )

data/lib/graphviz.rb

@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
 require 'tempfile'
-require 'mkmf'
+# require 'mkmf'
 
 require 'graphviz/node'
 require 'graphviz/edge'
@@ -636,20 +636,46 @@ class GraphViz
   # Escape a string to be acceptable as a node name in a graphviz input file
   #
   def self.escape(str, force = false) #:nodoc:
-    if force or str.match( /\A[a-zA-Z_]+[a-zA-Z0-9_:\.]*\Z/ ).nil?
-      '"' + str.gsub('"', '\\"').gsub("\n", '\\\\n') + '"' 
+    if force or str.match( /\A[a-zA-Z_]+[a-zA-Z0-9_:]*\Z/ ).nil?
+      '"' + str.gsub('"', '\\"').gsub("\n", '\\\\n').gsub(".","\\.") + '"' 
     else
       str
     end
   end
   
-  def find_executable( ) #:nodoc:
-    cmd = find_executable0( @prog )
-    if cmd == nil and @path != nil
-      __cmd = File.join( @path, @prog )
-      cmd = __cmd if File.executable?( __cmd )
+  # def find_executable( ) #:nodoc:
+  #   cmd = find_executable0( @prog )
+  #   if cmd == nil and @path != nil
+  #     __cmd = File.join( @path, @prog )
+  #     cmd = __cmd if File.executable?( __cmd )
+  #   end
+  #   return cmd
+  # end
+  
+  # Since this code is an adaptation of Launchy::Application#find_executable
+  # (http://copiousfreetime.rubyforge.org/launchy/Launchy/Application.html)
+  # it follow is licence :
+  #
+  # Permission to use, copy, modify, and/or distribute this software for any 
+  # purpose with or without fee is hereby granted, provided that the above 
+  # copyright notice and this permission notice appear in all copies.
+  #
+  # THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL WARRANTIES 
+  # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF 
+  # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY 
+  # SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES 
+  # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION 
+  # OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN 
+  # CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  def find_executable(bin = @prog, *paths) #:nodoc:
+    paths = ENV['PATH'].split(File::PATH_SEPARATOR) if paths.empty?
+    paths.each do |path|
+      file = File.join(path,bin)
+      if File.executable?(file) then
+        return file
+      end
     end
-    return cmd
+    return nil
   end
 end
 

data/lib/graphviz/constants.rb

@@ -15,7 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
 module Constants
-  RGV_VERSION = "0.9.4"
+  RGV_VERSION = "0.9.5"
   
   ## Const: Output formats
   FORMATS = [

data/lib/graphviz/edge.rb

@@ -60,10 +60,18 @@ class GraphViz
     end
 
     # 
-    # Get the value of the node attribut +xAttrName+
+    # Set values for edge attributs or 
+    # get the value of the given edge attribut +xAttrName+
     # 
     def []( xAttrName )
-      @oAttrEdge[xAttrName.to_s].clone
+      # Modification by axgle (http://github.com/axgle)
+      if Hash === xAttrName
+        xAttrName.each do |key, value|
+          self[key] = value
+        end
+      else
+        @oAttrEdge[xAttrName.to_s].clone
+      end
     end
     
     def <<( oNode ) #:nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-graphviz
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-21 00:00:00 +02:00
+date: 2009-11-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -86,6 +86,7 @@ files:
 - examples/sample23.rb
 - examples/sample24.rb
 - examples/sample25.rb
+- examples/sample26.rb
 - examples/shapes.rb
 - examples/test.xml
 - examples/testorder.rb