lutaml-model 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d80c5eb43638cf5d690c6c59db2fba76ddb8e2fc7252117a3c7933bc566b2607
-  data.tar.gz: d75c694c330c017500dcceb604aaa889633dadb53c7766a4b6310ee3aef1725e
+  metadata.gz: 55348c33e2e23ce7c53c33e588621b8e73df49c5ca4e82e70c8216ad8f0cc6ab
+  data.tar.gz: dd39d10a7f036596de8bce7f154197d446d065c76deee5a0b334522b8bbfdcea
 SHA512:
-  metadata.gz: fc9ed09d01c0c19b4038af7de38c3c458f7c200f7b5ae509f4e4cfc2d3abe116ad862168b7d2ffef16e0d5205c67b3a54226b8b826f9859a72ec5d32da00545e
-  data.tar.gz: b4b8348522112cce9236dc7989f30b42df22ac04d6a7459b2fff6ad6c6dc7018d4bd88e97ec9f83ab8b2dcf6d92938d18fcdc882914240d3d53fb16e0ba116d3
+  metadata.gz: 46d78508e5cd397bf19c79c4dfba9bb49835945ae6ae83744588bc134c7809988716ea83c2f83485efdf50bf4a31e8be4daafbf6ada78a22dbfa90e14def72ba
+  data.tar.gz: 05005dc4d4e6309913e706f38bf925c0ac77533728b34b89f8a69c901ea728d53bddf163e377ec7638be145ebf7bf7eb77f2d3c3ff078d7e7feb9ad6e52ff14f

data/.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-08-16 11:07:41 UTC using RuboCop version 1.65.1.
+# on 2024-08-17 14:46:05 UTC using RuboCop version 1.64.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -14,7 +14,7 @@ Gemspec/RequireMFA:
   Exclude:
     - 'lutaml-model.gemspec'
 
-# Offense count: 76
+# Offense count: 77
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
@@ -55,11 +55,11 @@ Metrics/AbcSize:
     - 'lib/lutaml/model/xml_adapter/ox_adapter.rb'
     - 'lib/lutaml/model/xml_adapter/xml_document.rb'
 
-# Offense count: 3
+# Offense count: 4
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 30
+  Max: 31
 
 # Offense count: 23
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
@@ -75,7 +75,7 @@ Metrics/CyclomaticComplexity:
 # Offense count: 38
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 41
+  Max: 52
 
 # Offense count: 4
 # Configuration parameters: CountKeywordArgs, MaxOptionalParameters.
@@ -102,7 +102,7 @@ RSpec/ContextWording:
     - 'spec/lutaml/model/xml_adapter/oga_adapter_spec.rb'
     - 'spec/lutaml/model/xml_adapter/ox_adapter_spec.rb'
 
-# Offense count: 70
+# Offense count: 72
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 57
@@ -129,7 +129,7 @@ RSpec/MultipleDescribes:
     - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
     - 'spec/lutaml/model/xml_adapter_spec.rb'
 
-# Offense count: 69
+# Offense count: 70
 RSpec/MultipleExpectations:
   Max: 15
 

data/README.adoc

@@ -1291,10 +1291,30 @@ each serialization mapping block for `from` and `to`.
 
 Syntax:
 
+.XML serialization with custom methods
 [source,ruby]
 ----
-xml | json | yaml | toml do
-  map 'key_value_model_attribute_name', to: :name_of_attribute, with: {
+xml do
+  map_element 'element_name', to: :name_of_element, with: {
+    to: :method_name_to_serialize,
+    from: :method_name_to_deserialize
+  }
+  map_attribute 'attribute_name', to: :name_of_attribute, with: {
+    to: :method_name_to_serialize,
+    from: :method_name_to_deserialize
+  }
+  map_content, to: :name_of_content, with: {
+    to: :method_name_to_serialize,
+    from: :method_name_to_deserialize
+  }
+end
+----
+
+.Key-value data model serialization with custom methods
+[source,ruby]
+----
+json | yaml | toml do
+  map 'attribute_name', to: :name_of_attribute, with: {
     to: :method_name_to_serialize,
     from: :method_name_to_deserialize
   }

data/lib/lutaml/model/serialize.rb

@@ -210,9 +210,7 @@ module Lutaml
               else
                 # TODO: This code is problematic because Type.cast does not know
                 # about all the types.
-                Lutaml::Model::Type.cast(
-                  v, attr_rule.type
-                )
+                Lutaml::Model::Type.cast(v, attr_rule.type)
               end
             end
           elsif value.is_a?(Hash) && attr_rule.type != Lutaml::Model::Type::Hash
@@ -276,7 +274,7 @@ module Lutaml
                 end.public_send(:[]=, path.last.to_s, child_obj.send(attr_name))
               end
             end
-            # hash[mapping.name] ||= {}
+
             hash[map_key] = map_value
           end
 
@@ -337,6 +335,8 @@ module Lutaml
           mapping_hash.item_order = doc.item_order
           mapping_hash.ordered = mappings_for(:xml).mixed_content? || mixed_content
 
+          mapping_from = []
+
           mappings.each_with_object(mapping_hash) do |rule, hash|
             attr = attributes[rule.to]
             raise "Attribute '#{rule.to}' not found in #{self}" unless attr
@@ -372,8 +372,22 @@ module Lutaml
               value = attr.type.cast(value) unless is_content_mapping
             end
 
+            mapping_from << rule if rule.custom_methods[:from]
+
             hash[rule.to] = value
           end
+
+          mapping_from.each do |rule|
+            value = if rule.name.nil?
+                      mapping_hash[rule.to].join("\n").strip
+                    else
+                      mapping_hash[rule.to]
+                    end
+
+            mapping_hash[rule.to] = new.send(rule.custom_methods[:from], mapping_hash, value)
+          end
+
+          mapping_hash
         end
 
         def ensure_utf8(value)
@@ -385,7 +399,9 @@ module Lutaml
           when Hash
             value.transform_keys do |k|
               ensure_utf8(k)
-            end.transform_values { |v| ensure_utf8(v) }
+            end.transform_values do |v|
+              ensure_utf8(v)
+            end
           else
             value
           end

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.3.4"
+    VERSION = "0.3.5"
   end
 end

data/lib/lutaml/model/xml_adapter/nokogiri_adapter.rb

@@ -71,10 +71,14 @@ module Lutaml
               end
             end
 
-            if xml_mapping.content_mapping
-              text = element.send(xml_mapping.content_mapping.to)
+            if (content_rule = xml_mapping.content_mapping)
+              text = element.send(content_rule.to)
               text = text.join if text.is_a?(Array)
 
+              if content_rule.custom_methods[:to]
+                text = @root.send(content_rule.custom_methods[:to], @root, text)
+              end
+
               prefixed_xml.text text
             end
           end
@@ -130,6 +134,10 @@ module Lutaml
         end
 
         def add_to_xml(xml, value, attribute, rule)
+          if rule.custom_methods[:to]
+            value = @root.send(rule.custom_methods[:to], @root, value)
+          end
+
           if value && (attribute&.type&.<= Lutaml::Model::Serialize)
             handle_nested_elements(
               xml,

data/lib/lutaml/model/xml_adapter/ox_adapter.rb

@@ -69,10 +69,14 @@ module Lutaml
               end
             end
 
-            if xml_mapping.content_mapping
+            if (content_rule = xml_mapping.content_mapping)
               text = element.send(xml_mapping.content_mapping.to)
               text = text.join if text.is_a?(Array)
 
+              if content_rule.custom_methods[:to]
+                text = @root.send(content_rule.custom_methods[:to], @root, text)
+              end
+
               el.text text
             end
           end
@@ -113,6 +117,10 @@ module Lutaml
         end
 
         def add_to_xml(xml, value, attribute, rule)
+          if rule.custom_methods[:to]
+            value = @root.send(rule.custom_methods[:to], @root, value)
+          end
+
           if value && (attribute&.type&.<= Lutaml::Model::Serialize)
             handle_nested_elements(
               xml,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-16 00:00:00.000000000 Z
+date: 2024-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor