svg_conform 0.1.2 → 0.1.4

data/lib/svg_conform/sax_validation_handler.rb

@@ -13,11 +13,11 @@ module SvgConform
 
     def initialize(profile)
       @profile = profile
-      @element_stack = []  # Track parent-child hierarchy
-      @path_stack = []  # Current element path
-      @position_counters = []  # Stack of sibling counters per level
+      @element_stack = [] # Track parent-child hierarchy
+      @path_stack = [] # Current element path
+      @position_counters = [] # Stack of sibling counters per level
       @parse_errors = []
-      @result = nil  # Will be set in end_document
+      @result = nil # Will be set in end_document
 
       # Create validation context (without document reference for SAX)
       @context = create_sax_context
@@ -50,13 +50,13 @@ module SvgConform
         attributes: attrs,
         position: position,
         path: @path_stack.dup,
-        parent: @element_stack.last
+        parent: @element_stack.last,
       )
 
       # Push to stacks
       @element_stack.push(element)
       @path_stack.push("#{name}[#{position}]")
-      @position_counters.push({})  # New level for this element's children
+      @position_counters.push({}) # New level for this element's children
 
       # Validate with immediate requirements
       @immediate_requirements.each do |req|
@@ -65,12 +65,15 @@ module SvgConform
 
       # Deferred requirements may need to collect data
       @deferred_requirements.each do |req|
-        req.collect_sax_data(element, @context) if req.respond_to?(:collect_sax_data)
+        if req.respond_to?(:collect_sax_data)
+          req.collect_sax_data(element,
+                               @context)
+        end
       end
     end
 
     # SAX Event: Element end tag
-    def end_element(name)
+    def end_element(_name)
       @element_stack.pop
       @path_stack.pop
       @position_counters.pop
@@ -79,6 +82,7 @@ module SvgConform
     # SAX Event: Text content
     def characters(string)
       return if @element_stack.empty?
+
       @element_stack.last.text_content << string
     end
 
@@ -109,7 +113,7 @@ module SvgConform
         node: nil,
         message: "Parse error: #{error.message}",
         requirement_id: "parse_error",
-        severity: :error
+        severity: :error,
       )
     end
 
@@ -138,7 +142,7 @@ module SvgConform
       context.instance_variable_set(:@data, {})
       context.instance_variable_set(:@structurally_invalid_node_ids, Set.new)
       context.instance_variable_set(:@node_id_cache, {})
-      context.instance_variable_set(:@cache_populated, true)  # Skip population for SAX
+      context.instance_variable_set(:@cache_populated, true) # Skip population for SAX
       context
     end
 

data/lib/svg_conform/validation_context.rb

@@ -26,7 +26,7 @@ module SvgConform
     # Also marks all descendants as invalid since they'll be removed with the parent
     def mark_node_structurally_invalid(node)
       node_id = generate_node_id(node)
-      return if node_id.nil?  # Safety check
+      return if node_id.nil? # Safety check
 
       @structurally_invalid_node_ids.add(node_id)
 
@@ -36,11 +36,13 @@ module SvgConform
 
     # Mark all descendants of a node as structurally invalid
     def mark_descendants_invalid(node)
-      return unless node.respond_to?(:children)
+      # In SAX mode, ElementProxy doesn't have children yet
+      # Children will be validated individually and will check parent validity
+      return unless node.respond_to?(:children) && node.children
 
       node.children.each do |child|
         child_id = generate_node_id(child)
-        return if child_id.nil?  # Safety check
+        next if child_id.nil? # Skip if can't generate ID
 
         @structurally_invalid_node_ids.add(child_id)
         # Recursively mark descendants
@@ -51,7 +53,7 @@ module SvgConform
     # Check if a node is structurally invalid
     def node_structurally_invalid?(node)
       node_id = generate_node_id(node)
-      return false if node_id.nil?  # Safety check
+      return false if node_id.nil? # Safety check
 
       @structurally_invalid_node_ids.include?(node_id)
     end
@@ -152,7 +154,7 @@ requirement_id: nil, severity: nil, fix: nil, data: {})
     # Populate cache for all nodes using document.traverse with parent tracking
     def populate_node_id_cache
       parent_stack = []
-      counter_stack = [{}]  # Stack of {element_name => count} hashes
+      counter_stack = [{}] # Stack of {element_name => count} hashes
 
       @document.traverse do |node|
         next unless node.respond_to?(:name) && node.name
@@ -161,7 +163,7 @@ requirement_id: nil, severity: nil, fix: nil, data: {})
         current_parent = node.respond_to?(:parent) ? node.parent : nil
 
         # Adjust stack based on actual parent
-        while parent_stack.size > 0 && !parent_stack.last.equal?(current_parent)
+        while parent_stack.size.positive? && !parent_stack.last.equal?(current_parent)
           parent_stack.pop
           counter_stack.pop
         end
@@ -187,7 +189,7 @@ requirement_id: nil, severity: nil, fix: nil, data: {})
       return unless node.respond_to?(:name) && node.name
 
       # Increment counter for this node name at current level
-     sibling_counters[node.name] ||= 0
+      sibling_counters[node.name] ||= 0
       sibling_counters[node.name] += 1
       position = sibling_counters[node.name]
 

data/lib/svg_conform/validator.rb

@@ -9,7 +9,7 @@ module SvgConform
       @options = {
         fix: false,
         strict: false,
-        mode: :auto  # :auto, :dom, or :sax
+        mode: :sax, # Testing SAX mode
       }.merge(options)
     end
 
@@ -34,13 +34,21 @@ module SvgConform
     # Validate SVG content string
     def validate(svg_content, profile: :svg_1_2_rfc, **options)
       merged_options = @options.merge(options)
-      mode = merged_options[:mode] == :sax ? :sax : :dom
+      mode = merged_options[:mode]
+
+      # Default to SAX if not specified
+      mode = :sax if mode.nil?
 
       case mode
       when :sax
         validate_content_sax(svg_content, profile: profile, **merged_options)
       when :dom
         validate_content_dom(svg_content, profile: profile, **merged_options)
+      when :auto
+        # For content, we can't check file size, so default to SAX
+        validate_content_sax(svg_content, profile: profile, **merged_options)
+      else
+        validate_content_sax(svg_content, profile: profile, **merged_options)
       end
     end
 
@@ -99,10 +107,21 @@ module SvgConform
       sax_doc = SvgConform::SaxDocument.from_file(file_path)
       result = sax_doc.validate_with_profile(profile_obj)
 
-      # If fixing is requested, convert to DOM and apply fixes
+      # If fixing is requested, load DOM and apply remediations directly
+      # Skip re-validation to avoid DOM performance penalty
       if options[:fix] && result.has_errors?
         dom_doc = SvgConform::Document.from_file(file_path)
-        result = validate_document(dom_doc, profile: profile_obj, **options)
+
+        # Apply remediations directly without re-validating
+        changes = profile_obj.apply_remediations(dom_doc)
+
+        # Write fixed output if specified
+        if options[:fix_output] && changes.any?
+          File.write(options[:fix_output], dom_doc.to_xml)
+        end
+
+        # Return original SAX validation result (errors already detected)
+        # Note: We don't re-validate to avoid DOM performance cost
       end
 
       result
@@ -152,7 +171,7 @@ module SvgConform
         warnings: [],
         file_path: file_path,
         error?: true,
-        to_s: -> { "Error processing #{file_path}: #{error.message}" }
+        to_s: -> { "Error processing #{file_path}: #{error.message}" },
       )
     end
   end

data/lib/svg_conform/version.rb

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

data/spec/spec_helper.rb

@@ -3,6 +3,9 @@
 require "svg_conform"
 require "canon"
 
+# Load shared examples
+Dir[File.expand_path("support/**/*.rb", __dir__)].each { |f| require f }
+
 RSpec.configure do |config|
   # Enable flags like --only-failures and --next-failure
   config.example_status_persistence_file_path = ".rspec_status"

data/spec/support/shared_examples_for_validation_modes.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+# Shared examples for testing both DOM and SAX validation modes
+RSpec.shared_examples "validates in both DOM and SAX modes" do |file_path, profile_name|
+  let(:file_path) { file_path }
+  let(:profile) { profile_name }
+
+  it "produces identical results in DOM and SAX modes" do
+    dom_result = SvgConform::Validator.new(mode: :dom).validate_file(file_path,
+                                                                     profile: profile)
+    sax_result = SvgConform::Validator.new(mode: :sax).validate_file(file_path,
+                                                                     profile: profile)
+
+    expect(sax_result.errors.size).to eq(dom_result.errors.size),
+                                      "SAX mode should produce same error count as DOM mode (DOM: #{dom_result.errors.size}, SAX: #{sax_result.errors.size})"
+
+    expect(sax_result.warnings.size).to eq(dom_result.warnings.size),
+                                        "SAX mode should produce same warning count as DOM mode"
+
+    expect(sax_result.valid?).to eq(dom_result.valid?),
+                                 "SAX mode should have same validity as DOM mode"
+  end
+
+  it "DOM mode validates correctly" do
+    result = SvgConform::Validator.new(mode: :dom).validate_file(file_path,
+                                                                 profile: profile)
+    expect(result).to be_a(SvgConform::ValidationResult)
+  end
+
+  it "SAX mode validates correctly" do
+    result = SvgConform::Validator.new(mode: :sax).validate_file(file_path,
+                                                                 profile: profile)
+    expect(result).to be_a(SvgConform::ValidationResult)
+  end
+
+  describe "performance comparison" do
+    it "SAX mode is faster than or equal to DOM mode" do
+      skip "Performance test - run manually for large files"
+
+      dom_time = Benchmark.realtime do
+        SvgConform::Validator.new(mode: :dom).validate_file(file_path,
+                                                            profile: profile)
+      end
+
+      sax_time = Benchmark.realtime do
+        SvgConform::Validator.new(mode: :sax).validate_file(file_path,
+                                                            profile: profile)
+      end
+
+      expect(sax_time).to be <= dom_time
+    end
+  end
+end
+
+RSpec.shared_examples "validates content in both modes" do |svg_content, profile_name|
+  let(:content) { svg_content }
+  let(:profile) { profile_name }
+
+  it "produces identical results for content validation" do
+    dom_result = SvgConform::Validator.new(mode: :dom).validate(content,
+                                                                profile: profile)
+    sax_result = SvgConform::Validator.new(mode: :sax).validate(content,
+                                                                profile: profile)
+
+    expect(sax_result.errors.size).to eq(dom_result.errors.size),
+                                      "SAX mode should produce same error count as DOM mode (DOM: #{dom_result.errors.size}, SAX: #{sax_result.errors.size})"
+
+    expect(sax_result.valid?).to eq(dom_result.valid?),
+                                 "SAX mode should have same validity as DOM mode"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svg_conform
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-18 00:00:00.000000000 Z
+date: 2025-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -372,6 +372,7 @@ files:
 - spec/fixtures/viewbox_required/inputs/missing_viewbox.svg
 - spec/fixtures/viewbox_required/repair/missing_viewbox.svg
 - spec/spec_helper.rb
+- spec/support/shared_examples_for_validation_modes.rb
 - spec/svg_conform/batch_report_spec.rb
 - spec/svg_conform/commands/check_command_spec.rb
 - spec/svg_conform/commands/profiles_command_spec.rb