xsd 2.6.0 → 2.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a5aa03e831e5cf4e88780b18a4ef57217eff54a14e2138669672f33486ba8bd
-  data.tar.gz: b6a9ab392e47192a6a286ffa7dc97c5f624c78d9ab117bdea67e11f801c39363
+  metadata.gz: d3f894631bb4ecfab0ab93c8b67f1a4d2d85dc88aeef5c69890e424c018ea7a0
+  data.tar.gz: 6be2dfdee0a06f955d80ba57cbc39739fa6c09c06d6af80d194e77ccf32c8797
 SHA512:
-  metadata.gz: a031bc3a3947708a8f6f8e4add4040853f9f8b62cd3465de56421600d9fc2d2b7c45b163efe239c7486dce05bf0427d8f380e119673b644739f736b4598b5276
-  data.tar.gz: ad7bbd0268373292a291935599749dc9937784438b398958acf592db4e1648967106f45c1dd402c82f3cdd534f2fe0e177a1250e91f65872fc3aa9d9a8b416a5
+  metadata.gz: 7d45a0c77011c0bdfd4bdee3998eef649129cb51d2c248b733a35b9c2c19bb8678b2b41035afcc95f69f02e37df550bd90ef5c57a03225789de34ff7dfb65c11
+  data.tar.gz: dd2673d5e862524a8fad13f8ce55857d9ec3c7daed215542b9806491c428e778ce011b77c26f2dc3aa6ba24a60bfd5d1bdf9ed6cc59a702ac4daa23725fa9dce

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [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
+
 ## [2.6.0] - 2024-04-12
 
 - Fix XSD boolean attributes

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
@@ -375,20 +379,19 @@ module XSD
     private
 
     def definition_match?(definition, query)
-      actual_definition = definition.referenced? ? definition.reference : definition
-
+      # namespace included in query
       if query.start_with?('{')
         parts = query[1..].split('}')
         raise Error, "Invalid element/attribute query: #{query}" if parts.size != 2
 
         namespace, name = parts
 
-        return false if namespace != actual_definition.namespace
+        return false if namespace != definition.namespace
       else
         name = query
       end
 
-      name == '*' || actual_definition.name == name
+      name == '*' || definition.name == name
     end
   end
 end

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

@@ -8,8 +8,9 @@ module XSD
   class Group < BaseObject
     include MinMaxOccurs
     include Referenced
+    include Named
 
-    # Optional. Specifies the name of the attribute. Name and ref attributes cannot both be present
+    # Optional. Specifies a name for the group. This attribute is used only when the schema element is the parent of this group element. Name and ref attributes cannot both be present
     # @!attribute name
     # @return String
     property :name, :string

data/lib/xsd/shared/named.rb

@@ -5,7 +5,8 @@ module XSD
     # Get definition namespace
     # @return String
     def namespace
-      schema.target_namespace
+      is_referenced = respond_to?(:referenced?)
+      is_referenced && referenced? ? reference.schema.target_namespace : 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.0'
+  VERSION = '2.6.2'
 end

metadata

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