r2dsvg 0.4.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6da60aae210c67cdc2a6c908e0721ddcfc07a6b516fbdedb49fb8ba33736dd43
-  data.tar.gz: 3a2735d01e9aaa4e319c4481ecce6d811fac9f7506086627865fe4a8be40a3c3
+  metadata.gz: 64d907b1e113033b25cb0f8f103f743c3994298a4bf66e14844c320dcb59c88a
+  data.tar.gz: 9ec11cbf12e85142093d766b56426d8cfe67c89cb57f3baf5991171514dfac61
 SHA512:
-  metadata.gz: 7370accf36a0322a26c0885f535f6fdc866fbbb65ff8f250d6a827d97251446fa716a71e2859a2f45873433f307001eaf78e48a491c5944fdacf04a3f8515cdc
-  data.tar.gz: 390bb9e097fb6660f8bc6f73750dab72f6b92500a521c094bf92b103311744cb5d41e7671e590b6d62116a2115afdb278e96a129c7fd0f8a98cad84bbd5e42ac
+  metadata.gz: 75fd5bd8348ae09903a12edb5a48b51bce69158b9a5d7630f52e9be2a8d1927669e7916255098aeb4eaf6260bcf39a9a7514f24176034f4dff0b36337b98e473
+  data.tar.gz: fdfd7077c881d6892ac2340e2bf10733ef041c3691f37e7a956e7710b09d6f082b16d5416f622dde272ec6d93b4530bff276aac901c87f397865fc83139d0c4a

data/lib/r2dsvg.rb

@@ -5,487 +5,179 @@
 # Description: Experimental gem to render SVG within a Ruby2D application. 
 
 
-require 'svgle'
-require 'onedrb'
-require 'ruby2d'  # experimental gem depends upon simple2d binaries
-require 'dom_render'
+require 'r2dsvg/r2dsvg_module'
 
 
-DEFAULT_CSS = <<CSS
-
-svg {background-color: white}
-rect {fill: yellow}
-line, polyline {stroke: green; stroke-width: 3}
-text {fill: red, size: 20}
-
-CSS
-
-module SvgleX
+class Reader
+  include R2dEngine
+  using ColouredText
   
-  refine Svgle::Element do
+  def initialize(s, model=Svgle, debug: false)
     
-    def obj=(object)
-      @obj = object
-    end
+    svg, _ = RXFHelper.read(s)    
+    doc = model.new(svg, debug: debug)
+    @a = Render.new(doc, debug: debug).to_a    
     
-    def obj()
-      @obj
-    end
     
   end
   
+  def to_a()
+    @a
+  end
+  
 end
 
 class R2dSvg
   include Ruby2D
+  include R2dEngine
   using ColouredText
   using SvgleX
 
-  class Render < DomRender
-    
-    def audio(e, attributes, raw_style)
-
-      puts 'inside audio attributes: ' + attributes.inspect if @debug
-      style = style_filter(attributes).merge(raw_style)
-      h = attributes
-
-      sources = e.xpath('source').map do |x|
-        h = x.attributes.to_h
-        h.delete :style
-        h
-      end
-
-      [:embed_audio, sources, e]
-    end    
-    
-    def circle(e, attributes, raw_style)
-
-      style = style_filter(attributes).merge(raw_style)
-
-      h = attributes
-
-      x, y, radius= %i(cx cy r).map{|x| h[x].to_i }
-      fill = h[:fill]
-      
-
-      [:draw_circle, [x, y], radius, fill, style, render_all(e)]
-    end       
-    
-    # not yet implemented
-    #
-    def ellipse(e, attributes, raw_style)
-
-      style = style_filter(attributes).merge(raw_style)
-      h = attributes
-
-      x, y= %i(cx cy).map{|x| h[x].to_i }
-      width = h[:rx].to_i * 2
-      height = h[:ry].to_i * 2
-
-      [:draw_arc, [x, y, width, height], style, render_all(e)]
-    end    
-    
-    def line(e, attributes, raw_style)
-
-      style = style_filter(attributes).merge(raw_style)
+  attr_reader :doc
 
-      x1, y1, x2, y2 = %i(x1 y1 x2 y2).map{|x| attributes[x].to_i }
+  def initialize(s, title: 'R2dSVG', debug: false, server: false)
 
-      [:draw_line, [x1, y1, x2, y2], style, render_all(e)]
-    end   
-        
+    @debug = debug
     
-    def image(e, attributes, raw_style)
-
-      style = style_filter(attributes).merge(raw_style)
-      h = attributes
-
-      x, y, width, height = %i(x y width height).map{|x| h[x] ? h[x].to_i : nil }
-      src = h[:'xlink:href']
-
-      [:draw_image, [x, y, width, height], src, style, e, render_all(e)]
-    end       
+    @window = window = Window.new
+    @loaded = false
+    @model = Svgle
     
-    def polygon(e, attributes, raw_style)
-
-      style = style_filter(attributes).merge(raw_style)
-      points = attributes[:points].split(/\s+/). \
-                                       map {|x| x.split(/\s*,\s*/).map(&:to_i)}
+    read(s, title)    
 
-      [:draw_polygon, points, style, e, render_all(e)]
-    end
-
-    def polyline(e, attributes, raw_style)
-
-      style = style_filter(attributes).merge(raw_style)
-      points = attributes[:points].split(/\s+/). \
-                                       map {|x| x.split(/\s*,\s*/).map(&:to_i)}
-
-      [:draw_lines, points, style, render_all(e)]
-    end      
-
-    def rect(e, attributes, raw_style)
-
-      puts 'inside rect attributes: ' + attributes.inspect if @debug
-      style = style_filter(attributes).merge(raw_style)
-      h = attributes
-
-      x1, y1, width, height = %i(x y width height).map{|x| h[x].to_i }
-      x2, y2, = x1 + width, y1 + height
-
-      [:draw_rectangle, [x1, y1, x2, y2], style, e, render_all(e)]
+    if server then
+      drb = OneDrb::Server.new(host: '127.0.0.1', port: '57844', obj: self)
+      Thread.new { drb.start }
     end
     
-    def script(e, attributes, style)
-      [:script]
-    end     
-       
-    def svg(e, attributes, raw_style)
-
-      style = style_filter(attributes).merge(raw_style)
-            
-      h = attributes
-      width, height = %i(width height).map{|x| h[x].to_i }
+    if @loaded then
       
-      [:draw_rectangle, [0, 0, width, height], style, render_all(e)]
-    end    
-    
-    def text(e, attributes, raw_style)
-
-      style = style_filter(attributes).merge(raw_style)
-      style.merge!({font_size: '20'})
-
-      x, y = %i(x y).map{|x| attributes[x].to_i }
-
-      [:draw_text, [x, y], e.text, style, e, render_all(e)]
-    end        
+      sleep 0.05
+      
+      window.on(:mouse_move) do |event|
+        mouse :mousemove, event
+        mouse :mouseenter, event
+      end
+      
+      window.on(:mouse_down) do |event|
+        
+        if event.button == :left then
+          
+          # click and mousedown do the same thing
+          mouse :click, event 
+          mouse :mousedown, event
+        end
         
-    private
+      end          
     
-    def style_filter(attributes)
-      
-      %i(stroke stroke-width fill z-index).inject({}) do |r,x|
-        attributes.has_key?(x) ? r.merge(x => attributes[x]) : r          
+      window.on :key_down do |event|
+        # A key was pressed
+        keyboard :keydown, event
       end
       
     end
-
-  end
-
-  class DrawingInstructions
-    using ColouredText
-    
-    attr_accessor :area
-
-
-    def initialize(window, debug: false)
-
-      @window, @debug = window, debug     
-
+=begin     
+    window.on :key_held do |event|
+      # A key is being held down
+      puts event.key
+      keyboard :onkeyheld, event
     end
     
-    def draw_arc(args)
-
-      dimensions, style = args
-
-      x, y, width, height = dimensions
-
-      #gc = gc_ini(fill: style[:fill] || :none)
-      #@area.window.draw_arc(gc, 1, x, y, width, height, 0, 64 * 360)
-    end      
-    
-    def draw_circle(args)
-
-      coords, radius, fill, style, e = args
-
-      x1, y1 = coords
-
-      if @debug then
-        puts 'inside draw_circle'.info
-        puts ('style: ' + style.inspect).debug 
-      end 
-
-      obj = Circle.new(
-        x: x1, y: y1,
-        radius: radius,
-        sectors: 32,
-        color: style[:fill],
-        z: style[:"z-index"].to_i
-      )
-      e.obj = obj if e.respond_to? :obj=
-      @window.add obj
-
-    end    
-    
-    def draw_image(args)
-
-      dimensions, src, style, e = args
-
-      x, y, width, height = dimensions      
-      
-      filepath = Tempfile.new('r2dsvg').path + File.basename(src)
-      puts 'filepath: ' + filepath.inspect if @debug
-      File.write filepath, RXFHelper.read(src).first
-        
-      
-      if File.exists? filepath then
-
-        obj = Image.new(
-          filepath,
-          x: x, y: y,
-          width: width, height: height,
-          color: style[:fill],
-          z: style[:"z-index"].to_i
-        )        
-
-        e.obj = obj if e.respond_to? :obj=
-        @window.add obj
-      end
-    end     
-    
-    def draw_line(args)
-
-      coords, style, e = args
-
-      x1, y1, x2, y2 = coords
-
-      if @debug then
-        puts 'inside draw_rectangle'.info
-        puts ('style: ' + style.inspect).debug 
-      end 
-
-      obj = Line.new(
-        x1: x1, y1: y1,
-        x2: x2, y2: y2,
-        width: style[:"stroke-width"].to_f,
-        color: style[:"stroke"],
-        z: style[:"z-index"].to_i
-      ) 
-      
-      e.obj = obj if e.respond_to? :obj=
-      @window.add obj
-      
+    window.on :key_up do |event|
+      # A key was released
+      puts event.key
+      keyboard :onkeyup, event
     end    
+=end
+    window.show
     
-    def draw_polygon(args)
-
-      vertices, style, e = args
-
-      puts ('vertices: ' + vertices.inspect).debug if @debug      
-
-      if @debug then
-        puts 'inside draw_polygon'.info
-        puts ('style: ' + style.inspect).debug 
-      end 
-      
-      puts ('vertices: ' + vertices.inspect).debug if @debug      
-      
-      h = vertices.map.with_index do |coords,i|
-
-        %w(x y).zip(coords).map {|key, c| [(key + (i+1).to_s).to_sym, c] }
-        
-      end.flatten(1).to_h
-      puts ('triangle h: ' + h.inspect).debug if @debug      
-
-      puts ('triangle h merged: ' + h.inspect).debug if @debug
-      obj = Triangle.new(h.merge({color: style[:fill], z: style[:"z-index"].to_i}))
-      e.obj = obj if e.respond_to? :obj=
-      @window.add obj
-    end       
-
-
-    # not yet implemented
-    #
-    def draw_lines(args)
-
-      coords, width, style, e = args
-
-      x1, y1, x2, y2 = coords
-
-     
-    end       
-    
-    def draw_rectangle(args)
-
-      coords, style, e = args
-
-      x1, y1, x2, y2 = coords
-
-      if @debug then
-        puts 'inside draw_rectangle'.info
-        puts ('style: ' + style.inspect).debug 
-      end 
-
-      obj = Rectangle.new(
-        x: x1, y: y1,
-        width: x2 - x1, height: y2 - y1,
-        color: style[:fill],
-        z: style[:"z-index"].to_i
-      )
-      e.obj = obj if e.respond_to? :obj=
-      @window.add obj
-
-    end
     
-    def draw_text(args)
-
-      coords, text, style, e = args
-
-      x, y = coords
-
-      if @debug then
-        puts 'inside draw_text'.info
-        puts ('style: ' + style.inspect).debug 
-      end 
-     
-      obj = Text.new(
-        text,
-        x: x, y: y,
-        #font: 'vera.ttf',
-        size: style[:font_size].to_i,
-        color: style[:color],
-        z: style[:"z-index"].to_i
-      )
-      e.obj = obj
-      @window.add obj
+  end
+  
+  def clear()
+    @window.clear
+  end
+  
+  def read(unknown, title=@title)
 
