svgeez 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3c37bab4033eb6499bc4d2bdfbdfd11c882de9d
-  data.tar.gz: a527d2cdf19b23775367fd9395941dd80d3ca1c4
+  metadata.gz: 585e1ea2905e2d635f3db935400a604dc5dcc1b3
+  data.tar.gz: c4d2db623624544191db0439a2355ddec476288a
 SHA512:
-  metadata.gz: 7b7c8277a22af454dda0b22827b370e1abbf6cb5324a4ddee1e1544b3338237a3eb00c01b7fb0bba6b350109548089c6f92431404a5e5204b3bc8e66676a8439
-  data.tar.gz: b21f4895462d5662266b7f22df1e8a673db0641f031fe6dd50cfce77b458497d6b4bd8cb398c06cd67d4fcaacaec70a1e62b580fc7120777201bd01d1b776f03
+  metadata.gz: 80f1c95ee4ae39bb8a528f019db7fb77a1b81b771fe34cfe548c160440083b21bf5fd94551bc55082c6ef9310430b1fd555407a6ba9bb0fede677589aeed064c
+  data.tar.gz: 4db1a89309a2f4636e3c7a5c1e3d8791e4613086e902aadc56e82de2dbe7f67867a90b0f1ab56f73350363d31e8e8822ff4ced83a7f64ac3bb984c5cdf51e247

data/lib/svgeez/sprite_builder.rb

@@ -34,23 +34,21 @@ module Svgeez
     end
 
     def build_destination_file_contents
-      %{<svg id="#{destination_file_id}" style="display: none;" version="1.1">}.tap do |destination_file_contents|
-        # Loop over all source files, grabbing their content, and appending to `destination_file_contents`
+      destination_file_contents = '<svg>'.tap do |file_contents|
         source_file_paths.each do |file_path|
-          file_contents = IO.read(file_path)
-          pattern = /^<svg.*?(?<viewbox>viewBox=".*?").*?>(?<content>.*?)<\/svg>/m
-
-          if use_svgo?
-            file_contents = `cat <<EOF | svgo -i - -o -\n#{file_contents}\nEOF`
-          end
-
-          file_contents.match(pattern) do |matches|
-            destination_file_contents << %{<symbol id="#{destination_file_id}-#{File.basename(file_path, '.svg').gsub(/['"\s]/, '-').downcase}" #{matches[:viewbox]}>#{matches[:content]}</symbol>}
+          IO.read(file_path).match(/^<svg.*?(?<viewbox>viewBox=".*?").*?>(?<content>.*?)<\/svg>/m) do |matches|
+            file_contents << %{<symbol id="#{destination_file_id}-#{File.basename(file_path, '.svg').gsub(/['"\s]/, '-')}" #{matches[:viewbox]}>#{matches[:content]}</symbol>}
           end
         end
 
-        destination_file_contents << '</svg>'
+        file_contents << '</svg>'
       end
+
+      if use_svgo?
+        destination_file_contents = `cat <<EOF | svgo --disable=removeUselessDefs -i - -o -\n#{destination_file_contents}\nEOF`
+      end
+
+      destination_file_contents.insert(4, %{ id="#{destination_file_id}" style="display: none;" version="1.1"})
     end
 
     def destination_file_id

data/lib/svgeez/version.rb

@@ -1,3 +1,3 @@
 module Svgeez
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svgeez
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Jason Garber