esvg 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01212e0dd22ac81b0551cbd8c036adc6dae5649f
-  data.tar.gz: 32dad04ed7e7252fdab0e0b4895cf03e994e5aea
+  metadata.gz: 5df426e77287c9878d1d1e4015cb0e53b587bb5a
+  data.tar.gz: 37c2c9e0f77f3898afdef009a59fecaae870fbec
 SHA512:
-  metadata.gz: f45c6bacd67ebc6e96b2f3902799e4c9695a744e049af01ed481769631d7f050dbba371d89f02c9deb0a3fa35638dadef4d72683fde895d8acac5ba0ebaf92ef
-  data.tar.gz: 56084715013ffea7f4ef6c28d99358fc3d4e04b1441a466ff50c65162db351e510aae34d307bf986db9dfd978069198bfd3d33dd11cdf1eedc6c10970fc298e6
+  metadata.gz: dbcb61a40159c48fef3e224b3a83723ef243d224acb6eff08b2c42032c66471b214e3d16ef6399abeb80d3c13c4f86ed5e4b6766cefa21fc4ee5d0026c5f7b32
+  data.tar.gz: 3305442d217788371c21e7c9f069522257c1d1f38dd85bef58ea996904a3197201ac5ab086b2c306a4db733ad092df56b107d22620bdbdfd72558a970bb77d06

data/lib/esvg/svg.rb

@@ -150,7 +150,16 @@ module Esvg
       (svg_cache.keys - files.keys.map {|file| file_key(file) }).each do |f|
         svg_cache.delete(f)
       end
+    end
+
+    def build_paths
+      build_keys = svgs.keys.reject do |key|
+        key == '.' ||
+        key.match(/^_/) ||
+        config[:flatten].include?(key)
+      end
 
+      build_keys.map { | key | File.expand_path(build_path(key)) }
     end
 
     def flatten_path(path)
@@ -354,21 +363,50 @@ module Esvg
       end
     end
 
+    def build_path(key)
+      dir = config[:js_build_dir] || File.dirname(config[:js_path])
+           
+      if config[:js_build_version]
+        key = "#{key}-#{config[:js_build_version]}"
+      end
+
+      File.join(dir, key+'.js')
+    end
+
     def write_path(path, key)
-      # Write esvg-core.js
+      # Write root svgs
       return config[path] if key == "."
 
       if !key.start_with?('_') && path.to_s.start_with?('js')
-        if config[:js_build_version]
-          key = "#{key}-#{config[:js_build_version]}"
-        end
+        build_path(key)
+      else
+        config[path].sub(/[^\/]+?\./, key+'.')
+      end
+    end
+
+    # Scans <def> blocks for IDs
+    # If urls(#id) are used, ensure these IDs are unique to this file
+    # Only replace IDs if urls exist to avoid replacing defs
+    # used in other svg files
+    #
+    def sub_def_ids(file, content)
+      return content unless !!content.match(/<defs>/)
+
+      content.scan(/<defs>.+<\/defs>/m).flatten.each do |defs|
+        defs.scan(/id="(.+?)"/).flatten.uniq.each_with_index do |id, index|
 
-        if config[:js_build_dir]
-          return File.join(config[:js_build_dir], key+'.js')
+          if content.match(/url\(##{id}\)/)
+            new_id = "#{classname(file)}-ref#{index}"
+
+            content = content.gsub(/id="#{id}"/, %Q{class="#{new_id}"})
+                             .gsub(/url\(##{id}\)/, "url(##{new_id})" )
+          else
+            content = content.gsub(/id="#{id}"/, %Q{class="#{id}"})
+          end
         end
       end
 
-      config[path].sub(/[^\/]+?\./, key+'.')
+      content
     end
 
     def prep_svg(file, content)
@@ -379,12 +417,14 @@ module Esvg
              .gsub(/\s?fill="(#0{3,6}|black|rgba?\(0,0,0\))"/,'')      # Strip black fill
              .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
+
+      sub_def_ids(file, content)
     end
 
     def optimize(svg)
       if config[:optimize] && svgo_path = find_node_module('svgo')
         path = write_svg(svg)
-        svg = `#{svgo_path} '#{path}' -o -`
+        svg = `#{svgo_path} --disable=removeUselessDefs '#{path}' -o -`
         FileUtils.rm(path)
       end
 

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esvg
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-03 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler