svgle 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebac10f7f16a51fdc11cb47d10722df139a6ad6e
-  data.tar.gz: c193058e7416fec69057dff1a4b6d1d8d0425bad
+  metadata.gz: d994517953a3e97d2db065bce4ed869a6c079f7a
+  data.tar.gz: 3d09ccfdfe4c55b63d74f0b119f3bd8c6b1b20bd
 SHA512:
-  metadata.gz: b502b25bc97c7143935a5a2af502136c4fd4972d585404d2889f980db1b8c2db11a36c47662f0ec897f035c09c896a1f60c6ad4235989b52c960d3e287498e51
-  data.tar.gz: 7436b3233067e7d5a94ed37fe58135661b26c40d1cd48b45f84cd247e05da5b557990b09dd805c3d36b6b7be76f7d33e23884ddbf0434cc6f51c6a37ce2b801a
+  metadata.gz: a8279f4ab5a081f25e068eec462aa3515595f5d22db7212fb265a3f63fd9107d14f609bb07a01f410b4fe1e19e6a12955bf6d9d2d3867a2e22a2177c9468862f
+  data.tar.gz: af1c29186fa99368c38de63d006ca0f8dc8fb21f9842e2ea88327c8ef52d59b742ea7614d396cbc8246122abdb04876f5a7d611ac3ae326166d307c72e7b4fb2

data.tar.gz.sig

@@ -1 +1 @@
-#�<;%��,��<�7�N��g	�}�N���,q���s��u�ަgn��"�����y{����P9a�fl���ά�0�+�c'�NP!��zG��jʽ�vj���`�.8���%6��@njd�}��4$Y��q��t��JJ�gX
+��ߔ8��;�e�j�"���'�~�������o3[�1f��og�Z98�Nl�cɸ$�$NM�=�Y
��ndcL�>�@hD辰��2�0/�"R�𾖽)���y�w�nj�k��	7�?ZM!�YG�����f/t�̙�kh�w�����@�������U�`)-�і0�<���v�P@��|��z�V������A}H��X��6%�%+}xw��|��.B?�����5�r�q��

data/lib/svgle.rb

@@ -3,6 +3,7 @@
 # file: svgle.rb
 
 require 'rexle'
+require 'rxfhelper'
 
 # helpful SVG element references: 
 #
@@ -62,10 +63,11 @@ class Svgle < Rexle
   
   class Element < Rexle::Element
 
-    def initialize(name=nil, value: nil, attributes: Attributes.new(parent: self), rexle: nil)
+    def initialize(name=nil, value: nil, \
+                          attributes: Attributes.new(parent: self), rexle: nil)
+      
       super(name, value: value, attributes: attributes, rexle: rexle)
       
-      @boundary_box = [[0,0,0,0]]
     end
     
     def self.attr2_accessor(*a)
@@ -177,6 +179,7 @@ class Svgle < Rexle
   end  
   
   class Style < Element
+    
 
   end  
   
@@ -197,8 +200,8 @@ class Svgle < Rexle
 
 
   def initialize(x=nil, callback: nil)
-    super x
-    add_css()
+    super x    
+    find_add_css()
     @callback = callback
   end
   
@@ -212,34 +215,54 @@ class Svgle < Rexle
   
   private
   
-  def add_css()
+  def find_add_css()
 
-    @doc.root.xpath('//style').each do |e|
-      
-      # parse the CSS
-      
-      a = e.text.split(/}/)[0..-2].map do |entry|
+    @doc.root.xpath('//style').each {|e|  add_css e.text }   
 
-        raw_selector,raw_styles = entry.split(/{/,2)
+    # check for an external CSS file
+    if @instructions and @instructions.any? then
 
-        h = raw_styles.split(/;/).inject({}) do |r, x| 
-          k, v = x.split(/:/,2).map(&:strip)
-          r.merge(k.to_sym => v)
-        end
+      hrefs = @instructions.inject([]) do |r,x| 
 
-        [raw_selector.split(/,\s*/).map(&:strip), h]
-      end      
+        if x[0] =~ /xml-stylesheet/i and x[1] =~ /text\/css/i then
 
-      
-      # add the CSS style attributes to the element
-      # e.g. a = [[['line'],{stroke: 'green'}]]
-      
-      a.each do |selectors, style|
-        selectors.each do |selector|
-          style.each {|k,v| self.at_css(selector).style[k] = v }
+          r << x[1][/href\s*=\s*["']([^'"]+)/,1]
+        else
+          r
         end
       end
       
+      add_css hrefs.map{|x| RXFHelper.read(x).first}.join
+      
+    end
+
+
+  end
+  
+  def add_css(s)
+
+    # parse the CSS
+    
+    a = s.split(/}/)[0..-2].map do |entry|
+
+      raw_selector,raw_styles = entry.split(/{/,2)
+
+      h = raw_styles.split(/;/).inject({}) do |r, x| 
+        k, v = x.split(/:/,2).map(&:strip)
+        r.merge(k.to_sym => v)
+      end
+
+      [raw_selector.split(/,\s*/).map(&:strip), h]
+    end      
+
+    
+    # add each CSS style attribute to the element
+    # e.g. a = [[['line'],{stroke: 'green'}]]
+    
+    a.each do |selectors, style|
+      selectors.each do |selector|
+        style.each {|k,v| self.at_css(selector).style[k] = v }
+      end
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svgle
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - James Robertson
@@ -53,6 +53,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.3.9
+- !ruby/object:Gem::Dependency
+  name: rxfhelper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.3
 description: 
 email: james@r0bertson.co.uk
 executables: []