esvg 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18967aa14b9ff1be12be160f27011f0d27f52c76
-  data.tar.gz: d302417c96f774c13fbe8f9f11ba05b11b3efe96
+  metadata.gz: 6b087a02dc8dc7a7441b1e1947004e94ec92c0da
+  data.tar.gz: 6493260130cb04bbb057919c7fd73ab905794105
 SHA512:
-  metadata.gz: b645873370e95a13572a900a08c70782904c8010cd2437c66fe74da38a24e5d2f8c910907fb7d9c948f3a739e3cf915a2c8f8590ab71efc19b95c54f9af31211
-  data.tar.gz: 41fed94f9feee7e3f45caf23fc520a9f05d06fa146a65796a41eb2ba6c398d0d24fb01f85b994b999c8ffc283a5b5cecd9e0a0145f08e3ed689daec9f2abd1ae
+  metadata.gz: dd65cb5d99def4eb3100975670c760e7f4bfed24bd7117844844d3c813d4e5dca289246e45d7cc3c439b0d80be8d73fe3329f3b3d0e3b8417f4ee7bab837c7f4
+  data.tar.gz: cd900bbfd5310726d2b946eb82c6f694cf7f947fd2b9a663105a09014364b1876c48f40228b2a0577ed2e795d399a026271e5047196d1c78d00b248c3127ead6

data/CHANGELOG.md

@@ -1,7 +1,10 @@
 # Changelog
 
+### 2.4.2 (2015-10-26)
+- Fix: Improved reliability and speed of optimization with svgo, by writing a temp file to the file system.
+
 ### 2.4.1 (2015-10-17)
-- Fix: Icon embedding (with ruby/rails) uses proper key for lookup.
+- Fix: icon embedding (with ruby/rails) uses proper key for lookup.
 
 ### 2.4.0 (2015-10-17)
 - New: Caching is now based on file modification times. It's much faster and more efficient.

data/lib/esvg/svg.rb

@@ -112,15 +112,6 @@ module Esvg
       }
     end
 
-    #def compress(file)
-      #if config[:optimize] && svgo?
-         #Compress files outputting to $STDOUT which returns as a string
-        #`#{@svgo} #{file} -o -`
-      #else
-        #File.read(file)
-      #end
-    #end
-
     def use_svg(file, content)
       name = classname(file)
       %Q{<svg class="#{config[:base_class]} #{name}" #{dimensions(content)}><use xlink:href="##{name}"/></svg>}
@@ -198,6 +189,12 @@ module Esvg
       end
     end
 
+    def write_svg(svg)
+      path = File.join(config[:path], '.esvg-cache')
+      write_file path, svg
+      path
+    end
+
     def write_js
       write_file config[:js_path], js
     end
@@ -254,10 +251,24 @@ module Esvg
     end
 
     def prep_svg(file, content)
-      content.gsub(/<svg.+?>/, %Q{<svg class="#{classname(file)}" #{dimensions(content)}>})  # convert svg to symbols
-             .gsub(/\n/, '')                 # remove endlines
-             .gsub(/\s{2,}/, ' ')            # remove whitespace
-             .gsub(/>\s+</, '><')            # remove whitespace between tags
+      content = content.gsub(/<svg.+?>/, %Q{<svg class="#{classname(file)}" #{dimensions(content)}>})  # convert svg to symbols
+             .gsub(/\n/, '')                 # Remove endlines
+             .gsub(/\s{2,}/, ' ')            # Remove whitespace
+             .gsub(/>\s+</, '><')            # Remove whitespace between tags
+             .gsub(/style="([^"]*?)fill:(.+?);/m, 'fill="\2" style="\1')                   # Make fill a property instead of a style
+             .gsub(/style="([^"]*?)fill-opacity:(.+?);/m, 'fill-opacity="\2" style="\1')   # Move fill-opacity a property instead of a style
+             .gsub(/\s?style=".*?";?/,'')    # Strip style property
+             .gsub(/\s?fill="(#0{3,6}|black|rgba?\(0,0,0\))"/,'')      # Strip black fill
+    end
+
+    def optimize(svg)
+      if config[:optimize] && svgo?
+        path = write_svg(svg)
+        svg = `svgo '#{path}' -o -`
+        FileUtils.rm(path)
+      end
+
+      svg
     end
 
     def html
@@ -269,13 +280,7 @@ module Esvg
           symbols << prep_svg(name, data[:content])
         end
 
-        symbols = if config[:optimize] && svgo?
-          `svgo -s '#{symbols.join}' -o -`
-        else
-          symbols.join
-        end
-
-        symbols = symbols.gsub(/class/,'id').gsub(/svg/,'symbol')
+        symbols = optimize(symbols.join).gsub(/class/,'id').gsub(/svg/,'symbol')
 
         %Q{<svg id="esvg-symbols" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display:none">#{symbols}</svg>}
       end

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "2.4.1"
+  VERSION = "2.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esvg
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-18 00:00:00.000000000 Z
+date: 2015-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler