lutaml-xsd 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4296cdc53ac951e9dabd94e87350ea4d82e7691fcd879e5ea38d9ac619c620e
-  data.tar.gz: a9e1191c508dabc0bc942e86b210f06d4c27815ab10cf5fbdc322bbde0b59f68
+  metadata.gz: 17d40234cd89518b6025cc5a7fb3fd528a2664f9e46928391141de6d6d190ca7
+  data.tar.gz: e74a794d5b769ef44809db6522967e697da1d84d3ef57eded7a7878a920f7d38
 SHA512:
-  metadata.gz: 2d69274700a75e1756c82103c095a0bf3b5b56fb0c9d9c35da98112afcbca422e37cfed00d46579f0969fec4392ae04b993f57e58f1aaea35e513d6ae39577ff
-  data.tar.gz: 7ffa3d40825726c740a29cac23685e32aff7f4295603634361524305b7579bbf4b02194582b78f12da42c6923657c682b7182d863b08bbd9267ce3190bef6149
+  metadata.gz: 0e4ef4980e59697d4089eae07c8f5bddf3019f02d25c9b73a4981937cf2fc1efa2c07a14e63251e59d044390ae7871b6f0d481c8eda16030a6529bdac18bc97a
+  data.tar.gz: 3495e42fa5fc29c2bb01682c4aa28e1bdb111459069b22a2d16a07bd92446b7367c5161ec848a36308a8b5645ec32e4071a63798a96ed87875225d1c12264e8b

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,7 @@ module Lutaml
       attribute :lang, :string
       attribute :xmlns, :string
       attribute :version, :string
+      attribute :imported, :boolean
       attribute :final_default, :string
       attribute :block_default, :string
       attribute :target_namespace, :string
@@ -56,14 +57,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"])
         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
 
@@ -83,7 +86,7 @@ module Lutaml
       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
@@ -118,7 +121,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 +132,11 @@ module Lutaml
       end
 
       def annotation_object(instance, schema)
-        annotation_key = schema.keys.find { |key| key.include?("annotation") }
+        elements = schema["elements"] || {}
+        annotation_key = elements.keys.find { |key| key.include?("annotation") }
         return unless annotation_key
 
-        instance.annotation = Annotation.apply_mappings(schema[annotation_key], :xml)
+        instance.annotation = Annotation.apply_mappings(elements[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.1"
   end
 end

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.1
 platform: ruby
 authors:
 - Ribose Inc.
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-12-31 00:00:00.000000000 Z
+date: 2025-01-30 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
@@ -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: []