braintree 3.2.0 → 4.2.0

data/lib/braintree/us_bank_account_verification.rb

@@ -63,7 +63,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
 
     def self.confirm_micro_transfer_amounts(*args)

data/lib/braintree/us_bank_account_verification_gateway.rb

@@ -18,7 +18,7 @@ module Braintree
         ErrorResult.new(@gateway, response[:api_error_response])
       else
         SuccessfulResult.new(
-          :us_bank_account_verification => UsBankAccountVerification._new(response[:us_bank_account_verification])
+          :us_bank_account_verification => UsBankAccountVerification._new(response[:us_bank_account_verification]),
         )
       end
     rescue NotFoundError

data/lib/braintree/util.rb

@@ -14,13 +14,13 @@ module Braintree
         else
           url_encode(full_key) + "=" + url_encode(value)
         end
-      end.sort * '&'
+      end.sort * "&"
     end
 
     def self.parse_query_string(qs)
-      qs.split('&').inject({}) do |result, couplet|
-        pair = couplet.split('=')
-        result[CGI.unescape(pair[0]).to_sym] = CGI.unescape(pair[1] || '')
+      qs.split("&").inject({}) do |result, couplet|
+        pair = couplet.split("=")
+        result[CGI.unescape(pair[0]).to_sym] = CGI.unescape(pair[1] || "")
         result
       end
     end

data/lib/braintree/venmo_account.rb

@@ -28,7 +28,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
   end
 end

data/lib/braintree/version.rb

@@ -1,6 +1,6 @@
 module Braintree
   module Version
-    Major = 3
+    Major = 4
     Minor = 2
     Tiny = 0
 

data/lib/braintree/visa_checkout_card.rb

@@ -39,7 +39,7 @@ module Braintree
     end
 
     def _most_recent_verification(attributes)
-      verification = (attributes[:verifications] || []).sort_by{ |verification| verification[:created_at] }.reverse.first
+      verification = (attributes[:verifications] || []).sort_by { |verification| verification[:created_at] }.reverse.first
       CreditCardVerification._new(verification) if verification
     end
 
@@ -84,7 +84,7 @@ module Braintree
     end
 
     def self._new(*args) # :nodoc:
-      self.new *args
+      self.new(*args)
     end
   end
 end

data/lib/braintree/webhook_notification.rb

@@ -1,12 +1,17 @@
-require 'ostruct'
+require "ostruct"
 
 module Braintree
   class WebhookNotification
     include BaseModule
 
     module Kind
+
+      AccountUpdaterDailyReport = "account_updater_daily_report"
+
       Check = "check"
 
+      ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
+      ConnectedMerchantStatusTransitioned = "connected_merchant_status_transitioned"
       Disbursement = "disbursement"
       DisbursementException = "disbursement_exception"
 
@@ -17,6 +22,24 @@ module Braintree
       DisputeDisputed = "dispute_disputed"
       DisputeExpired = "dispute_expired"
 
+      GrantedPaymentInstrumentRevoked = "granted_payment_instrument_revoked"
+
+      GrantorUpdatedGrantedPaymentMethod = "grantor_updated_granted_payment_method"
+      GrantedPaymentMethodRevoked = "granted_payment_method_revoked"
+
+      LocalPaymentCompleted = "local_payment_completed"
+      LocalPaymentReversed = "local_payment_reversed"
+
+      OAuthAccessRevoked = "oauth_access_revoked"
+
+      PartnerMerchantConnected = "partner_merchant_connected"
+      PartnerMerchantDisconnected = "partner_merchant_disconnected"
+      PartnerMerchantDeclined = "partner_merchant_declined"
+
+      PaymentMethodRevokedByCustomer = "payment_method_revoked_by_customer"
+
+      RecipientUpdatedGrantedPaymentMethod = "recipient_updated_granted_payment_method"
+
       SubscriptionCanceled = "subscription_canceled"
       SubscriptionChargedSuccessfully = "subscription_charged_successfully"
       SubscriptionChargedUnsuccessfully = "subscription_charged_unsuccessfully"
@@ -27,25 +50,10 @@ module Braintree
 
       SubMerchantAccountApproved = "sub_merchant_account_approved"
       SubMerchantAccountDeclined = "sub_merchant_account_declined"
+
       TransactionDisbursed = "transaction_disbursed"
       TransactionSettlementDeclined = "transaction_settlement_declined"
       TransactionSettled = "transaction_settled"
-      PartnerMerchantConnected = "partner_merchant_connected"
-      PartnerMerchantDisconnected = "partner_merchant_disconnected"
-      PartnerMerchantDeclined = "partner_merchant_declined"
-
-      AccountUpdaterDailyReport = "account_updater_daily_report"
-
-      OAuthAccessRevoked = "oauth_access_revoked"
-      ConnectedMerchantStatusTransitioned = "connected_merchant_status_transitioned"
-      ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
-
-      GrantorUpdatedGrantedPaymentMethod = "grantor_updated_granted_payment_method"
-      RecipientUpdatedGrantedPaymentMethod = "recipient_updated_granted_payment_method"
-      GrantedPaymentInstrumentRevoked = "granted_payment_instrument_revoked"
-      PaymentMethodRevokedByCustomer = "payment_method_revoked_by_customer"
-
-      LocalPaymentCompleted = "local_payment_completed"
     end
 
     attr_reader :account_updater_daily_report
@@ -57,6 +65,7 @@ module Braintree
     attr_reader :revoked_payment_method_metadata
     attr_reader :kind
     attr_reader :local_payment_completed
+    attr_reader :local_payment_reversed
     attr_reader :oauth_access_revocation
     attr_reader :partner_merchant
     attr_reader :source_merchant_id
@@ -87,8 +96,9 @@ module Braintree
       @connected_merchant_status_transitioned = ConnectedMerchantStatusTransitioned._new(@subject[:connected_merchant_status_transitioned]) if @subject.has_key?(:connected_merchant_status_transitioned)
       @connected_merchant_paypal_status_changed = ConnectedMerchantPayPalStatusChanged._new(@subject[:connected_merchant_paypal_status_changed]) if @subject.has_key?(:connected_merchant_paypal_status_changed)
       @granted_payment_instrument_update = GrantedPaymentInstrumentUpdate._new(@subject[:granted_payment_instrument_update]) if @subject.has_key?(:granted_payment_instrument_update)
-      @revoked_payment_method_metadata = RevokedPaymentMethodMetadata._new(gateway, @subject) if [Kind::GrantedPaymentInstrumentRevoked, Kind::PaymentMethodRevokedByCustomer].include?(@kind)
-      @local_payment_completed = LocalPaymentCompleted._new(@subject[:local_payment]) if @subject.has_key?(:local_payment)
+      @revoked_payment_method_metadata = RevokedPaymentMethodMetadata._new(gateway, @subject) if [Kind::GrantedPaymentInstrumentRevoked, Kind::PaymentMethodRevokedByCustomer, Kind::GrantedPaymentMethodRevoked].include?(@kind)
+      @local_payment_completed = LocalPaymentCompleted._new(@subject[:local_payment]) if @subject.has_key?(:local_payment) && Kind::LocalPaymentCompleted == @kind
+      @local_payment_reversed = LocalPaymentReversed._new(@subject[:local_payment_reversed]) if @subject.has_key?(:local_payment_reversed) && Kind::LocalPaymentReversed == @kind
     end
 
     def merchant_account
@@ -110,7 +120,7 @@ module Braintree
     class << self
       protected :new
       def _new(*args) # :nodoc:
-        self.new *args
+        self.new(*args)
       end
     end
   end

data/lib/braintree/webhook_notification_gateway.rb

@@ -7,8 +7,8 @@ module Braintree
     end
 
     def parse(signature_string, payload)
-      raise InvalidSignature, 'signature cannot be nil' if signature_string.nil?
-      raise InvalidSignature, 'payload cannot be nil' if payload.nil?
+      raise InvalidSignature, "signature cannot be nil" if signature_string.nil?
+      raise InvalidSignature, "payload cannot be nil" if payload.nil?
       if payload =~ /[^A-Za-z0-9+=\/\n]/
         raise InvalidSignature, "payload contains illegal characters"
       end
@@ -18,7 +18,7 @@ module Braintree
     end
 
     def verify(challenge)
-      raise InvalidChallenge, 'challenge contains non-hex characters' unless challenge =~ /\A[a-f0-9]{20,32}\z/
+      raise InvalidChallenge, "challenge contains non-hex characters" unless challenge =~ /\A[a-f0-9]{20,32}\z/
       digest = Braintree::Digest.hexdigest(@config.private_key, challenge)
       "#{@config.public_key}|#{digest}"
     end
@@ -34,13 +34,13 @@ module Braintree
 
     def _verify_signature(signature_string, payload)
       public_key, signature = _matching_signature_pair(signature_string)
-      raise InvalidSignature, 'no matching public key' if public_key.nil?
+      raise InvalidSignature, "no matching public key" if public_key.nil?
 
       signature_matches = [payload, payload + "\n"].any? do |payload|
         payload_signature = Braintree::Digest.hexdigest(@config.private_key, payload)
         Braintree::Digest.secure_compare(signature, payload_signature)
       end
-      raise InvalidSignature, 'signature does not match payload - one has been modified' unless signature_matches
+      raise InvalidSignature, "signature does not match payload - one has been modified" unless signature_matches
     end
   end
 end

data/lib/braintree/webhook_testing_gateway.rb

@@ -82,10 +82,14 @@ module Braintree
         _granted_payment_instrument_update_sample_xml(id)
       when Braintree::WebhookNotification::Kind::RecipientUpdatedGrantedPaymentMethod
         _granted_payment_instrument_update_sample_xml(id)
+      when Braintree::WebhookNotification::Kind::GrantedPaymentMethodRevoked
+        _granted_payment_method_revoked_xml(id)
       when Braintree::WebhookNotification::Kind::PaymentMethodRevokedByCustomer
         _payment_method_revoked_by_customer_sample_xml(id)
       when Braintree::WebhookNotification::Kind::LocalPaymentCompleted
         _local_payment_completed_sample_xml(id)
+      when Braintree::WebhookNotification::Kind::LocalPaymentReversed
+        _local_payment_reversed_sample_xml(id)
       else
         _subscription_sample_xml(id)
       end
@@ -875,6 +879,24 @@ module Braintree
       XML
     end
 
+    def _granted_payment_method_revoked_xml(id)
+      <<-XML
+        <venmo-account>
+          <created-at type='dateTime'>2018-10-11T21:28:37Z</created-at>
+          <updated-at type='dateTime'>2018-10-11T21:28:37Z</updated-at>
+          <default type='boolean'>true</default>
+          <image-url>https://assets.braintreegateway.com/payment_method_logo/venmo.png?environment=test</image-url>
+          <token>#{id}</token>
+          <source-description>Venmo Account: venmojoe</source-description>
+          <username>venmojoe</username>
+          <venmo-user-id>456</venmo-user-id>
+          <subscriptions type='array'/>
+          <customer-id>venmo_customer_id</customer-id>
+          <global-id>cGF5bWVudG1ldGhvZF92ZW5tb2FjY291bnQ</global-id>
+        </venmo-account>
+      XML
+    end
+
     def _payment_method_revoked_by_customer_sample_xml(id)
       <<-XML
         <paypal-account>
@@ -912,5 +934,13 @@ module Braintree
         </local-payment>
       XML
     end
+
+    def _local_payment_reversed_sample_xml(id)
+      <<-XML
+        <local-payment-reversed>
+          <payment-id>PAY-XYZ123</payment-id>
+        </local-payment-reversed>
+      XML
+    end
   end
 end

data/lib/braintree/xml/generator.rb

@@ -12,6 +12,7 @@ module Braintree
         "Date"       => "datetime",
         "DateTime"   => "datetime",
         "Time"       => "datetime",
+        "ActiveSupport::TimeWithZone" => "datetime"
       }
 
       XML_FORMATTING_NAMES = {
@@ -25,7 +26,7 @@ module Braintree
           date_or_time.respond_to?(:xmlschema) ? date_or_time.xmlschema : date_or_time.to_s
         end,
         "bigdecimal" => Proc.new do |bigdecimal|
-          str = bigdecimal.to_s('F')
+          str = bigdecimal.to_s("F")
           if str =~ /\.\d$/
             str += "0"
           end
@@ -61,15 +62,15 @@ module Braintree
             else
               type_name = XML_TYPE_NAMES[value.class.name]
 
-              attributes = ((value.nil? || type_name.nil?) ? {} : { :type => type_name })
+              attributes = ((value.nil? || type_name.nil?) ? {} : {:type => type_name})
               if value.nil?
                 attributes[:nil] = true
               end
 
-							formatting_name = XML_FORMATTING_NAMES[value.class.name]
+              formatting_name = XML_FORMATTING_NAMES[value.class.name]
               options[:builder].tag!(_xml_escape(key),
                 XML_FORMATTING[formatting_name] ? XML_FORMATTING[formatting_name].call(value) : value,
-                attributes
+                attributes,
               )
             end
           end

data/lib/braintree/xml/libxml.rb

@@ -1,4 +1,3 @@
-require 'libxml'
 # Portions of this code were copied and modified from Ruby on Rails, released
 # under the MIT license, copyright (c) 2005-2009 David Heinemeier Hansson
 module Braintree

data/lib/braintree/xml/parser.rb

@@ -2,7 +2,7 @@
 # under the MIT license, copyright (c) 2005-2009 David Heinemeier Hansson
 module Braintree
   module Xml # :nodoc:
-    CONTENT_ROOT = '__content__'
+    CONTENT_ROOT = "__content__"
 
     module Parser # :nodoc:
       XML_PARSING = {
@@ -11,18 +11,28 @@ module Braintree
         "boolean"  => Proc.new { |boolean| %w(1 true).include?(boolean.strip) },
       }
 
-      def self.hash_from_xml(xml)
-        standardized_hash_structure = ::Braintree::Xml::Libxml.parse(xml)
+      def self.hash_from_xml(xml, parser = _determine_parser)
+        standardized_hash_structure = parser.parse(xml)
         transformed_xml = _transform_xml(standardized_hash_structure)
         Util.symbolize_keys(transformed_xml)
       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
+        else
+          ::Braintree::Xml::Rexml
+        end
+      end
+
       # Transform into standard Ruby types and convert all keys to snake_case instead of dash-case
       def self._transform_xml(value)
         case value.class.to_s
-          when 'Hash'
-            if value['type'] == 'array'
-              child_key, entries = value.detect { |k,v| k != 'type' }   # child_key is throwaway
+          when "Hash"
+            if value["type"] == "array"
+              child_key, entries = value.detect { |k,v| k != "type" }   # child_key is throwaway
               if entries.nil? || ((c = value[CONTENT_ROOT]) && c.strip.empty?)
                 []
               else
@@ -37,21 +47,21 @@ module Braintree
               end
             elsif value.has_key?(CONTENT_ROOT)
               content = value[CONTENT_ROOT]
-              if parser = XML_PARSING[value["type"]]
+              if (parser = XML_PARSING[value["type"]])
                 XML_PARSING[value["type"]].call(content)
               else
                 content
               end
-            elsif value['type'] == 'string' && value['nil'] != 'true'
+            elsif value["type"] == "string" && value["nil"] != "true"
               ""
             elsif value == {}
               ""
-            elsif value.nil? || value['nil'] == 'true'
+            elsif value.nil? || value["nil"] == "true"
               nil
             # If the type is the only element which makes it then
             # this still makes the value nil, except if type is
             # a XML node(where type['value'] is a Hash)
-            elsif value['type'] && value.size == 1 && !value['type'].is_a?(::Hash)
+            elsif value["type"] && value.size == 1 && !value["type"].is_a?(::Hash)
               raise "is this needed?"
               nil
             else
@@ -61,14 +71,14 @@ module Braintree
               end
               xml_value
             end
-          when 'Array'
+          when "Array"
             value.map! { |i| _transform_xml(i) }
             case value.length
               when 0 then nil
               when 1 then value.first
               else value
             end
-          when 'String'
+          when "String"
             value
           else
             raise "can't transform #{value.class.name} - #{value.inspect}"

data/lib/braintree/xml/rexml.rb

@@ -0,0 +1,70 @@
+# Portions of this code were copied and modified from Ruby on Rails, released
+# under the MIT license, copyright (c) 2005-2009 David Heinemeier Hansson
+module Braintree
+  module Xml # :nodoc:
+    module Rexml # :nodoc:
+
+      CONTENT_KEY = "__content__".freeze
+
+      def self.parse(string)
+        require "rexml/document" unless defined?(REXML::Document)
+        doc = REXML::Document.new(string)
+        _merge_element!({}, doc.root)
+      end
+
+      def self._merge_element!(hash, element)
+        _merge!(hash, element.name, _collapse(element))
+      end
+
+      def self._collapse(element)
+        hash = _get_attributes(element)
+
+        if element.has_elements?
+          element.each_element { |child| _merge_element!(hash, child) }
+          _merge_texts!(hash, element) unless _empty_content?(element)
+          hash
+        else
+          _merge_texts!(hash, element)
+        end
+      end
+
+      def self._merge_texts!(hash, element)
+        unless element.has_text?
+          hash
+        else
+          # must use value to prevent double-escaping
+          _merge!(
+            hash,
+            CONTENT_KEY,
+            element.texts.map { |t| t.value }.join,
+          )
+        end
+      end
+
+      def self._merge!(hash, key, value)
+        if hash.has_key?(key)
+          if hash[key].instance_of?(Array)
+            hash[key] << value
+          else
+            hash[key] = [hash[key], value]
+          end
+        elsif value.instance_of?(Array)
+          hash[key] = [value]
+        else
+          hash[key] = value
+        end
+        hash
+      end
+
+      def self._get_attributes(element)
+        attributes = {}
+        element.attributes.each { |n,v| attributes[n] = v }
+        attributes
+      end
+
+      def self._empty_content?(element)
+        element.texts.join.strip == ""
+      end
+    end
+  end
+end