lutaml 0.10.12 → 0.10.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6c2a2164de4ea6ec27e076a4724d35d573af91829fa0103fc3e129707597de8
-  data.tar.gz: 811651ff02e1b7001d056f70b3f9e96bd52c227a67d9e943134816b3408dc321
+  metadata.gz: 66f287c7903f45ebce9fc0abdc3561ad6ef3df65fdb4b437a126685610756df7
+  data.tar.gz: 8459a2ad63cf3e4071c7d56ec4ae105410d3044aad2f05810419d4dd90adf861
 SHA512:
-  metadata.gz: '086fe280c4b5555a9e03d3718c5976bfbaaa7dbc9a7d4722fd6557e7779b6a673e372c5ea5e26cf9272c768067a8663672e06a2b3914bc6bbba459568a85faa5'
-  data.tar.gz: 49c1c37825b6e3390b696a30584998c29433dd182bb2dfbf733985fc960306913d7ed2706b38959ba9766ec2d6458f2e552180a904fef22d655c409acb276183
+  metadata.gz: d395f7c78511a601edef5eab6e96f5f896e46a135675767dfd031df36caaa6cfb34a3e5c834d96feed728760a59bd1fe2321ff2ce25490274d9d2693345eb2aa
+  data.tar.gz: e0ab7f240736d995f948283a9668f578133a39443d95d1889178c7e8c97afb7872d581bc0d8b2d0b79db9c3587087448c82048bb2bce00ee28179b011c422597

data/.rubocop_todo.yml

@@ -1,32 +1,32 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-05-11 22:46:59 UTC using RuboCop version 1.86.1.
+# on 2026-05-12 08:24:03 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
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 5
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: EnforcedStyle, IndentationWidth.
 # SupportedStyles: with_first_argument, with_fixed_indentation
 Layout/ArgumentAlignment:
   Exclude:
-    - 'spec/lutaml/xmi/liquid_drops/nil_safety_spec.rb'
+    - 'spec/lutaml/xml/parsers/xsd_spec.rb'
 
-# Offense count: 159
+# Offense count: 156
 # 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: 5
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowInHeredoc.
 Layout/TrailingWhitespace:
   Exclude:
-    - 'spec/lutaml/xmi/liquid_drops/nil_safety_spec.rb'
+    - 'spec/lutaml/xml/parsers/xsd_spec.rb'
 
 # Offense count: 1
 Lint/BinaryOperatorWithIdenticalOperands:
@@ -108,7 +108,7 @@ Metrics/BlockLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-# Offense count: 74
+# Offense count: 75
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 62
@@ -160,7 +160,7 @@ RSpec/BeforeAfterAll:
   Exclude:
     - 'spec/lutaml/qea/verification/comprehensive_equivalence_spec.rb'
 
-# Offense count: 25
+# Offense count: 24
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -175,7 +175,6 @@ RSpec/ContextWording:
     - 'spec/lutaml/cli/uml/search_command_spec.rb'
     - 'spec/lutaml/cli/uml/tree_command_spec.rb'
     - 'spec/lutaml/cli/uml/verify_command_spec.rb'
-    - 'spec/lutaml/parser_qea_spec.rb'
     - 'spec/lutaml/qea/integration/full_parsing_spec.rb'
     - 'spec/lutaml/xml/parsers/xml_spec.rb'
 
@@ -184,7 +183,7 @@ RSpec/ContextWording:
 RSpec/DescribeClass:
   Enabled: false
 
-# Offense count: 652
+# Offense count: 649
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 30
@@ -273,13 +272,12 @@ RSpec/RepeatedExampleGroupDescription:
   Exclude:
     - 'spec/lutaml/uml/parsers/dsl_spec.rb'
 
-# Offense count: 5
+# Offense count: 4
 # Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
 # SupportedInflectors: default, active_support
 RSpec/SpecFilePathFormat:
   Exclude:
     - 'spec/express/parsers/exp_spec.rb'
-    - 'spec/lutaml/parser_qea_spec.rb'
     - 'spec/lutaml/parsers/parse_xmi_spec.rb'
     - 'spec/lutaml/parsers/serialize_xmi_to_liquid_spec.rb'
     - 'spec/lutaml/uml_repository/web_ui/app_spec.rb'

data/lib/lutaml/cli/lml_commands.rb

@@ -7,6 +7,7 @@ require_relative "../uml/has_attributes"
 require_relative "../uml/parsers/attribute"
 require_relative "../uml/parsers/dsl"
 require_relative "../uml/parsers/yaml"
+require_relative "../express/parsers/exp"
 
 module Lutaml
   module Cli
@@ -81,9 +82,7 @@ module Lutaml
             raise Thor::Error, "File does not exist: #{input_path}"
           end
 
-          document = Lutaml::Parser
-            .parse_into_document(File.new(input_path), @input_format)
-            .first
+          document = parse_document(input_path)
           result = @formatter.format(document)
 
           if @output_path
@@ -131,10 +130,7 @@ module Lutaml
           end
 
           begin
-            Lutaml::Parser.parse_into_document(
-              File.new(input_path),
-              DEFAULT_INPUT_FORMAT,
-            )
+            parse_document(input_path)
             say "✓ #{input_path}", :green
           rescue StandardError => e
             errors << "#{input_path}: #{e.message}"
@@ -151,6 +147,20 @@ module Lutaml
       end
 
       no_commands do # rubocop:disable Metrics/BlockLength
+        def parse_document(input_path)
+          case @input_format
+          when "lutaml"
+            Lutaml::Uml::Parsers::Dsl.parse(File.new(input_path))
+          when "yaml", "yml"
+            Lutaml::Uml::Parsers::Yaml.parse(input_path.to_s)
+          when "exp"
+            Lutaml::Express::Parsers::Exp.parse(File.new(input_path))
+          else
+            raise Thor::Error,
+                  "Unsupported input format: #{@input_format}"
+          end
+        end
+
         def setup_options # rubocop:disable Metrics/AbcSize
           @formatter = options[:formatter] if options[:formatter]
           @type = options[:type] if options[:type]

data/lib/lutaml/express/parsers/exp.rb

@@ -2,19 +2,26 @@
 
 require "expressir"
 require "expressir/express/parser"
+require "expressir/express/cache"
 
 module Lutaml
   module Express
     module Parsers
-      # Class for parsing .exp schema files into Expressir::Model::Repository
+      # Parses EXPRESS schema files (.exp) and cached repositories (.exp.cache).
       class Exp
-        # @param [String] io - file object with path to .exp file
-        #        [Hash] options - options for parsing
-        #
+        # @param io [File, IO] file object with path to .exp file
+        # @param options [Hash] parsing options
         # @return [Expressir::Model::Repository]
         def self.parse(io, _options = {})
           Expressir::Express::Parser.from_files([io.path])
         end
+
+        # @param path [String] path to cached .exp.cache file
+        # @param options [Hash] parsing options
+        # @return [Expressir::Model::Cache]
+        def self.parse_cache(path, _options = {})
+          Expressir::Express::Cache.from_file(path)
+        end
       end
     end
   end

data/lib/lutaml/model_transformations/parsers/xmi_parser.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "base_parser"
-require_relative "../../parser"
+require_relative "../../xmi/parsers/xml"
 
 module Lutaml
   module ModelTransformations
@@ -9,11 +9,7 @@ module Lutaml
       # XMI Parser implements the BaseParser interface for XML Metadata
       # Interchange files.
       #
-      # This parser wraps the existing Lutaml::Parser functionality and adapts
-      # it
-      # to the new unified transformation architecture. It follows the Adapter
-      # pattern
-      # to integrate legacy XMI parsing with the new system.
+      # Delegates to Lutaml::Xmi::Parsers::Xml for actual parsing.
       class XmiParser < BaseParser
         # Get parser format name
         #

data/lib/lutaml/qea/verification/document_verifier.rb

@@ -5,7 +5,7 @@ require_relative "structure_matcher"
 require_relative "element_comparator"
 require_relative "comparison_result"
 require_relative "../../qea"
-require_relative "../../parser"
+require_relative "../../xmi/parsers/xml"
 
 module Lutaml
   module Qea
@@ -163,7 +163,7 @@ module Lutaml
 
         # Parse XMI file
         def parse_xmi(xmi_path)
-          Lutaml::Parser.parse([File.new(xmi_path)]).first
+          Lutaml::Xmi::Parsers::Xml.parse(File.new(xmi_path))
         end
 
         # Parse QEA file

data/lib/lutaml/uml/parsers/yaml.rb

@@ -7,6 +7,9 @@ module Lutaml
   module Uml
     module Parsers
       class Yaml
+        # @param yaml_path [String] path to YAML file
+        # @param options [Hash] parsing options
+        # @return [Lutaml::Uml::Document]
         def self.parse(yaml_path, options = {})
           new.parse(yaml_path, options)
         end

data/lib/lutaml/uml_repository/repository/loader.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative "../../xmi/parsers/xml"
 require_relative "../package_loader"
 
 module Lutaml
@@ -25,7 +26,7 @@ module Lutaml
         # @param options [Hash] Options for parsing
         # @return [Repository]
         def self.from_xmi(xmi_path, options = {})
-          document = Lutaml::Parser.parse([File.new(xmi_path)]).first
+          document = Lutaml::Xmi::Parsers::Xml.parse(File.new(xmi_path))
           indexes = IndexBuilder.build_all(document)
           new(document: document, indexes: indexes, options: options)
         end
@@ -36,7 +37,7 @@ module Lutaml
         # @param options [Hash] Options for parsing
         # @return [LazyRepository]
         def self.from_xmi_lazy(xmi_path, _options = {})
-          document = Lutaml::Parser.parse([File.new(xmi_path)]).first
+          document = Lutaml::Xmi::Parsers::Xml.parse(File.new(xmi_path))
           LazyRepository.new(document: document, lazy: true)
         end
 

data/lib/lutaml/uml_repository/repository.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative "../parser"
+require_relative "../xmi/parsers/xml"
 require_relative "../uml/package_path"
 require_relative "../uml/qualified_name"
 require_relative "error_handler"
@@ -116,8 +116,7 @@ module Lutaml
       #   repo = Repository.from_xmi('model.xmi')
       #   repo = Repository.from_xmi('model.xmi', validate: true)
       def self.from_xmi(xmi_path, options = {})
-        # Parse XMI using Lutaml::Parser
-        document = Lutaml::Parser.parse([File.new(xmi_path)]).first
+        document = Lutaml::Xmi::Parsers::Xml.parse(File.new(xmi_path))
 
         # Build indexes
         indexes = IndexBuilder.build_all(document)
@@ -143,8 +142,7 @@ module Lutaml
       #   repo = Repository.from_xmi_lazy('large-model.xmi')
       #   # Only document loaded, indexes built on first access
       def self.from_xmi_lazy(xmi_path, _options = {})
-        # Parse XMI using Lutaml::Parser
-        document = Lutaml::Parser.parse([File.new(xmi_path)]).first
+        document = Lutaml::Xmi::Parsers::Xml.parse(File.new(xmi_path))
 
         LazyRepository.new(document: document, lazy: true)
       end

data/lib/lutaml/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lutaml
-  VERSION = "0.10.12"
+  VERSION = "0.10.13"
 end

data/lib/lutaml/xmi/parsers/xml.rb

@@ -10,7 +10,7 @@ require "lutaml/converter/xmi_to_uml"
 module Lutaml
   module Xmi
     module Parsers
-      # Class for parsing .xmi schema files into ::Lutaml::Uml::Document
+      # Parses XMI files into Lutaml::Uml::Document objects.
       class Xml
         include Lutaml::Converter::XmiToUml
 
@@ -19,7 +19,7 @@ module Lutaml
         include XmiBase
 
         class << self
-          # @param xml [String] path to xml
+          # @param xml [String, File] path to XMI file or file object
           # @param options [Hash] options for parsing
           # @return [Lutaml::Uml::Document]
           def parse(xml, _options = {})

data/lib/lutaml/xml/parsers/xml.rb

@@ -4,7 +4,6 @@ require "nokogiri"
 require "htmlentities"
 require "lutaml/uml/has_attributes"
 require "lutaml/uml/document"
-require "lutaml/xsd"
 require "lutaml/model"
 require "lutaml/model/schema"
 

data/lib/lutaml/xml/parsers/xsd.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module Lutaml
+  module Xml
+    module Parsers
+      # Parses XSD schema files into Lutaml::Xml::Schema::Xsd::Schema objects.
+      #
+      # Delegates to lutaml-model's XSD parser with lazy loading to avoid
+      # eager-loading ~50 XSD model classes when not parsing XSD.
+      #
+      # @example Parse an XSD file
+      #   schema = Lutaml::Xml::Parsers::Xsd.parse(File.new("schema.xsd"))
+      #
+      # @example With location for resolving imports
+      #   schema = Lutaml::Xml::Parsers::Xsd.parse(
+      #     File.new("schema.xsd"),
+      #     location: "/path/to/schemas",
+      #   )
+      class Xsd
+        # @param file [File, IO] file object with XSD content
+        # @param options [Hash] parsing options
+        # @option options [String] :location base path for resolving schema imports
+        # @return [Lutaml::Xml::Schema::Xsd::Schema]
+        def self.parse(file, options = {})
+          require "lutaml/xml/schema/xsd"
+
+          Lutaml::Xml::Schema::Xsd.parse(
+            file.read,
+            location: options[:location],
+          )
+        end
+      end
+    end
+  end
+end

data/lib/lutaml/xml.rb

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
 
 require_relative "xml/parsers/xml"
+require_relative "xml/parsers/xsd"

data/lib/lutaml.rb

@@ -6,8 +6,6 @@ module Lutaml
   class Error < StandardError; end
 end
 
-require_relative "lutaml/parser"
-
 require_relative "lutaml/express"
 require_relative "lutaml/formatter"
 require_relative "lutaml/layout"

data/lutaml.gemspec

@@ -38,7 +38,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "listen"
   spec.add_dependency "lutaml-model", "~> 0.8.0"
   spec.add_dependency "lutaml-path"
-  spec.add_dependency "lutaml-xsd"
   spec.add_dependency "nokogiri", "~> 1.18"
   spec.add_dependency "paint"
   spec.add_dependency "parslet", "~> 2.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.10.12
+  version: 0.10.13
 platform: ruby
 authors:
 - Ribose Inc.
@@ -108,20 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: lutaml-xsd
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -699,7 +685,6 @@ files:
 - lib/lutaml/model_transformations/parsers/qea_parser.rb
 - lib/lutaml/model_transformations/parsers/xmi_parser.rb
 - lib/lutaml/model_transformations/transformation_engine.rb
-- lib/lutaml/parser.rb
 - lib/lutaml/qea.rb
 - lib/lutaml/qea/benchmark.rb
 - lib/lutaml/qea/database.rb
@@ -966,6 +951,7 @@ files:
 - lib/lutaml/xmi/xmi_lookup_service.rb
 - lib/lutaml/xml.rb
 - lib/lutaml/xml/parsers/xml.rb
+- lib/lutaml/xml/parsers/xsd.rb
 - lutaml.gemspec
 - plateau_all_packages.lur
 - templates/static_site/assets/images/lutaml-full.svg

data/lib/lutaml/parser.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-require "expressir"
-require "expressir/express/cache"
-require_relative "xmi"
-require_relative "xml"
-require_relative "qea"
-require_relative "uml"
-
-module Lutaml
-  class Parser
-    EXPRESS_CACHE_PARSE_TYPE = "exp.cache"
-
-    attr_reader :parse_type, :file_list
-
-    class << self
-      def parse(file_list, input_type = nil)
-        file_list = [file_list] unless file_list.is_a?(Array)
-        new(Array(file_list), input_type).parse_into_document
-      end
-      alias_method :parse_into_document, :parse
-    end
-
-    def initialize(file_list, input_type)
-      @parse_type = input_type || File.extname(file_list.first.path)[1..]
-      @file_list = file_list
-    end
-
-    def parse_into_document # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/MethodLength,Metrics/PerceivedComplexity
-      case parse_type
-      when "exp"
-        Expressir::Express::Parser.from_files(file_list.map(&:path))
-      when EXPRESS_CACHE_PARSE_TYPE
-        Expressir::Express::Cache.from_file(file_list.first.path)
-      when "qea"
-        # QEA files: Direct database parsing for Enterprise Architect
-        # Parse single QEA file and return as array for consistency with XMI
-        document = Lutaml::Qea.parse(file_list.first.path)
-        [document]
-      when "xmi"
-        file_list.map { |file| Lutaml::Xmi::Parsers::Xml.parse(file) }
-      when "xml"
-        file_list.map { |file| Lutaml::Xml::Parsers::Xml.parse(file) }
-      when "lutaml"
-        file_list.map { |file| Lutaml::Uml::Parsers::Dsl.parse(file) }
-      when "yml", "yaml"
-        file_list.map { |file| Lutaml::Uml::Parsers::Yaml.parse(file.path) }
-      else
-        raise ArgumentError, "Unsupported file format"
-      end
-    end
-  end
-end