xsd 2.7.2 → 2.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac666b4ba9690ed163376b0232dec21ba29c7098f2362b6ba9b1d5751fa60ca2
-  data.tar.gz: 8eedebb55d21670bf6620a892073b8c4af9a269e39be1f20e66a1873749c1c76
+  metadata.gz: d9095472b3d2f3c563c0418c8b9bc1effdd8a94d7e35e36196f750b37be868e5
+  data.tar.gz: a404b786ce073a8e3f24603fccaf16a22e8cbf7dd478973a58d20c4fc0fc6547
 SHA512:
-  metadata.gz: def1638cb816c68f2539611eb5ff2fd5328d729dab3ea530546f54e362f08fb39c06c325f2d734f934231404242adb85f560458c2a1ca8570f482a10fe4e0144
-  data.tar.gz: f62492a9cec4f219cb2b966d033b66c7d7a5f1cfdb7c27ac0bef5a5d7fdc3a3aa3265e5ea8c41fba8069433041fc210ceb7521f60304e3a0704a721bf1b0f567
+  metadata.gz: 9f8d71e7ca6571d89f19232b729fb2dacddb78f31ef6900bbf47eede632cc9c2f3f195b015c601c524bb30a3dd6b8ec1dc0d6a944260d2fafd953e27a69646a4
+  data.tar.gz: '08231dcf39f93087cf3c151345cba2f2c4d7f60db6074f1eaf452c8ffb2b316fef4cecc8fdf253943d48c8d9226537ec194fdbc0711653aebcad5b392f01d6d9'

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-## [2.7.2] - 2024-04-17
+## [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/objects/restriction.rb

@@ -73,7 +73,7 @@ module XSD
     def collect_attributes(include_base = true)
       result = super(include_base)
       # Filter restricted attributes to avoid duplicates from restricting and restricted type
-      result.inject({}) { |hash, item| hash[item.name] = item; hash }.values if include_base
+      include_base ? result.inject({}) { |hash, item| hash[item.name] = item; hash }.values : result
     end
   end
 end

data/lib/xsd/version.rb

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

metadata

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