4.33.1

Co-authored-by: Kevin Laguerre <klaguerre@paypal.com>
Co-authored-by: Wyatt Smith <wysmith@paypal.com>

Author: 3 people

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 4.33.1
+- Bug fix for Nokogiri XML parsing
+
 ## 4.33.0
 - Switch from libxml-ruby to Nokogiri to allow use with JRuby. 
 

lib/braintree/version.rb

@@ -2,7 +2,7 @@ module Braintree
   module Version
     Major = 4
     Minor = 33
-    Tiny = 0
+    Tiny = 1
 
     String = "#{Major}.#{Minor}.#{Tiny}"
   end

lib/braintree/xml/nokogiri.rb

@@ -12,12 +12,14 @@ def self.parse(xml_string)
       end
 
       def self._node_to_hash(node, hash = {})
+        sub_hash = node.text? ? hash : _build_sub_hash(hash, node.name)
+
         if node.text? || (node.children.size == 1 && node.children.first.text?)
           content = node.text? ? node.content : node.children.first.content
           raise "Content too large" if content.length >= NOKOGIRI_XML_LIMIT
-          hash[CONTENT_ROOT] = content
+          sub_hash[CONTENT_ROOT] = content
+          _attributes_to_hash(node, sub_hash) unless node.text?
         else
-          sub_hash = _build_sub_hash(hash, node.name)
           _attributes_to_hash(node, sub_hash)
           if _array?(node)
             _children_array_to_hash(node, sub_hash)
@@ -66,4 +68,4 @@ def self._array?(node)
       end
     end
   end
-end
+end

spec/unit/braintree/client_token_spec.rb

@@ -33,5 +33,16 @@ module Braintree
         end
       end
     end
+
+    describe "error response handling" do
+      it "correctly parses error response with nested structure" do
+        error_xml = "<api-error-response><message>Invalid request</message><errors><errors type=\"array\"></errors></errors></api-error-response>"
+        result = Braintree::Xml::Parser.hash_from_xml(error_xml)
+
+        expect(result[:api_error_response]).to be_a(Hash)
+        expect(result[:api_error_response][:message]).to eq("Invalid request")
+        expect(result[:api_error_response][:errors]).to be_a(Hash)
+      end
+    end
   end
 end

spec/unit/braintree/error_result_spec.rb

@@ -14,6 +14,34 @@
         )
       end.to_not raise_error
     end
+
+    it "handles parsed XML error response structure correctly" do
+      data = {
+        :message => "Validation failed",
+        :errors => {
+          :errors => [{:code => "81234", :message => "Field is required"}]
+        }
+      }
+
+      expect do
+        result = Braintree::ErrorResult.new(:gateway, data)
+        expect(result.message).to eq("Validation failed")
+        expect(result.errors.inspect).to eq("#<Braintree::Errors :[(81234) Field is required]>")
+      end.to_not raise_error
+    end
+
+    it "handles empty error array in parsed XML response" do
+      data = {
+        :message => "Invalid request",
+        :errors => {:errors => []}
+      }
+
+      expect do
+        result = Braintree::ErrorResult.new(:gateway, data)
+        expect(result.message).to eq("Invalid request")
+        expect(result.errors).to be_a(Braintree::Errors)
+      end.to_not raise_error
+    end
   end
 
   describe "inspect" do

spec/unit/braintree/xml/parser_spec.rb

@@ -81,5 +81,62 @@
       END
       expect(xml).to parse_to(:root => {:paypal_details => {:deets => [{:secret_code => "1234"}], :payer_email => "abc@test.com", :payment_id => "1234567890"}})
     end
+
+    it "does not collapse nested structures with single-child elements" do
+      xml = "<api-error-response><message>Test</message><errors><errors type=\"array\"></errors></errors></api-error-response>"
+      expect(xml).to parse_to({:api_error_response=>{:message=>"Test", :errors=>{:errors=>[]}}})
+    end
+
+    it "preserves hash structure when one key has array value" do
+      xml = <<-END
+        <root>
+          <message>Error message</message>
+          <items type="array">
+            <item>Value1</item>
+          </items>
+        </root>
+      END
+      expect(xml).to parse_to({:root => {:message => "Error message", :items => ["Value1"]}})
+    end
+
+    it "handles error response with nested errors correctly" do
+      xml = <<-END
+        <api-error-response>
+          <message>Validation failed</message>
+          <errors>
+            <errors type="array">
+              <error>
+                <code>81234</code>
+                <message>Field is required</message>
+              </error>
+            </errors>
+          </errors>
+        </api-error-response>
+      END
+      expect(xml).to parse_to({
+        :api_error_response => {
+          :message => "Validation failed",
+          :errors => {
+            :errors => [{:code => "81234", :message => "Field is required"}]
+          }
+        }
+      })
+    end
+
+    it "handles client token error response structure" do
+      xml = <<-END
+        <api-error-response>
+          <message>Invalid request</message>
+          <errors>
+            <errors type="array"></errors>
+          </errors>
+        </api-error-response>
+      END
+      result = Braintree::Xml::Parser.hash_from_xml(xml)
+      expect(result[:api_error_response]).to be_a(Hash)
+      expect(result[:api_error_response][:message]).to eq("Invalid request")
+      expect(result[:api_error_response][:errors]).to be_a(Hash)
+      expect(result[:api_error_response][:errors][:errors]).to eq([])
+    end
   end
 end