xsd 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a5aa03e831e5cf4e88780b18a4ef57217eff54a14e2138669672f33486ba8bd
-  data.tar.gz: b6a9ab392e47192a6a286ffa7dc97c5f624c78d9ab117bdea67e11f801c39363
+  metadata.gz: 73e87995baa341819126aaf56de8b4a865395423b6ea2f64c8a3aa8e702a611a
+  data.tar.gz: d330c3d390ff34c43d7988e0fe30b99d8538c62ff60205e0164d3119118ed1c4
 SHA512:
-  metadata.gz: a031bc3a3947708a8f6f8e4add4040853f9f8b62cd3465de56421600d9fc2d2b7c45b163efe239c7486dce05bf0427d8f380e119673b644739f736b4598b5276
-  data.tar.gz: ad7bbd0268373292a291935599749dc9937784438b398958acf592db4e1648967106f45c1dd402c82f3cdd534f2fe0e177a1250e91f65872fc3aa9d9a8b416a5
+  metadata.gz: 0bfc579e3376d04a72c4ac593d9c944c7739b0dc4ffe0ea94399fbdfb11771bb8f7a4d356609a257e47e5ff3fefa7bae6c34a0ac0cb76c1b149614b25fe58994
+  data.tar.gz: 2d44c024e3b658e2b907614a621db0d2367feac05e6abeb8c5e7bee027d830c3be6f4a438941141e17b1df626f3b5899793a9e7befc612bd28caae804812cf7b

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [2.6.1] - 2024-04-12
+
+- Correctly detect namespace for referenced elements
+
 ## [2.6.0] - 2024-04-12
 
 - Fix XSD boolean attributes

data/lib/xsd/base_object.rb

@@ -375,20 +375,19 @@ module XSD
     private
 
     def definition_match?(definition, query)
-      actual_definition = definition.referenced? ? definition.reference : definition
-
+      # namespace included in query
       if query.start_with?('{')
         parts = query[1..].split('}')
         raise Error, "Invalid element/attribute query: #{query}" if parts.size != 2
 
         namespace, name = parts
 
-        return false if namespace != actual_definition.namespace
+        return false if namespace != definition.namespace
       else
         name = query
       end
 
-      name == '*' || actual_definition.name == name
+      name == '*' || definition.name == name
     end
   end
 end

data/lib/xsd/objects/group.rb

@@ -8,8 +8,9 @@ module XSD
   class Group < BaseObject
     include MinMaxOccurs
     include Referenced
+    include Named
 
-    # Optional. Specifies the name of the attribute. Name and ref attributes cannot both be present
+    # Optional. Specifies a name for the group. This attribute is used only when the schema element is the parent of this group element. Name and ref attributes cannot both be present
     # @!attribute name
     # @return String
     property :name, :string

data/lib/xsd/shared/named.rb

@@ -5,7 +5,8 @@ module XSD
     # Get definition namespace
     # @return String
     def namespace
-      schema.target_namespace
+      is_referenced = respond_to?(:referenced?)
+      is_referenced && referenced? ? reference.schema.target_namespace : schema.target_namespace
     end
 
     # Get absolute definition name

data/lib/xsd/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module XSD
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xsd
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - d.arkhipov