gtk2svg 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f0fe558967f563d8d4f111a47f1c6437c13d369a
-  data.tar.gz: f0004931e1cac3e8fa85098dcfcaa4c05fbd0f40
+  metadata.gz: 3cd27c076a6295b4d03b26ce76fe32ef4052b82f
+  data.tar.gz: 0ec6e1a49c86a24545eb26f3fcd2eb711d582484
 SHA512:
-  metadata.gz: 285349e48fb22a23d68cd8f7d2e56a072778d9d6ce6dceddfbd81ee67cc20e19e4b9bb81f3b7810438c53e33d4fdbcafb0c88e644e65edf9e5192ffd8273d909
-  data.tar.gz: bec7350106552e774b66486d708c744fa136167862c50371fad7adf68925e763e38c9f9940b0853579017ad047f84059a57aa120b13641bb41c4c83ab194c6cf
+  metadata.gz: d4541d4d14ead9a7ded5ad1661d732a84e34be7fffdbfd85ad2132e1441ed6cb47d181e86aa0ef5030a8c2c56ece7b7325065438d5d1b3723a782bb4c367fa46
+  data.tar.gz: fcd1359c7b79dfde12b8d75d9c4acdf8c744f28ead3d7525656c38d06d97166fdbc4e2a3151421443264e29985971f425f3dedcb29b32c86826bc4c007692bb3

checksums.yaml.gz.sig

@@ -1,2 +1,3 @@
-�|[�'��}	�����
-,���\(�ߌ�h�=�n�4&t������w��>@C6_���X�	�����>��tS��°[r�a�u�+��s#��D��[�/�X&a$LN$��Gl�%Kx��c����9�f�1�۬7�%��i}�2_|4�$v���G��\ZG G�.*:
�=Y�a~=�ܑƻ�xܫ��v�� ������4��m�}爖H7��P�i�s�[:>�I۴VR@8g�6�.Pf�v}�e�
+�S��ʗ����f�})(3:�dh��朐E��L��
+�)�����=���+�H(��e�H8���BHt�@�P���۪cs|��}�ph�p��+���
8/ߥ(}I�\͞S�'�=�[� �z�Os��]n�[#�����bb��[ZI>e�.��^W�8���i��!柸�}=q]�&���a���{�\F^��TV�
+N�<dמ����%4������9�v:B����oZ�6����§Eu6�/�

data/lib/gtk2svg.rb

@@ -81,8 +81,15 @@ module Gtk2SVG
       [:script]
     end        
     
-    def svg(x, attributes, style)
-      [:window, render_all(x)]
+    def svg(e, attributes, raw_style)
+
+      style = style_filter(attributes).merge(raw_style)
+      
+      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)]
     end    
     
     def text(e, attributes, raw_style)
@@ -164,6 +171,7 @@ module Gtk2SVG
       coords, style = args
 
       x1, y1, x2, y2 = coords
+
       gc = gc_ini(fill: style[:fill] || :none)
       @area.window.draw_rectangle(gc, 1, x1, y1, x2, y2)
     end
@@ -188,7 +196,8 @@ module Gtk2SVG
     end
 
     def render(a)
-      draw a
+      method(a[0]).call(args=a[1..2])
+      draw a[3]
     end
     
     def script(args)
@@ -198,7 +207,7 @@ module Gtk2SVG
     private
 
     def draw(a)
-
+      
       a.each do |rawx|
 
         x, *remaining = rawx
@@ -260,6 +269,7 @@ module Gtk2SVG
       
       @svg = svg
       @doc = Svgle.new(svg, callback: self)
+      
       @area = area = Gtk::DrawingArea.new
       client_code = []
       
@@ -281,6 +291,7 @@ module Gtk2SVG
         end
         
         a = Render.new(@doc).to_a
+
         drawing = DrawingInstructions.new area
         drawing.render a
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtk2svg
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.10
 platform: ruby
 authors:
 - James Robertson
@@ -62,7 +62,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,27 +72,27 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: svgle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.1
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="