r2dsvg 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b561aa931c1a66e2884576dea1525f9f3c77cb07b5757fb11081b8f807aaf91
-  data.tar.gz: 45a8bd9cca6d36ffb694c8c1337849ebfe4819fb0f06493799131a171a168a95
+  metadata.gz: 4baad19f18ea64cd7a6272315012accb4f6784fd9efaef58c53a1534c289f011
+  data.tar.gz: 2406a7502a56f6d9a2a50851c29475e28d003fa7eef1206504f8ab328c1365a1
 SHA512:
-  metadata.gz: a117efd8624e7b97c7b35dc84fa10f4ed683841c86377c13c81c7c41fb8bc262d47ec178445333f173e6dade0a6d54ddbd7eb83f3743bc9129536166df76f5f2
-  data.tar.gz: cdb7a48f18fe178376f3b4331a969e1793d62863bc15bd6c1ce7cd47e9bba31fde0dfee99eec927284859066f88cb9aa69661e3c102a549ea242723a6a711a42
+  metadata.gz: 44b0861936c7abf63a1868fcae7a30c2812c04098b65e0b1d2c1b755d1420665de401a0de1ada1edf8e52d88ff33677b79dd81c6894b5a848375caeae423cb90
+  data.tar.gz: 8159d327f5331ee4adb6b5d9c2228bf20786f701b6ae8a3f86497f1d0b7b6b425cb787d49b74ad0d892ce06d52a2c4ac0563f71acf25c1eaad8be0c1a0948672

data/lib/r2dsvg.rb

@@ -20,6 +20,28 @@ text {fill: red, size: 20}
 
 CSS
 
+class Svgle
+  
+  class Shape
+
+    def initialize(*args)
+      super(*args)
+      @attr_map ||= {fill: :color}  
+    end
+    
+    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
@@ -31,8 +53,9 @@ module SvgleX
     def obj()
       @obj
     end
-    
+        
   end
+
   
   refine Svgle::Text do
     
@@ -50,6 +73,9 @@ module SvgleX
   
 end
 
+
+
+
 class R2dSvg
   include Ruby2D
   using ColouredText
@@ -150,9 +176,7 @@ class R2dSvg
       [:draw_rectangle, [x1, y1, x2, y2], style, e, render_all(e)]
     end
     
-    def script(e, attributes, style)
-      [:script]
-    end     
+   
        
     def svg(e, attributes, raw_style)
 
@@ -411,6 +435,9 @@ class R2dSvg
     def script(args)
 
     end         
+    
+    def style(args)
+    end
 
     private
 
@@ -516,16 +543,24 @@ class R2dSvg
     @width, @height = %i(width height).map{|x| doc.root.attributes[x].to_i }
     @window.set title: title, width: @width, height: @height        
     
-    Thread.new do
+    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
   
@@ -548,7 +583,7 @@ class R2dSvg
     
     end
     
-    @doc.event[action].each {|name| method(name).call event.key }
+    @doc.event[action].each {|name| method(name).call event }
         
   end  
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r2dsvg
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.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-05-12 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.6
   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.6
 - !ruby/object:Gem::Dependency
   name: onedrb
   requirement: !ruby/object:Gem::Requirement
@@ -101,22 +101,22 @@ dependencies:
   name: dom_render
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 description: 
 email: james@jamesrobertson.eu
 executables: []