lib/lutaml/model/xml_adapter/builder/nokogiri.rb in lutaml-model-0.3.24 vs lib/lutaml/model/xml_adapter/builder/nokogiri.rb in lutaml-model-0.3.25

@@ -37,10 +37,12 @@
                      nil),
             attributes: {}
           )
             add_namespace_prefix(prefix)
 
+            element_name = "#{element_name}_" if respond_to?(element_name)
+
             if block_given?
               public_send(element_name, attributes) do
                 xml.parent.namespace = nil if prefix.nil? && !prefix_unset
                 yield(self)
               end
@@ -52,20 +54,21 @@
           def add_text(element, text)
             if element.is_a?(self.class)
               element = element.xml.parent
             end
 
-            element << text.to_s
+            text_node = ::Nokogiri::XML::Text.new(text.to_s, element)
+            element.add_child(text_node)
           end
 
           def add_namespace_prefix(prefix)
             xml[prefix] if prefix
 
             self
           end
 
           def method_missing(method_name, *args, &block)
-            if block
+            if block_given?
               xml.public_send(method_name, *args, &block)
             else
               xml.public_send(method_name, *args)
             end
           end