xsd 2.7.3 → 2.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c9c91e0e5bbb59fb9f8350cfc63af850aaf6aa7bdb7512c3735d297743838075
-  data.tar.gz: 32c0ba7d54f5296ba378bfdc88a2f3f42d7c83c1e7101b9c59fdae1e7d3d72c0
+  metadata.gz: 153a03f87abecaab17a642bd1d822e102609c44f30a45bfdbd0ca4a52c6dc567
+  data.tar.gz: 7b7e50fb7e6915c7eb13a03d9d512b73e15e1d0abbbab5400e1f40703343ae2a
 SHA512:
-  metadata.gz: 6ae295c6457d02e0ffbb3bd06e8ad69469f779f9d15694694942e7cd6099d07d3865b8ca77674b94d00ed53bb564ffa73a9e7f32744972ea6393c50e88cd2b4e
-  data.tar.gz: c5b1a9aca305db447abd51117de1fbaee05da4bc3137b08a9f8bf775d3fe33fd56d1a25871a03bfaad41cd476e575bb09aaa4acc14c6c91c21d0cb8e81d72513
+  metadata.gz: 30c85bd21b725a01724e0c6b3239593d50a270a8f98c1c66af52a883a08d3f0fa91876c2f6ca4edf159ab4d6ee4eba4fbaec903cc967f3fefda757234379c6cb
+  data.tar.gz: e567f9b119ac0528ef8b91f4b0ef5619e0b5c008e3f6652a589e37ba85181ddd596271597819059181ec36f8adaee91b04c5aa2f6998a67e38c228da8ea41859

data/CHANGELOG.md

@@ -1,8 +1,9 @@
-## [2.7.3] - 2024-04-21
+## [2.7.5] - 2024-04-22
 
 - Return <xs:any> and <xs:anyAttribute> from collect_elements/collect_attributes
 - Make multiple_allowed? available on all definitions with max occurs
 - Don't return duplicated attributes from complex restriction
+- Fix base_complex_type on restriction without base
 
 ## [2.6.3] - 2024-04-13
 

data/lib/xsd/base_object.rb

@@ -343,7 +343,7 @@ module XSD
         name = link[:property] ? send(link[:property]) : nil
         if name
           return @cache[method] = object_by_name(link[:type], name)
-        elsif is_a?(Restriction) && method == :base_simple_type
+        elsif is_a?(Restriction) && %i[base_simple_type base_complex_type].include?(method)
           # handle restriction without base
           return nil
         end

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.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsd
 version: !ruby/object:Gem::Version
-  version: 2.7.3
+  version: 2.7.5
 platform: ruby
 authors:
 - d.arkhipov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-04-20 00:00:00.000000000 Z
+date: 2024-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder