lutaml-xsd 1.0.9 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2649418d3ea00927ab8b73628856fa55ed114ca61489f6834b6d6daca9d416b
-  data.tar.gz: 16452655b05b900cb227ea65d63b555d593cd8e31ffceeb8af78872e4ff7a94b
+  metadata.gz: da358b1ca55e63cb442380477680417cdff4627d23f83732a787713fdd1979bf
+  data.tar.gz: d717c30574106c682a448f390c5db3f8708e0132f56462f2cfd0789255d7b222
 SHA512:
-  metadata.gz: ae2220574c0cd979eb05eed45efe8770ba855cf641d6b30d68f899f370a831598392e44e7ab81e6a85d3c5e4c975c24057a2c11e783757d4831e23a8aae6435a
-  data.tar.gz: 4773bd5fc5b44b98d4ca7b2cffc60a233abd60c221829c77611d002e03f07c4de9142c1731ffa58827e22cac0f1a606548d109e08a2466073bece6093fe56ce8
+  metadata.gz: 14debf574d626ee36acdbb03377abe472918989252a09aec7a56434cf6d138b5996a88b087c25347fc3383e59b7bd27367ae954be7d15891ba26c1ae7f10729b
+  data.tar.gz: 26e1958238b0f1f973f57429e7c0a1b86c56fddd214c813f8be1e1b00dd8c38b3d8e24e3d887e848fba77658e7591e95ad1a731a3b2b55e78f12fa0c59fcc7aa

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-04-25 09:44:01 UTC using RuboCop version 1.86.1.
+# on 2026-04-27 11:46:52 UTC using RuboCop version 1.86.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -11,56 +11,21 @@ Gemspec/RequiredRubyVersion:
   Exclude:
     - 'lutaml-xsd.gemspec'
 
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: with_first_element, with_fixed_indentation
-Layout/ArrayAlignment:
-  Exclude:
-    - 'lib/lutaml/xsd/spa/schema_serializer.rb'
-    - 'lib/lutaml/xsd/spa/utils/extract_enumeration.rb'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: IndentationWidth.
-Layout/AssignmentIndentation:
-  Exclude:
-    - 'lib/lutaml/xsd/commands/package_command.rb'
-    - 'lib/lutaml/xsd/spa/schema_serializer.rb'
-
-# Offense count: 7
-# This cop supports safe autocorrection (--autocorrect).
-Layout/ClosingParenthesisIndentation:
-  Exclude:
-    - 'lib/lutaml/xsd/spa/schema_serializer.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyleAlignWith.
-# SupportedStylesAlignWith: keyword, variable, start_of_line
-Layout/EndAlignment:
+# SupportedStylesAlignWith: either, start_of_block, start_of_line
+Layout/BlockAlignment:
   Exclude:
     - 'lib/lutaml/xsd/spa/schema_serializer.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: consistent, consistent_relative_to_receiver, special_for_inner_method_call, special_for_inner_method_call_in_parentheses
-Layout/FirstArgumentIndentation:
-  Exclude:
-    - 'lib/lutaml/xsd/spa/schema_serializer.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/HashAlignment:
+Layout/BlockEndNewline:
   Exclude:
     - 'lib/lutaml/xsd/spa/schema_serializer.rb'
 
-# Offense count: 1
+# Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Width, EnforcedStyleAlignWith, AllowedPatterns.
 # SupportedStylesAlignWith: start_of_line, relative_to_receiver
@@ -68,30 +33,20 @@ Layout/IndentationWidth:
   Exclude:
     - 'lib/lutaml/xsd/spa/schema_serializer.rb'
 
-# Offense count: 730
+# Offense count: 722
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Enabled: false
 
-# Offense count: 7
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: symmetrical, new_line, same_line
-Layout/MultilineMethodCallBraceLayout:
-  Exclude:
-    - 'lib/lutaml/xsd/spa/schema_serializer.rb'
-
-# Offense count: 11
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
+# Configuration parameters: EnforcedStyle, IndentationWidth.
+# SupportedStyles: aligned, indented
+Layout/MultilineOperationIndentation:
   Exclude:
-    - 'lib/lutaml/xsd/commands/package_command.rb'
     - 'lib/lutaml/xsd/spa/schema_serializer.rb'
-    - 'lib/lutaml/xsd/spa/utils/extract_enumeration.rb'
-    - 'lib/lutaml/xsd/spa/xml_instance_generator.rb'
 
 # Offense count: 11
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
@@ -126,7 +81,7 @@ Lint/UselessRescue:
   Exclude:
     - 'lib/lutaml/xsd/validation/rule_engine.rb'
 