-    end
+    @loaded = false
+    @window.clear
+    doc = nil
     
-    # Ruby 2D supports a number of popular audio formats, including WAV, 
-    # MP3, Ogg Vorbis, and FLAC.
-
-    def embed_audio(args)
+    if unknown.is_a? String
       
-      sources, e = args
+      svg, _ = RXFHelper.read(unknown)    
+      doc = @model.new(svg, callback: self, debug: @debug)
+      instructions = Render.new(doc, debug: @debug).to_a      
 
-      if @debug then
-        puts 'sources: ' + sources.inspect if @debug
-        puts 'inside embed_audio'.info
-      end 
-     
-      
-      audio_files = sources.map do |source|
-        
-        filepath = Tempfile.new('r2dsvg').path + File.basename(source[:src])
-        File.write filepath, RXFHelper.read(source[:src]).first
-        filepath
-      end
-      
-      audio = audio_files.find {|file| File.exists? file }
+    elsif unknown.is_a? Array
       
-      return unless audio
+      puts 'array found' if @debug
       
-      file = File.exists?(audio) ? audio : nil
-      puts 'file: ' + file.inspect if @debug
-
-      obj = Sound.new(file)
-      e.obj = obj
+      instructions = unknown
       
-      def e.play() self.obj.play()  end
-
-    end     
-    
-    def window(args)
     end
+ 
+    drawing = DrawingInstructions.new @window, debug: @debug
 
-    def render(a)
-      method(a[0]).call(args=a[1..2])
-      draw a[3]
-    end
+    if doc then    
+      
+      @width, @height = %i(width height).map{|x| doc.root.attributes[x].to_i }
+      @window.set title: title, width: @width, height: @height        
     
-    def script(args)
 
-    end         
-
-    private
-
-    def draw(a)
-  
       threads = []
       
-      a.each do |rawx|
-  
-        threads << Thread.new do
-          x, *remaining = rawx
-
-          if x.is_a? Symbol then
-            method(x).call(args=remaining)
-          elsif x.is_a? String then
-            draw remaining
-          elsif x.is_a? Array
-            draw remaining
-          else        
-            method(x).call(remaining.take 2)
-          end
-        end
-                        
+      threads << Thread.new do
+        doc.root.xpath('//script').each {|x| eval x.texts.join }      
+        drawing.render instructions   
       end
       
       threads.join
 
+      @loaded = true
+      @doc = doc
+      
+    else
+      
+      drawing.render instructions   
+      h = instructions[2]
+      @width, @height = h[:width].to_i, h[:height].to_i
+      @window.set title: 'Untitled', width: @width, height: @height    
     end
-
+    
+  end  
+  
+  def refresh()
+    puts 'do nothing' if @debug
   end
   
-  attr_reader :doc
-
-  def initialize(s, title: 'R2dSVG', debug: false)
-
-    @debug = debug
+  
+  private
+  
+  def keyboard(action, event)
     
-    @window = window = Window.new
+    doc = @doc
     
-    @doc = read(s, title)    
+    @doc.root.xpath("//*[@on#{action}]").each do |x|
 
-    drb = OneDrb::Server.new host: '127.0.0.1', port: '57844', obj: self
-    Thread.new { drb.start }
-    
-    window.on(:mouse_move) do |event|
-      mouse :mousemove, event
-      mouse :mouseenter, event
-    end
-    
-    window.on(:mouse_down) do |event|
-      
-      if event.button == :left then
-        
-        # click and mousedown do the same thing
-        mouse :click, event 
-        mouse :mousedown, event
+      if block_given? then
+        valid = yield(x)
+        statement = x.method(('on' + action.to_s).to_sym).call()
+        puts 'statement: ' + statement.inspect if @debug
+        eval statement if valid
+      else
+        statement = x.method(('on' + action.to_s).to_sym).call()
+        puts 'statement: ' + statement.inspect if @debug
+        eval statement
       end
-      
-    end          
-
-    window.show
-    
     
-  end
-  
-  def read(s, title=@title)
-
-    svg, _ = RXFHelper.read(s)    
-    doc = Svgle.new(svg, callback: self, debug: @debug)
-    instructions = Render.new(doc, debug: @debug).to_a
-
- 
-    drawing = DrawingInstructions.new @window, debug: @debug
-    puts ('instructions: ' + instructions.inspect).debug if @debug
-
-    @width, @height = %i(width height).map{|x| doc.root.attributes[x].to_i }
-    @window.set title: title, width: @width, height: @height        
-    
-    Thread.new do
-      doc.root.xpath('//script').each {|x| eval x.text.unescape }      
-      drawing.render instructions    
     end
     
-    doc
-    
+    @doc.event[action].each {|name| method(name).call event }
+        
   end  
   
-  
-  private
-  
   def mouse(action, event)
     
     doc = @doc
@@ -533,6 +225,23 @@ class R2dSvg
     end
 
   end    
+  
+  private
+  
+  def timeout(duration=0.8)
+    
+    @t = Time.now
+    
+    Thread.new do
+
+      while @t + duration > Time.now do        
+        sleep 0.1
+      end
+
+      yield
+        
+    end
+  end  
     
 end
 

data/lib/r2dsvg/r2dsvg_module.rb

