braintree 4.32.0 → 4.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b982c20d1a239e4a623a802fb0c0d6ce66a5be501e767c22a33a7b06a3c09a59
-  data.tar.gz: 9d515e47f8d7e5908b21f7ed5ccd98b02f2ce712298082fd67cbc3d88d7fd13d
+  metadata.gz: 2e524f55d0d9990e6d2c25d6dbd81b3d75833ef145a624c70af52119d2b71fd8
+  data.tar.gz: c060e46e74b749cd934e7eecef42f4d783e6e8252ed59aff41acf574379141a3
 SHA512:
-  metadata.gz: 1459fb667fdbb3d3f52feb2082394f347dbe0c3347eef68c87cbc31a8c915fcc96ff8623bbd98f8766e2391801423514fa2db4a4c90f511ea9d2c1c3778f9b3d
-  data.tar.gz: 36af58c2cc626136cfaa8bc1f28d2acb8fa47e9e747e0e9eb641acabcbf4e0afadf34556e5467928c4e091a66279b505f952a1fb9e5476e19531f0c81b91a59d
+  metadata.gz: 2796040657fc77358e616b12dea6b8e1e9ebb1b06bd0d0d284b7ee2cb14f2e12d34e5570ed9d512b07293ef5605751ba2116a637077b0b19f0a2d6fd11704ada
+  data.tar.gz: 31ce1b5335dd36150b8f2dc46df425e17ea4e10bf2e8d0a6b44d2d0f72732c72e3d3b6f9f0a9362de56ded2ca70037a707210f72cff45955947407a8bc61273a

data/lib/braintree/version.rb

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

data/lib/braintree/xml/{libxml.rb → nokogiri.rb}

@@ -2,22 +2,20 @@
 # under the MIT license, copyright (c) 2005-2009 David Heinemeier Hansson
 module Braintree
   module Xml
-    module Libxml
-      LIB_XML_LIMIT = 30000000
+    module Nokogiri
+      NOKOGIRI_XML_LIMIT = 30000000
 
       def self.parse(xml_string)
-        old_keep_blanks_setting = ::LibXML::XML.default_keep_blanks
-        ::LibXML::XML.default_keep_blanks = false
-        root_node = LibXML::XML::Parser.string(xml_string.strip).parse.root
-        _node_to_hash(root_node)
-      ensure
-        ::LibXML::XML.default_keep_blanks = old_keep_blanks_setting
+        require "nokogiri" unless defined?(::Nokogiri)
+        doc = ::Nokogiri::XML(xml_string.strip)
+        _node_to_hash(doc.root)
       end
 
       def self._node_to_hash(node, hash = {})
-        if node.text?
-          raise ::LibXML::XML::Error if node.content.length >= LIB_XML_LIMIT
-          hash[CONTENT_ROOT] = node.content
+        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
         else
           sub_hash = _build_sub_hash(hash, node.name)
           _attributes_to_hash(node, sub_hash)
@@ -44,26 +42,28 @@ module Braintree
       end
 
       def self._children_to_hash(node, hash={})
-        node.each { |child| _node_to_hash(child, hash) }
+        node.children.each { |child| _node_to_hash(child, hash) unless child.text? && child.content.strip.empty? }
         _attributes_to_hash(node, hash)
         hash
       end
 
       def self._attributes_to_hash(node, hash={})
-        node.each_attr { |attr| hash[attr.name] = attr.value }
+        node.attributes.each { |name, attr| hash[name] = attr.value }
         hash
       end
 
       def self._children_array_to_hash(node, hash={})
-        hash[node.child.name] = node.map do |child|
+        first_child = node.children.find { |child| !child.text? }
+        hash[first_child.name] = node.children.select { |child| !child.text? }.map do |child|
           _children_to_hash(child, {})
         end
         hash
       end
 
       def self._array?(node)
-        node.child? && node.child.next? && node.child.name == node.child.next.name
+        non_text_children = node.children.select { |child| !child.text? }
+        non_text_children.size > 1 && non_text_children.first.name == non_text_children[1].name
       end
     end
   end
-end
+end

data/lib/braintree/xml/parser.rb

@@ -18,10 +18,10 @@ module Braintree
       end
 
       def self._determine_parser
-        # If LibXML is not available, we fall back to REXML
-        # This allows us to be compatible with JRuby, which LibXML does not support
-        if defined?(::LibXML::XML) && ::LibXML::XML.respond_to?(:default_keep_blanks=)
-          ::Braintree::Xml::Libxml
+        # If Nokogiri is available, use it for better performance
+        # Otherwise fall back to REXML for JRuby compatibility
+        if defined?(::Nokogiri)
+          ::Braintree::Xml::Nokogiri
         else
           ::Braintree::Xml::Rexml
         end

data/lib/braintree.rb

@@ -203,6 +203,6 @@ require "braintree/webhook_testing"
 require "braintree/webhook_testing_gateway"
 require "braintree/xml"
 require "braintree/xml/generator"
-require "braintree/xml/libxml"
+require "braintree/xml/nokogiri"
 require "braintree/xml/rexml"
 require "braintree/xml/parser"

data/spec/spec_helper.rb

