ruby-graphviz 0.9.18 → 0.9.19

data/AUTHORS

@@ -10,6 +10,7 @@ hipe <http://github.com/hipe>
 Stefan Huber <http://github.com/MSNexploder>
 Nigel Thorne <http://github.com/NigelThorne>
 Rolf Timmermans <http://github.com/rolftimmermans>
+Jonas Elfström <http://github.com/jonelf>
 
 Thanks to :
 

data/README.rdoc

@@ -16,6 +16,18 @@ Interface to the GraphViz graphing tool
 
 == CHANGELOG
 
+=== 0.9.19 :
+* Add strict digraph support (by Jonas Elfström) (see sample58.rb)
+    g = GraphViz.new(:G, :type => "strict digraph")
+    # or 
+    g = GraphViz.new(:G, :type => "digraph", :strict => true)
+    # or 
+    g = GraphViz.digraph(:G, :strict => true)
+    # or 
+    g = GraphViz.strict_digraph(:G)
+* Add GraphViz#root_graph, Node#root_graph, Edge#root_graph
+* The GraphML parser now accept a graphml file or string
+
 === 0.9.18 :
 * JRuby bug correction (by Nigel Thorne)
 * Fix autoload problem for Rubinius (by Rolf Timmermans)

data/examples/dot/this_crach_with_dot_2.20.dot

@@ -0,0 +1,24 @@
+graph A
+   {
+   graph [nodesep="0.10", size="7,5", bb="0,0,737,832"];
+   node [fontsize="12.00", shape=circle, height = 0.4 width = 0.4 fixedsize="true"];
+   779 -- 780 [label = 6.5 style = "bold" ];
+   522 -- 523 [label = 6.2 style = "bold" ];
+   527 -- 528 [label = 6.0 style = "bold" ];
+   752 -- 753 [label = 5.1 style = "solid"];
+   576 -- 577 [label = 5.1 style = "solid"];
+   578 -- 579 [label = 4.8 style = "dashed"];
+   757 -- 758 [label = 4.6 style = "dashed"];
+   696 -- 697 [label = 4.5 style = "dashed"];
+   542 -- 543 [label = 4.4 style = "dashed"];
+   723 -- 724 [label = 4.4 style = "dashed"];
+   495 -- 496 [label = 4.4 style = "dashed"];
+   459 -- 460 [label = 4.3 style = "dashed"];
+   784 -- 785 [label = 4.2 style = "dashed"];
+   518 -- 519 [label = 4.2 style = "dashed"];
+   894 -- 895 [label = 4.1 style = "dashed"];
+   435 -- 436 [label = 4.1 style = "dashed"];
+   322 -- 323 [label = 4.1 style = "dashed"];
+   545 -- 546 [label = 4.1 style = "dashed"];
+   513 -- 514 [label = 4.0 style = "dashed"];
+   }

data/examples/sample57.rb

@@ -2,5 +2,6 @@ $:.unshift( "../lib" )
 
 require 'graphviz/graphml'
 
-g = GraphViz::GraphML.new( "graphml/cluster.graphml" )
-g.graph.output( :path => "/usr/local/bin", :png => "#{$0}.png" )
+graphml = File.join( File.dirname( File.expand_path( __FILE__ ) ), "graphml", "cluster.graphml" )
+g = GraphViz::GraphML.new( graphml )
+g.graph.output( :png => "#{$0}.png" )

data/examples/sample58.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/ruby
+
+# By Jonas Elfström - http://github.com/jonelf
+$:.unshift( "../lib" )
+require 'graphviz'
+
+@min_level=1
+@max_level=12
+@max_depth=10
+start_level=6
+
+@g = GraphViz.new(:G, :type => "strict digraph")
+# or @g = GraphViz.new(:G, :type => "digraph", :strict => true)
+# or @g = GraphViz.digraph(:G, :strict => true)
+# or @g = GraphViz.strict_digraph(:G)
+
+def add_node(level, depth, parent)
+  if depth<@max_depth
+    current=[level, depth].join(",")
+
+    sub=level<=>@min_level
+    add=@max_level<=>level
+    add_node(level-sub, depth+1, current)
+    add_node(level+add, depth+1, current)
+
+    @g.add_node(current).label=level.to_s
+    @g.add_edge(parent, current) unless parent=="00"
+  end
+end
+
+add_node(start_level, 0, "00")
+
+@g.output( :png => "#{$0}.png" )

