xsd 2.7.4 → 2.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9095472b3d2f3c563c0418c8b9bc1effdd8a94d7e35e36196f750b37be868e5
-  data.tar.gz: a404b786ce073a8e3f24603fccaf16a22e8cbf7dd478973a58d20c4fc0fc6547
+  metadata.gz: 7c16048b771894d38405e3b63828e12ee144fc08195ea8000b4af88e54928a8a
+  data.tar.gz: bffa90cda6f88776e90aff1e8beaaee1a6574ea98a871cb195fc5fd690873883
 SHA512:
-  metadata.gz: 9f8d71e7ca6571d89f19232b729fb2dacddb78f31ef6900bbf47eede632cc9c2f3f195b015c601c524bb30a3dd6b8ec1dc0d6a944260d2fafd953e27a69646a4
-  data.tar.gz: '08231dcf39f93087cf3c151345cba2f2c4d7f60db6074f1eaf452c8ffb2b316fef4cecc8fdf253943d48c8d9226537ec194fdbc0711653aebcad5b392f01d6d9'
+  metadata.gz: 57f15db00816d658965e935e1a546df73dadf2e1efe0e388c0a7280fdd139d6a5daa6a6dac366ec7d50fb647afceb5bb0d931a1c598b8718f238c862198f7777
+  data.tar.gz: 0a3606861353e20d98965bc4f197ed8e04f8613aa52588b88f10991ea2712ff8c9a8219d3da8f1361fd8a4cfb3be82b1ca1046a6f489cf5eeded5bbd934888d2

data/CHANGELOG.md

@@ -1,8 +1,10 @@
-## [2.7.4] - 2024-04-21
+## [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/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/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.4'
+  VERSION = '2.7.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xsd
 version: !ruby/object:Gem::Version
-  version: 2.7.4
+  version: 2.7.6
 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