lutaml 0.9.26 → 0.9.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63135b601a74ae7525807e9b57974a2db686e49f6e6992918e7d209bdbf27460
-  data.tar.gz: 529878c2d79c6f35130ef8c34eb5223d16c46a10f96cf470e43c8563457491a8
+  metadata.gz: c3d4343125b51531e1c2cab816a8a9e85ada1764ecaef15c1598038124167ba6
+  data.tar.gz: 0bb4810dfe1e8d1cc363379d5f5cfbee8e778bf2ccb6dda67bcaf2360d625034
 SHA512:
-  metadata.gz: e70e2318f24f4a6c6beccdd8c6db99f8674ab92b7763a398ffc3b2617b6a44b2ef2b431fa039d5cabe58719d7660c96f2bde96c3dc8ecfc9fd904de7ac025cc9
-  data.tar.gz: 61f20ab2448dfaf836a698b1596ec0685f3d90380bcf2829e08ebda2f7b39dffddb9b0913609ccb682df77a66d2ada3f69e90071556a422a973eda5784942732
+  metadata.gz: af85cb2b8f1e4ae8ab8e2fb7831c4ef995b39899150ed35debada9e22f5211032ad1249bd1e45a35bb13708c1355d5a2d2a13df5821bd6ed5cc16e1bccbb8c8e
+  data.tar.gz: '019cd5694d0a1a91ec72116680728bb848ba184693af97f096d2d929ffda1b64fdf2d0bc0ba71d2e1b3fec0d060e1e2aeab122ab9683ee85bbc582b6d0000233'

data/README.adoc

@@ -31,52 +31,53 @@ $ gem install lutaml
 === Parsing
 
 The `Lutaml::Parser.parse` method provides a single point of entry for parsing
-data model files.
+data model files, such as:
 
-The return object is always a `Lutaml::LutamlPath::DocumentWrapper` object,
-where `#original_document` returns the native parsed models.
+* EXPRESS files with `.exp` extension
+* YAML Compressed EXPRESS CACHE files
+* XMI files with `.xmi` extension
+* XML files with `.xml` extension
+* LutaML files with `.lutaml` extension
+* LutaML YAML files with `.yml` extension
+
+Depending on the input file type, `Lutaml::Parser.parse` returns:
+
+* `Expressir::Express::Model::Repository` for EXPRESS files
+* `Expressir::Express::Cache` for EXPRESS CACHE files
+* `Lutaml::Uml::Document` for XMI files
+* `Lutaml::Uml::Document` for XML files
+* `Lutaml::Uml::Document` for LutaML files
+* `Lutaml::Uml::Document` for LutaML YAML files
+
+Examples to use the `Lutaml::Parser.parse`:
 
 [source,ruby]
 ----
+require "lutaml"
+
 # example.exp is an EXPRESS schema file
-wrapper = Lutaml::Parser.parse([File.new("example.exp")])
-# => returns a Lutaml::LutamlPath::DocumentWrapper object
-wrapper.original_document
-# => returns the original Expressir::Repository object
-----
+model = Lutaml::Parser.parse([File.new("example.exp")])
+# => returns Expressir::Express::Model::Repository model
 
-[source,ruby]
-----
 # example.exp.yaml is an EXPRESS cache file created with Expressir
-wrapper = Lutaml::Parser.parse([File.new("example.exp.yaml")], ::Lutaml::Parser::EXPRESS_CACHE_PARSE_TYPE)
-# => returns the DocumentWrapper but with the repository loaded from the Expressir cache file
-----
-
+model = Lutaml::Parser.parse([File.new("example.exp.yaml")], ::Lutaml::Parser::EXPRESS_CACHE_PARSE_TYPE)
+# => returns Expressir::Express::Cache model
 
-=== Selecting EXPRESS schemas
+# example.xmi is an XMI file
+model = Lutaml::Parser.parse([File.new("example.xmi")])
+# => returns Lutaml::Uml::Document model
 
-LutaML supports the `ModelElement#to_hash(..., select_proc:)` functionality
-of Expressir, allowing Expressir to only call `to_hash` on schemas that
-fit a dynamic criteria.
+# example.xml is an XML file
+model = Lutaml::Parser.parse([File.new("example.xml")])
+# => returns Lutaml::Uml::Document model
 
-The criteria is set via a Ruby `Proc` object, as follows.
+# example.lutaml is an LutaML file
+model = Lutaml::Parser.parse([File.new("example.lutaml")])
+# => returns Lutaml::Uml::Document model
 
-[source,ruby]
-----
-# Sets the filter
-filtered_schemas = ["action_schema", "date_time_schema"]
-
-# Sets the Proc
-wrapper.select_proc = Proc.new do |value|
-  if value.is_a?(Expressir::Model::Declarations::Schema)
-    filtered_schemas.include?(value.id)
-  else
-    true
-  end
-end
-
-serialized = wrapper.to_liquid
-# => returns the filtered to_hash method
+# example.yaml is an LutaML YAML file
+model = Lutaml::Parser.parse([File.new("example.yaml")])
+# => returns Lutaml::Uml::Document model
 ----
 
 

data/lib/lutaml/parser.rb

@@ -2,8 +2,6 @@ require "lutaml/express"
 require "lutaml/uml"
 require "lutaml/xmi"
 require "lutaml/xml"
-require "lutaml/uml/lutaml_path/document_wrapper"
-require "lutaml/express/lutaml_path/document_wrapper"
 require "expressir/express/cache"
 
 module Lutaml
