esvg 4.3.1 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4677251f95c7f1ab30e85a77dbbaecd683703680
-  data.tar.gz: f6dcf98027aab09923f34ad3d5065a3a29ed7128
+  metadata.gz: 051d0f7f2d698b4e1514aac9c3aa45701db91c4e
+  data.tar.gz: 9e6c581c464a7f931992f3598cab24b98ac6e2eb
 SHA512:
-  metadata.gz: 43e0f618e64866961bc89de0f376e5caa1ec8d68f3f990a286552cdc67b959431c1ddd401599a45c2496c56d831b34a77955753a4700bcbf00df0db6efe959cb
-  data.tar.gz: 7ab9ce67fd94776ed55a7004a607bf76ddbfc69ecf6c6580e6cdcfe380217e4a4d1cee48edac794f7d45f290584f663c49d914c5fe86632a5afe585a5bc1bb09
+  metadata.gz: 7ab57771920663c7b14891349355ef96d19aaf874491d566eea8842865954e4b0bb8914caabbb2548ddade85b4d7ba5184cd43ee3e3f1621a1402cc41e951084
+  data.tar.gz: a2b94f14a41c831b61ab49be31ac9c89cefe7ca59954f92a7ae97cd497e390bf64d83e454d7d5af057ae00a3b8c309434f8aa4219d3e21fad87fcc375cbeac32

data/lib/esvg/symbol.rb

@@ -67,36 +67,37 @@ module Esvg
     end
 
     def use(options={})
-      if options[:color]
-        options[:style] ||= ''
-        options[:style] += "color:#{options[:color]};#{options[:style]}"
+      options.delete(:fallback)
+      content = options.delete(:content) || ''
+
+      if desc   = options.delete(:desc)
+        content = "<desc>#{desc}</desc>#{content}"
+      end
+      if title  = options.delete(:title)
+        content = "<title>#{title}</title>#{content}"
       end
 
+      use_attr = {
+        height: options[:height],
+        width: options[:width],
+        scale: options[:scale],
+      }.merge(options.delete(:use) || {})
+
       svg_attr = {
-        class: [@config[:class], @config[:prefix]+"-"+@name, options[:class]].compact.join(' '),
+        class: [@config[:class], @config[:prefix]+"-"+@name, options.delete(:class)].compact.join(' '),
         viewBox: @size[:viewBox],
-        style:  options[:style],
-        fill:   options[:fill],
         role: 'img'
-      }
+      }.merge(options)
 
       # If user doesn't pass a size or set scale: true
-      if options[:width].nil? && options[:height].nil? && !options[:scale]
+      if svg_attr[:width].nil? && svg_attr[:height].nil? && !svg_attr[:scale]
         svg_attr[:width]  = width
         svg_attr[:height] = height
-      else
-        # Add sizes (nil options will be stripped)
-        svg_attr[:width]  = options[:width]
-        svg_attr[:height] = options[:height]
       end
 
-      use_attr = {
-        height: options[:height],
-        width: options[:width],
-        scale: options[:scale],
-      }
+      svg_attr.delete(:scale)
 
-      %Q{<svg #{attributes(svg_attr)}>#{use_tag(use_attr)}#{title(options)}#{desc(options)}#{options[:content]||''}</svg>}
+      %Q{<svg #{attributes(svg_attr)}>#{use_tag(use_attr)}#{content}</svg>}
     end
 
     def use_tag(options={})
@@ -113,22 +114,6 @@ module Esvg
       %Q{<use #{attributes(options)}/>}
     end
 
-    def title(options)
-      if options[:title]
-        "<title>#{options[:title]}</title>"
-      else
-        ''
-      end
-    end
-
-    def desc(options)
-      if options[:desc]
-        "<desc>#{options[:desc]}</desc>"
-      else
-        ''
-      end
-    end
-
     def svgo?
       @config[:optimize] && !!Esvg.node_module('svgo')
     end

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "4.3.1"
+  VERSION = "4.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esvg
 version: !ruby/object:Gem::Version
-  version: 4.3.1
+  version: 4.3.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler