lutaml-model 0.3.28 → 0.3.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7fbf76c4bb8fbe07fdaed6235a5e8edcd98dc17ace1d322d0e9a36c7c4a59aef
-  data.tar.gz: f63bf29850309ab1250e2713e62fd6ef624ad5c13a824dc6e7822dec77f75369
+  metadata.gz: fba70c8a3fca206b3109603109812019773027580c47b2e3615d873df6e0ce2d
+  data.tar.gz: 21313fbfb52c29c620eb1020672d337689eed963c25fe56c20baeef139e569b5
 SHA512:
-  metadata.gz: 58b261437656342dc5894e25dcde477f680e72b6eebd0ae6771a5d97f0212442ae5dab446d0e182f5a4a712516b8781a0849bdcb1fa2ee1fbc831ecf9dc33695
-  data.tar.gz: 0af5c64461b6e9f5ab6d67b18ebe81e19db49123b4241b201c786b1632b567290ab55288f7047e01e3c5938316d7e93b8aca511f6f4a3f3759f1d4575fe758ae
+  metadata.gz: 274739542b8473ae58b4fc6b78e1152aaef604a55f3c9db0ec5678743573d683b4afdd2429d97d6a24c03fdb2c14a72904bf4e057f480e6bafc635a21fde085a
+  data.tar.gz: b1a7ad49313463676b3afe8732f94ed8ab37f79935f33449c70011bd8a8449934425aa27b9dd25d2a7e25a064afa1e665bf95f8b2eac4ec7cd63be4bcfdb7b8d

data/.rubocop_todo.yml

@@ -1,12 +1,12 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-11-11 10:52:30 UTC using RuboCop version 1.68.0.
+# on 2024-11-25 13:01:09 UTC using RuboCop version 1.66.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
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 132
+# Offense count: 185
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
@@ -26,13 +26,12 @@ Lint/ConstantDefinitionInBlock:
     - 'spec/lutaml/model/validation_spec.rb'
     - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
 
-# Offense count: 2
+# Offense count: 1
 Lint/DuplicateMethods:
   Exclude:
-    - 'lib/lutaml/model/attribute.rb'
     - 'lib/lutaml/model/type/float.rb'
 
-# Offense count: 36
+# Offense count: 37
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
@@ -45,6 +44,7 @@ Metrics/AbcSize:
     - 'lib/lutaml/model/xml_adapter/nokogiri_adapter.rb'
     - 'lib/lutaml/model/xml_adapter/ox_adapter.rb'
     - 'lib/lutaml/model/xml_adapter/xml_document.rb'
+    - 'lib/lutaml/model/xml_mapping.rb'
     - 'lib/lutaml/model/xml_mapping_rule.rb'
 
 # Offense count: 6
@@ -53,7 +53,7 @@ Metrics/AbcSize:
 Metrics/BlockLength:
   Max: 47
 
-# Offense count: 26
+# Offense count: 28
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
@@ -65,7 +65,7 @@ Metrics/CyclomaticComplexity:
     - 'lib/lutaml/model/xml_adapter/ox_adapter.rb'
     - 'lib/lutaml/model/xml_adapter/xml_document.rb'
 
-# Offense count: 53
+# Offense count: 55
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 46
@@ -75,7 +75,7 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 14
 
-# Offense count: 23
+# Offense count: 25
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
@@ -87,7 +87,7 @@ Metrics/PerceivedComplexity:
     - 'lib/lutaml/model/xml_adapter/ox_adapter.rb'
     - 'lib/lutaml/model/xml_adapter/xml_document.rb'
 
-# Offense count: 7
+# Offense count: 8
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -97,7 +97,7 @@ RSpec/ContextWording:
     - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
     - 'spec/lutaml/model/xml_mapping_spec.rb'
 
-# Offense count: 117
+# Offense count: 127
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
   Max: 54
@@ -127,16 +127,16 @@ RSpec/MultipleDescribes:
     - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
     - 'spec/lutaml/model/xml_adapter_spec.rb'
 
-# Offense count: 149
+# Offense count: 153
 RSpec/MultipleExpectations:
   Max: 14
 
-# Offense count: 18
+# Offense count: 24
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
   Max: 9
 
-# Offense count: 9
+# Offense count: 11
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
   Max: 4
@@ -154,10 +154,9 @@ RSpec/PendingWithoutReason:
     - 'spec/lutaml/model/xml_adapter/xml_namespace_spec.rb'
     - 'spec/lutaml/model/xml_adapter_spec.rb'
 
-# Offense count: 2
+# Offense count: 1
 RSpec/RemoveConst:
   Exclude:
-    - 'spec/lutaml/model/type/decimal_spec.rb'
     - 'spec/lutaml/model/type_spec.rb'
 
 # Offense count: 2

data/README.adoc

@@ -938,8 +938,7 @@ This includes:
 * attributes
 * text nodes
 