-# Offense count: 267
+# Offense count: 269
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Enabled: false
@@ -142,12 +97,12 @@ Metrics/BlockLength:
 Metrics/BlockNesting:
   Max: 5
 
-# Offense count: 199
+# Offense count: 201
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-# Offense count: 370
+# Offense count: 373
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 90
@@ -157,12 +112,12 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 9
 
-# Offense count: 149
+# Offense count: 151
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Enabled: false
 
-# Offense count: 24
+# Offense count: 25
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 # AllowedNames: as, at, by, cc, db, id, if, in, io, ip, of, on, os, pp, to
 Naming/MethodParameterName:
@@ -222,6 +177,17 @@ Security/MarshalLoad:
   Exclude:
     - 'lib/lutaml/xsd/package_builder.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, AllowedMethods, AllowedPatterns, AllowBracesOnProceduralOneLiners, BracesRequiredMethods.
+# SupportedStyles: line_count_based, semantic, braces_for_chaining, always_braces
+# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
+# FunctionalMethods: let, let!, subject, watch
+# AllowedMethods: lambda, proc, it
+Style/BlockDelimiters:
+  Exclude:
+    - 'lib/lutaml/xsd/spa/schema_serializer.rb'
+
 # Offense count: 6
 Style/DocumentDynamicEvalDefinition:
   Exclude:
@@ -248,14 +214,6 @@ Style/IdenticalConditionalBranches:
   Exclude:
     - 'lib/lutaml/xsd/package_tree_formatter.rb'
 
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Style/MultilineIfModifier:
-  Exclude:
-    - 'lib/lutaml/xsd/commands/package_command.rb'
-    - 'lib/lutaml/xsd/spa/schema_serializer.rb'
-    - 'lib/lutaml/xsd/spa/utils/extract_enumeration.rb'
-
 # Offense count: 1
 Style/OpenStructUse:
   Exclude:

data/lib/lutaml/xsd/spa/schema_serializer.rb

@@ -4,6 +4,9 @@ require "json"
 require "moxml"
 require "tmpdir"
 require "fileutils"
+require "tempfile"
+require "nokogiri"
+require "xsdvi"
 require_relative "xml_instance_generator"
 require_relative "utils/extract_enumeration"
 
@@ -355,23 +358,48 @@ module Lutaml
           element_data
         end
 
-        def gen_element_diagram(name, file_path)
+        def gen_element_diagram(name, file_path, component_type = :element)
           if !file_path || !File.exist?(file_path)
             warn "xsdvi: XSD file '#{file_path}' not found" if config[:verbose]
             return nil
           end
 
-          output_folder = Dir.mktmpdir("xsdvi-")
+          actual_file_path = file_path
+          wrapper_name = name
 
-          # generate diagram using xsdvi command line tool
-          `bundle exec xsdvi generate #{file_path} -r #{name} -o -p #{output_folder}`
+          if component_type == :type
+            # For types, create a temporary XSD with a synthetic wrapper element
+            # so xsdvi can treat the type as a root element
+            actual_file_path = create_type_wrapper_xsd(name, file_path)
+            wrapper_name = "_diagram_root_#{name}"
+          end
 
+          output_folder = Dir.mktmpdir("xsdvi-")
           svg_file = File.join(output_folder, "#{name}.svg")
-          unless File.exist?(svg_file)
+
+          # Use xsdvi Ruby API directly instead of CLI
+          builder = Xsdvi::Tree::Builder.new
+          xsd_handler = Xsdvi::XsdHandler.new(builder)
+          writer_helper = Xsdvi::Utils::Writer.new
+          svg_generator = Xsdvi::SVG::Generator.new(writer_helper)
+
+          svg_generator.hide_menu_buttons = true
+          svg_generator.embody_style = true
+
+          xsd_handler.root_node_name = wrapper_name
+          xsd_handler.one_node_only = true
+          xsd_handler.process_file(actual_file_path)
+
+          unless builder.root
             warn "xsdvi: SVG not generated for '#{name}'" if config[:verbose]
             return nil
           end
 
+          writer_helper.new_writer(svg_file)
+          svg_generator.draw(builder.root)
+
+          return nil unless File.exist?(svg_file)
+
           # read generated SVG content
           svg_content = File.read(svg_file)
 
@@ -384,8 +412,84 @@ module Lutaml
             .gsub(/<a[^>]*>(.*?)<\/a>/im, '\1') # Remove links but keep content
 
           svg_content
+        rescue StandardError => e
+          warn "xsdvi: Failed to generate diagram for '#{name}': #{e.message}" if config[:verbose]
+          nil
         ensure
           FileUtils.rm_rf(output_folder) if output_folder
+          if component_type == :type && actual_file_path && actual_file_path != file_path
+            FileUtils.rm_f(actual_file_path)
+          end
+        end
+
+        # Create a temporary XSD file that wraps a complexType/simpleType
+        # in a synthetic root element, so xsdvi can generate a diagram for it.
+        #
+        # @param type_name [String] The type name
+        # @param original_file_path [String] Path to the original XSD file
+        # @return [String] Path to the temporary XSD file
+        def create_type_wrapper_xsd(type_name, original_file_path)
+          doc = Nokogiri::XML(File.read(original_file_path))
+          ns = { "xs" => "http://www.w3.org/2001/XMLSchema" }
+          schema = doc.at_xpath("//xs:schema", ns)
+
+          unless schema
+            warn "xsdvi: No xs:schema found in '#{original_file_path}'" if config[:verbose]
+            return original_file_path
+          end
+
+          wrapper_name = "_diagram_root_#{type_name}"
+
+          # Check if this type might need a namespace prefix
+          # Look for how the type is referenced in the original schema
+          type_ref = resolve_type_prefix(type_name, doc, ns)
+
+          # Create element with proper XSD namespace from the schema
+          xsd_ns = "http://www.w3.org/2001/XMLSchema"
+          xsd_ns_decl = schema.namespace_definitions.find do |nd|
+            nd.href == xsd_ns
+          end
+
+          element_node = doc.create_element("element")
+          element_node.namespace = xsd_ns_decl
+          element_node["name"] = wrapper_name
+          element_node["type"] = type_ref
+
+          schema.add_child(element_node)
+
+          tmp = Tempfile.new(["xsdvi-wrapper-", ".xsd"])
+          tmp.write(doc.to_xml)
+          tmp.close
+          tmp.path
+        end
+
+        # Determine the correct type reference prefix for a type in the schema.
+        # If the type is defined in the targetNamespace, use the same prefix
+        # that the schema uses internally for its targetNamespace.
+        #
+        # @param type_name [String] The type name
+        # @param doc [Nokogiri::Document] The parsed XSD document
+        # @param ns [Hash] Namespace mapping
+        # @return [String] The type reference string (possibly prefixed)
+        def resolve_type_prefix(type_name, doc, ns)
+          schema = doc.at_xpath("//xs:schema", ns)
+          target_ns = schema["targetNamespace"]
+
+          # Check if the type is defined in this schema's targetNamespace
+          type_in_schema = doc.xpath("//xs:complexType[@name='#{type_name}']",
+                                     ns).any? ||
+            doc.xpath("//xs:simpleType[@name='#{type_name}']",
+                      ns).any?
+
+          return type_name unless type_in_schema && target_ns
+
+          # Find what prefix maps to the targetNamespace
+          ns_decls = schema.namespace_definitions
+          tns_prefix = ns_decls.find do |nd|
+            nd.href == target_ns && nd.prefix
+          end
+
+          tns_prefix ? "#{tns_prefix.prefix}:#{type_name}" : type_name
         end
 
         # Serialize complex types from schema
@@ -1459,17 +1563,17 @@ source = nil)
           schema
         end
 
-        # Generate SVG diagram for a component using xsdvi CLI
+        # Generate SVG diagram for a component using xsdvi Ruby API
         #
         # @param component_data [Hash] Serialized component data
         # @param component_type [Symbol] Component type (:element or :type)
         # @param file_path [String, nil] XSD file path for xsdvi
         # @return [String, nil] SVG diagram markup
-        def generate_diagram(component_data, _component_type, file_path = nil)
+        def generate_diagram(component_data, component_type, file_path = nil)
           name = component_data[:name] || component_data["name"]
           return nil unless name && file_path
 
-          gen_element_diagram(name, file_path)
+          gen_element_diagram(name, file_path, component_type)
         rescue StandardError => e
           warn "Warning: Failed to generate SVG diagram: #{e.message}" if ENV["DEBUG"]
           nil

data/lib/lutaml/xsd/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Xsd
-    VERSION = "1.0.9"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-xsd
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.1.0
 platform: ruby
 authors:
 - Ribose Inc.