xsd 2.6.1 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73e87995baa341819126aaf56de8b4a865395423b6ea2f64c8a3aa8e702a611a
-  data.tar.gz: d330c3d390ff34c43d7988e0fe30b99d8538c62ff60205e0164d3119118ed1c4
+  metadata.gz: f1d2b1ea3cf4fb7f11e131e1a7cb9f446682b8be0bb1a38bb90817a9c0ef8717
+  data.tar.gz: edbb623f773bd0909284728b42e71e8a49d6663159e7382d12cb9229f4057b05
 SHA512:
-  metadata.gz: 0bfc579e3376d04a72c4ac593d9c944c7739b0dc4ffe0ea94399fbdfb11771bb8f7a4d356609a257e47e5ff3fefa7bae6c34a0ac0cb76c1b149614b25fe58994
-  data.tar.gz: 2d44c024e3b658e2b907614a621db0d2367feac05e6abeb8c5e7bee027d830c3be6f4a438941141e17b1df626f3b5899793a9e7befc612bd28caae804812cf7b
+  metadata.gz: 0b474c9ac63f1dd09b4b1aef416eee487aeaa84135f12242ba7a9fde520094a42279a738b5ef99e4540b622c35b4dc0b581d1ec3b44fd6a98217022dba1ab66a
+  data.tar.gz: ea99e743a50f84952b78f2d43463482ab630175c7eafcc92567bb9a35044698a50b2b2d6e92d33f274b07a3b8f6b3d639358d6d4020b8db140350396c3e3e9c2

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.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
+
 ## [2.6.1] - 2024-04-12
 
 - Correctly detect namespace for referenced elements

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
@@ -304,20 +313,24 @@ module XSD
       # check for property first
       if (property = self.class.properties[method])
         value = property[:resolve] ? property[:resolve].call(self) : node[property[:name].to_s]
-        result = if value.nil?
-                   # if object has reference - search property in referenced object
-                   node['ref'] ? reference.send(method, *args) : property[:default]
-                 else
-                   case property[:type]
-                   when :integer
-                     property[:name] == :maxOccurs && value == 'unbounded' ? :unbounded : value.to_i
-                   when :boolean
-                     value == 'true'
-                   else
-                     value
-                   end
-                 end
-        return @cache[method] = result
+        r = if value.nil?
+              if node['ref']
+                # if object has reference - search property in referenced object
+                reference.send(method, *args)
+              else
+                property[:default].is_a?(Proc) ? instance_eval(&property[:default]) : property[:default]
+              end
+            else
+              case property[:type]
+              when :integer
+                property[:name] == :maxOccurs && value == 'unbounded' ? :unbounded : value.to_i
+              when :boolean
+                value == 'true'
+              else
+                value
+              end
+            end
+        return @cache[method] = r
       end
 
       # if object has ref it cannot contain any type and children, so proxy call to target object

data/lib/xsd/objects/attribute.rb

@@ -28,15 +28,14 @@ module XSD
     property :fixed, :string
 
     # Optional. Specifies the form for the attribute. The default value is the value of the attributeFormDefault
-    # attribute of the element containing the attribute. Can be set to one of the following:
+    # attribute of the schema containing the attribute. Can be set to one of the following:
     #   qualified   - indicates that this attribute must be qualified with the namespace prefix and the no-colon-name
     #                 (NCName) of the attribute
     #   unqualified - indicates that this attribute is not required to be qualified with the namespace prefix and is
     #                 matched against the (NCName) of the attribute
     # @!attribute form
-    # @return String, nil
-    # TODO: support default value from parent
-    property :form, :string
+    # @return String
+    property :form, :string, default: proc { schema.attribute_form_default }
 
     # Optional. Specifies a built-in data type or a simple type. The type attribute can only be present when the
     # content does not contain a simpleType element

data/lib/xsd/objects/element.rb

@@ -47,7 +47,7 @@ module XSD
     # cannot be used if the parent element is the schema element
     # @!attribute form
     # @return String
-    property :form, :string
+    property :form, :string, default: proc { schema.element_form_default }
 
     # Optional. Specifies whether an explicit null value can be assigned to the element. True enables an instance of
     # the element to have the null attribute set to true. The null attribute is defined as part of the XML Schema

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.1'
+  VERSION = '2.6.3'
 end

metadata

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