svg_conform 0.1.1 → 0.1.2

data/lib/svg_conform/validation_context.rb

@@ -17,6 +17,8 @@ module SvgConform
       @infos = []
       @data = {}
       @structurally_invalid_node_ids = Set.new
+      @node_id_cache = {}
+      @cache_populated = false
     end
 
     # Mark a node as structurally invalid (e.g., invalid parent-child relationship)
@@ -24,6 +26,8 @@ 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
+
       @structurally_invalid_node_ids.add(node_id)
 
       # Mark all descendants as invalid too
@@ -36,6 +40,8 @@ module SvgConform
 
       node.children.each do |child|
         child_id = generate_node_id(child)
+        return if child_id.nil?  # Safety check
+
         @structurally_invalid_node_ids.add(child_id)
         # Recursively mark descendants
         mark_descendants_invalid(child)
@@ -45,6 +51,8 @@ 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
+
       @structurally_invalid_node_ids.include?(node_id)
     end
 
@@ -120,16 +128,90 @@ requirement_id: nil, severity: nil, fix: nil, data: {})
 
     # Generate a unique identifier for a node based on its path
     # Builds a stable path by walking up the parent chain
+    # OPTIMIZED: Lazy cache population - populate entire cache on first call
     def generate_node_id(node)
       return nil unless node.respond_to?(:name)
 
-      # Build path by walking up parent chain
+      # Populate cache for ALL nodes on first access
+      unless @cache_populated
+        populate_node_id_cache
+        @cache_populated = true
+      end
+
+      # Try cache lookup first
+      cached_id = @node_id_cache[node]
+      return cached_id if cached_id
+
+      # Fall back to building path if node not in cache
+      # (happens when different traversals create different wrapper objects)
+      build_node_path(node)
+    end
+
+    private
+
+    # 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
+
+      @document.traverse do |node|
+        next unless node.respond_to?(:name) && node.name
+
+        # Detect parent changes by checking node.parent
+        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)
+          parent_stack.pop
+          counter_stack.pop
+        end
+
+        # If we have a new parent level, push it
+        if current_parent && (parent_stack.empty? || !parent_stack.last.equal?(current_parent))
+          parent_stack.push(current_parent)
+          counter_stack.push({})
+        end
+
+        # Increment counter at current level
+        current_counters = counter_stack.last || {}
+        current_counters[node.name] ||= 0
+        current_counters[node.name] += 1
+
+        # Build path using original backward logic (for correctness)
+        @node_id_cache[node] = build_node_path(node)
+      end
+    end
+
+    # Traverse tree, building paths with forward position counters
+    def traverse_with_forward_counting(node, path_parts, sibling_counters)
+      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] += 1
+      position = sibling_counters[node.name]
+
+      # Build and cache path
+      current_path = path_parts + ["#{node.name}[#{position}]"]
+      @node_id_cache[node] = "/#{current_path.join('/')}"
+
+      # Traverse children with fresh counters
+      if node.respond_to?(:children)
+        child_counters = {}
+        node.children.each do |child|
+          traverse_with_forward_counting(child, current_path, child_counters)
+        end
+      end
+    end
+
+    # Build path-based ID for a node (original logic, unchanged)
+    def build_node_path(node)
       path_parts = []
       current = node
 
       while current
         if current.respond_to?(:name) && current.name
-          # Count previous siblings of the same type for position
+          # Count previous siblings of the same type for position (ORIGINAL LOGIC)
           position = 1
           if current.respond_to?(:previous_sibling)
             sibling = current.previous_sibling

data/lib/svg_conform/validator.rb

@@ -9,6 +9,7 @@ module SvgConform
       @options = {
         fix: false,
         strict: false,
+        mode: :auto  # :auto, :dom, or :sax
       }.merge(options)
     end
 
@@ -19,17 +20,31 @@ module SvgConform
               "File not found: #{file_path}"
       end
 
-      document = Document.from_file(file_path)
-      validate_document(document, profile: profile, **options)
+      merged_options = @options.merge(options)
+      mode = determine_mode(file_path, merged_options[:mode])
+
+      case mode
+      when :sax
+        validate_file_sax(file_path, profile: profile, **merged_options)
+      when :dom
+        validate_file_dom(file_path, profile: profile, **merged_options)
+      end
     end
 
     # Validate SVG content string
     def validate(svg_content, profile: :svg_1_2_rfc, **options)
-      document = Document.from_content(svg_content)
-      validate_document(document, profile: profile, **options)
+      merged_options = @options.merge(options)
+      mode = merged_options[:mode] == :sax ? :sax : :dom
+
+      case mode
+      when :sax
+        validate_content_sax(svg_content, profile: profile, **merged_options)
+      when :dom
+        validate_content_dom(svg_content, profile: profile, **merged_options)
+      end
     end
 
-    # Validate a Document object
+    # Validate a Document object (DOM only)
     def validate_document(document, profile: :svg_1_2_rfc, **options)
       merged_options = @options.merge(options)
       profile_obj = resolve_profile(profile)
@@ -64,6 +79,59 @@ module SvgConform
 
     private
 
+    def determine_mode(file_path, requested_mode)
+      case requested_mode
+      when :sax
+        :sax
+      when :dom
+        :dom
+      when :auto
+        # Use SAX for files larger than 1MB
+        file_size = File.size(file_path)
+        file_size > 1_000_000 ? :sax : :dom
+      else
+        :dom
+      end
+    end
+
+    def validate_file_sax(file_path, profile:, **options)
+      profile_obj = resolve_profile(profile)
+      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 options[:fix] && result.has_errors?
+        dom_doc = SvgConform::Document.from_file(file_path)
+        result = validate_document(dom_doc, profile: profile_obj, **options)
+      end
+
+      result
+    end
+
+    def validate_file_dom(file_path, profile:, **options)
+      document = SvgConform::Document.from_file(file_path)
+      validate_document(document, profile: profile, **options)
+    end
+
+    def validate_content_sax(content, profile:, **options)
+      profile_obj = resolve_profile(profile)
+      sax_doc = SvgConform::SaxDocument.from_content(content)
+      result = sax_doc.validate_with_profile(profile_obj)
+
+      # If fixing is requested, convert to DOM and apply fixes
+      if options[:fix] && result.has_errors?
+        dom_doc = SvgConform::Document.from_content(content)
+        result = validate_document(dom_doc, profile: profile_obj, **options)
+      end
+
+      result
+    end
+
+    def validate_content_dom(content, profile:, **options)
+      document = SvgConform::Document.from_content(content)
+      validate_document(document, profile: profile, **options)
+    end
+
     def resolve_profile(profile)
       case profile
       when Symbol, String
@@ -84,7 +152,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.1"
+  VERSION = "0.1.2"
 end

data/lib/svg_conform.rb

@@ -11,6 +11,7 @@ end
 
 require_relative "svg_conform/version"
 require_relative "svg_conform/document"
+require_relative "svg_conform/sax_document"
 require_relative "svg_conform/validation_context"
 require_relative "svg_conform/validation_result"
 require_relative "svg_conform/profiles"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: svg_conform
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ribose
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-11-17 00:00:00.000000000 Z
+date: 2025-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -97,6 +97,7 @@ files:
 - docs/remediation.adoc
 - docs/requirements.adoc
 - examples/demo.rb
+- examples/readme_usage.rb
 - examples/requirements_demo.rb
 - exe/svg_conform
 - lib/svg_conform.rb
@@ -122,6 +123,7 @@ files:
 - lib/svg_conform/constants.rb
 - lib/svg_conform/css_color.rb
 - lib/svg_conform/document.rb
+- lib/svg_conform/element_proxy.rb
 - lib/svg_conform/external_checkers.rb
 - lib/svg_conform/external_checkers/svgcheck.rb
 - lib/svg_conform/external_checkers/svgcheck/compatibility_engine.rb
@@ -130,7 +132,9 @@ files:
 - lib/svg_conform/external_checkers/svgcheck/report_comparator.rb
 - lib/svg_conform/external_checkers/svgcheck/report_generator.rb
 - 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_index_builder.rb
 - lib/svg_conform/profile.rb
 - lib/svg_conform/profiles.rb
 - lib/svg_conform/remediation_engine.rb
@@ -167,6 +171,8 @@ files:
 - lib/svg_conform/requirements/style_promotion_requirement.rb
 - lib/svg_conform/requirements/style_requirement.rb
 - lib/svg_conform/requirements/viewbox_required_requirement.rb
+- lib/svg_conform/sax_document.rb
+- lib/svg_conform/sax_validation_handler.rb
 - lib/svg_conform/semantic_comparator.rb
 - lib/svg_conform/validation_context.rb
 - lib/svg_conform/validation_result.rb