esvg 2.8.10 → 2.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7f1213db1c8babf0143f05a93ab2e18a677a2207
-  data.tar.gz: d149e49116c60aa64adf6335680d1f4676d7e94c
+  metadata.gz: 24c44ea3e068939c63866e73847817b2ae0b775e
+  data.tar.gz: cbd0c934f3cb92170dee3d4d2fff774e206610bf
 SHA512:
-  metadata.gz: e6a99543e715908e3713fc9a412530f91871365af61db8143c0879816cada1d6b7a82f3d0bc133a38f8b5f34603c1ab0637034a5e581a9071999da39efe662d3
-  data.tar.gz: 12b33696959aa397bdfc37f444fd946b248f8a1103f13a869ac06655472568b14da825297f83cc700db031e273005212d7f626e37b7aaaf9b1068161bee70866
+  metadata.gz: 131ca0178d2497c234e1af04a8e1e4d95f27e5138bba9ca3bc874c325ca341a47dbb99c77a99fbae7c339881375802e393a6b5c1ddc0eac48e04abde6aeee53a
+  data.tar.gz: 269d4b855617971d605e68db2d43c77037d4ed1ac6e865b204b28c5388e30e5ecaa56043fb74152fa389bf854b7453cfb50d7a3006e4b590464a8b0e43b21b9a

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+### 2.9.0 (2016-07-18)
+- New: `icon` method accepts fill, color, height, and width
+
 ### 2.8.10 (2016-07-01)
 - Fix: Improved svgo detection; no longer requires svgo_path.
 

data/lib/esvg/svg.rb

@@ -180,14 +180,16 @@ module Esvg
         embed = use_icon(name)
         embed = embed.sub(/class="(.+?)"/, 'class="\1 '+options[:class]+'"') if options[:class]
 
-        if options[:style]
-          if embed.match(/style/)
-            embed = embed.sub(/style="(.+?)"/, 'style="\1; '+options[:style]+'"')
-          else
-            embed = embed.sub(/><use/, %Q{ style="#{options[:style]}"><use})
-          end
+        if options[:color]
+          options[:style] ||= ''
+          options[:style] += ";color:#{options[:color]};"
         end
 
+        embed = add_attribute(embed, 'style', options[:style], ';')
+        embed = add_attribute(embed, 'fill', options[:fill])
+        embed = add_attribute(embed, 'height', options[:height])
+        embed = add_attribute(embed, 'width', options[:width])
+
         embed = embed.sub(/><\/svg/, ">#{title(options)}#{desc(options)}</svg")
 
         if Esvg.rails?
@@ -198,6 +200,19 @@ module Esvg
       end
     end
 
+    def add_attribute(tag, attr, content=nil, append=false)
+      return tag if content.nil?
+      if tag.match(/#{attr}/)
+        if append
+          tag.sub(/#{attr}="(.+?)"/, attr+'="\1'+append+content+'"')
+        else
+          tag.sub(/#{attr}=".+?"/, attr+'="'+content+'"')
+        end
+      else
+        tag.sub(/><use/, %Q{ #{attr}="#{content}"><use})
+      end
+    end
+
     def dimensions(input)
       dimension = input.scan(/<svg.+(viewBox=["'](.+?)["'])/).flatten
       viewbox = dimension.first

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "2.8.10"
+  VERSION = "2.9.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esvg
 version: !ruby/object:Gem::Version
-  version: 2.8.10
+  version: 2.9.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler