braintree 2.22.0 → 2.23.0

data/lib/braintree.rb

@@ -54,11 +54,13 @@ require "braintree/subscription_gateway"
 require "braintree/subscription_search"
 require "braintree/successful_result"
 require "braintree/test/credit_card"
+require "braintree/test/venmo_sdk"
 require "braintree/test/transaction_amounts"
 require "braintree/transaction"
 require "braintree/transaction/address_details"
 require "braintree/transaction/credit_card_details"
 require "braintree/transaction/customer_details"
+require "braintree/transaction/disbursement_details"
 require "braintree/transaction/subscription_details"
 require "braintree/transaction_gateway"
 require "braintree/transaction_search"

data/lib/braintree/configuration.rb

@@ -132,5 +132,9 @@ module Braintree
       logger.level = Logger::INFO
       logger
     end
+
+    def inspect
+      super.gsub(/@private_key=\".*\"/, '@private_key="[FILTERED]"')
+    end
   end
 end

data/lib/braintree/credit_card.rb

@@ -37,7 +37,8 @@ module Braintree
 
     attr_reader :billing_address, :bin, :card_type, :cardholder_name, :commercial, :country_of_issuance,
       :created_at, :customer_id, :debit, :durbin_regulated, :expiration_month, :expiration_year, :healthcare,
-      :issuing_bank, :last_4, :payroll, :prepaid, :subscriptions, :token, :unique_number_identifier, :updated_at
+      :issuing_bank, :last_4, :payroll, :prepaid, :subscriptions, :token, :unique_number_identifier, :updated_at,
+      :image_url
 
     # See http://www.braintreepayments.com/docs/ruby/credit_cards/create
     def self.create(attributes)
@@ -224,6 +225,11 @@ module Braintree
       return_object_or_raise(:credit_card) { update(attributes) }
     end
 
+    # Returns true if the card is associated with Venmo SDK
+    def venmo_sdk?
+      @venmo_sdk
+    end
+
     # Returns true if +other+ is a +CreditCard+ with the same token.
     def ==(other)
       return false unless other.is_a?(CreditCard)
@@ -238,7 +244,7 @@ module Braintree
       [
         :billing_address, :bin, :card_type, :cardholder_name, :created_at, :customer_id, :expiration_month,
         :expiration_year, :last_4, :token, :updated_at, :prepaid, :payroll, :commercial, :debit, :durbin_regulated,
-        :healthcare, :country_of_issuance, :issuing_bank
+        :healthcare, :country_of_issuance, :issuing_bank, :image_url
       ]
     end
 

data/lib/braintree/customer.rb

@@ -121,6 +121,11 @@ module Braintree
       return_object_or_raise(:transaction) { credit(transaction_attributes) }
     end
 
+    # Returns the default credit card of the customer
+    def default_credit_card
+       @credit_cards.find {|credit_card| credit_card.default? }
+    end
+
     # See http://www.braintreepayments.com/docs/ruby/customers/delete
     def delete
       @gateway.customer.delete(id)

data/lib/braintree/error_codes.rb

@@ -6,20 +6,28 @@ module Braintree
     # See http://www.braintreepayments.com/docs/ruby/addresses/validations
     module Address
       CannotBeBlank = "81801"
+      CompanyIsInvalid = "91821"
       CompanyIsTooLong = "81802"
       CountryCodeAlpha2IsNotAccepted  = "91814"
       CountryCodeAlpha3IsNotAccepted  = "91816"
       CountryCodeNumericIsNotAccepted = "91817"
       CountryNameIsNotAccepted = "91803"
+      ExtendedAddressIsInvalid = "91823"
       ExtendedAddressIsTooLong = "81804"
+      FirstNameIsInvalid = "91819"
       FirstNameIsTooLong = "81805"
       InconsistentCountry = "91815"
+      LastNameIsInvalid = "91820"
       LastNameIsTooLong = "81806"
+      LocalityIsInvalid = "91824"
       LocalityIsTooLong = "81807"
       PostalCodeInvalidCharacters = "81813"
+      PostalCodeIsInvalid = "91826"
       PostalCodeIsRequired = "81808"
       PostalCodeIsTooLong = "81809"
+      RegionIsInvalid = "91825"
       RegionIsTooLong = "81810"
+      StreetAddressIsInvalid = "91822"
       StreetAddressIsRequired = "81811"
       StreetAddressIsTooLong = "81812"
       TooManyAddressesPerCustomer = "91818"
@@ -43,18 +51,24 @@ module Braintree
       ExpirationDateYearIsInvalid = "81711"
       ExpirationMonthIsInvalid = "81712"
       ExpirationYearIsInvalid = "81713"
+      InvalidVenmoSDKPaymentMethodCode = "91727"
       NumberHasInvalidLength = "81716"
+      NumberLengthIsInvalid = "81716"
       NumberIsInvalid = "81715"
       NumberIsRequired = "81714"
       NumberMustBeTestNumber = "81717"
+      PaymentMethodConflict = "81725"
       TokenInvalid = "91718"
+      TokenFormatIsInvalid = "91718"
       TokenIsInUse = "91719"
       TokenIsNotAllowed = "91721"
       TokenIsRequired = "91722"
       TokenIsTooLong = "91720"
+      VenmoSDKPaymentMethodCodeCardTypeIsNotAccepted = "91726"
 
       module Options
         UpdateExistingTokenIsInvalid = "91723"
+        VerificationMerchantAccountIdIsInvalid = "91728"
       end
     end
 
@@ -64,6 +78,7 @@ module Braintree
       CustomFieldIsInvalid = "91602"
       CustomFieldIsTooLong = "81603"
       EmailIsInvalid = "81604"
+      EmailFormatIsInvalid = "81604"
       EmailIsRequired = "81606"
       EmailIsTooLong = "81605"
       FaxIsTooLong = "81607"
@@ -77,12 +92,16 @@ module Braintree
       LastNameIsTooLong = "81613"
       PhoneIsTooLong = "81614"
       WebsiteIsInvalid = "81616"
+      WebsiteFormatIsInvalid = "81616"
       WebsiteIsTooLong = "81615"
     end
 
     module Descriptor
-      PhoneFormatIsInvalid = "92202"
+      DynamicDescriptorsDisabled = "92203"
+      InternationalPhoneFormatIsInvalid = "92205"
+      InternationalNameFormatIsInvalid = "92204"
       NameFormatIsInvalid = "92201"
+      PhoneFormatIsInvalid = "92202"
     end
 
     module SettlementBatchSummary
@@ -141,6 +160,7 @@ module Braintree
         InconsistentNumberOfBillingCycles = "92018"
         InheritedFromIdIsInvalid = "92013"
         InheritedFromIdIsRequired = "92014"
+        Missing = "92024"
         NumberOfBillingCyclesCannotBeBlank = "92017"
         NumberOfBillingCyclesIsInvalid = "92005"
         NumberOfBillingCyclesMustBeGreaterThanZero = "92019"
@@ -154,6 +174,7 @@ module Braintree
     module Transaction
       AmountCannotBeNegative = "81501"
       AmountIsInvalid = "81503"
+      AmountFormatIsInvalid = "81503"
       AmountIsRequired = "81502"
       AmountIsTooLarge = "81528"
       AmountMustBeGreaterThanZero = "81531"

data/lib/braintree/http.rb

@@ -76,6 +76,8 @@ module Braintree
         end
         response
       end
+    rescue OpenSSL::SSL::SSLError
+      raise Braintree::SSLCertificateError
     end
 
     def _body(response)
@@ -101,9 +103,10 @@ module Braintree
       if preverify_ok != true || ssl_context.error != 0
         err_msg = "SSL Verification failed -- Preverify: #{preverify_ok}, Error: #{ssl_context.error_string} (#{ssl_context.error})"
         @config.logger.error err_msg
-        raise SSLCertificateError.new(err_msg)
+        false
+      else
+        true
       end
-      true
     end
   end
 end

data/lib/braintree/test/venmo_sdk.rb

@@ -0,0 +1,19 @@
+module Braintree
+  module Test
+    module VenmoSDK
+      def self.generate_test_payment_method_code(card_number)
+        "stub-#{card_number}"
+      end
+
+      AmExPaymentMethodCode = generate_test_payment_method_code(CreditCardNumbers::AmExes.first)
+      DiscoverPaymentMethodCode = generate_test_payment_method_code(CreditCardNumbers::Discovers.first)
+      JCBPaymentMethodCode = generate_test_payment_method_code(CreditCardNumbers::JCBs.first)
+      MasterCardPaymentMethodCode = generate_test_payment_method_code(CreditCardNumbers::MasterCards.first)
+      VisaPaymentMethodCode = generate_test_payment_method_code(CreditCardNumbers::Visas.first)
+      InvalidPaymentMethodCode = "stub-invalid-payment-method-code"
+
+      Session = "stub-session"
+      InvalidSession = "stub-invalid-session"
+    end
+  end
+end

data/lib/braintree/transaction.rb

@@ -48,6 +48,7 @@ module Braintree
     attr_reader :currency_iso_code
     attr_reader :custom_fields
     attr_reader :cvv_response_code
+    attr_reader :disbursement_details
     attr_reader :descriptor
     attr_reader :gateway_rejection_reason
     attr_reader :merchant_account_id
@@ -176,6 +177,7 @@ module Braintree
       @subscription_details = SubscriptionDetails.new(@subscription)
       @customer_details = CustomerDetails.new(@customer)
       @billing_details = AddressDetails.new(@billing)
+      @disbursement_details = DisbursementDetails.new(@disbursement_details)
       @shipping_details = AddressDetails.new(@shipping)
       @status_history = attributes[:status_history] ? attributes[:status_history].map { |s| StatusDetails.new(s) } : []
       @tax_amount = Util.to_big_decimal(tax_amount)
@@ -223,6 +225,11 @@ module Braintree
       !@refund_id.nil?
     end
 
+    # Returns true if the transaction has been disbursed. False otherwise.
+    def disbursed?
+      @disbursement_details.valid?
+    end
+
     def refund_id
       warn "[DEPRECATED] Transaction.refund_id is deprecated. Please use TransparentRedirect.refund_ids"
       @refund_id

data/lib/braintree/transaction/disbursement_details.rb

@@ -0,0 +1,21 @@
+module Braintree
+  class Transaction
+    class DisbursementDetails # :nodoc:
+      include BaseModule
+
+      attr_reader :disbursement_date, :settlement_amount, :settlement_currency_iso_code, :settlement_currency_exchange_rate
+
+      def initialize(attributes)
+        set_instance_variables_from_hash attributes unless attributes.nil?
+      end
+
+      def funds_held?
+        @funds_held
+      end
+
+      def valid?
+        !disbursement_date.nil?
+      end
+    end
+  end
+end

data/lib/braintree/transaction_search.rb

@@ -62,6 +62,7 @@ module Braintree
 
     range_fields :amount, :created_at, :authorization_expired_at, :authorized_at,
                  :failed_at, :gateway_rejected_at, :processor_declined_at,
-                 :settled_at, :submitted_for_settlement_at, :voided_at
+                 :settled_at, :submitted_for_settlement_at, :voided_at,
+                 :disbursement_date
   end
 end

data/lib/braintree/version.rb

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

data/lib/braintree/xml.rb

@@ -9,4 +9,3 @@ module Braintree
     end
   end
 end
-

data/spec/httpsd.pid

@@ -1 +1 @@
-95171
+11041

data/spec/integration/braintree/credit_card_spec.rb

@@ -23,6 +23,8 @@ describe Braintree::CreditCard do
       credit_card.last_4.should == Braintree::Test::CreditCardNumbers::Visa[-4..-1]
       credit_card.expiration_date.should == "05/2009"
       credit_card.unique_number_identifier.should =~ /\A\w{32}\z/
+      credit_card.venmo_sdk?.should == false
+      credit_card.image_url.should_not be_nil
     end
 
     it "can provide expiration month and year separately" do
@@ -378,6 +380,65 @@ describe Braintree::CreditCard do
       end
     end
 
+    context "venmo_sdk" do
+      describe "venmo_sdk_payment_method_code" do
+        it "can pass a venmo sdk payment method code" do
+          customer = Braintree::Customer.create!
+          result = Braintree::CreditCard.create(
+            :customer_id => customer.id,
+            :venmo_sdk_payment_method_code => Braintree::Test::VenmoSDK::VisaPaymentMethodCode
+          )
+          result.success?.should == true
+          result.credit_card.venmo_sdk?.should == true
+          result.credit_card.bin.should == "400934"
+          result.credit_card.last_4.should == "1881"
+        end
+
+        it "success? returns false when given an invalid venmo sdk payment method code" do
+          customer = Braintree::Customer.create!
+          result = Braintree::CreditCard.create(
+            :customer_id => customer.id,
+            :venmo_sdk_payment_method_code => Braintree::Test::VenmoSDK::InvalidPaymentMethodCode
+          )
+
+          result.success?.should == false
+          result.message.should == "Invalid VenmoSDK payment method code"
+          result.errors.first.code.should == "91727"
+        end
+      end
+
+      describe "venmo_sdk_session" do
+        it "venmo_sdk? returns true when given a valid session" do
+          customer = Braintree::Customer.create!
+          result = Braintree::CreditCard.create(
+            :customer_id => customer.id,
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "05/2009",
+            :cvv => "100",
+            :options => {
+              :venmo_sdk_session => Braintree::Test::VenmoSDK::Session
+            }
+          )
+          result.success?.should == true
+          result.credit_card.venmo_sdk?.should == true
+        end
+
+        it "venmo_sdk? returns false when given an invalid session" do
+          customer = Braintree::Customer.create!
+          result = Braintree::CreditCard.create(
+            :customer_id => customer.id,
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "05/2009",
+            :cvv => "100",
+            :options => {
+              :venmo_sdk_session => Braintree::Test::VenmoSDK::InvalidSession
+            }
+          )
+          result.success?.should == true
+          result.credit_card.venmo_sdk?.should == false
+        end
+      end
+    end
   end
 
   describe "self.create!" do

data/spec/integration/braintree/customer_spec.rb

@@ -336,6 +336,21 @@ describe Braintree::Customer do
       result.success?.should == false
       result.errors.for(:customer).on(:custom_fields)[0].message.should == "Custom field is invalid: spouse_name."
     end
+
+    describe "venmo_sdk" do
+      it "can create a customer with a venmo sdk payment method code" do
+        result = Braintree::Customer.create(
+          :first_name => "Steve",
+          :last_name => "Hamlin",
+          :credit_card => {
+            :venmo_sdk_payment_method_code => Braintree::Test::VenmoSDK::VisaPaymentMethodCode
+          }
+        )
+        result.success?.should == true
+        result.customer.credit_cards.first.bin.should == "400934"
+        result.customer.credit_cards.first.last_4.should == "1881"
+      end
+    end
   end
 
   describe "self.create!" do
@@ -1041,4 +1056,31 @@ describe Braintree::Customer do
       customer.website.should == "new.website.com"
     end
   end
+
+  describe "default_credit_card" do
+    it "should return the default credit card for a given customer" do
+      customer = Braintree::Customer.create!(
+        :credit_card => {
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+          :expiration_date => "12/2015",
+          :options => {
+            :make_default => false
+          }
+        }
+      )
+
+      default_credit_card = Braintree::CreditCard.create!(
+        :customer_id => customer.id,
+        :number => Braintree::Test::CreditCardNumbers::MasterCard,
+        :expiration_date => "11/2015",
+        :options => {
+          :make_default => true
+        }
+      )
+
+      customer = Braintree::Customer.find(customer.id)
+
+      customer.default_credit_card.should == default_credit_card
+    end
+  end
 end

data/spec/integration/braintree/http_spec.rb

@@ -93,11 +93,11 @@ describe Braintree::Http do
         start_ssl_server do
           expect do
             config.http._http_do(Net::HTTP::Get, "/login")
-          end.to raise_error(Braintree::SSLCertificateError, /Preverify: false, Error: self signed certificate/)
+          end.to raise_error(Braintree::SSLCertificateError)
         end
       end
 
-      it "rejets when the certificate is signed by a different (but valid) root CA" do
+      it "rejects when the certificate is signed by a different (but valid) root CA" do
         # Random CA root file from a different certificate authority
         config = Braintree::Configuration.instantiate
         config.stub(:ca_file).and_return(
@@ -109,7 +109,7 @@ describe Braintree::Http do
         start_ssl_server do
           expect do
             config.http._http_do(Net::HTTP::Get, "/login")
-          end.to raise_error(Braintree::SSLCertificateError, /Preverify: false, Error: self signed certificate/)
+          end.to raise_error(Braintree::SSLCertificateError)
         end
       end
 
@@ -160,19 +160,15 @@ describe Braintree::Http do
   end
 
   describe "self._verify_ssl_certificate" do
-    it "raises if preverify is false" do
+    it "is false if preverify is false" do
       context = OpenSSL::X509::StoreContext.new(OpenSSL::X509::Store.new)
-      expect do
-        Braintree::Configuration.instantiate.http._verify_ssl_certificate(false, context)
-      end.to raise_error(Braintree::SSLCertificateError)
+      Braintree::Configuration.instantiate.http._verify_ssl_certificate(false, context).should == false
     end
 
-    it "raise if ssl_context doesn't have an error code of 0" do
+    it "returns false if ssl_context doesn't have an error code of 0" do
       context = OpenSSL::X509::StoreContext.new(OpenSSL::X509::Store.new)
       context.error = 19 # ca_file incorrect, self-signed
-      expect do
-        Braintree::Configuration.instantiate.http._verify_ssl_certificate(true, context)
-      end.to raise_error(Braintree::SSLCertificateError)
+      Braintree::Configuration.instantiate.http._verify_ssl_certificate(true, context).should == false
     end
 
     it "doesn't raise if there is no error" do
@@ -190,9 +186,7 @@ describe Braintree::Http do
         utc_or_gmt = Time.now.utc.strftime("%Z")
         context = OpenSSL::X509::StoreContext.new(OpenSSL::X509::Store.new)
         context.error = 19
-        expect do
-          Braintree::Configuration.instantiate.http._verify_ssl_certificate(false, context)
-        end.to raise_error(Braintree::SSLCertificateError)
+        Braintree::Configuration.instantiate.http._verify_ssl_certificate(false, context).should == false
         output.string.should include("SSL Verification failed -- Preverify: false, Error: self signed certificate in certificate chain (19)")
       ensure
         Braintree::Configuration.logger = old_logger
@@ -208,7 +202,7 @@ describe Braintree::Http do
         context = OpenSSL::X509::StoreContext.new(OpenSSL::X509::Store.new)
         expect do
           Braintree::Configuration.instantiate.http._verify_ssl_certificate(true, context)
-        end.to_not raise_error(Braintree::SSLCertificateError)
+        end.to_not raise_error(OpenSSL::SSL::SSLError)
         output.string.should == ""
       ensure
         Braintree::Configuration.logger = old_logger

data/spec/integration/braintree/subscription_spec.rb

@@ -1119,6 +1119,41 @@ describe Braintree::Subscription do
       end
     end
 
+    describe "search on merchant account id" do
+      it "searches on merchant_account_id" do
+        id = rand(36**8).to_s(36)
+        subscription = Braintree::Subscription.create(
+          :payment_method_token => @credit_card.token,
+          :plan_id => SpecHelper::TrialPlan[:id],
+          :id => "subscription1_#{id}",
+          :price => "11.38"
+        ).subscription
+
+        collection = Braintree::Subscription.search do |search|
+          search.merchant_account_id.is subscription.merchant_account_id
+          search.price.is "11.38"
+        end
+
+        # not testing for specific number since the
+        # create subscriptions accumulate over time
+        collection.maximum_size.should >= 1
+
+        collection = Braintree::Subscription.search do |search|
+          search.merchant_account_id.in subscription.merchant_account_id, "bogus_merchant_account_id"
+          search.price.is "11.38"
+        end
+
+        collection.maximum_size.should >= 1
+
+        collection = Braintree::Subscription.search do |search|
+          search.merchant_account_id.is "bogus_merchant_account_id"
+          search.price.is "11.38"
+        end
+
+        collection.maximum_size.should == 0
+      end
+    end
+
     describe "id" do
       it "works using the is operator" do
         id = rand(36**8).to_s(36)

data/spec/integration/braintree/transaction_search_spec.rb

@@ -583,6 +583,116 @@ describe Braintree::Transaction, "search" do
         end
       end
 
+      context "disbursement_date" do
+        it "searches on disbursement_date in UTC" do
+          disbursement_time = Time.parse("2013-04-10 00:00:00 UTC")
+          transaction_id = "deposittransaction"
+
+          collection = Braintree::Transaction.search do |search|
+            search.id.is transaction_id
+            search.disbursement_date.between(
+              disbursement_time - 60,
+              disbursement_time + 60
+            )
+          end
+
+          collection.maximum_size.should == 1
+          collection.first.id.should == transaction_id
+
+          collection = Braintree::Transaction.search do |search|
+            search.id.is transaction_id
+            search.disbursement_date >= disbursement_time - 1
+          end
+
+          collection.maximum_size.should == 1
+          collection.first.id.should == transaction_id
+
+          collection = Braintree::Transaction.search do |search|
+            search.id.is transaction_id
+            search.disbursement_date <= disbursement_time + 1
+          end
+
+          collection.maximum_size.should == 1
+          collection.first.id.should == transaction_id
+
+          collection = Braintree::Transaction.search do |search|
+            search.id.is transaction_id
+            search.disbursement_date.between(
+              disbursement_time - 300,
+              disbursement_time - 100
+            )
+          end
+
+          collection.maximum_size.should == 0
+
+          collection = Braintree::Transaction.search do |search|
+            search.id.is transaction_id
+            search.disbursement_date.is disbursement_time
+          end
+
+          collection.maximum_size.should == 1
+          collection.first.id.should == transaction_id
+        end
+
+        it "searches on disbursement_date in local time" do
+          now = Time.parse("2013-04-09 18:00:00 CST")
+          transaction_id = "deposittransaction"
+
+          collection = Braintree::Transaction.search do |search|
+            search.id.is transaction_id
+            search.disbursement_date.between(
+              now - 60,
+              now + 60
+            )
+          end
+
+          collection.maximum_size.should == 1
+          collection.first.id.should == transaction_id
+
+          collection = Braintree::Transaction.search do |search|
+            search.id.is transaction_id
+            search.disbursement_date >= now - 60
+          end
+
+          collection.maximum_size.should == 1
+          collection.first.id.should == transaction_id
+
+          collection = Braintree::Transaction.search do |search|
+            search.id.is transaction_id
+            search.disbursement_date <= now + 60
+          end
+
+          collection.maximum_size.should == 1
+          collection.first.id.should == transaction_id
+
+          collection = Braintree::Transaction.search do |search|
+            search.id.is transaction_id
+            search.disbursement_date.between(
+              now - 300,
+              now - 100
+            )
+          end
+
+          collection.maximum_size.should == 0
+        end
+
+        it "searches on disbursement_date with date ranges" do
+          disbursement_date = Date.new(2013, 4, 10)
+          transaction_id = "deposittransaction"
+
+          collection = Braintree::Transaction.search do |search|
+            search.id.is transaction_id
+            search.disbursement_date.between(
+              disbursement_date - 1,
+              disbursement_date + 1
+            )
+          end
+
+          collection.maximum_size.should == 1
+          collection.first.id.should == transaction_id
+        end
+      end
+
       context "status date ranges" do
         it "finds transactions authorized in a given range" do
           transaction = Braintree::Transaction.sale!(

data/spec/integration/braintree/transaction_spec.rb

@@ -121,16 +121,15 @@ describe Braintree::Transaction do
   end
 
   describe "self.create" do
-
     describe "card type indicators" do
       it "sets the prepaid field if the card is prepaid" do
         result = Braintree::Transaction.create(
           :type => "sale",
           :amount => 1_00,
           :credit_card => {
-          :number => Braintree::Test::CreditCardNumbers::CardTypeIndicators::Prepaid,
-          :expiration_date => "05/2009"
-        }
+            :number => Braintree::Test::CreditCardNumbers::CardTypeIndicators::Prepaid,
+            :expiration_date => "05/2009"
+          }
         )
         result.transaction.credit_card_details.prepaid.should == Braintree::CreditCard::Prepaid::Yes
       end
@@ -873,6 +872,19 @@ describe Braintree::Transaction do
         end
       end
     end
+
+    describe "venmo_sdk" do
+      it "can create a card with a venmo sdk payment method code" do
+        result = Braintree::Transaction.create(
+          :type => "sale",
+          :amount => Braintree::Test::TransactionAmounts::Authorize,
+          :venmo_sdk_payment_method_code => Braintree::Test::VenmoSDK::VisaPaymentMethodCode
+        )
+        result.success?.should == true
+        result.transaction.credit_card_details.bin.should == "400934"
+        result.transaction.credit_card_details.last_4.should == "1881"
+      end
+    end
   end
 
   describe "self.create!" do
@@ -994,6 +1006,7 @@ describe Braintree::Transaction do
       end.to raise_error(Braintree::ValidationsFailed)
     end
   end
+
   describe "self.sale" do
     it "returns a successful result with type=sale if successful" do
       result = Braintree::Transaction.sale(
@@ -1733,6 +1746,36 @@ describe Braintree::Transaction do
         Braintree::Transaction.find("invalid-id")
       end.to raise_error(Braintree::NotFoundError, 'transaction with id "invalid-id" not found')
     end
+
+    context "disbursement_details" do
+      it "includes disbursement_details on found transactions" do
+        found_transaction = Braintree::Transaction.find("deposittransaction")
+
+        found_transaction.disbursed?.should == true
+        disbursement = found_transaction.disbursement_details
+
+        disbursement.disbursement_date.should == "2013-04-10"
+        disbursement.settlement_amount.should == "100.00"
+        disbursement.settlement_currency_iso_code.should == "USD"
+        disbursement.settlement_currency_exchange_rate.should == "1"
+        disbursement.funds_held?.should == false
+      end
+
+      it "is not disbursed" do
+        result = Braintree::Transaction.create(
+          :type => "sale",
+          :amount => Braintree::Test::TransactionAmounts::Authorize,
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "05/2009"
+          }
+        )
+        result.success?.should == true
+        created_transaction = result.transaction
+
+        created_transaction.disbursed?.should == false
+      end
+    end
   end
 
   describe "self.void" do

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ unless defined?(SPEC_HELPER_LOADED)
 
   project_root = File.expand_path(File.dirname(__FILE__) + "/..")
   require "rubygems"
-  gem "libxml-ruby", ENV["LIBXML_VERSION"] || "1.1.3"
+  gem "libxml-ruby", ENV["LIBXML_VERSION"] || (RUBY_VERSION == "1.9.3" ? "2.6.0" : "1.1.3")
   require "libxml"
   gem "builder", ENV["BUILDER_VERSION"] || "2.1.2"
   braintree_lib = "#{project_root}/lib"
@@ -34,6 +34,7 @@ unless defined?(SPEC_HELPER_LOADED)
 
     DefaultMerchantAccountId = "sandbox_credit_card"
     NonDefaultMerchantAccountId = "sandbox_credit_card_non_default"
+    NonDefaultSubMerchantAccountId = "sandbox_sub_merchant_account"
 
     TrialPlan = {
       :description => "Plan for integration tests -- with trial",

data/spec/unit/braintree/configuration_spec.rb

@@ -241,4 +241,12 @@ describe Braintree::Configuration do
       Braintree::Configuration.instantiate.user_agent.should == "Braintree Ruby Gem #{Braintree::Version::String}"
     end
   end
+
+  describe "inspect" do
+    it "masks the private_key" do
+      config = Braintree::Configuration.new(:private_key => "secret_key")
+      config.inspect.should include('@private_key="[FILTERED]"')
+      config.inspect.should_not include('secret_key')
+    end
+  end
 end

data/spec/unit/braintree/transaction/deposit_details_spec.rb

@@ -0,0 +1,18 @@
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
+
+describe Braintree::Transaction::DisbursementDetails do
+  describe "valid?" do
+    it "returns true if disbursement details are initialized" do
+      details = Braintree::Transaction::DisbursementDetails.new(
+        :disbursement_date => Date.new(2013, 4, 1)
+      )
+      details.valid?.should == true
+    end
+    it "returns true if disbursement details are initialized" do
+      details = Braintree::Transaction::DisbursementDetails.new(
+        :disbursement_date => nil
+      )
+      details.valid?.should == false
+    end
+  end
+end

data/spec/unit/braintree/transaction_spec.rb

@@ -85,6 +85,25 @@ describe Braintree::Transaction do
       transaction.customer_details.fax.should == "012-161-8055"
     end
 
+    it "sets up disbursement attributes in disbursement_details" do
+      transaction = Braintree::Transaction._new(
+        :gateway,
+        :disbursement_details => {
+          :disbursement_date => "2013-04-03",
+          :settlement_amount => "120.00",
+          :settlement_currency_iso_code => "USD",
+          :settlement_currency_exchange_rate => "1",
+          :funds_held => false
+        }
+      )
+      disbursement = transaction.disbursement_details
+      disbursement.disbursement_date.should == "2013-04-03"
+      disbursement.settlement_amount.should == "120.00"
+      disbursement.settlement_currency_iso_code.should == "USD"
+      disbursement.settlement_currency_exchange_rate.should == "1"
+      disbursement.funds_held?.should == false
+    end
+
     it "sets up credit card attributes in credit_card_details" do
       transaction = Braintree::Transaction._new(
         :gateway,

data/spec/unit/braintree/xml/parser_spec.rb

@@ -36,6 +36,15 @@ describe Braintree::Xml::Parser do
       xml.should parse_to(:root => {:created_at => Time.utc(2009, 10, 28, 10, 19, 49)})
     end
 
+    it "doesn't typecast dates" do
+      xml = <<-END
+        <root>
+          <created-at type="date">2009-10-28</created-at>
+        </root>
+      END
+      xml.should parse_to(:root => {:created_at => "2009-10-28"})
+    end
+
     it "builds an array if type=array" do
       xml = <<-END
         <root>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: braintree
 version: !ruby/object:Gem::Version 
-  hash: 87
-  prerelease: false
+  hash: 83
+  prerelease: 
   segments: 
   - 2
-  - 22
+  - 23
   - 0
-  version: 2.22.0
+  version: 2.23.0
 platform: ruby
 authors: 
 - Braintree
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-20 00:00:00 -06:00
-default_executable: 
+date: 2013-05-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -45,132 +44,134 @@ extra_rdoc_files: []
 files: 
 - README.rdoc
 - LICENSE
+- lib/braintree.rb
+- lib/braintree/subscription_search.rb
+- lib/braintree/modification.rb
+- lib/braintree/errors.rb
+- lib/braintree/test/credit_card.rb
+- lib/braintree/test/transaction_amounts.rb
+- lib/braintree/test/venmo_sdk.rb
+- lib/braintree/webhook_testing.rb
+- lib/braintree/webhook_testing_gateway.rb
+- lib/braintree/advanced_search.rb
+- lib/braintree/version.rb
 - lib/braintree/add_on.rb
-- lib/braintree/add_on_gateway.rb
-- lib/braintree/address/country_names.rb
 - lib/braintree/address.rb
-- lib/braintree/address_gateway.rb
-- lib/braintree/advanced_search.rb
-- lib/braintree/base_module.rb
-- lib/braintree/configuration.rb
-- lib/braintree/credit_card.rb
-- lib/braintree/credit_card_gateway.rb
-- lib/braintree/credit_card_verification.rb
-- lib/braintree/credit_card_verification_gateway.rb
-- lib/braintree/credit_card_verification_search.rb
-- lib/braintree/customer.rb
-- lib/braintree/customer_gateway.rb
-- lib/braintree/customer_search.rb
-- lib/braintree/descriptor.rb
 - lib/braintree/digest.rb
-- lib/braintree/discount.rb
-- lib/braintree/discount_gateway.rb
+- lib/braintree/settlement_batch_summary.rb
 - lib/braintree/error_codes.rb
-- lib/braintree/error_result.rb
-- lib/braintree/errors.rb
+- lib/braintree/discount.rb
+- lib/braintree/webhook_notification.rb
+- lib/braintree/settlement_batch_summary_gateway.rb
+- lib/braintree/validation_error_collection.rb
+- lib/braintree/credit_card_verification_gateway.rb
+- lib/braintree/credit_card.rb
+- lib/braintree/customer_search.rb
+- lib/braintree/util.rb
+- lib/braintree/transparent_redirect.rb
+- lib/braintree/xml/generator.rb
+- lib/braintree/xml/rexml.rb
+- lib/braintree/xml/libxml.rb
+- lib/braintree/xml/parser.rb
 - lib/braintree/exceptions.rb
-- lib/braintree/gateway.rb
-- lib/braintree/http.rb
-- lib/braintree/modification.rb
-- lib/braintree/plan.rb
-- lib/braintree/plan_gateway.rb
+- lib/braintree/validation_error.rb
 - lib/braintree/resource_collection.rb
-- lib/braintree/settlement_batch.rb
-- lib/braintree/settlement_batch_summary.rb
-- lib/braintree/settlement_batch_summary_gateway.rb
-- lib/braintree/subscription.rb
+- lib/braintree/xml.rb
+- lib/braintree/credit_card_verification.rb
+- lib/braintree/configuration.rb
+- lib/braintree/transaction.rb
+- lib/braintree/http.rb
+- lib/braintree/address_gateway.rb
 - lib/braintree/subscription_gateway.rb
-- lib/braintree/subscription_search.rb
+- lib/braintree/customer_gateway.rb
+- lib/braintree/plan_gateway.rb
+- lib/braintree/credit_card_verification_search.rb
 - lib/braintree/successful_result.rb
-- lib/braintree/test/credit_card.rb
-- lib/braintree/test/transaction_amounts.rb
-- lib/braintree/transaction/address_details.rb
-- lib/braintree/transaction/credit_card_details.rb
+- lib/braintree/settlement_batch.rb
+- lib/braintree/plan.rb
+- lib/braintree/gateway.rb
+- lib/braintree/transparent_redirect_gateway.rb
+- lib/braintree/base_module.rb
+- lib/braintree/add_on_gateway.rb
+- lib/braintree/transaction/subscription_details.rb
+- lib/braintree/transaction/disbursement_details.rb
 - lib/braintree/transaction/customer_details.rb
+- lib/braintree/transaction/credit_card_details.rb
 - lib/braintree/transaction/status_details.rb
-- lib/braintree/transaction/subscription_details.rb
-- lib/braintree/transaction.rb
-- lib/braintree/transaction_gateway.rb
+- lib/braintree/transaction/address_details.rb
 - lib/braintree/transaction_search.rb
-- lib/braintree/transparent_redirect.rb
-- lib/braintree/transparent_redirect_gateway.rb
-- lib/braintree/util.rb
-- lib/braintree/validation_error.rb
-- lib/braintree/validation_error_collection.rb
-- lib/braintree/version.rb
-- lib/braintree/webhook_notification.rb
+- lib/braintree/error_result.rb
+- lib/braintree/credit_card_gateway.rb
+- lib/braintree/descriptor.rb
+- lib/braintree/transaction_gateway.rb
+- lib/braintree/subscription.rb
+- lib/braintree/address/country_names.rb
 - lib/braintree/webhook_notification_gateway.rb
-- lib/braintree/webhook_testing.rb
-- lib/braintree/webhook_testing_gateway.rb
-- lib/braintree/xml/generator.rb
-- lib/braintree/xml/libxml.rb
-- lib/braintree/xml/parser.rb
-- lib/braintree/xml/rexml.rb
-- lib/braintree/xml.rb
-- lib/braintree.rb
+- lib/braintree/customer.rb
+- lib/braintree/discount_gateway.rb
+- lib/ssl/www_braintreegateway_com.ca.crt
 - lib/ssl/sandbox_braintreegateway_com.ca.crt
 - lib/ssl/securetrust_ca.crt
-- lib/ssl/www_braintreegateway_com.ca.crt
-- spec/hacks/tcp_socket.rb
-- spec/httpsd.pid
-- spec/integration/braintree/add_on_spec.rb
-- spec/integration/braintree/address_spec.rb
-- spec/integration/braintree/advanced_search_spec.rb
-- spec/integration/braintree/credit_card_spec.rb
-- spec/integration/braintree/credit_card_verification_search_spec.rb
-- spec/integration/braintree/credit_card_verification_spec.rb
-- spec/integration/braintree/customer_search_spec.rb
-- spec/integration/braintree/customer_spec.rb
-- spec/integration/braintree/discount_spec.rb
-- spec/integration/braintree/error_codes_spec.rb
-- spec/integration/braintree/http_spec.rb
-- spec/integration/braintree/plan_spec.rb
-- spec/integration/braintree/settlement_batch_summary_spec.rb
-- spec/integration/braintree/subscription_spec.rb
-- spec/integration/braintree/test/transaction_amounts_spec.rb
-- spec/integration/braintree/transaction_search_spec.rb
-- spec/integration/braintree/transaction_spec.rb
-- spec/integration/braintree/transparent_redirect_spec.rb
-- spec/integration/spec_helper.rb
 - spec/script/httpsd.rb
-- spec/spec.opts
 - spec/spec_helper.rb
-- spec/ssl/certificate.crt
-- spec/ssl/geotrust_global.crt
-- spec/ssl/privateKey.key
-- spec/unit/braintree/address_spec.rb
-- spec/unit/braintree/base_module_spec.rb
-- spec/unit/braintree/configuration_spec.rb
-- spec/unit/braintree/credit_card_spec.rb
-- spec/unit/braintree/credit_card_verification_search_spec.rb
-- spec/unit/braintree/credit_card_verification_spec.rb
-- spec/unit/braintree/customer_spec.rb
-- spec/unit/braintree/digest_spec.rb
+- spec/unit/spec_helper.rb
+- spec/unit/braintree/transaction_search_spec.rb
 - spec/unit/braintree/error_result_spec.rb
-- spec/unit/braintree/errors_spec.rb
+- spec/unit/braintree/xml_spec.rb
+- spec/unit/braintree/customer_spec.rb
+- spec/unit/braintree/transaction_spec.rb
+- spec/unit/braintree/webhook_notification_spec.rb
 - spec/unit/braintree/http_spec.rb
-- spec/unit/braintree/modification_spec.rb
-- spec/unit/braintree/resource_collection_spec.rb
-- spec/unit/braintree/subscription_search_spec.rb
 - spec/unit/braintree/subscription_spec.rb
+- spec/unit/braintree/credit_card_verification_search_spec.rb
+- spec/unit/braintree/subscription_search_spec.rb
 - spec/unit/braintree/successful_result_spec.rb
-- spec/unit/braintree/transaction/credit_card_details_spec.rb
-- spec/unit/braintree/transaction/customer_details_spec.rb
-- spec/unit/braintree/transaction_search_spec.rb
-- spec/unit/braintree/transaction_spec.rb
-- spec/unit/braintree/transparent_redirect_spec.rb
-- spec/unit/braintree/util_spec.rb
-- spec/unit/braintree/validation_error_collection_spec.rb
+- spec/unit/braintree/credit_card_verification_spec.rb
 - spec/unit/braintree/validation_error_spec.rb
-- spec/unit/braintree/webhook_notification_spec.rb
+- spec/unit/braintree/resource_collection_spec.rb
 - spec/unit/braintree/xml/libxml_spec.rb
 - spec/unit/braintree/xml/parser_spec.rb
 - spec/unit/braintree/xml/rexml_spec.rb
-- spec/unit/braintree/xml_spec.rb
+- spec/unit/braintree/configuration_spec.rb
+- spec/unit/braintree/validation_error_collection_spec.rb
+- spec/unit/braintree/errors_spec.rb
+- spec/unit/braintree/modification_spec.rb
+- spec/unit/braintree/util_spec.rb
+- spec/unit/braintree/base_module_spec.rb
+- spec/unit/braintree/address_spec.rb
+- spec/unit/braintree/transparent_redirect_spec.rb
+- spec/unit/braintree/transaction/deposit_details_spec.rb
+- spec/unit/braintree/transaction/credit_card_details_spec.rb
+- spec/unit/braintree/transaction/customer_details_spec.rb
+- spec/unit/braintree/credit_card_spec.rb
+- spec/unit/braintree/digest_spec.rb
 - spec/unit/braintree_spec.rb
-- spec/unit/spec_helper.rb
+- spec/hacks/tcp_socket.rb
+- spec/httpsd.pid
+- spec/integration/spec_helper.rb
+- spec/integration/braintree/settlement_batch_summary_spec.rb
+- spec/integration/braintree/transaction_search_spec.rb
+- spec/integration/braintree/test/transaction_amounts_spec.rb
+- spec/integration/braintree/customer_spec.rb
+- spec/integration/braintree/transaction_spec.rb
+- spec/integration/braintree/add_on_spec.rb
+- spec/integration/braintree/http_spec.rb
+- spec/integration/braintree/subscription_spec.rb
+- spec/integration/braintree/credit_card_verification_search_spec.rb
+- spec/integration/braintree/credit_card_verification_spec.rb
+- spec/integration/braintree/advanced_search_spec.rb
+- spec/integration/braintree/customer_search_spec.rb
+- spec/integration/braintree/plan_spec.rb
+- spec/integration/braintree/error_codes_spec.rb
+- spec/integration/braintree/address_spec.rb
+- spec/integration/braintree/transparent_redirect_spec.rb
+- spec/integration/braintree/credit_card_spec.rb
+- spec/integration/braintree/discount_spec.rb
+- spec/spec.opts
+- spec/ssl/geotrust_global.crt
+- spec/ssl/certificate.crt
+- spec/ssl/privateKey.key
 - braintree.gemspec
-has_rdoc: true
 homepage: http://www.braintreepayments.com/
 licenses: []
 
@@ -200,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: braintree
-rubygems_version: 1.3.7
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Braintree Gateway Ruby Client Library