@@ -3,7 +3,6 @@ unless defined?(SPEC_HELPER_LOADED)
   project_root = File.expand_path(File.dirname(__FILE__) + "/..")
   require "rubygems"
   require "bundler/setup"
-  require "libxml"
   require "rspec"
   require "pry"
 
@@ -195,10 +194,10 @@ unless defined?(SPEC_HELPER_LOADED)
       end
 
       def matches?(xml_string)
-        @libxml_parse = Braintree::Xml::Parser.hash_from_xml(xml_string)
-        if @libxml_parse != @expected_hash
-          @results = @libxml_parse
-          @failed_parser = "libxml"
+        @xml_parse = Braintree::Xml::Parser.hash_from_xml(xml_string)
+        if @xml_parse != @expected_hash
+          @results = @xml_parse
+          @failed_parser = "xml"
           false
         else
           true

data/spec/unit/braintree/xml/{libxml_spec.rb → nokogiri_spec.rb}

@@ -1,10 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
-describe Braintree::Xml::Libxml do
+describe Braintree::Xml::Nokogiri do
   describe "self.parse" do
     it "typecasts integers" do
       xml = "<root><foo type=\"integer\">123</foo></root>"
-      expect(Braintree::Xml::Libxml.parse(xml)).to eq({"root"=>{"foo"=>{"__content__"=>"123", "type"=>"integer"}}})
+      expect(Braintree::Xml::Nokogiri.parse(xml)).to eq({"root"=>{"foo"=>{"__content__"=>"123", "type"=>"integer"}}})
     end
 
     it "works with dashes or underscores" do
@@ -14,7 +14,7 @@ describe Braintree::Xml::Libxml do
           <under_scores />
         </root>
       END
-      expect(Braintree::Xml::Libxml.parse(xml)).to eq({"root"=>{"dash-es"=>{}, "under_scores"=>{}}})
+      expect(Braintree::Xml::Nokogiri.parse(xml)).to eq({"root"=>{"dash-es"=>{}, "under_scores"=>{}}})
     end
 
     it "uses nil if nil=true, otherwise uses empty string" do
@@ -24,7 +24,7 @@ describe Braintree::Xml::Libxml do
           <an_empty_string></an_empty_string>
         </root>
       END
-      expect(Braintree::Xml::Libxml.parse(xml)).to eq({"root"=>{"a_nil_value"=>{"nil"=>"true"}, "an_empty_string"=>{}}})
+      expect(Braintree::Xml::Nokogiri.parse(xml)).to eq({"root"=>{"a_nil_value"=>{"nil"=>"true"}, "an_empty_string"=>{}}})
     end
 
     it "typecasts dates and times" do
@@ -33,7 +33,7 @@ describe Braintree::Xml::Libxml do
           <created-at type="datetime">2009-10-28T10:19:49Z</created-at>
         </root>
       END
-      expect(Braintree::Xml::Libxml.parse(xml)).to eq({"root"=>{"created-at"=>{"__content__"=>"2009-10-28T10:19:49Z", "type"=>"datetime"}}})
+      expect(Braintree::Xml::Nokogiri.parse(xml)).to eq({"root"=>{"created-at"=>{"__content__"=>"2009-10-28T10:19:49Z", "type"=>"datetime"}}})
     end
 
     it "builds an array if type=array" do
@@ -45,7 +45,7 @@ describe Braintree::Xml::Libxml do
           </customers>
         </root>
       END
-      expect(Braintree::Xml::Libxml.parse(xml)).to eq({"root"=>{"customers"=>{"type"=>"array", "customer"=>[{"name"=>{"__content__"=>"Adam"}}, {"name"=>{"__content__"=>"Ben"}}]}}})
+      expect(Braintree::Xml::Nokogiri.parse(xml)).to eq({"root"=>{"customers"=>{"type"=>"array", "customer"=>[{"name"=>{"__content__"=>"Adam"}}, {"name"=>{"__content__"=>"Ben"}}]}}})
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: braintree
 version: !ruby/object:Gem::Version
-  version: 4.32.0
+  version: 4.33.0
 platform: ruby
 authors:
 - Braintree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-10-23 00:00:00.000000000 Z
+date: 2025-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -236,7 +236,7 @@ files:
 - lib/braintree/webhook_testing_gateway.rb
 - lib/braintree/xml.rb
 - lib/braintree/xml/generator.rb
-- lib/braintree/xml/libxml.rb
+- lib/braintree/xml/nokogiri.rb
 - lib/braintree/xml/parser.rb
 - lib/braintree/xml/rexml.rb
 - lib/ssl/api_braintreegateway_com.ca.crt
@@ -390,7 +390,7 @@ files:
 - spec/unit/braintree/venmo_profile_data_spec.rb
 - spec/unit/braintree/visa_checkout_card_spec.rb
 - spec/unit/braintree/webhook_notification_spec.rb
-- spec/unit/braintree/xml/libxml_spec.rb
+- spec/unit/braintree/xml/nokogiri_spec.rb
 - spec/unit/braintree/xml/parser_spec.rb
 - spec/unit/braintree/xml/rexml_spec.rb
 - spec/unit/braintree/xml_spec.rb