r2dsvg 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4baad19f18ea64cd7a6272315012accb4f6784fd9efaef58c53a1534c289f011
-  data.tar.gz: 2406a7502a56f6d9a2a50851c29475e28d003fa7eef1206504f8ab328c1365a1
+  metadata.gz: 218f3f75c56256cfbf3ccd9f0755d31bfad7ec53ae8a235e32103118de2fc8e9
+  data.tar.gz: 21aba9150ca1a85bfe48352c02e5bac17b276de41133b97d4e887a823bd85a2d
 SHA512:
-  metadata.gz: 44b0861936c7abf63a1868fcae7a30c2812c04098b65e0b1d2c1b755d1420665de401a0de1ada1edf8e52d88ff33677b79dd81c6894b5a848375caeae423cb90
-  data.tar.gz: 8159d327f5331ee4adb6b5d9c2228bf20786f701b6ae8a3f86497f1d0b7b6b425cb787d49b74ad0d892ce06d52a2c4ac0563f71acf25c1eaad8be0c1a0948672
+  metadata.gz: 0250d7a5f4a76af1811e16ad9d38a9e9be12a13708abf20698876a5a94d22fa293ce94bb879d19f900fa802e78b85e73c8eedc455418cf7dd7685f70938a9181
+  data.tar.gz: 8fe0f560dddc4f193338019384356665170fb130a08f03407a3dda0709d03e4b91ed3fbf40c7cb2a0911344a915ab0aa6b9d92b6c28db584e3654a7c1c349200

data/lib/r2dsvg.rb

@@ -5,483 +5,50 @@
 # 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
-
-class Svgle
+class Reader
+  include R2dEngine
+  using ColouredText
   
-  class Shape
-
-    def initialize(*args)
-      super(*args)
-      @attr_map ||= {fill: :color}  
-    end
+  def initialize(s, model=Svgle, debug: false)
     
-    def attr_update(name, val)
-      
-      puts 'inside attr_update, @attr_map: ' + @attr_map.inspect if @debug
-      name = (@attr_map[name].to_s + '=').to_sym      
-      @obj.method(name).call(val) if @obj.respond_to? name
-      
-    end
-  end
-
-end
-
-  
-
-module SvgleX
-  
-  refine Svgle::Element do
+    svg, _ = RXFHelper.read(s)    
+    doc = model.new(svg, debug: debug)
+    @a = Render.new(doc, debug: debug).to_a    
     
-    def obj=(object)
-      @obj = object
-    end
     
-    def obj()
-      @obj
-    end
-        
   end
-
   
-  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
+  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)
-
-      x1, y1, x2, y2 = %i(x1 y1 x2 y2).map{|x| attributes[x].to_i }
-
-      [:draw_line, [x1, y1, x2, y2], style, render_all(e)]
-    end   
-        
-    
-    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       
-    
-    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)}
-
-      [: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)]
-    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 }
-      
-      [: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        
-        
-    private
-    
-    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          
-      end
-      
-    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)
-      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
-          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
-                        
-      end
-      
-      #threads.join
-
-    end
-
-  end
-  
   attr_reader :doc
 
-  def initialize(s, title: 'R2dSVG', debug: false)
+  def initialize(s, title: 'R2dSVG', debug: false, server: false)
 
     @debug = debug
     
     @window = window = Window.new
     @loaded = false
+    @model = Svgle
     
     read(s, title)    
 
-    drb = OneDrb::Server.new host: '127.0.0.1', port: '57844', obj: self
-    Thread.new { drb.start }
+    if server then
+      drb = OneDrb::Server.new(host: '127.0.0.1', port: '57844', obj: self)
+      Thread.new { drb.start }
+    end
     
     if @loaded then
       
@@ -529,31 +96,53 @@ class R2dSvg
     @window.clear
   end
   
-  def read(s, title=@title)
+  def read(unknown, 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
+    doc = nil
+    
+    if unknown.is_a? String
+      
+      svg, _ = RXFHelper.read(unknown)    
+      doc = @model.new(svg, callback: self, debug: @debug)
+      instructions = Render.new(doc, debug: @debug).to_a      
 
+    elsif unknown.is_a? Array
+      
+      puts 'array found' if @debug
+      
+      instructions = unknown
+      
+    end
  
     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
+    if doc then    
+      
+      @width, @height = %i(width height).map{|x| doc.root.attributes[x].to_i }
+      @window.set title: title, width: @width, height: @height        
     
-    threads.join
 
-    @loaded = true
-    @doc = doc
+      threads = []
+      
+      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  
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r2dsvg
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   2z9cm0kGX/0pBfn8cMKC0JgNNNONx3uqiCAhaBEN35C8dqBjua/CK4rMoKEB7XQq
   OAk+mR2SqyWecmZhdnsnm86T
   -----END CERTIFICATE-----
-date: 2020-05-12 00:00:00.000000000 Z
+date: 2020-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: svgle