esvg 4.6.0 → 4.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 820db24a0bf898bc0a5fc35930e83c09fc14c7d83e352cb31b0150d0d84b74c3
-  data.tar.gz: 25e7b4d70ec12353ac66a44379359f039f44cc2d554afb99d4bb73f1239a4a7d
+  metadata.gz: 8b5d0d6910641142e441309223019ebfbb1d2a89482bddbe54ab449a27043beb
+  data.tar.gz: 46834ffa28ddc045350703ba4e3606c168e65022d3a024dc989970252d3a68cc
 SHA512:
-  metadata.gz: cc625fd97ac79845b97224d438a9f8187c95894651a2418b942ba6ef5dfbf04d7529f66f210136829ef89d0c6c4e8160a4b9cb508591fe0170b3fc11ab822623
-  data.tar.gz: 49fa04b7635aa59a5d42c9bf358ab7c4bc63b195454a3abb9c6eb0783e2b557eda5d409e281053e475de1245a8764545c6856acd6e45dd86445fb130c0da27dc
+  metadata.gz: 25e807067537f26d6aba337e6c94acfcf22385842411706fde699338460ed1ae6a49a9850f513a63bba17d75620696107cd4b458b97fc4bff4eadab494786ed2
+  data.tar.gz: e69bfb87e23cffe1b4b7a17e92475f605f0ad24f7d092dd169a97ca4561819f2447790ef39a1dcc3ed6813032b7e8df04eeab4d7710b7d827286beac5d30306a

data/lib/esvg.rb

@@ -52,9 +52,13 @@ module Esvg
   def new(options={})
     @svgs ||=[]
     c = config(options)
+
+    # If the source path is the same continue
+    # Otherwise add a new SVG group for this path
     unless @svgs.find { |s| s.config[:source] == c[:source] }
       @svgs << Svgs.new(c)
     end
+
     @svgs.last
   end
 

data/lib/esvg/svg.rb

@@ -80,9 +80,9 @@ module Esvg
         defs = @symbols.map(&:defs).compact.join
         defs = "<defs>#{defs}</defs>" unless defs.empty?
 
-        optimized = @symbols.map(&:optimize).join.gsub("\n",'')
+        symbols = @symbols.map(&:symbol).join.gsub("\n",'')
 
-        @svg = %Q{<svg id="esvg-#{id}" #{attributes(attr)} data-turbolinks-permanent>#{defs}#{optimized}</svg>}
+        @svg = %Q{<svg id="esvg-#{id}" #{attributes(attr)} data-turbolinks-permanent>#{defs}#{symbols}</svg>}
       end
     end
 

data/lib/esvg/svgs.rb

@@ -90,9 +90,13 @@ module Esvg
       end
     end
 
-    # Embed only build scripts
+    # Embed svg symbols
     def embed_script(names=nil)
-      embeds = buildable_svgs(names).map(&:embed)
+      if Esvg.rails? && Rails.env.production?
+        embeds = buildable_svgs(names).map(&:embed)
+      else
+        embeds = find_svgs(names).map(&:embed)
+      end
 
       write_cache if cache_stale?
 

data/lib/esvg/symbol.rb

@@ -83,7 +83,6 @@ module Esvg
     def data
       {
         path: @path,
-        id: @id,
         name: @name,
         group: @group,
         mtime: @mtime,
@@ -102,10 +101,12 @@ module Esvg
 
     def use(options={})
       
+      # If preset key is set, merge presets from configuration
       if options[:preset] && preset = @config[:presets][ options.delete(:preset).to_sym ]
         options = options.merge( preset )
       end
 
+      # If size key is set, merge size class from configuration
       if options[:size] && size_class = @config[:sizes][ options.delete(:size).to_sym ]
         options = options.merge( size_class )
       end
@@ -165,20 +166,23 @@ module Esvg
       # Only optimize again if the file has changed
       return @optimized if @optimized && @optimized_at && @optimized_at > @mtime
 
-      @optimized = @content
-
       if svgo?
-        response = Open3.capture3(%Q{#{Esvg.node_module('svgo')} --disable=removeUselessDefs -s '#{@optimized}' -o -})
+        response = Open3.capture3(%Q{#{Esvg.node_module('svgo')} --disable=removeUselessDefs -s '#{@content}' -o -})
         if !response[0].empty? && response[2].success?
           @optimized = response[0]
           @svgo_optimized = true
         end
+
+        post_optimize
+        @optimized_at = Time.now.to_i
+
+        @optimized
       end
 
-      post_optimize
-      @optimized_at = Time.now.to_i
+    end
 
-      @optimized
+    def symbol
+      symbolize( optimize || @content )
     end
 
     def changed?
@@ -279,17 +283,22 @@ module Esvg
     end
 
     def post_optimize
-      @optimized = set_attributes
+      @optimized.gsub!(/\w+=""/,'') # Remove empty attributes
+    end
+
+    def symbolize( str )
+      strip_attributes( str )
         .gsub(/<\/svg/,'</symbol')      # Replace svgs with symbols
         .gsub(/\w+=""/,'')              # Remove empty attributes
+        .sub(/<svg/, "<symbol #{attributes(attr)}")
     end
 
-    def set_attributes
+    def strip_attributes( str )
       attr.keys.each do |key|
-        @optimized.sub!(/ #{key}=".+?"/,'')
+        str.sub!(/ #{key}=".+?"/,'')
       end
 
-      @optimized.sub(/<svg/, "<symbol #{attributes(attr)}")
+      str
     end
 
     # Scans <def> blocks for IDs

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "4.6.0"
+  VERSION = "4.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: esvg
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.1
 platform: ruby
 authors:
 - Brandon Mathis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-13 00:00:00.000000000 Z
+date: 2018-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler