esvg 4.1.1 → 4.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27d93663b8b9b36654390502132bf232efe68c66
-  data.tar.gz: 43344a22127df181e71d73602dbe0764e51d13e5
+  metadata.gz: c9fdbb78002cc2514c00fb6dbff29b2dd59c0e08
+  data.tar.gz: fd7dd209964226bf4a7c9ec90431f68eca9ae94e
 SHA512:
-  metadata.gz: cc486ddf04d4b6692407740dc3d1c808181587ce8d92c0e3a78b33c35c4631d1913b961d649b2179e4e9378d4c230e2d8c53cf8e513568246511686387e3c7b2
-  data.tar.gz: 1d1e3f0476e4c2dee4eb68d2814712407b0e84eb8faf1e5bd49b9b5729bfa95181c106ce5ddd98e6053bb54245907702d8bfe07992dcb2c337d573f7eb65eb20
+  metadata.gz: 6a5c58dd0ec3a9c2b2f287ce96cf0fecb967bd70a381a3570b4c56d9fd4ecf806ece2efa67024214fd1edf9fb231335ddf91903dc651f68a3c84939f5c54befd
+  data.tar.gz: 630f7341d55747c4e68e40b9ddbea1ed30815c6c33f91f0ba31c6b2ff529895c7e6f2eb756c454eee7ae035424b32d638b2a16de54ac7fa1982d47a0bce7d87d

data/lib/esvg/svg.rb

@@ -108,6 +108,7 @@ module Esvg
 
         # Name may have changed due to flatten config
         svgs[key][:name] = file_name(path)
+        svgs[key][:attr][:name] = id(svgs[key][:name])
 
         dirs[dkey]           ||= {}
         (dirs[dkey][:files]  ||= []) << key
@@ -450,7 +451,7 @@ module Esvg
     if ( !names ) {
       names = {}
       for( var symbol of document.querySelectorAll( 'svg[id^=esvg] symbol' ) ) {
-        names[symbol.id] = symbol
+        names[symbol.getAttribute('name')] = symbol
       }
     }
     return names
@@ -548,12 +549,12 @@ module Esvg
       reg = %w(xmlns xmlns:xlink xml:space version).map { |m| "#{m}=\".+?\"" }.join('|')
       svg.gsub(Regexp.new(reg), '')                           # Remove unwanted attributes
          .gsub(/<?.+\?>/,'').gsub(/<!.+?>/,'')                # Get rid of doctypes and comments
+         .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(/\n/, '')                                      # Remove endlines
          .gsub(/\s{2,}/, ' ')                                 # Remove whitespace
          .gsub(/>\s+</, '><')                                 # Remove whitespace between tags
          .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
     end
 
     def post_optimize(svg)

data/lib/esvg/symbols.rb

@@ -0,0 +1,10 @@
+require 'yaml'
+require 'json'
+require 'zlib'
+
+module Esvg
+  class Script
+    def build
+    end
+  end
+end

data/lib/esvg/version.rb

@@ -1,3 +1,3 @@
 module Esvg
-  VERSION = "4.1.1"
+  VERSION = "4.1.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: esvg
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.1.2
 platform: ruby
 authors:
 - Brandon Mathis
@@ -90,6 +90,7 @@ files:
 - lib/esvg/helpers.rb
 - lib/esvg/railties.rb
 - lib/esvg/svg.rb
+- lib/esvg/symbols.rb
 - lib/esvg/version.rb
 homepage: https://github.com/imathis/esvg
 licenses: