xsd 2.7.0 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ec3eb825c36a39f706cd6a684d294b443fa7c59a4e9494ef8b1a6e65f226e5e
-  data.tar.gz: 659b6e95914a0d3a4e04c7b5e17ec54cebbda343b8154b7cd5ff6dd9f2a2ca93
+  metadata.gz: ac666b4ba9690ed163376b0232dec21ba29c7098f2362b6ba9b1d5751fa60ca2
+  data.tar.gz: 8eedebb55d21670bf6620a892073b8c4af9a269e39be1f20e66a1873749c1c76
 SHA512:
-  metadata.gz: 7d5dc6738b374642049d316e7213f2b7c83177182cc8aeed164ff7253d8c3a349faf6c46a8781ad1734fa4daa5337462cee769d72bdd7c69d959e18b3ea8605b
-  data.tar.gz: e1d929216f6e9239f5ab82ddaf20558b6e562917e6f1c51c392bd988c699f73af0500f9837fd85c8f76afaccb170f88c6a3ddd723b0be7660e596e1010ef7aa1
+  metadata.gz: def1638cb816c68f2539611eb5ff2fd5328d729dab3ea530546f54e362f08fb39c06c325f2d734f934231404242adb85f560458c2a1ca8570f482a10fe4e0144
+  data.tar.gz: f62492a9cec4f219cb2b966d033b66c7d7a5f1cfdb7c27ac0bef5a5d7fdc3a3aa3265e5ea8c41fba8069433041fc210ceb7521f60304e3a0704a721bf1b0f567

data/CHANGELOG.md

@@ -1,6 +1,8 @@
-## [2.7.0] - 2024-04-17
+## [2.7.2] - 2024-04-17
 
 - 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
 
 ## [2.6.3] - 2024-04-13
 

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/objects/restriction.rb

@@ -62,8 +62,18 @@ module XSD
     # @param [Boolean] include_base
     # @return Array<Element>
     def collect_elements(include_base = false)
-      # By default we do not include base element for complex restrictions
-      super
+      # Don't include elements from base by default, that will lead to element duplicates because
+      # elements in complex restriction MUST be all listen in restricting type
+      super(include_base)
+    end
+
+    # Get all available attributes on the current stack level, optionally including base type attributes
+    # @param [Boolean] include_base
+    # @return Array<Attribute>
+    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
     end
   end
 end

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.7.0'
+  VERSION = '2.7.2'
 end

metadata

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