svg_optimizer 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3f96c3fad6ba2b506bf3f6cf7b36eb040944125
-  data.tar.gz: 268be369b5313dbce1c1dbde5ff5bc8bdcaa4838
+  metadata.gz: 252e3ad0e74992fe85def8ef8d749d2f55975b6a
+  data.tar.gz: 0ab2451d8cf7ee5ec69a0cf6462adcba953575e2
 SHA512:
-  metadata.gz: 398a67942d5b8dccb24cbd5b0edd0deadeba51c60f17380ec9846079b05db9b66050271f973ac872c788e84159dd81991b8fb186284151a53b0a7819a7169eaa
-  data.tar.gz: a63c514ed5b9b288a6cfcc0f72b06f40cbaaed7426d1e7e7873c962fd49770ab9f33146b01fbad3b5459282e75178a9ae39db518a873730591fb3202708d89e0
+  metadata.gz: bfd401c30de6a280c6daddc788678f8635f0e179b7119ddc9ead993dbfbd0d08d70c30cf61153a6a6e7ff224dbdfd8b336c0027c65cbb916b8d115e262d966e6
+  data.tar.gz: 0db71a133efeaa39992777d7a34fd4c1c309afafb4367fa1b9741fa73af26f4755cdb834ee3f2e8f80948794bf03f3190397e0a24e9e34e6e8395fffca9292a2

data/lib/svg_optimizer.rb

@@ -6,7 +6,6 @@ require "svg_optimizer/version"
 require "svg_optimizer/plugins/base"
 require "svg_optimizer/plugins/cleanup_attribute"
 require "svg_optimizer/plugins/cleanup_id"
-require "svg_optimizer/plugins/collapse_groups"
 require "svg_optimizer/plugins/remove_comment"
 require "svg_optimizer/plugins/remove_metadata"
 require "svg_optimizer/plugins/remove_empty_text_node"
@@ -22,21 +21,20 @@ require "svg_optimizer/plugins/remove_description"
 
 module SvgOptimizer
   DEFAULT_PLUGINS = %w[
+    RemoveTitle
+    RemoveDescription
+    RemoveUnusedNamespace
     CleanupAttribute
     CleanupId
     RemoveComment
     RemoveMetadata
     RemoveEditorNamespace
     RemoveHiddenElement
-    RemoveUnusedNamespace
     RemoveRasterImage
     RemoveEmptyAttribute
-    CollapseGroups
     RemoveUselessStrokeAndFill
     RemoveEmptyTextNode
     RemoveEmptyContainer
-    RemoveTitle
-    RemoveDescription
   ].map {|name| Plugins.const_get(name) }
 
   def self.optimize(contents, plugins = DEFAULT_PLUGINS)

data/lib/svg_optimizer/plugins/remove_editor_namespace.rb

@@ -3,50 +3,54 @@
 module SvgOptimizer
   module Plugins
     class RemoveEditorNamespace < Base
-      NAMESPACES = %w[
-        http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd
-        http://www.inkscape.org/namespaces/inkscape
-        http://ns.adobe.com/AdobeIllustrator/10.0/
-        http://ns.adobe.com/Graphs/1.0/
-        http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/
-        http://ns.adobe.com/Variables/1.0/
-        http://ns.adobe.com/SaveForWeb/1.0/
-        http://ns.adobe.com/Extensibility/1.0/
-        http://ns.adobe.com/Flows/1.0/
-        http://ns.adobe.com/ImageReplacement/1.0/
-        http://ns.adobe.com/GenericCustomNamespace/1.0/
-        http://ns.adobe.com/XPath/1.0
-        http://www.bohemiancoding.com/sketch/ns
+      NAMESPACES = [
+        "http://ns.adobe.com/AdobeIllustrator/10.0/",
+        "http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/",
+        "http://ns.adobe.com/Extensibility/1.0/",
+        "http://ns.adobe.com/Flows/1.0/",
+        "http://ns.adobe.com/GenericCustomNamespace/1.0/",
+        "http://ns.adobe.com/Graphs/1.0/",
+        "http://ns.adobe.com/ImageReplacement/1.0/",
+        "http://ns.adobe.com/SaveForWeb/1.0/",
+        "http://ns.adobe.com/Variables/1.0/",
+        "http://ns.adobe.com/XPath/1.0",
+        "http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd",
+        "http://www.bohemiancoding.com/sketch/ns",
+        "http://www.inkscape.org/namespaces/inkscape"
       ].freeze
 
       def process
-        namespaces = xml.namespaces
-        remove_namespaced_attributes
-        xml.remove_namespaces!
+        xml.namespaces.each do |full_name, href|
+          _, name = full_name.split(":")
+          next unless NAMESPACES.include?(href)
 
-        namespaces.each do |name, value|
-          next if NAMESPACES.include?(value)
+          remove_namespaced_attributes(name, href)
+        end
+
+        xml.root.namespace_definitions.each do |namespace|
+          remove_namespace(namespace) if NAMESPACES.include?(namespace.href)
+        end
+      end
+
+      def remove_namespaced_attributes(name, href)
+        xml.xpath("//@*[namespace-uri()='#{href}']").each do |node|
+          remove_matching_attribute(node, name)
+        end
 
-          _, name = name.split(":")
-          xml.root.add_namespace name, value
+        xml.xpath("//*[@#{name}:*]").each do |node|
+          remove_matching_attribute(node, name)
         end
       end
 
-      def namespaces_to_be_removed
-        xml.namespaces.map do |name, value|
-          _, name = name.split(":")
-          name if NAMESPACES.include?(value)
-        end.compact
+      def remove_namespace(namespace)
+        source = xml.root.to_s.gsub(/ *xmlns:#{namespace.prefix}=".*?"/, "")
+        xml.root = Nokogiri::XML(source).root
       end
 
-      def remove_namespaced_attributes
-        namespaces_to_be_removed.each do |ns|
-          xml.xpath("//*[@#{ns}:*]").each do |node|
-            node.attributes.each do |_, attr|
-              next unless attr.namespace
-              attr.remove if attr.namespace.prefix == ns
-            end
-          end
+      def remove_matching_attribute(node, name)
+        node.attributes.each do |_, attr|
+          next unless attr.namespace
+          attr.remove if attr.namespace.prefix == name
         end
       end
     end

data/lib/svg_optimizer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SvgOptimizer
-  VERSION = "0.2.4".freeze
+  VERSION = "0.2.5".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svg_optimizer
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Nando Vieira
@@ -107,7 +107,6 @@ files:
 - lib/svg_optimizer/plugins/base.rb
 - lib/svg_optimizer/plugins/cleanup_attribute.rb
 - lib/svg_optimizer/plugins/cleanup_id.rb
-- lib/svg_optimizer/plugins/collapse_groups.rb
 - lib/svg_optimizer/plugins/remove_comment.rb
 - lib/svg_optimizer/plugins/remove_description.rb
 - lib/svg_optimizer/plugins/remove_editor_namespace.rb

data/lib/svg_optimizer/plugins/collapse_groups.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module SvgOptimizer
-  module Plugins
-    class CollapseGroups < Base
-      COLLAPSABLE_ATTRS = %w[transform class].freeze
-
-      def process
-        xml.css("g:not(:empty)").each do |group|
-          collapse(group)
-        end
-      end
-
-      private
-
-      def collapse(group)
-        collapse_attributes(group)
-        group.swap(group.children) if collapse?(group)
-      end
-
-      def collapse_attributes(group)
-        child = group.first_element_child
-        return unless collapse_attributes?(group, child)
-
-        group.attributes.each do |attr, val|
-          if COLLAPSABLE_ATTRS.include?(attr)
-            child[attr] = [val, child[attr]].compact.join(" ")
-          else
-            child[attr] ||= val
-          end
-
-          group.delete(attr)
-        end
-      end
-
-      def collapse?(group)
-        group.attributes.empty? &&
-          !group.element_children.map(&:name).include?("animate")
-      end
-
-      def collapse_attributes?(group, child)
-        return unless group.attributes.any?
-        return unless group.element_children.length == 1
-        return if child.has_attribute?("id")
-        return unless !group.has_attribute?("clip-path") ||
-                      child.name == "g" &&
-                      !group.has_attribute?("transform") &&
-                      !child.has_attribute?("transform")
-        true
-      end
-    end
-  end
-end