-The `map_all` tag is **exclusive** and cannot be combined with other mappings
-(`map_element`, `map_attribute`, `map_content`) for the same element, ensuring
+The `map_all` tag is **exclusive** and cannot be combined with other mappings (`map_element`, `map_content`) except for `map_attribute` for the same element, ensuring
 it captures the entire inner XML content.
 
 NOTE: An error is raised if `map_all` is defined alongside any other mapping in

data/lib/lutaml/model/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Model
-    VERSION = "0.3.28"
+    VERSION = "0.3.29"
   end
 end

data/lib/lutaml/model/xml_mapping.rb

@@ -3,6 +3,13 @@ require_relative "xml_mapping_rule"
 module Lutaml
   module Model
     class XmlMapping
+      TYPES = {
+        attribute: :map_attribute,
+        element: :map_element,
+        content: :map_content,
+        all_content: :map_all,
+      }.freeze
+
       attr_reader :root_element,
                   :namespace_uri,
                   :namespace_prefix,
@@ -53,7 +60,7 @@ module Lutaml
         prefix: (prefix_set = false
                  nil)
       )
-        validate!(name, to, with)
+        validate!(name, to, with, type: TYPES[:element])
 
         rule = XmlMappingRule.new(
           name,
@@ -84,7 +91,7 @@ module Lutaml
         prefix: (prefix_set = false
                  nil)
       )
-        validate!(name, to, with)
+        validate!(name, to, with, type: TYPES[:attribute])
 
         rule = XmlMappingRule.new(
           name,
@@ -114,7 +121,7 @@ module Lutaml
         mixed: false,
         cdata: false
       )
-        validate!("content", to, with)
+        validate!("content", to, with, type: TYPES[:content])
 
         @content_mapping = XmlMappingRule.new(
           nil,
@@ -139,7 +146,7 @@ module Lutaml
         prefix: (prefix_set = false
                  nil)
       )
-        validate!("__raw_mapping", to, with)
+        validate!("__raw_mapping", to, with, type: TYPES[:all_content])
 
         rule = XmlMappingRule.new(
           "__raw_mapping",
@@ -158,8 +165,8 @@ module Lutaml
         @raw_mapping = rule
       end
 
-      def validate!(key, to, with)
-        validate_mappings!(key)
+      def validate!(key, to, with, type: nil)
+        validate_mappings!(type)
 
         if to.nil? && with.empty?
           msg = ":to or :with argument is required for mapping '#{key}'"
@@ -172,13 +179,14 @@ module Lutaml
         end
       end
 
-      def validate_mappings!(key)
-        unless @raw_mapping.nil?
-          raise StandardError, "no other mappings are allowed with map_all"
+      def validate_mappings!(type)
+        if !@raw_mapping.nil? && type != TYPES[:attribute]
+          raise StandardError, "#{type} is not allowed, only #{TYPES[:attribute]} " \
+                               "is allowed with #{TYPES[:all_content]}"
         end
 
-        if !mappings.empty? && key == "__raw_mapping"
-          raise StandardError, "map_all is not allowed with other mappings"
+        if !(elements.empty? && content_mapping.nil?) && type == TYPES[:all_content]
+          raise StandardError, "#{TYPES[:all_content]} is not allowed with other mappings"
         end
       end
 

data/spec/lutaml/model/xml_mapping_spec.rb

@@ -179,6 +179,7 @@ module XmlMapping
 
   class WithMapAll < Lutaml::Model::Serializable
     attribute :all_content, :string
+    attribute :attr, :string
 
     xml do
       root "WithMapAll"
@@ -777,30 +778,34 @@ RSpec.describe Lutaml::Model::XmlMapping do
 
   describe "#map_all" do
     context "when map_all is defined before any other mapping" do
-      let(:error_message) { "no other mappings are allowed with map_all" }
-
       it "raise error when for map_element with map_all" do
         expect do
           XmlMapping::WithMapAll.xml do
             map_element "ele", to: :ele
           end
-        end.to raise_error(StandardError, error_message)
+        end.to raise_error(
+          StandardError,
+          "map_element is not allowed, only map_attribute is allowed with map_all",
+        )
       end
 
-      it "raise error when for map_attribute with map_all" do
+      it "raise error when for map_content with map_all" do
         expect do
           XmlMapping::WithMapAll.xml do
-            map_attribute "attr", to: :attr
+            map_content to: :text
           end
-        end.to raise_error(StandardError, error_message)
+        end.to raise_error(
+          StandardError,
+          "map_content is not allowed, only map_attribute is allowed with map_all",
+        )
       end
 
-      it "raise error when for map_content with map_all" do
+      it "does not raise error for map_attribute with map_all" do
         expect do
           XmlMapping::WithMapAll.xml do
-            map_content to: :text
+            map_attribute "attr", to: :attr
           end
-        end.to raise_error(StandardError, error_message)
+        end.not_to raise_error
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-model
 version: !ruby/object:Gem::Version
-  version: 0.3.28
+  version: 0.3.29
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-21 00:00:00.000000000 Z
+date: 2024-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor