xsd 2.7.5 → 2.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 153a03f87abecaab17a642bd1d822e102609c44f30a45bfdbd0ca4a52c6dc567
-  data.tar.gz: 7b7e50fb7e6915c7eb13a03d9d512b73e15e1d0abbbab5400e1f40703343ae2a
+  metadata.gz: 7c16048b771894d38405e3b63828e12ee144fc08195ea8000b4af88e54928a8a
+  data.tar.gz: bffa90cda6f88776e90aff1e8beaaee1a6574ea98a871cb195fc5fd690873883
 SHA512:
-  metadata.gz: 30c85bd21b725a01724e0c6b3239593d50a270a8f98c1c66af52a883a08d3f0fa91876c2f6ca4edf159ab4d6ee4eba4fbaec903cc967f3fefda757234379c6cb
-  data.tar.gz: e567f9b119ac0528ef8b91f4b0ef5619e0b5c008e3f6652a589e37ba85181ddd596271597819059181ec36f8adaee91b04c5aa2f6998a67e38c228da8ea41859
+  metadata.gz: 57f15db00816d658965e935e1a546df73dadf2e1efe0e388c0a7280fdd139d6a5daa6a6dac366ec7d50fb647afceb5bb0d931a1c598b8718f238c862198f7777
+  data.tar.gz: 0a3606861353e20d98965bc4f197ed8e04f8613aa52588b88f10991ea2712ff8c9a8219d3da8f1361fd8a4cfb3be82b1ca1046a6f489cf5eeded5bbd934888d2

data/CHANGELOG.md

@@ -1,9 +1,10 @@
-## [2.7.5] - 2024-04-22
+## [2.7.6] - 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
 
 ## [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/version.rb

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

metadata

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