data/lib/graphviz.rb

@@ -479,7 +479,8 @@ class GraphViz
       
       @output = hOutput if hOutput.size > 0
   
-      xDOTScript = ("#{@oGraphType} #{GraphViz.escape(@name)} {\n" << xDOTScript).gsub( "\0", "" )
+      xStict = ((@strict && @oGraphType == "digraph") ? "strict " : "")
+      xDOTScript = ("#{xStict}#{@oGraphType} #{GraphViz.escape(@name)} {\n" << xDOTScript).gsub( "\0", "" )
 
       xOutputString = (@filename == String ||
         @output.any? {|format, file| file == String })
@@ -599,6 +600,13 @@ class GraphViz
     @oParentGraph
   end
   
+  #
+  # Return the root graph
+  #
+  def root_graph
+    return( (self.pg.nil?) ? self : self.pg.root_graph )
+  end
+  
   def self.commonGraph( o1, o2 ) #:nodoc:
     g1 = o1.pg
     g2 = o2.pg
@@ -685,10 +693,10 @@ class GraphViz
   # 
   # Options :
   # * :output : Output format (Constants::FORMATS) (default : dot)
-  # * :file : Output file name (default : none)
+  # * :file : Output file name (default : nil)
   # * :use : Program to use (Constants::PROGRAMS) (default : dot)
   # * :path : Program PATH
-  # * :parent : Parent graph (default : none)
+  # * :parent : Parent graph (default : nil)
   # * :type : Graph type (Constants::GRAPHTYPE) (default : digraph)
   # * :errors : DOT error level (default 1)
   #   * 0 = Error + Warning
@@ -705,6 +713,7 @@ class GraphViz
     @extlibs  = @@extlibs
     @output   = {}
     @nothugly = false
+    @strict   = false
     
     @elements_order = GraphViz::Elements::new()
 
@@ -744,6 +753,8 @@ class GraphViz
           @oGraphType = xValue.to_s
         when "path"
           @path = xValue.split( "," ).map{ |x| x.strip }
+        when "strict"
+          @strict = (xValue ? true : false)
         when "errors"
           @errors = xValue
         when "extlibs"
@@ -756,13 +767,33 @@ class GraphViz
     yield( self ) if( block )
   end
   
+  #
+  # Create a new undirected graph
+  #
+  # See also GraphViz::new
+  #
   def self.graph( xGraphName, hOpts = {}, &block )
     new( xGraphName, hOpts.symbolize_keys.merge( {:type => "graph"} ), &block )
   end
+
+  #
+  # Create a new directed graph
+  #
+  # See also GraphViz::new
+  #
   def self.digraph( xGraphName, hOpts = {}, &block )
     new( xGraphName, hOpts.symbolize_keys.merge( {:type => "digraph"} ), &block )
   end
   
+  #
+  # Create a new strict directed graph
+  #
+  # See also GraphViz::new
+  #
+  def self.strict_digraph( xGraphName, hOpts = {}, &block )
+    new( xGraphName, hOpts.symbolize_keys.merge( {:type => "digraph", :strict => true} ), &block )
+  end
+  
   #
   # Escape a string to be acceptable as a node name in a graphviz input file
   #

data/lib/graphviz/constants.rb

@@ -40,7 +40,7 @@
 #   C => cluster
 #
 module Constants
-  RGV_VERSION = "0.9.18"
+  RGV_VERSION = "0.9.19"
   
   ## Const: Output formats
   FORMATS = [
@@ -103,7 +103,8 @@ module Constants
   ## Const: graphs type
   GRAPHTYPE = [
     "digraph",
-	  "graph"
+	  "graph",
+	  "strict digraph"
   ]
 
   def self.getAttrsFor( x )

data/lib/graphviz/edge.rb

@@ -35,7 +35,7 @@ class GraphViz
     # * vNodeTwo : Second node (can be a GraphViz::Node or a node ID)
     # * oGParrent : Graph 
     #
-    def initialize( vNodeOne, vNodeTwo, oGParrent = nil )
+    def initialize( vNodeOne, vNodeTwo, oGParrent )
       @xNodeOne, @xNodeOnePort = getNodeNameAndPort( vNodeOne )
 	    # if vNodeOne.class == String
       #   @xNodeOne = vNodeOne
@@ -64,7 +64,8 @@ class GraphViz
         GraphViz.escape(@xNodeOne, true) + ":#{@xNodeOnePort}"
       end
     end
-
+    alias :tail_node :node_one
+    
     # Return the node two as string (so with port if any)
     def node_two( with_port = true )
       if @xNodeTwoPort.nil? or with_port == false
@@ -73,7 +74,7 @@ class GraphViz
 	      GraphViz.escape(@xNodeTwo, true) + ":#{@xNodeTwoPort}"
       end
     end
-    
+    alias :head_node :node_two
     #
 	  # Return the index of the edge
 	  #
@@ -120,6 +121,17 @@ class GraphViz
     alias :- :<< #:nodoc:
     alias :>> :<< #:nodoc:
     
+    #
+    # Return the root graph
+    #
+    def root_graph
+      return( (self.pg.nil?) ? nil : self.pg.root_graph )
+    end
+    
+    def pg #:nodoc:
+      @oGParrent
+    end
+    
     #
     # Set edge attributs
     #

data/lib/graphviz/graphml.rb

@@ -35,8 +35,9 @@ class GraphViz
       'undirected' => :graph
     }
     
-    def initialize( xFile )
-      @xmlDoc = REXML::Document::new( File::new( xFile ) )
+    def initialize( file_or_str )
+      data = ((File.file?( file_or_str )) ? File::new(file_or_str) : file_or_str) 
+      @xmlDoc = REXML::Document::new( data )
       @attributs = {
         :nodes => {},
         :edges => {},

data/lib/graphviz/node.rb

@@ -31,7 +31,7 @@ class GraphViz
     # * xNodeName : ID of the node
     # * oGParrent : Graph 
     # 
-    def initialize( xNodeName, oGParrent = nil )
+    def initialize( xNodeName, oGParrent )
       @xNodeName = xNodeName
       @oGParrent = oGParrent
       @oAttrNode = GraphViz::Attrs::new( nil, "node", NODESATTRS )
@@ -54,7 +54,7 @@ class GraphViz
 	  end
 	  
 	  #
-	  # Return the index of the node
+	  # Return the node index
 	  #
 	  def index
 	    @index
@@ -62,7 +62,14 @@ class GraphViz
     def index=(i) #:nodoc:
       @index = i if @index == nil
     end
-	
+
+    #
+    # Return the root graph
+    #
+    def root_graph
+      return( (self.pg.nil?) ? nil : self.pg.root_graph )
+    end
+    
 	  # 
     # Set value +xAttrValue+ to the node attribut +xAttrName+
     # 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-graphviz
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 9
-  - 18
-  version: 0.9.18
+  - 19
+  version: 0.9.19
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-07 00:00:00 +02:00
+date: 2010-11-02 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -58,6 +58,7 @@ files:
 - examples/dot/siblings.dot
 - examples/dot/test.dot
 - examples/dot/test_parse.rb
+- examples/dot/this_crach_with_dot_2.20.dot
 - examples/dot/unix.dot
 - examples/graphml/attributes.ext.graphml
 - examples/graphml/attributes.graphml
@@ -127,6 +128,7 @@ files:
 - examples/sample55.rb
 - examples/sample56.rb
 - examples/sample57.rb
+- examples/sample58.rb
 - examples/sample99.rb
 - examples/sdlshapes/README
 - examples/sdlshapes/sdl.ps
@@ -162,9 +164,6 @@ files:
 - lib/graphviz/utils.rb
 - lib/graphviz/xml.rb
 - lib/graphviz.rb
-- lib/src/html_string_parser.gv
-- lib/src/html_string_parser.rb
-- lib/src/html_string_parser.rl
 - test/support.rb
 - test/test_examples.rb
 - test/test_init.rb

data/lib/src/html_string_parser.gv

@@ -1,43 +0,0 @@
-digraph html_string_lexer {
-	rankdir=LR;
-	node [ shape = point ];
-	ENTRY;
-	en_22;
-	node [ shape = circle, height = 0.2 ];
-	node [ fixedsize = true, height = 0.65, shape = doublecircle ];
-	22;
-	node [ shape = circle ];
-	1 -> 2 [ label = "'/'" ];
-	1 -> 10 [ label = "'B'" ];
-	1 -> 13 [ label = "'F'" ];
-	1 -> 18 [ label = "'b'" ];
-	1 -> 19 [ label = "'f'" ];
-	2 -> 3 [ label = "'F'" ];
-	2 -> 7 [ label = "'f'" ];
-	3 -> 4 [ label = "'O'" ];
-	4 -> 5 [ label = "'N'" ];
-	5 -> 6 [ label = "'T'" ];
-	6 -> 22 [ label = "'>' / last3, initts" ];
-	7 -> 8 [ label = "'o'" ];
-	8 -> 9 [ label = "'n'" ];
-	9 -> 6 [ label = "'t'" ];
-	10 -> 11 [ label = "'R'" ];
-	11 -> 12 [ label = "'\\t'..'\\r', SP" ];
-	11 -> 22 [ label = "'>' / last1, initts" ];
-	12 -> 22 [ label = "'>' / last1, initts" ];
-	12 -> 12 [ label = "DEF" ];
-	13 -> 14 [ label = "'O'" ];
-	14 -> 15 [ label = "'N'" ];
-	15 -> 16 [ label = "'T'" ];
-	16 -> 17 [ label = "'\\t'..'\\r', SP" ];
-	16 -> 22 [ label = "'>' / last2, initts" ];
-	17 -> 22 [ label = "'>' / last2, initts" ];
-	17 -> 17 [ label = "DEF" ];
-	18 -> 11 [ label = "'r'" ];
-	19 -> 20 [ label = "'o'" ];
-	20 -> 21 [ label = "'n'" ];
-	21 -> 16 [ label = "'t'" ];
-	22 -> 1 [ label = "'<' / ts" ];
-	ENTRY -> 22 [ label = "IN" ];
-	en_22 -> 22 [ label = "main" ];
-}

data/lib/src/html_string_parser.rb

@@ -1,422 +0,0 @@
-
-# line 1 "html_string_parser.rl"
-
-# line 20 "html_string_parser.rl"
-
-
-
-# line 9 "html_string_parser.rb"
-class << self
-	attr_accessor :_html_string_lexer_actions
-	private :_html_string_lexer_actions, :_html_string_lexer_actions=
-end
-self._html_string_lexer_actions = [
-	0, 1, 0, 1, 1, 1, 8, 1, 
-	9, 2, 2, 3, 2, 2, 4, 2, 
-	2, 5, 2, 2, 6, 2, 2, 7
-]
-
-class << self
-	attr_accessor :_html_string_lexer_key_offsets
-	private :_html_string_lexer_key_offsets, :_html_string_lexer_key_offsets=
-end
-self._html_string_lexer_key_offsets = [
-	0, 1, 1, 6, 8, 9, 10, 11, 
-	12, 13, 14, 15, 16, 20, 21, 22, 
-	23, 24, 27, 28, 39, 51, 64, 76, 
-	88, 100, 112, 113, 114, 115, 116, 117, 
-	118, 119
-]
-
-class << self
-	attr_accessor :_html_string_lexer_trans_keys
-	private :_html_string_lexer_trans_keys, :_html_string_lexer_trans_keys=
-end
-self._html_string_lexer_trans_keys = [
-	60, 47, 66, 70, 98, 102, 70, 102, 
-	79, 78, 84, 62, 111, 110, 116, 82, 
-	32, 62, 9, 13, 62, 79, 78, 84, 
-	32, 9, 13, 62, 60, 95, 97, 99, 
-	108, 101, 103, 110, 111, 115, 116, 47, 
-	60, 95, 97, 99, 108, 101, 103, 110, 
-	111, 115, 116, 60, 70, 95, 97, 99, 
-	102, 108, 101, 103, 110, 111, 115, 116, 
-	60, 79, 95, 97, 99, 108, 101, 103, 
-	110, 111, 115, 116, 60, 78, 95, 97, 
-	99, 108, 101, 103, 110, 111, 115, 116, 
-	60, 84, 95, 97, 99, 108, 101, 103, 
-	110, 111, 115, 116, 60, 62, 95, 97, 
-	99, 108, 101, 103, 110, 111, 115, 116, 
-	111, 110, 116, 62, 114, 111, 110, 116, 
-	0
-]
-
-class << self
-	attr_accessor :_html_string_lexer_single_lengths
-	private :_html_string_lexer_single_lengths, :_html_string_lexer_single_lengths=
-end
-self._html_string_lexer_single_lengths = [
-	1, 0, 5, 2, 1, 1, 1, 1, 
-	1, 1, 1, 1, 2, 1, 1, 1, 
-	1, 1, 1, 5, 6, 7, 6, 6, 
-	6, 6, 1, 1, 1, 1, 1, 1, 
-	1, 1
-]
-
-class << self
-	attr_accessor :_html_string_lexer_range_lengths
-	private :_html_string_lexer_range_lengths, :_html_string_lexer_range_lengths=
-end
-self._html_string_lexer_range_lengths = [
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 1, 0, 0, 0, 
-	0, 1, 0, 3, 3, 3, 3, 3, 
-	3, 3, 0, 0, 0, 0, 0, 0, 
-	0, 0
-]
-
-class << self
-	attr_accessor :_html_string_lexer_index_offsets
-	private :_html_string_lexer_index_offsets, :_html_string_lexer_index_offsets=
-end
-self._html_string_lexer_index_offsets = [
-	0, 2, 3, 9, 12, 14, 16, 18, 
-	20, 22, 24, 26, 28, 32, 34, 36, 
-	38, 40, 43, 45, 54, 64, 75, 85, 
-	95, 105, 115, 117, 119, 121, 123, 125, 
-	127, 129
-]
-
-class << self
-	attr_accessor :_html_string_lexer_indicies
-	private :_html_string_lexer_indicies, :_html_string_lexer_indicies=
-end
-self._html_string_lexer_indicies = [
-	1, 0, 0, 4, 5, 6, 7, 8, 
-	0, 9, 10, 0, 11, 0, 12, 0, 
-	13, 0, 14, 0, 15, 0, 16, 0, 
-	13, 0, 17, 0, 18, 19, 18, 0, 
-	19, 18, 20, 0, 21, 0, 22, 0, 
-	23, 23, 0, 24, 23, 26, 0, 0, 
-	0, 0, 0, 0, 0, 25, 27, 26, 
-	0, 0, 0, 0, 0, 0, 0, 25, 
-	26, 28, 0, 0, 0, 29, 0, 0, 
-	0, 0, 25, 26, 30, 0, 0, 0, 
-	0, 0, 0, 0, 25, 26, 31, 0, 
-	0, 0, 0, 0, 0, 0, 25, 26, 
-	32, 0, 0, 0, 0, 0, 0, 0, 
-	25, 26, 33, 0, 0, 0, 0, 0, 
-	0, 0, 25, 34, 0, 35, 0, 36, 
-	0, 37, 0, 17, 0, 38, 0, 39, 
-	0, 22, 0, 0
-]
-
-class << self
-	attr_accessor :_html_string_lexer_trans_targs
-	private :_html_string_lexer_trans_targs, :_html_string_lexer_trans_targs=
-end
-self._html_string_lexer_trans_targs = [
-	1, 2, 0, 0, 3, 11, 14, 30, 
-	31, 4, 8, 5, 6, 7, 1, 9, 
-	10, 12, 13, 1, 15, 16, 17, 18, 
-	19, 19, 20, 21, 22, 26, 23, 24, 
-	25, 19, 27, 28, 29, 1, 32, 33
-]
-
-class << self
-	attr_accessor :_html_string_lexer_trans_actions
-	private :_html_string_lexer_trans_actions, :_html_string_lexer_trans_actions=
-end
-self._html_string_lexer_trans_actions = [
-	21, 0, 7, 5, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 18, 0, 
-	0, 0, 0, 9, 0, 0, 0, 0, 
-	15, 21, 0, 0, 0, 0, 0, 0, 
-	0, 12, 0, 0, 0, 12, 0, 0
-]
-
-class << self
-	attr_accessor :_html_string_lexer_to_state_actions
-	private :_html_string_lexer_to_state_actions, :_html_string_lexer_to_state_actions=
-end
-self._html_string_lexer_to_state_actions = [
-	1, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0
-]
-
-class << self
-	attr_accessor :_html_string_lexer_from_state_actions
-	private :_html_string_lexer_from_state_actions, :_html_string_lexer_from_state_actions=
-end
-self._html_string_lexer_from_state_actions = [
-	3, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0, 0, 0, 0, 0, 0, 0, 
-	0, 0
-]
-
-class << self
-	attr_accessor :_html_string_lexer_eof_trans
-	private :_html_string_lexer_eof_trans, :_html_string_lexer_eof_trans=
-end
-self._html_string_lexer_eof_trans = [
-	0, 3, 4, 4, 4, 4, 4, 4, 
-	4, 4, 4, 4, 4, 4, 4, 4, 
-	4, 4, 4, 3, 4, 4, 4, 4, 
-	4, 4, 4, 4, 4, 4, 4, 4, 
-	4, 4
-]
-
-class << self
-	attr_accessor :html_string_lexer_start
-end
-self.html_string_lexer_start = 0;
-class << self
-	attr_accessor :html_string_lexer_first_final
-end
-self.html_string_lexer_first_final = 0;
-class << self
-	attr_accessor :html_string_lexer_error
-end
-self.html_string_lexer_error = -1;
-
-class << self
-	attr_accessor :html_string_lexer_en_main
-end
-self.html_string_lexer_en_main = 0;
-
-
-# line 23 "html_string_parser.rl"
-
-# ---------- %
-
-def test( data )
-	puts "Check : #{data}"
-	data = data.unpack("c*") if(data.is_a?(String))
-	eof = data.length
-
-	
-# line 204 "html_string_parser.rb"
-begin
-	p ||= 0
-	pe ||= data.length
-	cs = html_string_lexer_start
-	ts = nil
-	te = nil
-	act = 0
-end
-
-# line 32 "html_string_parser.rl"
-	
-# line 216 "html_string_parser.rb"
-begin
-	_klen, _trans, _keys, _acts, _nacts = nil
-	_goto_level = 0
-	_resume = 10
-	_eof_trans = 15
-	_again = 20
-	_test_eof = 30
-	_out = 40
-	while true
-	_trigger_goto = false
-	if _goto_level <= 0
-	if p == pe
-		_goto_level = _test_eof
-		next
-	end
-	end
-	if _goto_level <= _resume
-	_acts = _html_string_lexer_from_state_actions[cs]
-	_nacts = _html_string_lexer_actions[_acts]
-	_acts += 1
-	while _nacts > 0
-		_nacts -= 1
-		_acts += 1
-		case _html_string_lexer_actions[_acts - 1]
-			when 1 then
-# line 1 "NONE"
-		begin
-ts = p
-		end
-# line 246 "html_string_parser.rb"
-		end # from state action switch
-	end
-	if _trigger_goto
-		next
-	end
-	_keys = _html_string_lexer_key_offsets[cs]
-	_trans = _html_string_lexer_index_offsets[cs]
-	_klen = _html_string_lexer_single_lengths[cs]
-	_break_match = false
-	
-	begin
-	  if _klen > 0
-	     _lower = _keys
-	     _upper = _keys + _klen - 1
-
-	     loop do
-	        break if _upper < _lower
-	        _mid = _lower + ( (_upper - _lower) >> 1 )
-
-	        if data[p] < _html_string_lexer_trans_keys[_mid]
-	           _upper = _mid - 1
-	        elsif data[p] > _html_string_lexer_trans_keys[_mid]
-	           _lower = _mid + 1
-	        else
-	           _trans += (_mid - _keys)
-	           _break_match = true
-	           break
-	        end
-	     end # loop
-	     break if _break_match
-	     _keys += _klen
-	     _trans += _klen
-	  end
-	  _klen = _html_string_lexer_range_lengths[cs]
-	  if _klen > 0
-	     _lower = _keys
-	     _upper = _keys + (_klen << 1) - 2
-	     loop do
-	        break if _upper < _lower
-	        _mid = _lower + (((_upper-_lower) >> 1) & ~1)
-	        if data[p] < _html_string_lexer_trans_keys[_mid]
-	          _upper = _mid - 2
-	        elsif data[p] > _html_string_lexer_trans_keys[_mid+1]
-	          _lower = _mid + 2
-	        else
-	          _trans += ((_mid - _keys) >> 1)
-	          _break_match = true
-	          break
-	        end
-	     end # loop
-	     break if _break_match
-	     _trans += _klen
-	  end
-	end while false
-	_trans = _html_string_lexer_indicies[_trans]
-	end
-	if _goto_level <= _eof_trans
-	cs = _html_string_lexer_trans_targs[_trans]
-	if _html_string_lexer_trans_actions[_trans] != 0
-		_acts = _html_string_lexer_trans_actions[_trans]
-		_nacts = _html_string_lexer_actions[_acts]
-		_acts += 1
-		while _nacts > 0
-			_nacts -= 1
-			_acts += 1
-			case _html_string_lexer_actions[_acts - 1]
-when 2 then
-# line 1 "NONE"
-		begin
-te = p+1
-		end
-when 3 then
-# line 12 "html_string_parser.rl"
-		begin
-act = 1;		end
-when 4 then
-# line 13 "html_string_parser.rl"
-		begin
-act = 2;		end
-when 5 then
-# line 14 "html_string_parser.rl"
-		begin
-act = 3;		end
-when 6 then
-# line 15 "html_string_parser.rl"
-		begin
-act = 4;		end
-when 7 then
-# line 16 "html_string_parser.rl"
-		begin
-act = 5;		end
-when 8 then
-# line 16 "html_string_parser.rl"
-		begin
-te = p
-p = p - 1; begin  puts "\t =>string"  end
-		end
-when 9 then
-# line 1 "NONE"
-		begin
-	case act
-	when 1 then
-	begin begin p = ((te))-1; end
- puts "\t =><BR>" end
-	when 2 then
-	begin begin p = ((te))-1; end
- puts "\t =><FONT>...</FONT>"end
-	when 3 then
-	begin begin p = ((te))-1; end
- puts "\t =><FONT>"end
-	when 4 then
-	begin begin p = ((te))-1; end
- puts "\t =></FONT>"end
-	when 5 then
-	begin begin p = ((te))-1; end
- puts "\t =>string" end
-end 
-			end
-# line 365 "html_string_parser.rb"
-			end # action switch
-		end
-	end
-	if _trigger_goto
-		next
-	end
-	end
-	if _goto_level <= _again
-	_acts = _html_string_lexer_to_state_actions[cs]
-	_nacts = _html_string_lexer_actions[_acts]
-	_acts += 1
-	while _nacts > 0
-		_nacts -= 1
-		_acts += 1
-		case _html_string_lexer_actions[_acts - 1]
-when 0 then
-# line 1 "NONE"
-		begin
-ts = nil;		end
-# line 385 "html_string_parser.rb"
-		end # to state action switch
-	end
-	if _trigger_goto
-		next
-	end
-	p += 1
-	if p != pe
-		_goto_level = _resume
-		next
-	end
-	end
-	if _goto_level <= _test_eof
-	if p == eof
-	if _html_string_lexer_eof_trans[cs] > 0
-		_trans = _html_string_lexer_eof_trans[cs] - 1;
-		_goto_level = _eof_trans
-		next;
-	end
-end
-	end
-	if _goto_level <= _out
-		break
-	end
-	end
-	end
-
-# line 33 "html_string_parser.rl"
-end
-
-# ----------
-
-test "<BRRR ALIGN=\"LEFT\">"
-test "<BR ALIGN=\"LEFT\">"
-test "\\<BR ALIGN=\"LEFT\"\\>"
-test "simple test"
-test "<FONT COLOR=\"blue\">"
-test "</FONT>"
-test "<font>simple test</font>"

data/lib/src/html_string_parser.rl

@@ -1,43 +0,0 @@
-%%{
-
-  machine html_string_lexer;
-  
-  br_tag = '<'('br'|'BR')(space{1,}[^>]*)*'>';
-  font_open_tag = '<'('font'|'FONT')(space{1,}[^>]*)'>';
-  font_close_tag = '</font>'|'</FONT>';
-  font_tag = font_open_tag [^font_close_tag]* font_close_tag;
-  string = any*;
-  
-  main := |*
-    br_tag => { puts "\t =><BR>" };
-    font_tag => { puts "\t =><FONT>...</FONT>"};
-    font_open_tag => { puts "\t =><FONT>"};
-    font_close_tag => { puts "\t =></FONT>"};
-    string => { puts "\t =>string" };
-    space;
-  *|;  
-  
-}%%
-
-%% write data;
-
-# ---------- %
-
-def test( data )
-	puts "Check : #{data}"
-	data = data.unpack("c*") if(data.is_a?(String))
-	eof = data.length
-
-	%% write init;
-	%% write exec;
-end
-
-# ----------
-
-test "<BRRR ALIGN=\"LEFT\">"
-test "<BR ALIGN=\"LEFT\">"
-test "\\<BR ALIGN=\"LEFT\"\\>"
-test "simple test"
-test "<FONT COLOR=\"blue\">"
-test "</FONT>"
-test "<font>simple test</font>"