esvg 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3215d01408d6127b3827a4514024675e5e45f46c
-  data.tar.gz: 8b1a528f475f4cf98e2c674d8b25f57643906f41
+  metadata.gz: 4677251f95c7f1ab30e85a77dbbaecd683703680
+  data.tar.gz: f6dcf98027aab09923f34ad3d5065a3a29ed7128
 SHA512:
-  metadata.gz: 915d328c730f351de449eab23ac219f8b2ec9aef6df69f05656a5fc020de9c9c62c9a6bcab5a2c68fb5bcecd893d54888a808c42191669e33811a4d74d17461b
-  data.tar.gz: 7a65f080943ddd4d367b02474ecc0087f8246faa452973e7f1a37fbc10eab47daec0dfc3de0a710a18df6ef8df3e207829b48284c978f20cb046912e512937b4
+  metadata.gz: 43e0f618e64866961bc89de0f376e5caa1ec8d68f3f990a286552cdc67b959431c1ddd401599a45c2496c56d831b34a77955753a4700bcbf00df0db6efe959cb
+  data.tar.gz: 7ab9ce67fd94776ed55a7004a607bf76ddbfc69ecf6c6580e6cdcfe380217e4a4d1cee48edac794f7d45f290584f663c49d914c5fe86632a5afe585a5bc1bb09

data/lib/esvg/svg.rb

@@ -11,6 +11,7 @@ module Esvg
       @name = name
       @config = config
       @symbols = symbols
+      @symbol_defs = []
       @asset = File.basename(name).start_with?('_')
       @version = @config[:version] || Digest::MD5.hexdigest(symbols.map(&:mtime).join)
     end
@@ -65,10 +66,6 @@ module Esvg
       end
     end
 
-    def optimize
-      @symbols.map(&:optimize).join.gsub("\n",'')
-    end
-
     def svg
       attr = {
         "data-symbol-class" => @config[:class],
@@ -76,7 +73,13 @@ module Esvg
         "version" => "1.1",
         "style" => "height:0;position:absolute"
       }
-      %Q{<svg id="esvg-#{id}" #{attributes(attr)}>#{optimize}</svg>}
+
+      defs = @symbols.map(&:defs).compact.join
+      defs = "<defs>#{defs}</defs>" unless defs.empty?
+
+      optimized = @symbols.map(&:optimize).join.gsub("\n",'')
+
+      %Q{<svg id="esvg-#{id}" #{attributes(attr)}>#{defs}#{optimized}</svg>}
     end
 
   end

data/lib/esvg/symbol.rb

@@ -2,7 +2,7 @@ require 'open3'
 
 module Esvg
   class Symbol
-    attr_reader :name, :id, :path, :content, :optimized, :size, :group, :mtime
+    attr_reader :name, :id, :path, :content, :optimized, :size, :group, :mtime, :defs
 
     include Esvg::Utils
 
@@ -17,25 +17,24 @@ module Esvg
       return if !File.exist?(@path)
 
       time = last_modified
-      if @mtime != time
-        @mtime   = time
-        @content = pre_optimize File.read(@path)
-        @size    = dimensions
-        @optimized = nil
-        @optimized_at = nil
-      end
 
       # Ensure that cache optimization matches current optimization settings
       # If config has changed name, reset optimized build (name gets baked in)
-      if @svgo_optimized != svgo? || name != file_name
+      if @mtime != time || @svgo_optimized != svgo? || name != file_name
         @optimized = nil
         @optimized_at = nil
       end
-      
+
       @group = dir_key
       @name  = file_name
       @id    = file_id file_key
 
+      if @mtime != time
+        @content = prep_defs pre_optimize File.read(@path)
+        @mtime   = time
+        @size    = dimensions
+      end
+
       self
     end
 
@@ -56,6 +55,7 @@ module Esvg
         mtime: @mtime,
         size: @size,
         content: @content,
+        defs: @defs,
         optimized: @optimized,
         optimized_at: @optimized_at,
         svgo_optimized: svgo? && @svgo_optimized
@@ -138,8 +138,6 @@ module Esvg
       return @optimized if @optimized && @optimized_at > @mtime
 
       @optimized = @content
-      sub_def_ids
-      move_defs
 
       if svgo? 
         response = Open3.capture3(%Q{#{Esvg.node_module('svgo')} --disable=removeUselessDefs -s '#{@optimized}' -o -})
@@ -227,6 +225,7 @@ module Esvg
     end
 
     def pre_optimize(svg)
+
       # Generate a regex of attributes to be removed
       att = Regexp.new %w(xmlns xmlns:xlink xml:space version).map { |m| "#{m}=\".+?\"" }.join('|')
 
@@ -244,7 +243,6 @@ module Esvg
     def post_optimize
       @optimized = set_attributes
         .gsub(/<\/svg/,'</symbol')      # Replace svgs with symbols
-        .gsub(/class="def-/,'id="def-') # Replace <def> classes with ids (classes are generated in sub_def_ids)
         .gsub(/\w+=""/,'')              # Remove empty attributes
     end
 
@@ -261,36 +259,28 @@ module Esvg
     # Only replace IDs if urls exist to avoid replacing defs
     # used in other svg files
     #
-    def sub_def_ids
-      @optimized.scan(/<defs>.+<\/defs>/m).flatten.each do |defs|
-        defs.scan(/id="(.+?)"/).flatten.uniq.each_with_index do |id, index|
-
-          # If there are urls which refer to
-          # ids be sure to update both
-          #
-          if @optimized.match(/url\(##{id}\)/)
-            new_id = "def-#{@id}-#{index}"
-
-            @optimized = @optimized.gsub(/id="#{id}"/, %Q{class="#{new_id}"})
-                                   .gsub(/url\(##{id}\)/, "url(##{new_id})")
-
-          # Otherwise just leave the IDs of the
-          # defs and change them to classes to 
-          # avoid SVGO ID mangling
-          #
-          else
-            @optimized = @optimized.gsub /id="#{id}"/, %Q{class="#{id}"}
+    def prep_defs(svg)
+
+      # <defs> should be moved to the beginning of the SVG file for braod browser support. Ahem, Firefox ಠ_ಠ
+      # When symbols are reassembled, @defs will be added back
+      
+      if @defs = svg.scan(/<defs>(.+)<\/defs>/m).flatten[0]
+        svg.sub!("<defs>#{@defs}</defs>", '')
+        @defs.gsub!(/(\n|\s{2,})/,'')
+
+        @defs.scan(/id="(.+?)"/).flatten.uniq.each_with_index do |id, index|
+
+          # If there are urls matching def ids
+          if svg.match(/url\(##{id}\)/)
+
+            new_id = "def-#{@id}-#{index}"                 # Generate a unique id
+            @defs.gsub!(/id="#{id}"/, %Q{id="#{new_id}"})  # Replace the def ids
+            svg.gsub!(/url\(##{id}\)/, "url(##{new_id})")  # Replace url references to these old def ids
           end
         end
       end
-    end
 
-    # <defs> should be moved to the beginning of the SVG file for braod browser support. Ahem, Firefox ಠ_ಠ
-    def move_defs
-      if defs = @optimized.scan(/(\s*<defs>.+<\/defs>\s*)/m).flatten[0]
-        @optimized.sub!(defs, '')
-        @optimized.sub!(/(<svg.+?>)/, "\1#{defs}")
-      end
+      svg
     end
   end
 end

data/lib/esvg/version.rb

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

metadata

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