gtk2svg 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1989417cefdc129432376ab637368e1399fbb668
-  data.tar.gz: 01810dd6ce14e2519010091bc806e07541b7313b
+  metadata.gz: a55c872601bd2d4c2fc6bf06dcb2584fbf0f243c
+  data.tar.gz: beff474fdeea18a06e29fb0b0638a6f74ccc23b9
 SHA512:
-  metadata.gz: 82caa0952e6b937902772080ca01d3b7dabeae8caba8e9295f6d2c2462e7d866255acdd237dcba45b18c1af2907853b520d1f1e421d090d02b259c072e80c3b5
-  data.tar.gz: 15d26bc9e4c0b3921f88228b18bd9c5358785e362e73b1335d80924aee077672d24f3b2074fb6711114afce6c468d396d4724ca02e72d3f2ecdb1d0af660927b
+  metadata.gz: 8d371d6758b11617697842efa6434513e89d7fbd45c17a8ffb719f34ec689e73420cbd357c41d3da37eb8a4440cad55daf6caed57223a01ece9623252ed1b46a
+  data.tar.gz: c1686b09617e0aa837a0fbb3e26fcb1351ade542f348847af88568b3c481097a124ccbffc1ea29abbf43b0751dc453adf710bd2b6c398bde920035a35452d51f

data/lib/gtk2svg.rb

@@ -8,30 +8,8 @@ require 'svgle'
 
 
 # Description: Experimental gem to render SVG within an GTK2 application. 
-#           Currently it can only render rectangles along with the fill colour.
 
 
-module SVG
-  class Element
-
-    attr_reader :style
-
-    def initialize(attributes, style)
-
-      @h = {x: '0', y: '0'}.merge attributes 
-
-      @style = {fill: 'black'}
-      @style.merge!(style) if attributes[:style]
-
-    end
-
-    def attributes()
-      @h
-    end
-
-  end
-end
-
 module Gtk2SVG
 
   class Render < DomRender
@@ -42,10 +20,7 @@ module Gtk2SVG
     
     def ellipse(e, attributes, style)
 
-      e2 = SVG::Element.new attributes, style
-      h = e2.attributes
-      style = e2.style
-
+      h = attributes
 
       x, y= %i(cx cy).map{|x| h[x].to_i }
       width = h[:rx].to_i * 2
@@ -56,22 +31,16 @@ module Gtk2SVG
     
     def line(e, attributes, style)
 
-      e2 = SVG::Element.new attributes, style
-      h = e2.attributes
-      style = e2.style
       style[:stroke_width] = style.delete(:'stroke-width') || '3'
 
-      x1, y1, x2, y2 = %i(x1 y1 x2 y2).map{|x| h[x].to_i }
+      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 rect(e, attributes, style)
 
-      e2 = SVG::Element.new attributes, style
-      h = e2.attributes
-      style = e2.style
-
+      h = attributes
 
       x1, y1, width, height = %i(x y width height).map{|x| h[x].to_i }
       x2, y2, = x1 + width, y1 + height
@@ -81,12 +50,9 @@ module Gtk2SVG
     
     def text(e, attributes, style)
 
-      e2 = SVG::Element.new attributes, style
-      h = e2.attributes
-      style = e2.style.merge({font_size: '20'})
-
+      style.merge!({font_size: '20'})
 
-      x, y, fill = %i(x y fill).map{|x| h[x] }
+      x, y, fill = %i(x y fill).map{|x| attributes[x] }
       style.merge!({fill: fill})
 
       [:draw_layout, [x.to_i, y.to_i], e.text, style, render_all(e)]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtk2svg
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - James Robertson