svgplot 0.0.3 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78645b3474126de624520769e3e47a912c74c8ec
-  data.tar.gz: 912c342c8937cf8d955276d755a7ef2d8e215d9a
+  metadata.gz: 1362ed73c8432a4d47876d69af1d926045cc8650
+  data.tar.gz: 9de3d7f372a01012cdd48a9b4f5612da0a0be8ad
 SHA512:
-  metadata.gz: 57e2114c946ee6c2f1fd26df0ad418f4abee99535f63674b15de6ec1af1ad6ae1437b44401a874687f135892d91356d9d4a5231efc23f88cad71c0f9dc71649d
-  data.tar.gz: 2552ad29a97eddf67c6b90b3a9050e691ae3c13a58a7fb7668937d66b15d5566a960240c565064714cba88dd778e069c4820493facea0b6da251c0b04fb802eb
+  metadata.gz: 4e490f441c1323f48dc42dd7031590285fd88c0353eca35839f1de9637fceeeef5c28ae470227a22bec368d3b2e61dd3b77606652cd29ca9f0765349e58d4a33
+  data.tar.gz: ece9f1a0bf6fc7c539f6777aa62cdc849d76aae33c52f9c150dc00501620a8af177e4c8f448caad925c002986bf59c67845fcaad506e31b2dd60d71fad0dc668

data/lib/svgplot/meta.rb

@@ -50,16 +50,3 @@ SVGPlot::SVG_TRANSFORM = [
   :skewX,     # angle
   :skewY      # angle
 ]
-
-SVGPlot::CSS_STYLE = [
-  :fill,
-  :stroke_width,
-  :stroke,
-  :fill_opacity,
-  :stroke_opacity,
-  :opacity,
-  :'text-align',
-  :font,
-  :'white-space',
-  :display
-]

data/lib/svgplot/plot.rb

@@ -54,33 +54,31 @@ module SVGPlot
 
     def validate_attributes(attributes)
       clean_attributes = {}
-      transforms = {}
-      styles = {}
 
-      attributes.each do |attribute, value|
-        if SVGPlot::SVG_TRANSFORM.include? attribute
-          transforms[attribute] = value
-        elsif SVGPlot::CSS_STYLE.include? attribute
-          styles[attribute] = value
-        elsif attribute.match(/^data-[a-z]+$/)
-          clean_attributes[attribute] = value
-        else
-          clean_attributes[validate_attribute(attribute)] = value
-        end
+      transforms = {}
+      attributes.delete(:transform) { Hash.new }.each do |key, value|
+        transforms[key] = value
       end
-
-      #always prefer more verbose definition.
       unless transforms.empty?
-        transforms.merge!(clean_attributes[:transform]) if clean_attributes[:transform]
         str = ""
         write_transforms(transforms, str)
         clean_attributes[validate_attribute(:transform)] = str
       end
 
+      styles = {}
+      attributes.delete(:style) { Hash.new }.each { |k, v| styles[k] = v }
       unless styles.empty?
-        styles.merge!(clean_attributes[:style]) if clean_attributes[:style]
         clean_attributes[validate_attribute(:style)] = styles
       end
+
+      attributes.delete(:data) { Hash.new }.each do |key, value|
+        clean_attributes["data-#{key.to_s}".to_sym] = value
+      end
+
+      attributes.each do |key, value|
+        clean_attributes[validate_attribute(key)] = value
+      end
+
       clean_attributes
     end
 

data/svgplot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'svgplot'
-  s.version     = '0.0.3'
+  s.version     = '0.1.1'
   s.date        = Time.now.strftime("%Y-%m-%d")
 
   s.summary     = 'SVG Generation Library'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svgplot
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.1.1
 platform: ruby
 authors:
 - Les Aker
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop