braintree 2.102.0 → 3.1.0

data/lib/braintree/transaction/disbursement_details.rb

@@ -13,6 +13,7 @@ module Braintree
 
       def initialize(attributes)
         set_instance_variables_from_hash attributes unless attributes.nil?
+        @disbursement_date = Date.parse(disbursement_date) unless disbursement_date.nil?
       end
 
       def funds_held?

data/lib/braintree/transaction/{android_pay_details.rb → google_pay_details.rb}

@@ -1,6 +1,6 @@
 module Braintree
   class Transaction
-    class AndroidPayDetails
+    class GooglePayDetails
       include BaseModule
 
       attr_reader :bin

data/lib/braintree/transaction/paypal_details.rb

@@ -4,11 +4,14 @@ module Braintree
       include BaseModule
 
       attr_reader :authorization_id
+      attr_reader :billing_agreement_id
       attr_reader :capture_id
       attr_reader :custom_field
       attr_reader :debug_id
       attr_reader :description
       attr_reader :image_url
+      attr_reader :implicitly_vaulted_payment_method_global_id
+      attr_reader :implicitly_vaulted_payment_method_token
       attr_reader :payee_email
       attr_reader :payee_id
       attr_reader :payer_email

data/lib/braintree/transaction/subscription_details.rb

@@ -8,6 +8,8 @@ module Braintree
 
       def initialize(attributes)
         set_instance_variables_from_hash attributes unless attributes.nil?
+        @billing_period_start_date = Date.parse(billing_period_start_date) unless billing_period_start_date.nil?
+        @billing_period_end_date = Date.parse(billing_period_end_date) unless billing_period_end_date.nil?
       end
     end
   end

data/lib/braintree/transaction_gateway.rb

@@ -52,17 +52,6 @@ module Braintree
       return_object_or_raise(:transaction) { clone_transaction(*args) }
     end
 
-    # Deprecated
-    def create_from_transparent_redirect(query_string)
-      params = @gateway.transparent_redirect.parse_and_validate_query_string query_string
-      _do_create("/transactions/all/confirm_transparent_redirect_request", :id => params[:id])
-    end
-
-    def create_transaction_url
-      warn "[DEPRECATED] Transaction.create_transaction_url is deprecated. Please use TransparentRedirect.url"
-      "#{@config.base_merchant_url}/transactions/all/create_via_transparent_redirect_request"
-    end
-
     def credit(attributes)
       create(attributes.merge(:type => 'credit'))
     end
@@ -124,7 +113,7 @@ module Braintree
       if response.has_key?(:search_results)
         ResourceCollection.new(response) { |ids| _fetch_transactions(search, ids) }
       else
-        raise DownForMaintenanceError
+        raise UnexpectedError, "expected :search_results"
       end
     end
 
@@ -184,21 +173,22 @@ module Braintree
 
     def self._create_signature # :nodoc:
       [
-        :amount, :customer_id, :merchant_account_id, :order_id, :channel, :payment_method_token,
-        :purchase_order_number, :recurring, :transaction_source, :shipping_address_id, :type, :tax_amount, :tax_exempt,
-        :venmo_sdk_payment_method_code, :device_session_id, :service_fee_amount, :device_data, :fraud_merchant_id,
-        :shipping_amount, :discount_amount, :ships_from_postal_code,
-        :billing_address_id, :payment_method_nonce, :three_d_secure_token, :three_d_secure_authentication_id,
-        :shared_payment_method_token, :shared_billing_address_id, :shared_customer_id, :shared_shipping_address_id, :shared_payment_method_nonce,
+        :amount, :billing_address_id, :channel, :customer_id, :device_data, :discount_amount,
+        :merchant_account_id, :order_id, :payment_method_nonce, :payment_method_token,
+        :product_sku, :purchase_order_number, :service_fee_amount, :shared_billing_address_id,
+        :shared_customer_id, :shared_payment_method_nonce, :shared_payment_method_token,
+        :shared_shipping_address_id, :shipping_address_id, :shipping_amount,
+        :ships_from_postal_code, :tax_amount, :tax_exempt, :three_d_secure_authentication_id,
+        :three_d_secure_token, :transaction_source, :type, :venmo_sdk_payment_method_code,
         {:line_items => [:quantity, :name, :description, :kind, :unit_amount, :unit_tax_amount, :total_amount, :discount_amount, :tax_amount, :unit_of_measure, :product_code, :commodity_code, :url]},
-        {:risk_data => [:customer_browser, :customer_ip]},
+        {:risk_data => [:customer_browser, :customer_device_id, :customer_ip, :customer_location_zip, :customer_tenure]},
         {:credit_card => [:token, :cardholder_name, :cvv, :expiration_date, :expiration_month, :expiration_year, :number]},
         {:customer => [:id, :company, :email, :fax, :first_name, :last_name, :phone, :website]},
         {
           :billing => AddressGateway._shared_signature
         },
         {
-          :shipping => AddressGateway._shared_signature
+          :shipping => AddressGateway._shared_signature + [:shipping_method],
         },
         {
           :three_d_secure_pass_thru => [
@@ -255,7 +245,7 @@ module Braintree
           ]},
         ]},
         {:apple_pay_card => [:number, :cardholder_name, :cryptogram, :expiration_month, :expiration_year, :eci_indicator]},
-        {:android_pay_card => [:number, :cryptogram, :google_transaction_id, :expiration_month, :expiration_year, :source_card_type, :source_card_last_four, :eci_indicator]}
+        {:google_pay_card => [:number, :cryptogram, :google_transaction_id, :expiration_month, :expiration_year, :source_card_type, :source_card_last_four, :eci_indicator]}
       ]
     end
 
@@ -289,6 +279,9 @@ module Braintree
     end
 
     def _do_create(path, params=nil) # :nodoc:
+      if !params.nil?
+        params = Util.replace_key(params, :google_pay_card, :android_pay_card)
+      end
       response = @config.http.post("#{@config.base_merchant_path}#{path}", params)
       _handle_transaction_response(response)
     end

data/lib/braintree/transaction_search.rb

@@ -28,7 +28,6 @@ module Braintree
       :paypal_authorization_id,
       :paypal_payer_email,
       :processor_authorization_code,
-      :europe_bank_account_iban,
       :settlement_batch_id,
       :shipping_company,
       :shipping_country_name,

data/lib/braintree/util.rb

@@ -53,6 +53,8 @@ module Braintree
         raise AuthorizationError, message
       when 404
         raise NotFoundError
+      when 408
+        raise RequestTimeoutError
       when 426
         raise UpgradeRequiredError, "Please upgrade your client library."
       when 429
@@ -60,7 +62,9 @@ module Braintree
       when 500
         raise ServerError
       when 503
-        raise DownForMaintenanceError
+        raise ServiceUnavailableError
+      when 504
+        raise GatewayTimeoutError
       else
         raise UnexpectedError, "Unexpected HTTP_RESPONSE #{status_code.to_i}"
       end
@@ -87,7 +91,7 @@ module Braintree
           when "INTERNAL"
             raise ServerError
           when "SERVICE_AVAILABILITY"
-            raise DownForMaintenanceError
+            raise ServiceUnavailableError
           else
             raise UnexpectedError, "Unexpected Response: #{error[:message]}"
           end
@@ -126,6 +130,17 @@ module Braintree
       !invalid_keys.any?
     end
 
+    def self.replace_key(hash, target_key, replacement_key)
+      hash.inject({}) do |new_hash, (key, value)|
+        if value.is_a?(Hash)
+          value = replace_key(value, target_key, replacement_key)
+        end
+
+        key = replacement_key if key == target_key
+        new_hash.merge(key => value)
+      end
+    end
+
     def self._flatten_valid_keys(valid_keys, namespace = nil)
       valid_keys.inject([]) do |result, key|
         if key.is_a?(Hash)

data/lib/braintree/version.rb

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

data/lib/braintree/webhook_notification.rb

@@ -36,18 +36,10 @@ module Braintree
 
       AccountUpdaterDailyReport = "account_updater_daily_report"
 
-      # NEXT_MAJOR_VERSION Remove this class as legacy Ideal has been removed/disabled in the Braintree Gateway
-      # DEPRECATED If you're looking to accept iDEAL as a payment method contact accounts@braintreepayments.com for a solution.
-      IdealPaymentComplete = "ideal_payment_complete"
-      IdealPaymentFailed = "ideal_payment_failed"
-
       OAuthAccessRevoked = "oauth_access_revoked"
       ConnectedMerchantStatusTransitioned = "connected_merchant_status_transitioned"
       ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
 
-      # NEXT_MAJOR_VERSION remove GrantedPaymentInstrumentUpdate. Kind is not sent by Braintree Gateway.
-      # Kind will either be GrantorUpdatedGrantedPaymentMethod or RecipientUpdatedGrantedPaymentMethod.
-      GrantedPaymentInstrumentUpdate = "granted_payment_instrument_update"
       GrantorUpdatedGrantedPaymentMethod = "grantor_updated_granted_payment_method"
       RecipientUpdatedGrantedPaymentMethod = "recipient_updated_granted_payment_method"
       GrantedPaymentInstrumentRevoked = "granted_payment_instrument_revoked"
@@ -63,7 +55,6 @@ module Braintree
     attr_reader :dispute
     attr_reader :granted_payment_instrument_update
     attr_reader :revoked_payment_method_metadata
-    attr_reader :ideal_payment
     attr_reader :kind
     attr_reader :local_payment_completed
     attr_reader :oauth_access_revocation
@@ -93,7 +84,6 @@ module Braintree
       @disbursement = Disbursement._new(gateway, @subject[:disbursement]) if @subject.has_key?(:disbursement)
       @dispute = Dispute._new(@subject[:dispute]) if @subject.has_key?(:dispute)
       @account_updater_daily_report = AccountUpdaterDailyReport._new(@subject[:account_updater_daily_report]) if @subject.has_key?(:account_updater_daily_report)
-      @ideal_payment = Braintree::IdealPayment._new(gateway, @subject[:ideal_payment]) if @subject.has_key?(:ideal_payment)
       @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)

data/lib/braintree/webhook_testing_gateway.rb

@@ -78,17 +78,6 @@ module Braintree
         _auth_status_transitioned_sample_xml(id)
       when Braintree::WebhookNotification::Kind::ConnectedMerchantPayPalStatusChanged
         _auth_paypal_status_changed_sample_xml(id)
-        # NEXT_MAJOR_VERSION Remove this class as legacy Ideal has been removed/disabled in the Braintree Gateway
-        # DEPRECATED If you're looking to accept iDEAL as a payment method contact accounts@braintreepayments.com for a solution.
-      when Braintree::WebhookNotification::Kind::IdealPaymentComplete
-        _ideal_payment_complete_sample_xml(id)
-        # NEXT_MAJOR_VERSION Remove this class as legacy Ideal has been removed/disabled in the Braintree Gateway
-        # DEPRECATED If you're looking to accept iDEAL as a payment method contact accounts@braintreepayments.com for a solution.
-      when Braintree::WebhookNotification::Kind::IdealPaymentFailed
-        _ideal_payment_failed_sample_xml(id)
-      # NEXT_MAJOR_VERSION remove GrantedPaymentInstrumentUpdate
-      when Braintree::WebhookNotification::Kind::GrantedPaymentInstrumentUpdate
-        _granted_payment_instrument_update_sample_xml(id)
       when Braintree::WebhookNotification::Kind::GrantorUpdatedGrantedPaymentMethod
         _granted_payment_instrument_update_sample_xml(id)
       when Braintree::WebhookNotification::Kind::RecipientUpdatedGrantedPaymentMethod
