gtk2svg 0.3.19 → 0.3.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1b9596660f5d99ce677a22cd9aa7074720b30ba3f7ec83f8e76e52cd68196df
-  data.tar.gz: 5d85c4ecbf1178f3a6f9848a8b00d82c2f16691f9b306cca94ed995f87ff2abe
+  metadata.gz: 8b5a118c0868c06925d3a913ddc70520252cf750417619386a0861c15a9b18dc
+  data.tar.gz: 767e84933875bebbeaa06ba7e4b46895d5cdcb174b2488d07b1f271feb46f54f
 SHA512:
-  metadata.gz: cdf9f7fe4fea456be34bdca25d689f6d8d86637b7b79e4cea5a09945da0291bea87e5f66199e502774923372f5fd8d721eb5a34e09e608fdf768a59bb4874bfb
-  data.tar.gz: ec6b574a7e920aa4be77e130c2f2ad886dc0497da61265ea07b71c1d1beec82523738d12d5f1b00eddd463dbc001fbc29e463d5b4880aadd031251049fce72ec
+  metadata.gz: 9aff8130ed2d5422e8f4119f2bc813631fe350a7d29daef0778283f23547e0205111f9a0b546ea55832442a96d5ea2bfa370d1896a31180308de620243b882d8
+  data.tar.gz: ad7e9921a4be4257cff93f79227cb000480a411759efdfce0495356d8562b8e5a020303f7ca0d176f8bcd3bc4da28095dbd288ac979780f6e1c52e7842c7f0c4

data/lib/gtk2svg.rb

@@ -15,113 +15,94 @@ module Gtk2SVG
   class Render < DomRender
 
 
-    def circle(e, attributes, raw_style)
-
-      style = style_filter(attributes).merge(raw_style)
+    def circle(e, attributes)
 
       h = attributes
 
       x, y= %i(cx cy).map{|x| h[x].to_i }
       radius = h[:r].to_i * 2
 
-      [:draw_arc, [x, y, radius, radius], style, render_all(e)]
+      [:draw_arc, [x, y, radius, radius], attributes, render_all(e)]
     end       
     
-    def ellipse(e, attributes, raw_style)
+    def ellipse(e, attributes)
 
-      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)]
+      [:draw_arc, [x, y, width, height], attributes, render_all(e)]
     end    
     
-    def line(e, attributes, raw_style)
+    def line(e, attributes)
 
-      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)]
+      [:draw_line, [x1, y1, x2, y2], attributes, render_all(e)]
     end   
     
-    def image(e, attributes, raw_style)
+    def image(e, attributes)
 
-      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, render_all(e)]
+      [:draw_image, [x, y, width, height], src, attributes, render_all(e)]
     end    
 
-    def polygon(e, attributes, raw_style)
+    def polygon(e, attributes)
 
-      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, render_all(e)]
+      [:draw_polygon, points, attributes, render_all(e)]
     end
 
-    def polyline(e, attributes, raw_style)
+    def polyline(e, attributes)
 
-      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)]
+      [:draw_lines, points, attributes, render_all(e)]
     end           
 
-    def rect(e, attributes, raw_style)
+    def rect(e, attributes)
 
-      style = style_filter(attributes).merge(raw_style)
+      puts 'inside rect'
       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, render_all(e)]
+      [:draw_rectangle, [x1, y1, x2, y2],  attributes, render_all(e)]
     end
     
-    def script(e, attributes, style)
+    def script(e, attributes)
       [:script]
     end        
     
-    def svg(e, attributes, raw_style)
+    def svg(e, attributes)
 
-      style = style_filter(attributes).merge(raw_style)
       
       # jr051216 style[:fill] = style.delete :'background-color'
       h = attributes
       width, height = %i(width height).map{|x| h[x].to_i }
       
-      [:draw_rectangle, [0, 0, width, height], style, render_all(e)]
+      [:draw_rectangle, [0, 0, width, height], attributes, render_all(e)]
     end    
     
-    def text(e, attributes, raw_style)
-
-      style = style_filter(attributes).merge(raw_style)
-      style.merge!({font_size: '20'})
+    def text(e, attributes)
 
       x, y = %i(x y).map{|x| attributes[x].to_i }
 
-      [:draw_layout, [x, y], e.text, style, render_all(e)]
+      [:draw_layout, [x, y], e.text, attributes, render_all(e)]
     end    
     
-    private
-    
-    def style_filter(attributes)
-      
-      %i(stroke stroke-width fill).inject({}) do |r,x|
-        attributes.has_key?(x) ? r.merge(x => attributes[x]) : r          
-      end
-      
-    end
+
 
   end
 
@@ -204,7 +185,9 @@ module Gtk2SVG
 
     def draw_rectangle(args)
 
-      coords, style = args
+      puts 'inside draw_rectangle' if @debug
+      
+      coords, style, e = args
 
       x1, y1, x2, y2 = coords
 
@@ -232,7 +215,16 @@ module Gtk2SVG
     end
 
     def render(a)
+      
+      if @debug then
+        puts 'inside gtk2svg render '.info 
+        puts 'a: ' + a.inspect
+      end
+      
       method(a[0]).call(args=a[1..2])
+      puts 'after method' if @debug
+      return unless a[3].any?
+      
       draw a[3]
     end
     
@@ -301,7 +293,7 @@ module Gtk2SVG
     attr_accessor :doc, :svg
     attr_reader :width, :height
     
-    def initialize(svg, irb: false, title: 'Window', debug: @debug)
+    def initialize(svg, irb: false, title: 'window', debug: @debug)
       
       @svg, @debug = svg, debug
       @doc = Svgle.new(svg, callback: self, debug: debug)
@@ -388,7 +380,10 @@ module Gtk2SVG
     
     def onmousemove(x,y)
       
-    end    
+    end
+
+    def refresh()    
+    end
     
     def svg=(svg)
       @svg = svg

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtk2svg
 version: !ruby/object:Gem::Version
-  version: 0.3.19
+  version: 0.3.20
 platform: ruby
 authors:
 - James Robertson
@@ -10,27 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDXjCCAkagAwIBAgIBATANBgkqhkiG9w0BAQUFADAsMSowKAYDVQQDDCFnZW1t
-  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMTgwODA2MDk1MjE2WhcN
-  MTkwODA2MDk1MjE2WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
-  cnRzb24vREM9ZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCnJgw
-  beSqH1nNFExWZSmiCWii2EOLLbXGrQfHLHMDOHNZmuiA0NGZPeJ9GiwJspKGCv9R
-  dsIuAo6jEZ1bgwh/W6uTZQ1hRzRe9BPlCmPyn2ifbyNrszqKkVo7KTVBXYjPu7f6
-  qAQQ65CCMF00z819ed2akpnWvxl8RjjaaSgJTjox44JJxamz6+kiMx0QanezUpsi
-  TIFZn3qUnGXF4i/XfY1EbQ92fO/0Nt8k7Ym3BImOWpilGFNWu+17sQLCQMBSgmPc
-  /uvairKyZiPIVzIHeh9KXwOrjoNey3QXKyWt1jkToP6MlKsDrdlF/+MJGU0nBJx1
-  pA7n59AkH9XUKJ3dAgMBAAGjgYowgYcwCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAw
-  HQYDVR0OBBYEFPoqeGP0IXBuOBmXDvJKIGQRUeyzMCYGA1UdEQQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTAmBgNVHRIEHzAdgRtnZW1tYXN0ZXJAamFt
-  ZXNyb2JlcnRzb24uZXUwDQYJKoZIhvcNAQEFBQADggEBAKOaiytfibVlbY1HODYI
-  eATiw5/9tN/ZFQCSI+Abu6+/6xLKCWwMnvghbtgWxHWiSLYqUw8pTMqWByL8uIyL
-  HegeXgVgRTsoPhH7S1/oAxOSzWfhMOoTkkcVu0sd5RJ+/Kg4EIeD7e6PCcD55yBb
-  SZnYY3MFxwUbkFXBvi3ovFP9z2CSb2GTzVQIVJWet5eiSoaoGOe+51ztEKs9wg6S
-  CX+YBId+k34qntLi/voSpF0tVEtlWoag+8i6P2yCmlloounifmrM+9jDBfK1iqpE
-  E58sMBXygQAS9z+rxrOjqD11GdUAt2KIexqN5UhAWCmNTT6hufguI4Y8Qw3tu6O4
-  7eo=
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwODI1MDkyMzE5WhcN
+  MjEwODI1MDkyMzE5WjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDZipRF
+  PddOhSJWjA5AU0enpeQuWI33p2Vxr5nzmqFw1v8L9et4dEfwf8jrvGQCFKVrLkOF
+  V16DPS7aB4CRyqysrT3Wcx7PRcAcU8PM/60x5VjlHkOoIGyDBS19FeEXSxnCL37P
+  qpN3IR32F3MnhQgi/Q75MGeT7EdG1QF0hfnUSvdWcfhMu85RppIrfMx8KBXNoOya
+  9rmsFHLiGZMvkCVQ/slMRTPy2FdZi9+KbkvoEll4wZgw5CyYDTlW/eu43bg2+5uZ
+  hZYkPajmyP31OfXXoITEuZBuwShJBvXh3hr4pRJ/WZEwbCzQxV7GnW8nS0+cVv9i
+  HVsUrX/J47s1vZsCVBOaExiAfO2fJv67DR99PzK2fKcvPw5YmLWoBm6yaMNQ361p
+  usLtsag3TqrqIsG8rOY6QZactnoFGtW9bSFqXOqaO4FKbwgCcdTJELte9XX4mMvJ
+  Epal/e/KUDQFTKIB367qZ5lG7I8SvQrI87PkQ0LShHf80/QSpEqcgf2A4zUCAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU5/XXpoSY
+  0jQsP2JR2vU5b7uMJhYwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAj4Dp4hBFi30D7gviksCLr+eMB3XD+YiZ9kbMi3P3
+  WJXH9gkELeKX9kzMRJDgZ3fJNcpAt3dT7pMKNGLfMhzXr4S0K9oNIfmq+5y4eUQ3
+  /eZnDrhLdLN0CfLaT1taKTbnh98wroE44fvW34KOzHEhPx4IL3Bd5jxuztqJRaZW
+  NsUP3kOGU/DUK+0/r96bPELVaXYq8AFuQGK13Z/Cr2tM3uX6bLj+tmKx0zOHRBBf
+  8YSz4LRUsv2LMkhdxyQKXEmIgsu9EE1DPu0Jf6DNOsbm/pFQmJ04V5AIoEixNjeZ
+  /0gRFIHa6KaTLBTDlD56Vp/KxVAKa4lpIgJd8meNWibAl3URscgQTcKOUpKU0YSU
+  +tP3l68P25LjOVqb36q+te45SjB8ATohHZ2kCFc4e5jDB+HX1lwYKqDLTfSd/cuh
+  5C/ULWUz63TixmnPQiXfUV5DTAb+U7xkR+IoF9PZXNzriqakqL6/kvguqZSDiG5K
+  C+3upURGHZLC1bs5uIZirvk+
   -----END CERTIFICATE-----
-date: 2019-02-09 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
@@ -118,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Renders SVG using GTK2