xsd 2.6.2 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3f894631bb4ecfab0ab93c8b67f1a4d2d85dc88aeef5c69890e424c018ea7a0
-  data.tar.gz: 6be2dfdee0a06f955d80ba57cbc39739fa6c09c06d6af80d194e77ccf32c8797
+  metadata.gz: 6ec3eb825c36a39f706cd6a684d294b443fa7c59a4e9494ef8b1a6e65f226e5e
+  data.tar.gz: 659b6e95914a0d3a4e04c7b5e17ec54cebbda343b8154b7cd5ff6dd9f2a2ca93
 SHA512:
-  metadata.gz: 7d45a0c77011c0bdfd4bdee3998eef649129cb51d2c248b733a35b9c2c19bb8678b2b41035afcc95f69f02e37df550bd90ef5c57a03225789de34ff7dfb65c11
-  data.tar.gz: dd2673d5e862524a8fad13f8ce55857d9ec3c7daed215542b9806491c428e778ce011b77c26f2dc3aa6ba24a60bfd5d1bdf9ed6cc59a702ac4daa23725fa9dce
+  metadata.gz: 7d5dc6738b374642049d316e7213f2b7c83177182cc8aeed164ff7253d8c3a349faf6c46a8781ad1734fa4daa5337462cee769d72bdd7c69d959e18b3ea8605b
+  data.tar.gz: e1d929216f6e9239f5ab82ddaf20558b6e562917e6f1c51c392bd988c699f73af0500f9837fd85c8f76afaccb170f88c6a3ddd723b0be7660e596e1010ef7aa1

data/.rubocop.yml

@@ -4,7 +4,7 @@ require:
   - rubocop-rspec
 
 AllCops:
-  TargetRubyVersion: 3.2.2
+  TargetRubyVersion: 3.2.3
   NewCops: enable
   SuggestExtensions: false
 

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## [2.7.0] - 2024-04-17
+
+- Return <xs:any> and <xs:anyAttribute> from collect_elements/collect_attributes
+
+## [2.6.3] - 2024-04-13
+
+- Fix retrieving documentation for referenced elements
+- Cache "namespace" call result
+
 ## [2.6.2] - 2024-04-12
 
 - Get default value for element/attribute "form" property from schema

data/lib/xsd/base_object.rb

@@ -189,7 +189,16 @@ module XSD
     # Return element documentation
     # @return Array<String>
     def documentation
-      documentation_for(node)
+      @documentation ||= begin
+        docs = documentation_for(node)
+        if docs.any?
+          docs
+        elsif is_a?(Referenced) && referenced?
+          documentation_for(reference.node)
+        else
+          []
+        end
+      end
     end
 
     # Return documentation for specified node
@@ -211,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
@@ -235,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/shared/named.rb

@@ -5,8 +5,7 @@ module XSD
     # Get definition namespace
     # @return String
     def namespace
-      is_referenced = respond_to?(:referenced?)
-      is_referenced && referenced? ? reference.schema.target_namespace : schema.target_namespace
+      @namespace ||= (is_a?(Referenced) && referenced? ? reference.schema : schema).target_namespace
     end
 
     # Get absolute definition name

data/lib/xsd/version.rb

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

metadata

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