svg_optimizer 0.2.2 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8b58103eace64dcab3740e83ce4a1c328dd6ae06
-  data.tar.gz: 68ee27f69693afcd6eab21e0b1ffa57905d1c90b
+SHA256:
+  metadata.gz: 385024a89793a95b04290dbea791b71007a8d27387a02939865f4ed6f2528c72
+  data.tar.gz: 8e1e9581f7516362b09bc2221a889043e3ae1b1ad442e73a7b178be26e3e1d8b
 SHA512:
-  metadata.gz: '08e57257160f937494ee265a804e887033e59246d1e5a74b903ba99d8a5b4bc47687fd0e0ad9f1affa4afee2c6aa4bbd0d37c1ef5be1fe2d0036473f83c983b5'
-  data.tar.gz: f6b6caf4b7ff9f4ae069d23a1c22267e55cde26d134fc2368ff5f26efabd767e03687a1e1c21060a9313124e12c14809498e9128f2dd72201fb71e1830fc7a57
+  metadata.gz: 699299880bf18dab73133899f59dcfa541a46ab45f3f0d2aeb48eb478caec60bdc2ce07c5093b5ab99e6c09118a966fa1009ba656ac7db0ef768a22a54774222
+  data.tar.gz: 1862ba8ad388c1523d7e69ff2e139efef59e4d3ede808d6ac9cabfd112c94b35a706563b1efaf10302386acce25812b02ba2b33ba3a2ab3bb45dc459963748d8

data/README.md

@@ -1,8 +1,7 @@
 # SvgOptimizer
 
-[![Travis-CI](https://travis-ci.org/fnando/svg_optimizer.svg)](https://travis-ci.org/fnando/svg_optimizer)
+[![Tests](https://github.com/fnando/svg_optimizer/workflows/ruby-tests/badge.svg)](https://github.com/fnando/svg_optimizer)
 [![Code Climate](https://codeclimate.com/github/fnando/svg_optimizer/badges/gpa.svg)](https://codeclimate.com/github/fnando/svg_optimizer)
-[![Test Coverage](https://codeclimate.com/github/fnando/svg_optimizer/badges/coverage.svg)](https://codeclimate.com/github/fnando/svg_optimizer/coverage)
 [![Gem](https://img.shields.io/gem/v/svg_optimizer.svg)](https://rubygems.org/gems/svg_optimizer)
 [![Gem](https://img.shields.io/gem/dt/svg_optimizer.svg)](https://rubygems.org/gems/svg_optimizer)
 
@@ -10,17 +9,15 @@ Some small optimizations for SVG files.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-    gem 'svg_optimizer'
-
-And then execute:
-
-    $ bundle
+```bash
+gem install svg_optimizer
+```
 
-Or install it yourself as:
+Or add the following line to your project's Gemfile:
 
-    $ gem install svg_optimizer
+```ruby
+gem "svg_optimizer"
+```
 
 ## Usage
 
@@ -53,16 +50,34 @@ class MyPlugin < SvgOptimizer::Plugins::Base
 end
 ```
 
-The default list of plugins is stored at `SvgOptimizer::DEFAULT_PLUGINS`. To use your new plugin, just do something like this:
+The default list of plugins is stored at `SvgOptimizer::DEFAULT_PLUGINS`. To use
+your new plugin, just do something like this:
 
 ```ruby
 SvgOptimizer.optimize(xml, SvgOptimizer::DEFAULT_PLUGINS + [MyPlugin])
 ```
 
+## Maintainer
+
+- [Nando Vieira](https://github.com/fnando)
+
+## Contributors
+
+- https://github.com/fnando/svg_optimizer/contributors
+
 ## Contributing
 
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+For more details about how to contribute, please read
+https://github.com/fnando/svg_optimizer/blob/main/CONTRIBUTING.md.
+
+## License
+
+The gem is available as open source under the terms of the
+[MIT License](https://opensource.org/licenses/MIT). A copy of the license can be
+found at https://github.com/fnando/svg_optimizer/blob/main/LICENSE.md.
+
+## Code of Conduct
+
+Everyone interacting in the svg_optimizer project's codebases, issue trackers,
+chat rooms and mailing lists is expected to follow the
+[code of conduct](https://github.com/fnando/svg_optimizer/blob/main/CODE_OF_CONDUCT.md).

data/lib/svg_optimizer/plugins/cleanup_id.rb

@@ -9,7 +9,7 @@ module SvgOptimizer
       ].freeze
 
       IDS = LETTERS.dup.concat(LETTERS.combination(2).to_a).freeze
-      XLINK_NAMESPACE = "http://www.w3.org/1999/xlink".freeze
+      XLINK_NAMESPACE = "http://www.w3.org/1999/xlink"
 
       def ids
         @ids ||= IDS.dup
@@ -19,6 +19,10 @@ module SvgOptimizer
         # If there's a <script> or <style>, don't mess with ids.
         return if xml.css("script, style").any?
 
+        # SVG can have ids as arrays.
+        # Skip id optimization if that's the case.
+        return if xml.css("[id^='[']").size.nonzero?
+
         # Replace the ids otherwise.
         xml.css("[id]").each(&method(:cleanup_id))
       end

data/lib/svg_optimizer/plugins/remove_editor_namespace.rb

@@ -3,50 +3,55 @@
 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
 
-          _, name = name.split(":")
-          xml.root.add_namespace name, value
+        xml.root.namespace_definitions.each do |namespace|
+          remove_namespace(namespace) if NAMESPACES.include?(namespace.href)
         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_namespaced_attributes(name, href)
+        xml.xpath("//@*[namespace-uri()='#{href}']").each do |node|
+          remove_matching_attribute(node, name)
+        end
+
+        xml.xpath("//*[@#{name}:*]").each do |node|
+          remove_matching_attribute(node, name)
+        end
       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_namespace(namespace)
+        source = xml.root.to_s.gsub(/ *xmlns:#{namespace.prefix}=".*?"/, "")
+        xml.root = Nokogiri::XML(source).root
+      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/plugins/remove_empty_attribute.rb

@@ -11,9 +11,7 @@ module SvgOptimizer
         end
       end
 
-      private
-
-      def remove_if_empty(node, attr)
+      private def remove_if_empty(node, attr)
         node.remove_attribute(attr) if node[attr].empty?
       end
     end

data/lib/svg_optimizer/plugins/remove_empty_container.rb

@@ -3,7 +3,17 @@
 module SvgOptimizer
   module Plugins
     class RemoveEmptyContainer < Base
-      ELEMENTS = %w[a defs g marker mask missing-glyph pattern switch symbol].freeze
+      ELEMENTS = %w[
+        a
+        defs
+        g
+        marker
+        mask
+        missing-glyph
+        pattern
+        switch
+        symbol
+      ].freeze
       SELECTOR = ELEMENTS.map {|element| %[#{element}:empty] }.join(", ")
 
       def process
@@ -12,9 +22,7 @@ module SvgOptimizer
         end
       end
 
-      private
-
-      def remove_node(node)
+      private def remove_node(node)
         node.children.empty? && node.remove
         remove_node(node.parent) if node.parent
       end

data/lib/svg_optimizer/plugins/remove_empty_text_node.rb

@@ -7,9 +7,7 @@ module SvgOptimizer
         xml.xpath("//text()").each(&method(:remove_if_empty))
       end
 
-      private
-
-      def remove_if_empty(node)
+      private def remove_if_empty(node)
         node.remove if node.text.gsub(/\s/, "").empty?
       end
     end

data/lib/svg_optimizer/plugins/remove_title.rb

@@ -4,7 +4,7 @@ module SvgOptimizer
   module Plugins
     class RemoveTitle < Base
       def process
-        xml.xpath("//title").remove
+        xml.css("title").remove
       end
     end
   end

data/lib/svg_optimizer/plugins/remove_unused_namespace.rb

@@ -13,6 +13,7 @@ module SvgOptimizer
 
       def remove_unused_ns(ns)
         return if xml.xpath("//#{ns.prefix}:*").any?
+        return if xml.xpath("//@*[namespace-uri()='#{ns.href}']").any?
 
         source = xml.root.to_s.gsub(/ *xmlns:#{ns.prefix}=".*?"/, "")
         xml.root = Nokogiri::XML(source).root

data/lib/svg_optimizer/plugins/remove_useless_stroke_and_fill.rb

@@ -4,7 +4,12 @@ module SvgOptimizer
   module Plugins
     class RemoveUselessStrokeAndFill < Base
       SELECTOR = %w[circle ellipse line path polygon polyline rect].join(",")
-      STROKE_ATTRS = %w[stroke stroke-opacity stroke-width stroke-dashoffset].freeze
+      STROKE_ATTRS = %w[
+        stroke
+        stroke-opacity
+        stroke-width
+        stroke-dashoffset
+      ].freeze
       FILL_ATTRS = %w[fill-opacity fill-rule].freeze
 
       def process
@@ -15,40 +20,39 @@ module SvgOptimizer
         end
       end
 
-      private
-
-      def remove_useless_attributes(node)
+      private def remove_useless_attributes(node)
         return if inherited_attribute(node, "id")
+
         remove_stroke(node) if remove_stroke?(node)
         remove_fill(node) if remove_fill?(node)
       end
 
-      def remove_stroke(node)
+      private def remove_stroke(node)
         STROKE_ATTRS.each {|attr| node.delete(attr) }
         node["stroke"] = "none" if decline_inherited_stroke?(node)
       end
 
-      def remove_fill(node)
+      private def remove_fill(node)
         FILL_ATTRS.each {|attr| node.delete(attr) }
         node["fill"] = "none" if decline_inherited_fill?(node)
       end
 
-      def decline_inherited_stroke?(node)
+      private def decline_inherited_stroke?(node)
         (inherited_attribute(node.parent, "stroke") || "none") != "none"
       end
 
-      def decline_inherited_fill?(node)
+      private def decline_inherited_fill?(node)
         !inherited_attribute(node, "fill") || node.has_attribute?("fill")
       end
 
-      def remove_stroke?(node)
+      private def remove_stroke?(node)
         return true if (inherited_attribute(node, "stroke") || "none") == "none"
         return true if inherited_attribute(node, "stroke-opacity") == "0"
 
         inherited_attribute(node, "stroke-width") == "0"
       end
 
-      def remove_fill?(node)
+      private def remove_fill?(node)
         fill = inherited_attribute(node, "fill")
 
         return true if fill == "none"
@@ -57,7 +61,7 @@ module SvgOptimizer
         !fill
       end
 
-      def inherited_attribute(node, attr)
+      private def inherited_attribute(node, attr)
         return if node.nil? || node.document?
         return node[attr] if node.has_attribute?(attr)
 

data/lib/svg_optimizer/version.rb

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

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,26 +21,29 @@ 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)
-    xml = Nokogiri::XML(contents)
+    xml = Nokogiri::XML(contents) do |config|
+      config.recover.noent
+    end
+
     plugins.each {|plugin| plugin.new(xml).process }
+
     xml.root.to_xml
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svg_optimizer
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.6
 platform: ruby
 authors:
 - Nando Vieira
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-01 00:00:00.000000000 Z
+date: 2022-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest-utils
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-fnando
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -101,13 +129,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE.txt
+- LICENSE.md
 - README.md
 - lib/svg_optimizer.rb
 - 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
@@ -124,8 +151,9 @@ files:
 homepage: https://github.com/fnando/svg_optimizer
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -133,16 +161,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: SVG optimization based on Node's SVGO
 test_files: []

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