lutaml-xsd 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4296cdc53ac951e9dabd94e87350ea4d82e7691fcd879e5ea38d9ac619c620e
-  data.tar.gz: a9e1191c508dabc0bc942e86b210f06d4c27815ab10cf5fbdc322bbde0b59f68
+  metadata.gz: e8d8b1ad8e625ee8cab24750b1431684ee5a7129c5fbd94d2f238bc1742eaf0b
+  data.tar.gz: fd018a29d844d9a4c2e6ae3b7b59a2c6520e4a3ca2a9f5c6ab59548a125806bb
 SHA512:
-  metadata.gz: 2d69274700a75e1756c82103c095a0bf3b5b56fb0c9d9c35da98112afcbca422e37cfed00d46579f0969fec4392ae04b993f57e58f1aaea35e513d6ae39577ff
-  data.tar.gz: 7ffa3d40825726c740a29cac23685e32aff7f4295603634361524305b7579bbf4b02194582b78f12da42c6923657c682b7182d863b08bbd9267ce3190bef6149
+  metadata.gz: 0f2f77d3f47cb88123d7addac782e80f41f2ee6362758841aabfc90934976b3ac26e7d47e7eadd975c6d5744acfa1d2f8a53462e949f486e3ad5b0152a2bfec5
+  data.tar.gz: 1da9d9df59da0f84fb0f1f374b7b28e7ff1d3d83ced963513482630dec9954b2fcffc5482c81134ebe1d160b6920c2248ad5008d722ec9ad7f846da6746da20e

data/lib/lutaml/xsd/glob.rb

@@ -38,7 +38,7 @@ module Lutaml
       end
 
       def include_schema(schema_location)
-        return unless location? || schema_location
+        return unless location? && schema_location
 
         schema_path = schema_location_path(schema_location)
         url? ? http_get(schema_path) : File.read(schema_path)

data/lib/lutaml/xsd/import.rb

@@ -19,7 +19,7 @@ module Lutaml
       end
 
       def fetch_schema
-        Glob.include_schema(schema_path) if schema_path
+        Glob.include_schema(schema_path) if schema_path && Glob.location?
       end
     end
   end

data/lib/lutaml/xsd/schema.rb

@@ -8,6 +8,8 @@ module Lutaml
       attribute :lang, :string
       attribute :xmlns, :string
       attribute :version, :string
+      attribute :imported, :boolean
+      attribute :included, :boolean
       attribute :final_default, :string
       attribute :block_default, :string
       attribute :target_namespace, :string
@@ -56,14 +58,16 @@ module Lutaml
 
       def import_from_schema(model, value)
         value.each do |schema|
-          setup_import_and_include("import", model, schema, namespace: schema["namespace"])
+          setup_import_and_include("import", model, schema, namespace: schema.attributes["namespace"].value)
         end
       end
 
       def import_to_schema(model, parent, _doc)
-        model.imports.each_with_index do |imported_schema, index|
+        return if model.imported
+
+        model.imported = true
+        model.imports.each do |imported_schema|
           parent.add_child(imported_schema.to_xml)
-          model.imports.delete_at(index)
         end
       end
 
@@ -74,16 +78,18 @@ module Lutaml
       end
 
       def include_to_schema(model, parent, _doc)
-        model.includes.each_with_index do |schema_hash, index|
+        return if model.included
+
+        model.included = true
+        model.includes.each do |schema_hash|
           parent.add_child(schema_hash.to_xml)
-          model.includes.delete_at(index)
         end
       end
 
       private
 
       def setup_import_and_include(klass, model, schema, args = {})
-        instance = init_instance_of(klass, schema, args)
+        instance = init_instance_of(klass, schema.attributes || {}, args)
         annotation_object(instance, schema)
         model.send("#{klass}s") << instance
         schema_path = instance.schema_path
@@ -94,17 +100,9 @@ module Lutaml
         self.class.remove_in_progress(schema_path)
       end
 
-      def dig_schema_location(schema_hash)
-        schema_hash&.dig("__schema_location", :schema_location)
-      end
-
-      def schema_location?(schema_hash)
-        schema_hash&.dig("__schema_location")&.key?(:schema_location)
-      end
-
       def init_instance_of(klass, schema_hash, args = {})
-        args[:id] = schema_hash["id"]
-        args[:schema_path] = dig_schema_location(schema_hash)
+        args[:id] = schema_hash["id"].value if schema_hash&.key?("id")
+        args[:schema_path] = schema_hash["schemaLocation"].value if schema_hash&.key?("schemaLocation")
         Lutaml::Xsd.const_get(klass.capitalize).new(**args)
       end
 
@@ -118,7 +116,7 @@ module Lutaml
 
       def schema_by_location_or_instance(instance)
         schema_path = instance.schema_path
-        return unless schema_path
+        return unless schema_path && Glob.location?
 
         self.class.processed_schemas[schema_path] ||
           Lutaml::Xsd.parse(
@@ -129,10 +127,11 @@ module Lutaml
       end
 
       def annotation_object(instance, schema)
-        annotation_key = schema.keys.find { |key| key.include?("annotation") }
+        elements = schema.children || []
+        annotation_key = elements.find { |element| element.unprefixed_name == "annotation" }
         return unless annotation_key
 
-        instance.annotation = Annotation.apply_mappings(schema[annotation_key], :xml)
+        instance.annotation = Annotation.apply_mappings(annotation_key, :xml)
       end
 
       class << self

data/lib/lutaml/xsd/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Xsd
-    VERSION = "1.0.0"
+    VERSION = "1.0.2"
   end
 end

data/lib/lutaml/xsd.rb

@@ -2,11 +2,31 @@
 
 require "zeitwerk"
 require "lutaml/model"
-require_relative "xsd/xsd"
-
+require "lutaml/model/xml_adapter/nokogiri_adapter"
 Lutaml::Model::Config.xml_adapter_type = :nokogiri
 
 loader = Zeitwerk::Loader.for_gem(warn_on_extra_files: true)
+loader.push_dir(__dir__, namespace: Lutaml)
 loader.push_dir("#{__dir__}/xsd", namespace: Lutaml::Xsd)
-loader.ignore("#{__dir__}/lib/lutaml/xsd.rb")
 loader.setup
+
+module Lutaml
+  module Xsd
+    class Error < StandardError; end
+
+    module_function
+
+    def parse(xsd, location: nil, nested_schema: false)
+      Schema.reset_processed_schemas unless nested_schema
+
+      Glob.path_or_url(location)
+      Schema.from_xml(xsd)
+    end
+  end
+end
+
+begin
+  loader.eager_load(force: true)
+rescue Zeitwerk::NameError => e
+  flunk e.message
+end

data/lib/lutaml_xsd.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require_relative "lutaml/xsd"

data/lutaml-xsd.gemspec

@@ -32,6 +32,6 @@ Gem::Specification.new do |spec|
 
   spec.test_files = `git ls-files -- {spec}/*`.split("\n")
 
-  spec.add_dependency "lutaml-model", "~> 0.3"
+  spec.add_dependency "lutaml-model", "~> 0.5"
   spec.add_dependency "zeitwerk"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-xsd
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-31 00:00:00.000000000 Z
+date: 2025-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lutaml-model
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ files:
 - lib/lutaml/xsd/unique.rb
 - lib/lutaml/xsd/version.rb
 - lib/lutaml/xsd/white_space.rb
-- lib/lutaml/xsd/xsd.rb
+- lib/lutaml_xsd.rb
 - lutaml-xsd.gemspec
 - sig/lutaml/xsd.rbs
 homepage: https://github.com/lutaml/expressir
@@ -117,7 +117,7 @@ metadata:
   source_code_uri: https://github.com/lutaml/expressir
   changelog_uri: https://github.com/lutaml/lutaml-xsd/releases
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -133,7 +133,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Library for XML Schema Definition (XSD) files
 test_files: []

data/lib/lutaml/xsd/xsd.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Lutaml
-  module Xsd
-    class Error < StandardError; end
-
-    module_function
-
-    def parse(xsd, location: nil, nested_schema: false)
-      Schema.reset_processed_schemas unless nested_schema
-
-      Glob.path_or_url(location)
-      Schema.from_xml(xsd)
-    end
-  end
-end