svg_conform 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9ecc9cf94ec2791168aba3939afb43f456b86c596912339ea2947162c5f738d
-  data.tar.gz: 32671c37c920fdb2cb36666183d1e965d803c6c706dc4e98e97a581e2cf49e4d
+  metadata.gz: a671b1d69dd6498470fc03cdaf2488bd3180187a39ef505cef2cb67d76de1725
+  data.tar.gz: c915d4ed0894b35293d78ea4a71f326e8985190dac8ae8df55c55b8eb10d1696
 SHA512:
-  metadata.gz: 1d849f548dfff6df9b81c624430323459cd33f12756c64c9fe04e4cf801bf7a1a45d94bcbbb632423c5eeefac4040733eea9a3133bfcdd75d11a64568d74413e
-  data.tar.gz: d22c6710edadb75a1346a8e56f835f9f18d9113018c719bbc8362f04ea6288c6a17b6142144a9388c03b838a350217d59b797ceea3850dba232e0f388b7ee275
+  metadata.gz: a32f6b36b517598e1a5f95612457c4e9a5386f64a15d6383dfb2e63052a2c58354a24afc730ad3a27b3ce6165c52447872e759655ef33ba8c546c12de2b16fbc
+  data.tar.gz: 1f22474906b51fe86cdeadac2817a66b2695bf7b1685370e25e058ed6c66dc9d09b2f95e26526b5a7937b493f2a7e51b3cf7a97b036c4ec0c8a7f7b0d1494801

data/Gemfile

@@ -5,8 +5,8 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in svg_conform.gemspec
 gemspec
 
-gem "canon"
-gem "openssl"
+gem "canon", "~>0.1.10"
+gem "openssl", "~> 3.0"
 gem "rake"
 gem "rspec"
 gem "rubocop"

data/lib/svg_conform/document.rb

@@ -92,7 +92,28 @@ module SvgConform
     def to_xml
       # Always generate from current moxml_document state
       # This ensures modifications are reflected in the output
-      @moxml_document.to_xml
+      xml = @moxml_document.to_xml
+
+      # Clean up unused namespace declarations if marked by remediations
+      if instance_variable_defined?(:@unused_namespace_prefixes)
+        prefixes = @unused_namespace_prefixes
+        xml = remove_namespace_declarations(xml, prefixes) if prefixes && !prefixes.empty?
+        # Clear the marker after cleanup
+        remove_instance_variable(:@unused_namespace_prefixes)
+      end
+
+      xml
+    end
+
+    def remove_namespace_declarations(xml, prefixes)
+      # Remove xmlns:prefix="uri" declarations from the XML string
+      # This works around Moxml/Nokogiri's inability to remove namespace declarations
+      prefixes.reduce(xml) do |result, prefix|
+        # Match xmlns:prefix="..." with various quote styles and surrounding whitespace
+        # The pattern matches: xmlns:prefix="uri" or xmlns:prefix='uri'
+        # It captures leading whitespace to remove it too
+        result.gsub(%r{\s+xmlns:#{prefix}=["'][^"']*["']}, "")
+      end
     end
 
     def dup

data/lib/svg_conform/node_helpers.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module SvgConform
+  # Shared helper methods for working with XML nodes
+  #
+  # This module provides common utilities used by both requirements
+  # and remediations to avoid code duplication and ensure consistency.
+  module NodeHelpers
+    # Check if a node is an element
+    # @param node [Object] the node to check
+    # @return [Boolean] true if the node is an element
+    def element?(node)
+      node.respond_to?(:name) && !node.name.nil?
+    end
+
+    # Check if a node is text
+    # @param node [Object] the node to check
+    # @return [Boolean] true if the node is text
+    def text?(node)
+      node.respond_to?(:text?) && node.text?
+    end
+
+    # Get attribute value from a node
+    # @param node [Object] the node
+    # @param name [String] attribute name
+    # @return [String, nil] attribute value or nil
+    def get_attribute(node, name)
+      return nil unless node.respond_to?(:[])
+
+      node[name]
+    end
+
+    # Set attribute value on a node
+    # @param node [Object] the node
+    # @param name [String] attribute name
+    # @param value [String] attribute value
+    # @return [Boolean] true if successful
+    def set_attribute(node, name, value)
+      return unless node.respond_to?(:[]=)
+
+      node[name] = value
+      true
+    end
+
+    # Check if node has an attribute
+    # @param node [Object] the node
+    # @param name [String] attribute name
+    # @return [Boolean] true if attribute exists
+    def has_attribute?(node, name)
+      return false unless node.respond_to?(:[])
+
+      !node[name].nil?
+    end
+
+    # Remove attribute from a node
+    # @param node [Object] the node
+    # @param name [String] attribute name
+    # @return [Boolean] true if successful
+    def remove_attribute(node, name)
+      if node.respond_to?(:remove_attribute)
+        node.remove_attribute(name)
+        true
+      elsif node.respond_to?(:[]=) && node.respond_to?(:[])
+        # Fallback for bracket notation
+        node[name] = nil
+        true
+      else
+        false
+      end
+    end
+  end
+end

data/lib/svg_conform/remediations/base_remediation.rb

@@ -2,11 +2,14 @@
 
 require "lutaml/model"
 require_relative "../remediation_result"
+require_relative "../node_helpers"
 
 module SvgConform
   module Remediations
     # Base class for all remediations using lutaml-model serialization
     class BaseRemediation < Lutaml::Model::Serializable
+      include SvgConform::NodeHelpers
+
       attribute :id, :string
       attribute :description, :string
       attribute :targets, :string, collection: true
@@ -72,27 +75,8 @@ module SvgConform
 
       protected
 
-      def element?(node)
-        node.respond_to?(:name) && node.name
-      end
-
-      def get_attribute(node, attr_name)
-        return nil unless node.respond_to?(:[])
-
-        node[attr_name]
-      end
-
-      def set_attribute(node, attr_name, value)
-        return unless node.respond_to?(:[]=)
-
-        node[attr_name] = value
-      end
-
-      def has_attribute?(node, attr_name)
-        return false unless node.respond_to?(:[])
-
-        !node[attr_name].nil?
-      end
+      # Helper methods for node manipulation included via NodeHelpers module:
+      # element?, text?, get_attribute, set_attribute, has_attribute?, remove_attribute
 
       def find_nodes(document, &)
         nodes = []
@@ -100,20 +84,6 @@ module SvgConform
         nodes
       end
 
-      # Helper method to remove attribute
-      def remove_attribute(node, name)
-        if node.respond_to?(:remove_attribute)
-          node.remove_attribute(name)
-          true
-        elsif node.respond_to?(:[]=) && node.respond_to?(:[])
-          # Fallback for different implementations
-          node[name] = nil
-          true
-        else
-          false
-        end
-      end
-
       # Helper method to remove node
       def remove_node(node)
         return false unless node.respond_to?(:remove)

data/lib/svg_conform/remediations/namespace_remediation.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "base_remediation"
+require "set"
 
 module SvgConform
   module Remediations
@@ -105,6 +106,11 @@ module SvgConform
           remove_node(node)
         end
 
+        # Clean up unused namespace declarations
+        # Note: Moxml/Nokogiri don't support removing namespace declarations directly,
+        # so we mark the document for post-processing during serialization
+        cleanup_unused_namespace_declarations(document)
+
         changes
       end
 
@@ -146,6 +152,60 @@ module SvgConform
         # Same logic as find_namespace_uri_for_prefix
         find_namespace_uri_for_prefix(node, prefix)
       end
+
+      def cleanup_unused_namespace_declarations(document)
+        # Find which namespace prefixes are still in use
+        used_prefixes = find_used_namespace_prefixes(document)
+
+        # Get the root element
+        root = document.respond_to?(:root) ? document.root : document
+        return unless root.respond_to?(:namespace_definitions)
+
+        # Get disallowed namespace prefixes
+        disallowed_prefixes = root.namespace_definitions.filter_map do |ns|
+          prefix = ns.respond_to?(:prefix) ? ns.prefix : nil
+          # Extract namespace URI from Moxml::Namespace object
+          uri = ns.respond_to?(:uri) ? ns.uri : nil
+          next if prefix.nil? || prefix.empty? # Skip default namespace
+          next if allowed_namespaces.include?(uri) # Keep allowed namespaces
+
+          next if used_prefixes.include?(prefix) # Keep prefixes still in use
+
+          prefix
+        end
+
+        # Store the prefixes to remove on the document for later serialization
+        # Try to store on Document wrapper first, fallback to moxml_document
+        target = document.respond_to?(:instance_variable_set) ? document : root.document
+        target&.instance_variable_set(:@unused_namespace_prefixes, disallowed_prefixes)
+      end
+
+      def find_used_namespace_prefixes(document)
+        used_prefixes = Set.new(["xml"]) # xml prefix is always reserved
+
+        document.traverse do |node|
+          next unless node.respond_to?(:name)
+
+          # Check element name for namespace prefix
+          if node.name.include?(":")
+            prefix = node.name.split(":").first
+            used_prefixes << prefix
+          end
+
+          # Check attributes for namespace prefixes
+          if node.respond_to?(:attributes)
+            node.attributes.each do |attr|
+              attr_name = attr.respond_to?(:name) ? attr.name : attr.to_s
+              if attr_name.include?(":")
+                prefix = attr_name.split(":").first
+                used_prefixes << prefix
+              end
+            end
+          end
+        end
+
+        used_prefixes
+      end
     end
   end
 end

data/lib/svg_conform/requirements/base_requirement.rb

@@ -1,9 +1,13 @@
 # frozen_string_literal: true
 
+require_relative "../node_helpers"
+
 module SvgConform
   module Requirements
     # Base class for all validation requirements
     class BaseRequirement < Lutaml::Model::Serializable
+      include SvgConform::NodeHelpers
+
       attribute :id, :string
       attribute :description, :string
       attribute :type, :string, polymorphic_class: true, default: -> {
@@ -65,48 +69,8 @@ module SvgConform
         true
       end
 
-      # Helper method to check if a node is an element
-      def element?(node)
-        node.respond_to?(:name) && !node.name.nil?
-      end
-
-      # Helper method to check if a node is text
-      def text?(node)
-        node.respond_to?(:text?) && node.text?
-      end
-
-      # Helper method to get attribute value
-      def get_attribute(node, name)
-        return nil unless node.respond_to?(:attribute)
-
-        attr = node.attribute(name)
-        attr&.value
-      end
-
-      # Helper method to set attribute value
-      def set_attribute(node, name, value)
-        return false unless node.respond_to?(:set_attribute)
-
-        node.set_attribute(name, value)
-        true
-      end
-
-      # Helper method to remove attribute
-      def remove_attribute(node, name)
-        return false unless node.respond_to?(:remove_attribute)
-
-        node.remove_attribute(name)
-        true
-      end
-
-      # Helper method to check if attribute exists
-      def has_attribute?(node, name)
-        return false unless node.respond_to?(:attribute)
-
-        !node.attribute(name).nil?
-      end
-
       # Helper method to get all attributes
+      # Note: Other attribute helpers are included via NodeHelpers module
       def get_attributes(node)
         return {} unless node.respond_to?(:attributes)
 

data/lib/svg_conform/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SvgConform
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svg_conform
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-26 00:00:00.000000000 Z
+date: 2026-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -144,6 +144,7 @@ files:
 - lib/svg_conform/external_checkers/svgcheck/validation_pipeline.rb
 - lib/svg_conform/fast_document_analyzer.rb
 - lib/svg_conform/fixer.rb
+- lib/svg_conform/node_helpers.rb
 - lib/svg_conform/node_index_builder.rb
 - lib/svg_conform/profile.rb
 - lib/svg_conform/profiles.rb