xsd 2.7.3 → 2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9c91e0e5bbb59fb9f8350cfc63af850aaf6aa7bdb7512c3735d297743838075
-  data.tar.gz: 32c0ba7d54f5296ba378bfdc88a2f3f42d7c83c1e7101b9c59fdae1e7d3d72c0
+  metadata.gz: d9095472b3d2f3c563c0418c8b9bc1effdd8a94d7e35e36196f750b37be868e5
+  data.tar.gz: a404b786ce073a8e3f24603fccaf16a22e8cbf7dd478973a58d20c4fc0fc6547
 SHA512:
-  metadata.gz: 6ae295c6457d02e0ffbb3bd06e8ad69469f779f9d15694694942e7cd6099d07d3865b8ca77674b94d00ed53bb564ffa73a9e7f32744972ea6393c50e88cd2b4e
-  data.tar.gz: c5b1a9aca305db447abd51117de1fbaee05da4bc3137b08a9f8bf775d3fe33fd56d1a25871a03bfaad41cd476e575bb09aaa4acc14c6c91c21d0cb8e81d72513
+  metadata.gz: 9f8d71e7ca6571d89f19232b729fb2dacddb78f31ef6900bbf47eede632cc9c2f3f195b015c601c524bb30a3dd6b8ec1dc0d6a944260d2fafd953e27a69646a4
+  data.tar.gz: '08231dcf39f93087cf3c151345cba2f2c4d7f60db6074f1eaf452c8ffb2b316fef4cecc8fdf253943d48c8d9226537ec194fdbc0711653aebcad5b392f01d6d9'

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## [2.7.3] - 2024-04-21
+## [2.7.4] - 2024-04-21
 
 - Return <xs:any> and <xs:anyAttribute> from collect_elements/collect_attributes
 - Make multiple_allowed? available on all definitions with max occurs

data/lib/xsd/objects/complex_type.rb

@@ -120,7 +120,13 @@ module XSD
       restriction = simple_content.restriction
       if restriction
         if restriction.base
-          restriction.base_simple_type&.data_type || strip_prefix(restriction.base)
+          if restriction.base_simple_type
+            restriction.base_simple_type.data_type
+          elsif restriction.base_complex_type
+            restriction.base_complex_type.data_type
+          else
+            strip_prefix(restriction.base)
+          end
         else
           restriction.simple_type&.data_type
         end

data/lib/xsd/version.rb

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

metadata

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