xsd 2.6.1 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73e87995baa341819126aaf56de8b4a865395423b6ea2f64c8a3aa8e702a611a
-  data.tar.gz: d330c3d390ff34c43d7988e0fe30b99d8538c62ff60205e0164d3119118ed1c4
+  metadata.gz: d3f894631bb4ecfab0ab93c8b67f1a4d2d85dc88aeef5c69890e424c018ea7a0
+  data.tar.gz: 6be2dfdee0a06f955d80ba57cbc39739fa6c09c06d6af80d194e77ccf32c8797
 SHA512:
-  metadata.gz: 0bfc579e3376d04a72c4ac593d9c944c7739b0dc4ffe0ea94399fbdfb11771bb8f7a4d356609a257e47e5ff3fefa7bae6c34a0ac0cb76c1b149614b25fe58994
-  data.tar.gz: 2d44c024e3b658e2b907614a621db0d2367feac05e6abeb8c5e7bee027d830c3be6f4a438941141e17b1df626f3b5899793a9e7befc612bd28caae804812cf7b
+  metadata.gz: 7d45a0c77011c0bdfd4bdee3998eef649129cb51d2c248b733a35b9c2c19bb8678b2b41035afcc95f69f02e37df550bd90ef5c57a03225789de34ff7dfb65c11
+  data.tar.gz: dd2673d5e862524a8fad13f8ce55857d9ec3c7daed215542b9806491c428e778ce011b77c26f2dc3aa6ba24a60bfd5d1bdf9ed6cc59a702ac4daa23725fa9dce

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [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

@@ -304,20 +304,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/version.rb

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

metadata

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