xsd 2.7.5 → 2.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 153a03f87abecaab17a642bd1d822e102609c44f30a45bfdbd0ca4a52c6dc567
-  data.tar.gz: 7b7e50fb7e6915c7eb13a03d9d512b73e15e1d0abbbab5400e1f40703343ae2a
+  metadata.gz: 8d62fa4aab11649bbbb36686518037701a98f8b0f6c7a553e4c6925eecf2f5eb
+  data.tar.gz: 9f75202ed5c7945d6667e81f3c5044fb2442c64294412a7a25a73cadd6993829
 SHA512:
-  metadata.gz: 30c85bd21b725a01724e0c6b3239593d50a270a8f98c1c66af52a883a08d3f0fa91876c2f6ca4edf159ab4d6ee4eba4fbaec903cc967f3fefda757234379c6cb
-  data.tar.gz: e567f9b119ac0528ef8b91f4b0ef5619e0b5c008e3f6652a589e37ba85181ddd596271597819059181ec36f8adaee91b04c5aa2f6998a67e38c228da8ea41859
+  metadata.gz: 8749bf41fa3a2449e2cec62d8d657fff5e69458e59dbb8fa2a8a93945f6cda96d704d269a39fe03b521f95ba7b7b25ca4d14061fad38e4172dea4f07d59f1844
+  data.tar.gz: 57160d2965a6281b7faace74f9e556d1fd78d4adce27f8b1fafd241ad979860c68560a67cbd4adaecbb69851bf47e58297bb53da6e460a5466a9b29732227494

data/CHANGELOG.md

@@ -1,9 +1,11 @@
-## [2.7.5] - 2024-04-22
+## [2.7.7] - 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
+- Improve substitutable elements detection
+- Added mutiple? shorthand
 
 ## [2.6.3] - 2024-04-13
 

data/lib/xsd/objects/element.rb

@@ -130,14 +130,28 @@ module XSD
       complex_type&.mixed_content? || false
     end
 
-    # Get elements that can appear instead of this one
+    # Get substitutable elements
     # @return Array<Element>
-    def substitution_elements
-      # TODO: for now we do not search in parent schemas (that imported current schema)
-      # TODO: refactor for better namespace handling (use xpath with namespaces or correct comparison)
-      schema.collect_elements.select do |element|
-        strip_prefix(element.substitution_group) == name
-      end
+    def substitutable_elements
+      @substitutable_elements ||= begin
+                                    if ref
+                                      reference.substitutable_elements
+                                    elsif !global? || %w[#all substitution].include?(block)
+                                      []
+                                    else
+                                      # TODO: we search substituted element only in the same schema with head element, is this enough?
+                                      # TODO: maybe don't collect all elements but search with xpath first?
+                                      schema.collect_elements.select do |element|
+                                        strip_prefix(element.substitution_group) == name
+                                      end
+                                    end
+                                  end
+    end
+
+    # Check is this attribute is global (immediate child of schema element)
+    # @return Boolean
+    def global?
+      parent.is_a?(Schema)
     end
 
     # Get base data type

data/lib/xsd/shared/min_max_occurs.rb

@@ -45,6 +45,12 @@ module XSD
 
     # Determine if element may occur multiple times
     # @return Boolean
+    def multiple?
+      max_occurs == :unbounded || max_occurs > 1
+    end
+
+    # Determine if element may occur multiple times, accounting parents
+    # @return Boolean
     def multiple_allowed?
       computed_max_occurs == :unbounded || computed_max_occurs > 1
     end

data/lib/xsd/version.rb

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

metadata

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