@@ -0,0 +1,586 @@
+#!/usr/bin/env ruby
+
+# file: r2dsvg_module.rb
+
+# Description: Experimental gem to render SVG within a Ruby2D application. 
+
+
+#require 'svgle'
+require 'onedrb'
+require 'svgle'
+require 'dom_render'
+require 'ruby2d'  # experimental gem depends upon simple2d binaries
+
+
+DEFAULT_CSS = <<CSS
+g {background-color: blue}
+svg {background-color: white}
+rect {fill: yellow}
+line, polyline {stroke: green; stroke-width: 3}
+text {fill: red, size: 20}
+
+CSS
+
+
+  
+class Svgle::Shape
+
+  def initialize(*args)
+    super(*args)
+    @attr_map ||= {fill: :color}  
+  end
+  
+
+end
+  
+
+module SvgleX
+  
+  
+  refine Svgle::Text do
+    
+    def text=(raw_s)    
+      
+      oldval = @child_elements.first
+
+      r = super(raw_s)
+      self.obj.text = raw_s if oldval != raw_s
+      
+      return r        
+      
+    end
+  end
+  
+end
+
+
+module R2dEngine
+    
+  
+
+  class Render < DomRender
+    
+    def audio(e, attributes)
+
+      puts 'inside audio attributes: ' + attributes.inspect if @debug
+
+      h = attributes
+
+      sources = e.xpath('source').map do |x|
+        h = x.attributes.to_h
+        h.delete :style
+        h
+      end
+
+      [:embed_audio, sources, e]
+    end    
+    
+    def circle(e, attributes)
+
+
+
+      h = attributes
+
+      x, y, radius= %i(cx cy r).map{|x| h[x].to_i }
+      fill = h[:fill]
+      
+
+      [:draw_circle, [x, y], radius, fill, attributes, render_all(e)]
+    end       
+    
+    # not yet implemented
+    #
+    def ellipse(e, attributes)
+
+      h = attributes
+
+      x, y= %i(cx cy).map{|x| h[x].to_i }
+      width = h[:rx].to_i * 2
+      height = h[:ry].to_i * 2
+
+      [:draw_arc, [x, y, width, height], attributes, render_all(e)]
+    end    
+    
+    def g(e, attributes)
+
+      puts 'inside rect attributes: ' + attributes.inspect if @debug
+
+      h = attributes
+
+      x1, y1, width, height = %i(x y width height).map{|x| h[x].to_i }
+      x2, y2, = x1 + width, y1 + height
+
+      [:draw_rectangle, [x1, y1, x2, y2], attributes, e, render_all(e)]
+    end
+    
+            
+    
+    def line(e, attributes)
+
+
+      x1, y1, x2, y2 = %i(x1 y1 x2 y2).map{|x| attributes[x].to_i }
+
+      [:draw_line, [x1, y1, x2, y2], attributes, render_all(e)]
+    end   
+        
+    
+    def image(e, attributes)
+
+      h = attributes
+
+      x, y, width, height = %i(x y width height).map{|x| h[x] ? h[x].to_i : nil }
+      src = h[:'xlink:href']
+
+      [:draw_image, [x, y, width, height], src, attributes, e, render_all(e)]
+    end       
+    
+    def polygon(e, attributes)
+
+
+      points = attributes[:points].split(/\s+/). \
+                                      map {|x| x.split(/\s*,\s*/).map(&:to_i)}
+
+      [:draw_polygon, points, attributes, e, render_all(e)]
+    end
+
+    def polyline(e, attributes)
+
+      points = attributes[:points].split(/\s+/). \
+                                      map {|x| x.split(/\s*,\s*/).map(&:to_i)}
+
+      [:draw_lines, points, attributes, render_all(e)]
+    end      
+
+    def rect(e, attributes)
+
+      puts 'inside rect attributes: ' + attributes.inspect if @debug
+
+      h = attributes
+
+      x1, y1, width, height = %i(x y width height).map{|x| h[x].to_i }
+      x2, y2, = x1 + width, y1 + height
+
+      [:draw_rectangle, [x1, y1, x2, y2], attributes, e, render_all(e)]
+    end
+    
+  
+      
+    def svg(e, attributes)
+           
+      h = attributes
+      width, height = %i(width height).map{|x| h[x].to_i }
+      
+      [:draw_rectangle, [0, 0, width, height], attributes, render_all(e)]
+    end    
+    
+    def text(e, attributes)
+
+
+      attributes.merge!({font_size: '20'})
+
+      x, y = %i(x y).map{|x| attributes[x].to_i }
+
+      [:draw_text, [x, y], e.text, attributes, e, render_all(e)]
+    end        
+        
+
+  end
+
+  class DrawingInstructions
+    using ColouredText
+    
+    attr_accessor :area
+
+
+    def initialize(window, debug: false)
+
+      @window, @debug = window, debug     
+
+    end
+    
+    def draw_arc(args)
+
+      dimensions, style = args
+
+      x, y, width, height = dimensions
+
+      #gc = gc_ini(fill: style[:fill] || :none)
+      #@area.window.draw_arc(gc, 1, x, y, width, height, 0, 64 * 360)
+    end      
+    
+    def draw_circle(args)
+
+      coords, radius, fill, style, e = args
+
+      x1, y1 = coords
+
+      if @debug then
+        puts 'inside draw_circle'.info
+        puts ('style: ' + style.inspect).debug 
+      end 
+
+      obj = Circle.new(
+        x: x1, y: y1,
+        radius: radius,
+        sectors: 32,
+        color: style[:fill],
+        z: style[:"z-index"].to_i
+      )
+      e.obj = obj if e.respond_to? :obj=
+      @window.add obj
+
+    end    
+    
+    def draw_image(args)
+
+      dimensions, src, style, e = args
+
+      x, y, width, height = dimensions      
+      
+      filepath = Tempfile.new('r2dsvg').path + File.basename(src)
+      puts 'filepath: ' + filepath.inspect if @debug
+      File.write filepath, RXFHelper.read(src).first
+        
+      
+      if File.exists? filepath then
+
+        obj = Image.new(
+          filepath,
+          x: x, y: y,
+          width: width, height: height,
+          color: style[:fill],
+          z: style[:"z-index"].to_i
+        )        
+
+        e.obj = obj if e.respond_to? :obj=
+        @window.add obj
+      end
+    end     
+    
+    def draw_line(args)
+
+      coords, style, e = args
+
+      x1, y1, x2, y2 = coords
+
+      if @debug then
+        puts 'inside draw_rectangle'.info
+        puts ('style: ' + style.inspect).debug 
+      end 
+
+      obj = Line.new(
+        x1: x1, y1: y1,
+        x2: x2, y2: y2,
+        width: style[:"stroke-width"].to_f,
+        color: style[:"stroke"],
+        z: style[:"z-index"].to_i
+      ) 
+      
+      e.obj = obj if e.respond_to? :obj=
+      @window.add obj
+      
+    end    
+    
+    def draw_polygon(args)
+
+      vertices, style, e = args
+
+      puts ('vertices: ' + vertices.inspect).debug if @debug      
+
+      if @debug then
+        puts 'inside draw_polygon'.info
+        puts ('style: ' + style.inspect).debug 
+      end 
+      
+      puts ('vertices: ' + vertices.inspect).debug if @debug      
+      
+      h = vertices.map.with_index do |coords,i|
+
+        %w(x y).zip(coords).map {|key, c| [(key + (i+1).to_s).to_sym, c] }
+        
+      end.flatten(1).to_h
+      puts ('triangle h: ' + h.inspect).debug if @debug      
+
+      puts ('triangle h merged: ' + h.inspect).debug if @debug
+      obj = Triangle.new(h.merge({color: style[:fill], z: style[:"z-index"].to_i}))
+      e.obj = obj if e.respond_to? :obj=
+      @window.add obj
+    end       
+
+
+    # not yet implemented
+    #
+    def draw_lines(args)
+
+      coords, width, style, e = args
+
+      x1, y1, x2, y2 = coords
+
+    
+    end       
+    
+    def draw_rectangle(args)
+
+      coords, style, e = args
+
+      x1, y1, x2, y2 = coords
+
+      if @debug then
+        puts 'inside draw_rectangle'.info
+        puts ('style: ' + style.inspect).debug 
+      end 
+
+      obj = Rectangle.new(
+        x: x1, y: y1,
+        width: x2 - x1, height: y2 - y1,
+        color: style[:fill],
+        z: style[:"z-index"].to_i
+      )
+      e.obj = obj if e.respond_to? :obj=
+      @window.add obj
+
+    end
+    
+    def draw_text(args)
+
+      coords, text, style, e = args
+
+      x, y = coords
+
+      if @debug then
+        puts 'inside draw_text'.info
+        puts ('style: ' + style.inspect).debug 
+      end 
+    
+      obj = Text.new(
+        text,
+        x: x, y: y,
+        #font: 'vera.ttf',
+        size: style[:font_size].to_i,
+        color: style[:color],
+        z: style[:"z-index"].to_i
+      )
+      puts 'e: ' + e.inspect
+      e.obj = obj
+      @window.add obj
+
+    end
+    
+    # Ruby 2D supports a number of popular audio formats, including WAV, 
+    # MP3, Ogg Vorbis, and FLAC.
+
+    def embed_audio(args)
+      
+      sources, e = args
+
+      if @debug then
+        puts 'sources: ' + sources.inspect if @debug
+        puts 'inside embed_audio'.info
+      end 
+    
+      
+      audio_files = sources.map do |source|
+        
+        filepath = Tempfile.new('r2dsvg').path + File.basename(source[:src])
+        File.write filepath, RXFHelper.read(source[:src]).first
+        filepath
+      end
+      
+      audio = audio_files.find {|file| File.exists? file }
+      
+      return unless audio
+      
+      file = File.exists?(audio) ? audio : nil
+      puts 'file: ' + file.inspect if @debug
+
+      obj = Sound.new(file)
+      e.obj = obj
+      
+      def e.play() self.obj.play()  end
+
+    end     
+    
+    def window(args)
+    end
+
+    def render(a)
+     
+      stylex, e = a[-3..-2]
+      
+      if e.respond_to? :attr_map then
+        
+        h = e.attr_map.inject({}) do |r, x|
+          key, value = x
+          r.merge!({value => stylex[key]})
+        end
+        a[-3].merge!(h)        
+      end
+      
+
+      method(a[0]).call(args=a[1..2])
+      draw a[3]
+    end
+    
+    def script(args)
+
+    end         
+    
+    def style(args)
+    end
+
+    private
+
+    def draw(a)
+  
+      #threads = []
+      
+      a.each do |rawx|
+  
+        #threads << Thread.new do
+          puts 'rawx: ;' + rawx.inspect if @debug
+          x, *remaining = rawx
+
+          puts 'x: ;' + x.inspect if @debug
+          puts 'remaining: ' + remaining.inspect if @debug
+          
+          if x.is_a? Symbol then
+            method(x).call(args=remaining)
+            draw(remaining[3])
+          elsif x.is_a? String then
+            draw remaining
+          elsif x.is_a? Array
+            draw remaining
+          else        
+            method(x).call(remaining.take 2)
+          end
+        #end
+                        
+      end
+      
+      #threads.join
+
+    end
+
+  end
+  
+
+
+  class App
+    
+    attr_reader :doc
+
+    
+    def clear()
+      @window.clear
+    end
+    
+    def read(s, title=@title)
+      @loaded = false
+      @window.clear
+      svg, _ = RXFHelper.read(s)    
+      doc = Svgle.new(svg, callback: self, debug: @debug)
+      instructions = Render.new(doc, debug: @debug).to_a
+
+  
+      drawing = DrawingInstructions.new @window, debug: @debug
+      puts ('instructions: ' + instructions.inspect).debug if @debug
+
+      @width, @height = %i(width height).map{|x| doc.root.attributes[x].to_i }
+      @window.set title: title, width: @width, height: @height        
+      
+      threads = []
+      
+      threads << Thread.new do
+        doc.root.xpath('//script').each {|x| eval x.text.unescape }      
+        drawing.render instructions    
+      end
+      
+      threads.join
+
+      @loaded = true
+      @doc = doc
+      
+    end  
+    
+    def refresh()
+      puts 'do nothing' if @debug
+    end
+    
+    
+    private
+    
+    def keyboard(action, event)
+      
+      doc = @doc
+      
+      @doc.root.xpath("//*[@on#{action}]").each do |x|
+
+        if block_given? then
+          valid = yield(x)
+          statement = x.method(('on' + action.to_s).to_sym).call()
+          puts 'statement: ' + statement.inspect if @debug
+          eval statement if valid
+        else
+          statement = x.method(('on' + action.to_s).to_sym).call()
+          puts 'statement: ' + statement.inspect if @debug
+          eval statement
+        end
+      
+      end
+      
+      @doc.event[action].each {|name| method(name).call event }
+          
+    end  
+    
+    def mouse(action, event)
+      
+      doc = @doc
+      
+      @doc.root.xpath("//*[@on#{action}]").each do |x|
+
+        #puts 'x.class: ' + x.inspect if @debug
+        if x.obj and x.obj.contains? event.x, event.y then
+          
+            
+          if not x.active? then
+            x.active = true
+          elsif action == :mouseenter
+            next
+          end
+                    
+          if block_given? then
+            valid = yield(x)
+            statement = x.method(('on' + action.to_s).to_sym).call()
+            puts 'statement: ' + statement.inspect if @debug
+            eval statement if valid
+          else
+            statement = x.method(('on' + action.to_s).to_sym).call()
+            puts 'statement: ' + statement.inspect if @debug
+            eval statement
+          end
+          
+        else
+          
+          if x.active? then
+            x.active = false
+            onleave
+          end
+        end
+      
+      end
+          
+    end
+    
+    def onleave()
+
+      @doc.root.xpath("//*[@onmouseleave]").each do |x|
+        puts 'onleave'.info if @debug
+        eval x.method(:onmouseleave).call()
+      end
+
+    end    
+      
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r2dsvg
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   2z9cm0kGX/0pBfn8cMKC0JgNNNONx3uqiCAhaBEN35C8dqBjua/CK4rMoKEB7XQq
   OAk+mR2SqyWecmZhdnsnm86T
   -----END CERTIFICATE-----
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: svgle
@@ -46,7 +46,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: 0.4.7
 - !ruby/object:Gem::Dependency
   name: onedrb
   requirement: !ruby/object:Gem::Requirement
@@ -103,20 +103,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.1
 description: 
 email: james@jamesrobertson.eu
 executables: []
@@ -124,6 +124,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/r2dsvg.rb
+- lib/r2dsvg/r2dsvg_module.rb
 homepage: https://github.com/jrobertson/r2dsvg
 licenses:
 - MIT