@@ -867,38 +856,6 @@ module Braintree
       XML
     end
 
-    def _ideal_payment_complete_sample_xml(id)
-      <<-XML
-        <ideal-payment>
-          <id>#{id}</id>
-          <status>COMPLETE</status>
-          <issuer>ABCISSUER</issuer>
-          <order-id>ORDERABC</order-id>
-          <currency>EUR</currency>
-          <amount>10.00</amount>
-          <created-at>2016-11-29T23:27:34.547Z</created-at>
-          <approval-url>https://example.com</approval-url>
-          <ideal-transaction-id>1234567890</ideal-transaction-id>
-        </ideal-payment>
-      XML
-    end
-
-    def _ideal_payment_failed_sample_xml(id)
-      <<-XML
-        <ideal-payment>
-          <id>#{id}</id>
-          <status>FAILED</status>
-          <issuer>ABCISSUER</issuer>
-          <order-id>ORDERABC</order-id>
-          <currency>EUR</currency>
-          <amount>10.00</amount>
-          <created-at>2016-11-29T23:27:34.547Z</created-at>
-          <approval-url>https://example.com</approval-url>
-          <ideal-transaction-id>1234567890</ideal-transaction-id>
-        </ideal-payment>
-      XML
-    end
-
     def _granted_payment_instrument_update_sample_xml(id)
       <<-XML
         <granted-payment-instrument-update>

data/lib/braintree/xml/libxml.rb

@@ -1,3 +1,4 @@
+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

@@ -11,23 +11,14 @@ module Braintree
         "boolean"  => Proc.new { |boolean| %w(1 true).include?(boolean.strip) },
       }
 
-      def self.hash_from_xml(xml, parser = _determine_parser)
-        standardized_hash_structure = parser.parse(xml)
-        with_underscores_in_keys = _unrename_keys(standardized_hash_structure)
-        typecasted_xml = _typecast_xml_value(with_underscores_in_keys)
-        Util.symbolize_keys(typecasted_xml)
+      def self.hash_from_xml(xml)
+        standardized_hash_structure = ::Braintree::Xml::Libxml.parse(xml)
+        transformed_xml = _transform_xml(standardized_hash_structure)
+        Util.symbolize_keys(transformed_xml)
       end
 
-      def self._determine_parser
-        # LibXML causes a segfault in Ruby 2.0.0. We need to fall back to Rexml to prevent this segfault.
-        if !RUBY_VERSION.start_with?("2.0") && defined?(::LibXML::XML) && ::LibXML::XML.respond_to?(:default_keep_blanks=)
-          ::Braintree::Xml::Libxml
-        else
-          ::Braintree::Xml::Rexml
-        end
-      end
-
-      def self._typecast_xml_value(value)
+      # 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'
@@ -37,9 +28,9 @@ module Braintree
               else
                 case entries.class.to_s   # something weird with classes not matching here.  maybe singleton methods breaking is_a?
                 when "Array"
-                  entries.collect { |v| _typecast_xml_value(v) }
+                  entries.collect { |v| _transform_xml(v) }
                 when "Hash"
-                  [_typecast_xml_value(entries)]
+                  [_transform_xml(entries)]
                 else
                   raise "can't typecast #{entries.inspect}"
                 end
@@ -65,13 +56,13 @@ module Braintree
               nil
             else
               xml_value = value.inject({}) do |h,(k,v)|
-                h[k] = _typecast_xml_value(v)
+                h[k.to_s.tr("-", "_")] = _transform_xml(v) # convert dashes to underscores in keys
                 h
               end
               xml_value
             end
           when 'Array'
-            value.map! { |i| _typecast_xml_value(i) }
+            value.map! { |i| _transform_xml(i) }
             case value.length
               when 0 then nil
               when 1 then value.first
@@ -80,21 +71,7 @@ module Braintree
           when 'String'
             value
           else
-            raise "can't typecast #{value.class.name} - #{value.inspect}"
-        end
-      end
-
-      def self._unrename_keys(params)
-        case params.class.to_s
-          when "Hash"
-            params.inject({}) do |h,(k,v)|
-              h[k.to_s.tr("-", "_")] = _unrename_keys(v)
-              h
-            end
-          when "Array"
-            params.map { |v| _unrename_keys(v) }
-          else
-            params
+            raise "can't transform #{value.class.name} - #{value.inspect}"
         end
       end
     end

data/spec/integration/braintree/address_spec.rb

@@ -347,98 +347,11 @@ describe Braintree::Address do
     it "deletes the address" do
       customer = Braintree::Customer.create!(:last_name => "Wilson")
       address = Braintree::Address.create!(:customer_id => customer.id, :street_address => "123 E Main St")
-      address.delete.success?.should == true
+      result = Braintree::Address.delete(customer.id, address.id)
+      result.success?.should == true
       expect do
         Braintree::Address.find(customer.id, address.id)
       end.to raise_error(Braintree::NotFoundError)
     end
   end
-
-  describe "update" do
-    it "returns a success response and updates the address if valid" do
-      customer = Braintree::Customer.create!(:last_name => "Miller")
-      address = Braintree::Address.create!(
-        :customer_id => customer.id,
-        :street_address => "1812 E Old St",
-        :extended_address => "Suite Old 201",
-        :locality => "Old Chicago",
-        :region => "IL",
-        :postal_code => "60620",
-        :country_name => "United States of America"
-      )
-      result = address.update(
-        :street_address => "123 E New St",
-        :extended_address => "New Suite 3",
-        :locality => "Chicago",
-        :region => "Illinois",
-        :postal_code => "60621",
-        :country_name => "United States of America"
-      )
-      result.success?.should == true
-      result.address.should == address
-      address.street_address.should == "123 E New St"
-      address.extended_address.should == "New Suite 3"
-      address.locality.should == "Chicago"
-      address.region.should == "Illinois"
-      address.postal_code.should == "60621"
-      address.country_name.should == "United States of America"
-    end
-
-    it "returns an error response if invalid" do
-      customer = Braintree::Customer.create!(:last_name => "Miller")
-      address = Braintree::Address.create!(
-        :customer_id => customer.id,
-        :country_name => "United States of America"
-      )
-      result = address.update(
-        :street_address => "123 E New St",
-        :country_name => "United States of Invalid"
-      )
-      result.success?.should == false
-      result.errors.for(:address).on(:country_name)[0].message.should == "Country name is not an accepted country."
-    end
-  end
-
-  describe "update!" do
-    it "returns true and updates the address if valid" do
-      customer = Braintree::Customer.create!(:last_name => "Miller")
-      address = Braintree::Address.create!(
-        :customer_id => customer.id,
-        :street_address => "1812 E Old St",
-        :extended_address => "Suite Old 201",
-        :locality => "Old Chicago",
-        :region => "IL",
-        :postal_code => "60620",
-        :country_name => "United States of America"
-      )
-      address.update!(
-        :street_address => "123 E New St",
-        :extended_address => "New Suite 3",
-        :locality => "Chicago",
-        :region => "Illinois",
-        :postal_code => "60621",
-        :country_name => "United States of America"
-      ).should == address
-      address.street_address.should == "123 E New St"
-      address.extended_address.should == "New Suite 3"
-      address.locality.should == "Chicago"
-      address.region.should == "Illinois"
-      address.postal_code.should == "60621"
-      address.country_name.should == "United States of America"
-    end
-
-    it "raises a ValidationsFailed invalid" do
-      customer = Braintree::Customer.create!(:last_name => "Miller")
-      address = Braintree::Address.create!(
-        :customer_id => customer.id,
-        :country_name => "United States of America"
-      )
-      expect do
-        address.update!(
-          :street_address => "123 E New St",
-          :country_name => "United States of Invalid"
-        )
-      end.to raise_error(Braintree::ValidationsFailed)
-    end
-  end
 end