@@ -14,14 +12,10 @@ module Lutaml
 
     class << self
       def parse(file_list, input_type = nil)
-        file_list = file_list.is_a?(Array) ? file_list : [file_list]
-        new(Array(file_list), input_type).parse
-      end
-
-      def parse_into_document(file_list, input_type = nil)
-        file_list = file_list.is_a?(Array) ? file_list : [file_list]
+        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)
@@ -29,15 +23,7 @@ module Lutaml
       @file_list = file_list
     end
 
-    def parse
-      documents = parse_into_document
-      return document_wrapper(documents) if ["exp",
-                                             EXPRESS_CACHE_PARSE_TYPE].include?(parse_type)
-
-      documents.map { |doc| document_wrapper(doc) }
-    end
-
-    def parse_into_document
+    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))
@@ -55,19 +41,5 @@ module Lutaml
         raise ArgumentError, "Unsupported file format"
       end
     end
-
-    private
-
-    def document_wrapper(document)
-      if ["exp", EXPRESS_CACHE_PARSE_TYPE].include?(parse_type)
-        return Lutaml::Express::LutamlPath::DocumentWrapper.new(document)
-      end
-
-      if parse_type == "xml"
-        return Lutaml::Xml::LutamlPath::DocumentWrapper.new(document)
-      end
-
-      Lutaml::Uml::LutamlPath::DocumentWrapper.new(document)
-    end
   end
 end

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.9.26".freeze
+  VERSION = "0.9.28".freeze
 end

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

@@ -48,19 +48,19 @@ module Lutaml
           private
 
           # @param xml [String]
-          # @return [Shale::Mapper]
+          # @return [Lutaml::Model::Serializable]
           def get_xmi_model(xml)
             Xmi::Sparx::SparxRoot.parse_xml(File.read(xml))
           end
         end
 
-        # @param xmi_model [Shale::Mapper]
+        # @param xmi_model [Lutaml::Model::Serializable]
         def set_xmi_model(xmi_model)
           @xmi_cache = {}
           @xmi_root_model = xmi_model
         end
 
-        # @param xmi_model [Shale::Mapper]
+        # @param xmi_model [Lutaml::Model::Serializable]
         # @return [Lutaml::Uml::Document]
         def parse(xmi_model)
           set_xmi_model(xmi_model)
@@ -69,7 +69,7 @@ module Lutaml
           ::Lutaml::Uml::Document.new(serialized_hash)
         end
 
-        # @param xmi_model [Shale::Mapper]
+        # @param xmi_model [Lutaml::Model::Serializable]
         # @param with_gen: [Boolean]
         # @param with_absolute_path: [Boolean]
         # return [Hash]
@@ -82,7 +82,7 @@ module Lutaml
           )
         end
 
-        # @param xmi_model [Shale::Mapper]
+        # @param xmi_model [Lutaml::Model::Serializable]
         # @param guidance_yaml [String]
         # return [Liquid::Drop]
         def serialize_xmi_to_liquid(xmi_model, guidance_yaml = nil)
@@ -104,7 +104,7 @@ module Lutaml
           YAML.safe_load(File.read(yaml, encoding: "UTF-8"))
         end
 
-        # @param xmi_model [Shale::Mapper]
+        # @param xmi_model [Lutaml::Model::Serializable]
         # @param name [String]
         # @param guidance_yaml [String]
         # @return [Hash]
@@ -120,7 +120,7 @@ module Lutaml
 
         private
 
-        # @param xmi_model [Shale::Mapper]
+        # @param xmi_model [Lutaml::Model::Serializable]
         # @param with_gen: [Boolean]
         # @param with_absolute_path: [Boolean]
         # @return [Hash]
@@ -138,7 +138,7 @@ module Lutaml
           }
         end
 
-        # @param model [Shale::Mapper]
+        # @param model [Lutaml::Model::Serializable]
         # @param with_gen: [Boolean]
         # @param with_absolute_path: [Boolean]
         # @param absolute_path: [String]
@@ -188,7 +188,7 @@ module Lutaml
           end
         end
 
-        # @param package [Shale::Mapper]
+        # @param package [Lutaml::Model::Serializable]
         # @return [String]
         def get_package_name(package) # rubocop:disable Metrics/AbcSize
           return package.name unless package.name.nil?
@@ -202,8 +202,8 @@ module Lutaml
           "unnamed"
         end
 
-        # @param package [Shale::Mapper]
-        # @param model [Shale::Mapper]
+        # @param package [Lutaml::Model::Serializable]
+        # @param model [Lutaml::Model::Serializable]
         # @param with_gen: [Boolean]
         # @param with_absolute_path: [Boolean]
         # @return [Array<Hash>]
@@ -228,8 +228,8 @@ module Lutaml
           end
         end
 
-        # @param klass [Shale::Mapper]
-        # @param model [Shale::Mapper]
+        # @param klass [Lutaml::Model::Serializable]
+        # @param model [Lutaml::Model::Serializable]
         # @param with_gen: [Boolean]
         # @param with_absolute_path: [Boolean]
         # @return [Hash]
@@ -258,7 +258,7 @@ module Lutaml
           klass_hash
         end
 
-        # @param klass [Shale::Mapper]
+        # @param klass [Lutaml::Model::Serializable]
         # # @return [Hash]
         def serialize_generalization(klass)
           general_hash, next_general_node_id = get_top_level_general_hash(klass)
@@ -271,7 +271,7 @@ module Lutaml
           general_hash
         end
 
-        # @param klass [Shale::Mapper]
+        # @param klass [Lutaml::Model::Serializable]
         # @return [Array<Hash>]
         def get_top_level_general_hash(klass) # rubocop:disable Metrics/AbcSize
           general_hash, next_general_node_id = get_general_hash(klass.id)
@@ -305,7 +305,7 @@ module Lutaml
         end
 
         # @param xmi_id [String]
-        # @param model [Shale::Mapper]
+        # @param model [Lutaml::Model::Serializable]
         # @return [Array<Hash>]
         # @note get generalization node and its owned attributes
         def serialize_generalization_attributes(general_id)
@@ -321,18 +321,18 @@ module Lutaml
         end
 
         # @param xmi_id [String]
-        # @return [Shale::Mapper]
+        # @return [Lutaml::Model::Serializable]
         def get_general_node(xmi_id)
           find_packaged_element_by_id(xmi_id)
         end
 
-        # @param general_node [Shale::Mapper]
+        # @param general_node [Lutaml::Model::Serializable]
         # @return [Hash]
         def get_general_attributes(general_node)
           serialize_class_attributes(general_node, with_assoc: true)
         end
 
-        # @param general_node [Shale::Mapper]
+        # @param general_node [Lutaml::Model::Serializable]
         # @return [String]
         def get_next_general_node_id(general_node)
           general_node.generalization.first&.general
@@ -361,13 +361,13 @@ module Lutaml
         end
 
         # @param id [String]
-        # @return [Shale::Mapper]
+        # @return [Lutaml::Model::Serializable]
         def find_packaged_element_by_id(id)
           all_packaged_elements.find { |e| e.id == id }
         end
 
         # @param id [String]
-        # @return [Shale::Mapper]
+        # @return [Lutaml::Model::Serializable]
         def find_upper_level_packaged_element(klass_id)
           upper_klass = all_packaged_elements.find do |e|
             e.packaged_element.find { |pe| pe.id == klass_id }
@@ -376,7 +376,7 @@ module Lutaml
         end
 
         # @param path [String]
-        # @return [Shale::Mapper]
+        # @return [Lutaml::Model::Serializable]
         def find_klass_packaged_element(path)
           lutaml_path = Lutaml::Path.parse(path)
           if lutaml_path.segments.count == 1
@@ -387,7 +387,7 @@ module Lutaml
         end
 
         # @param path [Lutaml::Path::ElementPath]
-        # @return [Shale::Mapper]
+        # @return [Lutaml::Model::Serializable]
         def find_klass_packaged_element_by_path(path)
           if path.absolute?
             iterate_packaged_element(
@@ -399,7 +399,7 @@ module Lutaml
         end
 
         # @param name_array [Array<String>]
-        # @return [Shale::Mapper]
+        # @return [Lutaml::Model::Serializable]
         def iterate_relative_packaged_element(name_array)
           # match the first element in the name_array
           matched_elements = all_packaged_elements.select do |e|
@@ -414,11 +414,11 @@ module Lutaml
           result.compact.first
         end
 
-        # @param model [Shale::Mapper]
+        # @param model [Lutaml::Model::Serializable]
         # @param name_array [Array<String>]
         # @param index: [Integer]
         # @param type: [String]
-        # @return [Shale::Mapper]
+        # @return [Lutaml::Model::Serializable]
         def iterate_packaged_element(model, name_array,
           index: 1, type: "uml:Package")
           return model if index == name_array.count
@@ -435,7 +435,7 @@ module Lutaml
         end
 
         # @param name [String]
-        # @return [Shale::Mapper]
+        # @return [Lutaml::Model::Serializable]
         def find_klass_packaged_element_by_name(name)
           all_packaged_elements.find do |e|
             e.type?("uml:Class") && e.name == name
@@ -443,14 +443,14 @@ module Lutaml
         end
 
         # @param name [String]
-        # @return [Shale::Mapper]
+        # @return [Lutaml::Model::Serializable]
         def find_packaged_element_by_name(name)
           all_packaged_elements.find do |e|
             e.name == name
           end
         end
 
-        # @param package [Shale::Mapper]
+        # @param package [Lutaml::Model::Serializable]
         # @return [Array<Hash>]
         # @note xpath ./packagedElement[@xmi:type="uml:Enumeration"]
         def serialize_model_enums(package)
@@ -466,7 +466,7 @@ module Lutaml
           end
         end
 
-        # @param model [Shale::Mapper]
+        # @param model [Lutaml::Model::Serializable]
         # @return [Hash]
         # @note xpath .//ownedLiteral[@xmi:type="uml:EnumerationLiteral"]
         def serialize_enum_owned_literal(enum)
@@ -486,7 +486,7 @@ module Lutaml
           end
         end
 
-        # @param model [Shale::Mapper]
+        # @param model [Lutaml::Model::Serializable]
         # @return [Array<Hash>]
         # @note xpath ./packagedElement[@xmi:type="uml:DataType"]
         def serialize_model_data_types(model)
@@ -576,7 +576,7 @@ module Lutaml
         end
 
         # @param link_id [String]
-        # @return [Shale::Mapper]
+        # @return [Lutaml::Model::Serializable]
         # @note xpath %(//connector[@xmi:idref="#{link_id}"])
         def fetch_connector(link_id)
           @xmi_root_model.extension.connectors.connector.find do |con|
@@ -594,7 +594,7 @@ module Lutaml
           connector_node.send(node_name.to_sym).documentation
         end
 
-        # @param klass [Shale::Mapper]
+        # @param klass [Lutaml::Model::Serializable]
         # @return [Array<Hash>]
         # @note xpath .//ownedOperation
         def serialize_class_operations(klass)
@@ -638,7 +638,7 @@ module Lutaml
         end
 
         # @param owner_xmi_id [String]
-        # @param link [Shale::Mapper]
+        # @param link [Lutaml::Model::Serializable]
         # @param link_member_name [String]
         # @return [String]
         def serialize_owned_type(owner_xmi_id, link, linke_owner_name)
@@ -665,7 +665,7 @@ module Lutaml
         end
 
         # @param owner_xmi_id [String]
-        # @param link [Shale::Mapper]
+        # @param link [Lutaml::Model::Serializable]
         # @return [Array<String, String>]
         def serialize_member_end(owner_xmi_id, link)
           case link.name
@@ -706,7 +706,7 @@ module Lutaml
         end
 
         # @param owner_xmi_id [String]
-        # @param link [Shale::Mapper]
+        # @param link [Lutaml::Model::Serializable]
         # @param link_member_name [String]
         # @return [Array<String, String, Hash, String, String>]
         def serialize_member_type(owner_xmi_id, link, link_member_name)
@@ -750,7 +750,7 @@ module Lutaml
         end
 
         # @param owner_xmi_id [String]
-        # @param link [Shale::Mapper]
+        # @param link [Lutaml::Model::Serializable]
         # @return [Array<String, String, Hash, String, String>]
         # @note match return value of serialize_member_type
         def generalization_association(owner_xmi_id, link)
@@ -796,7 +796,7 @@ module Lutaml
         end
 
         # @param klass_id [String]
-        # @return [Shale::Mapper]
+        # @return [Lutaml::Model::Serializable]
         # @note xpath %(//element[@xmi:idref="#{klass['xmi:id']}"])
         def fetch_element(klass_id)
           @xmi_root_model.extension.elements.element.find do |e|
@@ -804,7 +804,7 @@ module Lutaml
           end
         end
 
-        # @param klass [Shale::Mapper]
+        # @param klass [Lutaml::Model::Serializable]
         # @param with_assoc [Boolean]
         # @return [Array<Hash>]
         # @note xpath .//ownedAttribute[@xmi:type="uml:Property"]
@@ -920,7 +920,7 @@ module Lutaml
           }
         end
 
-        # @node [Shale::Mapper]
+        # @node [Lutaml::Model::Serializable]
         # @attr_name [String]
         # @return [String]
         # @note xpath %(//element[@xmi:idref="#{xmi_id}"]/properties)
@@ -928,11 +928,13 @@ module Lutaml
           doc_node = fetch_element(node_id)
           return unless doc_node
 
-          doc_node.properties&.send(Shale::Utils.snake_case(attr_name).to_sym)
+          doc_node.properties&.send(
+            Lutaml::Model::Utils.snake_case(attr_name).to_sym,
+          )
         end
 
         # @param xmi_id [String]
-        # @return [Shale::Mapper]
+        # @return [Lutaml::Model::Serializable]
         # @note xpath %(//attribute[@xmi:idref="#{xmi_id}"])
         def fetch_attribute_node(xmi_id)
           attribute_node = nil
@@ -1045,15 +1047,15 @@ module Lutaml
           all_elements
         end
 
-        # @param items [Array<Shale::Mapper>]
-        # @param model [Shale::Mapper]
+        # @param items [Array<Lutaml::Model::Serializable>]
+        # @param model [Lutaml::Model::Serializable]
         # @param type [String] nil for any
         def select_all_items(items, model, type, method)
           iterate_tree(items, model, type, method.to_sym)
         end
 
-        # @param all_elements [Array<Shale::Mapper>]
-        # @param model [Shale::Mapper]
+        # @param all_elements [Array<Lutaml::Model::Serializable>]
+        # @param model [Lutaml::Model::Serializable]
         # @param type [String] nil for any
         # @note xpath ./packagedElement[@xmi:type="#{type}"]
         def select_all_packaged_elements(all_elements, model, type)
@@ -1063,8 +1065,8 @@ module Lutaml
           end
         end
 
-        # @param result [Array<Shale::Mapper>]
-        # @param node [Shale::Mapper]
+        # @param result [Array<Lutaml::Model::Serializable>]
+        # @param node [Lutaml::Model::Serializable]
         # @param type [String] nil for any
         # @param children_method [String] method to determine children exist
         def iterate_tree(result, node, type, children_method)
@@ -1081,7 +1083,7 @@ module Lutaml
         end
 
         # @param result [Hash]
-        # @param node [Shale::Mapper]
+        # @param node [Lutaml::Model::Serializable]
         # @note set id as key and name as value into result
         #       if id and name are found
         def map_id_name(result, node)

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

@@ -2,8 +2,9 @@ require "nokogiri"
 require "htmlentities"
 require "lutaml/uml/has_attributes"
 require "lutaml/uml/document"
-
-require "shale/schema"
+require "lutaml/xsd"
+require "lutaml/model"
+require "lutaml/model/schema"
 
 module Lutaml
   module Xml
@@ -11,12 +12,10 @@ module Lutaml
       # Class for parsing .xml schema files into ::Lutaml::Uml::Document
       class Xml
         def self.load_schema(schema, root_schema)
-          result = Shale::Schema.from_xml([schema])
+          result = Lutaml::Model::Schema.from_xml(schema)
 
           result.values.each do |klass|
-            # Temporary solution will update in the parser
             klass = klass.gsub(/^require.*?\n/, "")
-            klass = klass.gsub(/< Shale::Mapper/, "< Lutaml::Xml::Mapper")
 
             eval(klass, TOPLEVEL_BINDING)
           end
@@ -39,18 +38,6 @@ module Lutaml
 
           @root_class.from_xml(doc)
         end
-
-        private
-
-        def load_schema(schema)
-          result = Shale::Schema.from_xml([schema])
-
-          result.values.each do |klass|
-            klass = klass.gsub(/^require.*?\n/, "")
-
-            eval(klass, TOPLEVEL_BINDING)
-          end
-        end
       end
     end
   end

data/lib/lutaml/xml.rb

@@ -1,9 +1 @@
 require "lutaml/xml/parsers/xml"
-
-require "lutaml/xml/mapper"
-require "lutaml/xml/lutaml_path/document_wrapper"
-
-require "shale"
-require "shale/adapter/nokogiri"
-
-Shale.xml_adapter = Shale::Adapter::Nokogiri

data/lutaml.gemspec

@@ -33,12 +33,14 @@ Gem::Specification.new do |spec|
   spec.add_dependency "hashie", "~> 4.1.0"
   spec.add_dependency "htmlentities"
   spec.add_dependency "liquid"
+  spec.add_dependency "lutaml-model"
   spec.add_dependency "lutaml-path"
+  spec.add_dependency "lutaml-xsd"
   spec.add_dependency "nokogiri", "~> 1.10"
   spec.add_dependency "parslet", "~> 2.0.0"
   spec.add_dependency "ruby-graphviz", "~> 1.2"
   spec.add_dependency "thor", "~> 1.0"
-  spec.add_dependency "xmi", "~> 0.3.10"
+  spec.add_dependency "xmi", "~> 0.3.12"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "equivalent-xml", "~> 0.6.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.9.26
+  version: 0.9.28
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-10 00:00:00.000000000 Z
+date: 2025-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: lutaml-model
+  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: lutaml-path
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ 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
@@ -142,14 +170,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 0.3.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.10
+        version: 0.3.12
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -284,8 +312,6 @@ files:
 - lib/lutaml/command_line.rb
 - lib/lutaml/express.rb
 - lib/lutaml/express/README.adoc
-- lib/lutaml/express/lutaml_path/document_wrapper.rb
-- lib/lutaml/express/lutaml_path/formatter.rb
 - lib/lutaml/express/parsers/exp.rb
 - lib/lutaml/express/version.rb
 - lib/lutaml/formatter.rb
@@ -293,7 +319,6 @@ files:
 - lib/lutaml/formatter/graphviz.rb
 - lib/lutaml/layout/engine.rb
 - lib/lutaml/layout/graph_viz_engine.rb
-- lib/lutaml/lutaml_path/document_wrapper.rb
 - lib/lutaml/parser.rb
 - lib/lutaml/sysml.rb
 - lib/lutaml/sysml/README.md
@@ -339,7 +364,6 @@ files:
 - lib/lutaml/uml/has_attributes.rb
 - lib/lutaml/uml/has_members.rb
 - lib/lutaml/uml/instance.rb
-- lib/lutaml/uml/lutaml_path/document_wrapper.rb
 - lib/lutaml/uml/model.rb
 - lib/lutaml/uml/node/base.rb
 - lib/lutaml/uml/node/class_node.rb
@@ -399,8 +423,6 @@ files:
 - lib/lutaml/xmi/parsers/xml.rb
 - lib/lutaml/xmi/version.rb
 - lib/lutaml/xml.rb
-- lib/lutaml/xml/lutaml_path/document_wrapper.rb
-- lib/lutaml/xml/mapper.rb
 - lib/lutaml/xml/parsers/xml.rb
 - lutaml.gemspec
 homepage: https://github.com/lutaml/lutaml

data/lib/lutaml/express/lutaml_path/document_wrapper.rb

@@ -1,22 +0,0 @@
-require "lutaml/lutaml_path/document_wrapper"
-require "lutaml/express/lutaml_path/formatter"
-
-module Lutaml
-  module Express
-    module LutamlPath
-      class DocumentWrapper < ::Lutaml::LutamlPath::DocumentWrapper
-        attr_accessor :select_proc
-
-        protected
-
-        def serialize_document(repository)
-          repository.to_hash(
-            formatter: Formatter,
-            include_empty: true,
-            select_proc: select_proc,
-          )
-        end
-      end
-    end
-  end
-end

data/lib/lutaml/express/lutaml_path/formatter.rb

@@ -1,14 +0,0 @@
-require "expressir/express/formatter"
-require "expressir/express/schema_head_formatter"
-require "expressir/express/hyperlink_formatter"
-
-module Lutaml
-  module Express
-    module LutamlPath
-      class Formatter < Expressir::Express::Formatter
-        include Expressir::Express::SchemaHeadFormatter
-        include Expressir::Express::HyperlinkFormatter
-      end
-    end
-  end
-end

data/lib/lutaml/lutaml_path/document_wrapper.rb

@@ -1,51 +0,0 @@
-module Lutaml
-  module LutamlPath
-    class DocumentWrapper
-      attr_reader :serialized_document, :original_document
-
-      def initialize(document)
-        @original_document = document
-      end
-
-      def to_liquid
-        serialized_document
-      end
-
-      def serialized_document
-        @serialized_document ||= serialize_document(@original_document)
-      end
-
-      protected
-
-      def serialize_document(_path)
-        raise ArgumentError, "implement #serialize_document!"
-      end
-
-      def serialize_value(attr_value)
-        if attr_value.is_a?(Array)
-          return attr_value.map(&method(:serialize_to_hash))
-        end
-
-        serialize_to_hash(attr_value)
-      end
-
-      BASE_OBJECTS = [String, Integer, Float, FalseClass, TrueClass, Symbol, NilClass, Hash]
-      def serialize_to_hash(object)
-        return object if BASE_OBJECTS.include?(object.class)
-
-        object.instance_variables.each_with_object({}) do |var, res|
-          variable = object.instance_variable_get(var)
-          res[var.to_s.gsub("@", "")] = if variable.is_a?(Array)
-                                          variable.map do |n|
-                                            serialize_to_hash(n)
-                                          end
-                                        elsif BASE_OBJECTS.include?(variable.class) || var == :@parent
-                                          variable
-                                        else
-                                          serialize_to_hash(variable)
-                                        end
-        end
-      end
-    end
-  end
-end

data/lib/lutaml/uml/lutaml_path/document_wrapper.rb

@@ -1,15 +0,0 @@
-require "lutaml/lutaml_path/document_wrapper"
-
-module Lutaml
-  module Uml
-    module LutamlPath
-      class DocumentWrapper < ::Lutaml::LutamlPath::DocumentWrapper
-        protected
-
-        def serialize_document(document)
-          serialize_to_hash(document)
-        end
-      end
-    end
-  end
-end

data/lib/lutaml/xml/lutaml_path/document_wrapper.rb

@@ -1,45 +0,0 @@
-require "lutaml/lutaml_path/document_wrapper"
-
-module Lutaml
-  module Xml
-    module LutamlPath
-      class DocumentWrapper < ::Lutaml::LutamlPath::DocumentWrapper
-        protected
-
-        def serialize_document(document)
-          serialize_to_hash(document)
-        end
-
-        def serialize_to_hash(object)
-          hash = {}
-          attribute_name = nil
-
-          object.all_content.each do |mapping, content|
-            if mapping == "content"
-              attribute_name = object.class.xml_mapping.content.attribute.to_s
-              hash[attribute_name] ||= []
-              hash[attribute_name] << content.strip unless content.strip&.empty?
-            elsif content.is_a?(String)
-              if object.class.attributes[mapping.attribute].collection?
-                hash[mapping.name] ||= []
-                hash[mapping.name] << content.strip
-              else
-                hash[mapping.name] = content.strip
-              end
-            else
-              if object.class.attributes[mapping.attribute].collection?
-                hash[mapping.name] ||= []
-                hash[mapping.name] << serialize_to_hash(content)
-              else
-                hash[mapping.name] = serialize_to_hash(content)
-              end
-            end
-          end
-
-          hash[attribute_name] = hash[attribute_name].compact if attribute_name
-          hash
-        end
-      end
-    end
-  end
-end

data/lib/lutaml/xml/mapper.rb

@@ -1,448 +0,0 @@
-require "shale"
-
-module Lutaml
-  module Xml
-    class Mapper < Shale::Mapper
-      # rubocop:disable Metrics/AbcSize
-      # rubocop:disable Metrics/MethodLength
-      # rubocop:disable Metrics/BlockLength
-      # rubocop:disable Metrics/CyclomaticComplexity
-      # rubocop:disable Metrics/PerceivedComplexity
-      class << self
-        # Convert XML document to Object
-        #
-        # @param [Shale::Adapter::<XML adapter>::Node] element
-        # @param [Array<Symbol>] only
-        # @param [Array<Symbol>] except
-        # @param [any] context
-        #
-        # @return [model instance]
-        #
-        # @api public
-        def of_xml(element, only: nil, except: nil, context: nil)
-          instance = model.new
-
-          attributes
-            .values
-            .select(&:default)
-            .each { |attr| instance.send(attr.setter, attr.default.call) }
-
-          grouping = Shale::Mapping::Group::XmlGrouping.new
-          delegates = Shale::Mapping::Delegates.new
-
-          only = to_partial_render_attributes(only)
-          except = to_partial_render_attributes(except)
-
-          element.attributes.each do |key, value|
-            mapping = xml_mapping.attributes[key.to_s]
-            next unless mapping
-
-            if mapping.group
-              grouping.add(mapping, :attribute, value)
-            elsif mapping.method_from
-              mapper = new
-
-              if mapper.method(mapping.method_from).arity == 3
-                mapper.send(mapping.method_from, instance, value, context)
-              else
-                mapper.send(mapping.method_from, instance, value)
-              end
-            else
-              receiver_attributes = get_receiver_attributes(mapping)
-              attribute = receiver_attributes[mapping.attribute]
-              next unless attribute
-
-              next if only && !only.key?(attribute.name)
-              next if except&.key?(attribute.name)
-
-              casted_value = attribute.type.cast(value)
-
-              if attribute.collection?
-                if mapping.receiver
-                  delegates.add_collection(
-                    attributes[mapping.receiver],
-                    attribute.setter,
-                    casted_value,
-                  )
-                else
-                  instance.send(attribute.name) << casted_value
-                end
-              elsif mapping.receiver
-                delegates.add(attributes[mapping.receiver], attribute.setter,
-                              casted_value)
-              else
-                instance.send(attribute.setter, casted_value)
-              end
-            end
-          end
-
-          content_mapping = xml_mapping.content
-
-          if content_mapping
-            if content_mapping.group
-              grouping.add(content_mapping, :content, element)
-            elsif content_mapping.method_from
-              mapper = new
-
-              if mapper.method(content_mapping.method_from).arity == 3
-                mapper.send(content_mapping.method_from, instance, element,
-                            context)
-              else
-                mapper.send(content_mapping.method_from, instance, element)
-              end
-            else
-              get_content_value(content_mapping, element, only, except,
-                                delegates, instance)
-            end
-          end
-
-          # rubocop:disable Metrics/BlockNesting
-          element.instance_variable_get(:@node)&.children&.each do |nokogiri_node|
-            if nokogiri_node.name == "text"
-              content_value = get_content_value(content_mapping, nokogiri_node,
-                                                only, except, delegates, instance)
-              instance.all_content << ["content", content_value]
-              next
-            elsif nokogiri_node.name == "comment"
-              instance.all_content << ["comment", nokogiri_node.text]
-              next
-            end
-
-            node = element.class.new(nokogiri_node)
-            mapping = xml_mapping.elements[node.name]
-
-            next unless mapping
-
-            if mapping.group
-              grouping.add(mapping, :element, node)
-            elsif mapping.method_from
-              mapper = new
-
-              if mapper.method(mapping.method_from).arity == 3
-                mapper.send(mapping.method_from, instance, node, context)
-              else
-                mapper.send(mapping.method_from, instance, node)
-              end
-            else
-              receiver_attributes = get_receiver_attributes(mapping)
-              attribute = receiver_attributes[mapping.attribute]
-              next unless attribute
-
-              if only
-                attribute_only = only[attribute.name]
-                next unless only.key?(attribute.name)
-              end
-
-              if except
-                attribute_except = except[attribute.name]
-                next if except.key?(attribute.name) && attribute_except.nil?
-              end
-
-              value = attribute.type.of_xml(
-                node,
-                only: attribute_only,
-                except: attribute_except,
-                context: context,
-              )
-
-              casted_value = attribute.type.cast(value)
-              instance.all_content << [mapping, casted_value]
-
-              if attribute.collection?
-                if mapping.receiver
-                  delegates.add_collection(
-                    attributes[mapping.receiver],
-                    attribute.setter,
-                    casted_value,
-                  )
-                else
-                  instance.send(attribute.name) << casted_value
-                end
-              elsif mapping.receiver
-                delegates.add(attributes[mapping.receiver], attribute.setter,
-                              casted_value)
-              else
-                instance.send(attribute.setter, casted_value)
-              end
-            end
-          end
-          # rubocop:enable Metrics/BlockNesting
-
-          delegates.each do |delegate|
-            receiver = get_receiver(instance, delegate.receiver_attribute)
-            receiver.send(delegate.setter, delegate.value)
-          end
-
-          grouping.each do |group|
-            mapper = new
-
-            if mapper.method(group.method_from).arity == 3
-              mapper.send(group.method_from, instance, group.dict, context)
-            else
-              mapper.send(group.method_from, instance, group.dict)
-            end
-          end
-
-          instance
-        end
-
-        # Convert Object to XML document
-        #
-        # @param [any] instance Object to convert
-        # @param [String, nil] node_name XML node name
-        # @param [Shale::Adapter::<xml adapter>::Document, nil]
-        #          doc Object to convert
-        # @param [Array<Symbol>] only
-        # @param [Array<Symbol>] except
-        # @param [any] context
-        #
-        # @raise [IncorrectModelError]
-        #
-        # @return [::REXML::Document, ::Nokogiri::Document, ::Ox::Document]
-        #
-        # @api public
-        def as_xml(
-          instance,
-          node_name = nil,
-          doc = nil,
-          _cdata = nil,
-          only: nil,
-          except: nil,
-          context: nil,
-          version: nil
-        )
-          unless instance.is_a?(model)
-            msg = "argument is a '#{instance.class}' but should be a '#{model}'"
-            raise IncorrectModelError, msg
-          end
-
-          unless doc
-            doc = Shale.xml_adapter.create_document(version)
-
-            element = as_xml(
-              instance,
-              xml_mapping.prefixed_root,
-              doc,
-              only: only,
-              except: except,
-              context: context,
-            )
-            doc.add_element(doc.doc, element)
-
-            return doc.doc
-          end
-
-          element = doc.create_element(node_name)
-
-          doc.add_namespace(
-            xml_mapping.default_namespace.prefix,
-            xml_mapping.default_namespace.name,
-          )
-
-          grouping = Shale::Mapping::Group::XmlGrouping.new
-
-          only = to_partial_render_attributes(only)
-          except = to_partial_render_attributes(except)
-
-          # rubocop:disable Metrics/BlockNesting
-          xml_mapping.attributes.each_value do |mapping|
-            if mapping.group
-              grouping.add(mapping, :attribute, nil)
-            elsif mapping.method_to
-              mapper = new
-
-              if mapper.method(mapping.method_to).arity == 4
-                mapper.send(mapping.method_to, instance, element, doc, context)
-              else
-                mapper.send(mapping.method_to, instance, element, doc)
-              end
-            else
-              receiver = if mapping.receiver
-                           instance.send(mapping.receiver)
-                         else
-                           instance
-                         end
-
-              receiver_attributes = get_receiver_attributes(mapping)
-              attribute = receiver_attributes[mapping.attribute]
-              next unless attribute
-
-              next if only && !only.key?(attribute.name)
-              next if except&.key?(attribute.name)
-
-              value = receiver.send(attribute.name) if receiver
-
-              if mapping.render_nil? || !value.nil?
-                doc.add_namespace(mapping.namespace.prefix,
-                                  mapping.namespace.name)
-                doc.add_attribute(element, mapping.prefixed_name, value)
-              end
-            end
-          end
-          # rubocop:enable Metrics/BlockNesting
-
-          # rubocop:disable Metrics/BlockNesting
-          instance.all_content.each do |mapping, content|
-            if mapping == "comment"
-              comment = Nokogiri::XML::Comment.new(doc.doc, content)
-              doc.add_element(element, comment)
-            elsif mapping == "content"
-              content_mapping = xml_mapping.content
-              if content_mapping
-                if content_mapping.group
-                  grouping.add(content_mapping, :content, nil)
-                elsif content_mapping.method_to
-                  mapper = new
-
-                  if mapper.method(content_mapping.method_to).arity == 4
-                    mapper.send(content_mapping.method_to, instance, element,
-                                doc, context)
-                  else
-                    mapper.send(content_mapping.method_to, instance, element, doc)
-                  end
-                else
-                  receiver_attributes = get_receiver_attributes(content_mapping)
-                  attribute = receiver_attributes[content_mapping.attribute]
-
-                  if attribute
-                    skip = false
-
-                    skip = true if only && !only.key?(attribute.name)
-                    skip = true if except&.key?(attribute.name)
-
-                    unless skip
-                      # value = receiver.send(attribute.name) if receiver
-                      value = content
-
-                      if content_mapping.cdata
-                        doc.create_cdata(value, element)
-                      else
-                        a = Nokogiri::XML::Text.new(value, doc.doc)
-                        doc.add_element(element, a)
-                      end
-                    end
-                  end
-                end
-              end
-            elsif mapping.group
-              grouping.add(mapping, :element, nil)
-            elsif mapping.method_to
-              mapper = new
-
-              if mapper.method(mapping.method_to).arity == 4
-                mapper.send(mapping.method_to, instance, element, doc, context)
-              else
-                mapper.send(mapping.method_to, instance, element, doc)
-              end
-            else
-              receiver_attributes = get_receiver_attributes(mapping)
-              attribute = receiver_attributes[mapping.attribute]
-              next unless attribute
-
-              if only
-                attribute_only = only[attribute.name]
-                next unless only.key?(attribute.name)
-              end
-
-              if except
-                attribute_except = except[attribute.name]
-                next if except.key?(attribute.name) && attribute_except.nil?
-              end
-
-              value = content
-
-              if mapping.render_nil? || !value.nil?
-                doc.add_namespace(mapping.namespace.prefix,
-                                  mapping.namespace.name)
-              end
-
-              if value.nil?
-                if mapping.render_nil?
-                  child = doc.create_element(mapping.prefixed_name)
-                  doc.add_element(element, child)
-                end
-              elsif attribute.collection?
-                [*value].each do |v|
-                  next if v.nil?
-
-                  child = attribute.type.as_xml(
-                    v,
-                    mapping.prefixed_name,
-                    doc,
-                    mapping.cdata,
-                    only: attribute_only,
-                    except: attribute_except,
-                    context: context,
-                  )
-                  doc.add_element(element, child)
-                end
-              else
-                child = attribute.type.as_xml(
-                  value,
-                  mapping.prefixed_name,
-                  doc,
-                  mapping.cdata,
-                  only: attribute_only,
-                  except: attribute_except,
-                  context: context,
-                )
-                doc.add_element(element, child)
-              end
-            end
-          end
-          # rubocop:enable Metrics/BlockNesting
-
-          grouping.each do |group|
-            mapper = new
-
-            if mapper.method(group.method_to).arity == 4
-              mapper.send(group.method_to, instance, element, doc, context)
-            else
-              mapper.send(group.method_to, instance, element, doc)
-            end
-          end
-
-          element
-        end
-
-        def get_content_value(content_mapping, element, only, except, delegates, instance)
-          receiver_attributes = get_receiver_attributes(content_mapping)
-          attribute = receiver_attributes[content_mapping.attribute]
-
-          if attribute
-            skip = false
-
-            # rubocop:disable Metrics/BlockNesting
-            skip = true if only && !only.key?(attribute.name)
-            skip = true if except&.key?(attribute.name)
-
-            unless skip
-              value = attribute.type.cast(attribute.type.of_xml(element))
-
-              if content_mapping.receiver
-                delegates.add(attributes[content_mapping.receiver],
-                              attribute.setter, value)
-              else
-                instance.send(attribute.setter, value)
-              end
-            end
-            # rubocop:enable Metrics/BlockNesting
-          end
-        end
-      end
-      # rubocop:enable Metrics/AbcSize
-      # rubocop:enable Metrics/MethodLength
-      # rubocop:enable Metrics/BlockLength
-      # rubocop:enable Metrics/CyclomaticComplexity
-      # rubocop:enable Metrics/PerceivedComplexity
-
-      attr_accessor :all_content
-
-      def initialize(*args)
-        @all_content = []
-
-        super
-      end
-    end
-  end
-end