lutaml 0.9.27 → 0.9.29

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,14 +12,12 @@ 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
+          result.each_value do |klass|
             klass = klass.gsub(/^require.*?\n/, "")
-            klass = klass.gsub(/< Shale::Mapper/, "< Lutaml::Xml::Mapper")
 
-            eval(klass, TOPLEVEL_BINDING)
+            eval(klass, TOPLEVEL_BINDING) # rubocop:disable Security/Eval
           end
 
           @@root_schema = root_schema
@@ -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,11 +33,12 @@ 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 "shale"
   spec.add_dependency "thor", "~> 1.0"
   spec.add_dependency "xmi", "~> 0.3.12"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.9.27
+  version: 0.9.29
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-01-24 00:00:00.000000000 Z
+date: 2025-03-05 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
@@ -122,20 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: shale
-  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: thor
   requirement: !ruby/object:Gem::Requirement
@@ -298,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
@@ -307,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
@@ -353,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
@@ -410,11 +420,10 @@ files:
 - lib/lutaml/xmi/liquid_drops/operation_drop.rb
 - lib/lutaml/xmi/liquid_drops/package_drop.rb
 - lib/lutaml/xmi/liquid_drops/root_drop.rb
+- lib/lutaml/xmi/parsers/xmi_base.rb
 - 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
@@ -440,7 +449,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.27
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: 'LutaML: data models in textual form'

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