xsd 2.6.3 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1d2b1ea3cf4fb7f11e131e1a7cb9f446682b8be0bb1a38bb90817a9c0ef8717
-  data.tar.gz: edbb623f773bd0909284728b42e71e8a49d6663159e7382d12cb9229f4057b05
+  metadata.gz: a204e10bdaaac5744ae8f38bf10e7d83a030a570134739e71a28db641bc955c3
+  data.tar.gz: e61695c62db5a99877b3d87098a42021df2b416a3ee00dfdeac13a8377ccdea8
 SHA512:
-  metadata.gz: 0b474c9ac63f1dd09b4b1aef416eee487aeaa84135f12242ba7a9fde520094a42279a738b5ef99e4540b622c35b4dc0b581d1ec3b44fd6a98217022dba1ab66a
-  data.tar.gz: ea99e743a50f84952b78f2d43463482ab630175c7eafcc92567bb9a35044698a50b2b2d6e92d33f274b07a3b8f6b3d639358d6d4020b8db140350396c3e3e9c2
+  metadata.gz: a70c3ac790859ee1d7a649f5ee1ee41b21aacc5fd29d6465a5dd3a113c755856f92f8aafeb937d42e98f57d6f6e3a4e1bb7231a5aeb12e78de8aee66b9cc7cbd
+  data.tar.gz: 77ae1a10ed5165d71b065814e5466a00f3831ccda312a7a18d4646f2d0d44b7775570ccade57731e75d51f9016c91c4721084f991692f53c6075949051dc5be9

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## [2.7.1] - 2024-04-17
+
+- Return <xs:any> and <xs:anyAttribute> from collect_elements/collect_attributes
+- Make multiple_allowed? available on all definitions with max occurs
+
 ## [2.6.3] - 2024-04-13
 
 - Fix retrieving documentation for referenced elements

data/lib/xsd/base_object.rb

@@ -220,7 +220,7 @@ module XSD
           else
             # map children recursive
             map_children(:*).map do |obj|
-              if obj.is_a?(Element)
+              if obj.is_a?(Element) || obj.is_a?(Any)
                 obj
               else
                 # get elements considering references
@@ -244,7 +244,7 @@ module XSD
           else
             # map children recursive
             map_children(:*).map do |obj|
-              if obj.is_a?(Attribute)
+              if obj.is_a?(Attribute) || obj.is_a?(AnyAttribute)
                 obj
               else
                 # get attributes considering references

data/lib/xsd/objects/any.rb

@@ -27,5 +27,11 @@ module XSD
     # @!attribute process_contents
     # @return String, nil
     property :processContents, :string, default: 'strict'
+
+    # Get virtual element name
+    # @return String
+    def name
+      '#any'
+    end
   end
 end

data/lib/xsd/objects/any_attribute.rb

@@ -26,5 +26,11 @@ module XSD
     # @!attribute process_contents
     # @return String, nil
     property :processContents, :string, default: 'strict'
+
+    # Get virtual attribute name
+    # @return String
+    def name
+      '#anyAttribute'
+    end
   end
 end

data/lib/xsd/objects/element.rb

@@ -100,12 +100,6 @@ module XSD
       !required?
     end
 
-    # Determine if element may occur multiple times
-    # @return Boolean
-    def multiple_allowed?
-      computed_max_occurs == :unbounded || computed_max_occurs > 1
-    end
-
     # Determine if element has complex content
     # @return Boolean
     def complex_content?

data/lib/xsd/shared/min_max_occurs.rb

@@ -42,5 +42,11 @@ module XSD
                                  min_occurs
                                end
     end
+
+    # Determine if element may occur multiple times
+    # @return Boolean
+    def multiple_allowed?
+      computed_max_occurs == :unbounded || computed_max_occurs > 1
+    end
   end
 end

data/lib/xsd/version.rb

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

metadata

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