braintree 2.78.0 → 2.79.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ff2f57752c2090e56f153c4b590152f48034845
-  data.tar.gz: 2ccc9d6fdf906b351347c2c078756a12bd2eb51b
+  metadata.gz: 0e9443a409e302f9f139f6b8f43f6357671c4fb4
+  data.tar.gz: 58f33b08befa54a85859bda8277d6f556c4c834d
 SHA512:
-  metadata.gz: 7836928d15d3627bad6d2fddb76c997a79d180c53cb2786be2a60e0d2fa165d3908f386cbd2b33e7c1651acd4c58586850badfc47c7524a9b36b4acf605c2f18
-  data.tar.gz: 8eece8b27a133e15d677e95f609ca4bf93d4974a6b716f872c97b37c14d47868999b50bd725cf275519bdf650606da9dedd79814fe389bc39e9f501fc5e19642
+  metadata.gz: 2482192edfc3d977132a3fee6c9f1052746ec2fc20ce8b2be5ae02021978cfbb64c1c93248a7f3b27d20da680b7d6f92abdc3ed7d627768887812a1f30ffc84e
+  data.tar.gz: f33e4c21098180d53f3839d7f2039c2add7df880b0856e86717b450d3604803d8b92463a0d365657cb23f5749708eb1b23e352e7d84212a8a80e862b5e3f2f5c

data/README.rdoc

@@ -88,6 +88,15 @@ The unit specs can be run by anyone on any system, but the integration specs are
 server of our gateway code.  These integration specs are not meant for public consumption and will likely fail if run on
 your system. To run unit tests use rake: <tt>rake test:unit</tt>.
 
+== Suppress Braintree Logs
+
+To suppress logs from Braintree on environments where they are considered noise
+(e.g. test) use the following configuration:
+
+  logger = Logger.new("/dev/null")
+  logger.level = Logger::INFO
+  Braintree::Configuration.logger = logger
+
 == License
 
 See the LICENSE[https://github.com/braintree/braintree_ruby/blob/master/LICENSE] file for more info.

data/lib/braintree.rb

@@ -49,6 +49,7 @@ require "braintree/credit_card_verification_gateway"
 require "braintree/credit_card_verification_search"
 require "braintree/customer"
 require "braintree/customer_gateway"
+require "braintree/granted_payment_instrument_update"
 require "braintree/customer_search"
 require "braintree/descriptor"
 require "braintree/digest"

data/lib/braintree/configuration.rb

@@ -201,7 +201,7 @@ module Braintree
     def server # :nodoc:
       case @environment
       when :development, :integration
-        "localhost"
+        ENV['GATEWAY_HOST'] || "localhost"
       when :production
         "#{endpoint}.braintreegateway.com"
       when :qa
@@ -260,7 +260,7 @@ module Braintree
 
     def assert_has_access_token_or_keys
       if (public_key.nil? || private_key.nil?) && access_token.nil?
-        raise ConfigurationError.new("Braintree::Gateway public_key and private_key are required.")
+        raise ConfigurationError.new("Braintree::Gateway access_token or public_key and private_key are required.")
       end
     end
 

data/lib/braintree/customer_gateway.rb

@@ -74,6 +74,7 @@ module Braintree
     def self._create_signature # :nodoc:
       credit_card_signature = CreditCardGateway._create_signature - [:customer_id]
       paypal_account_signature = PayPalAccountGateway._create_nested_signature
+      paypal_options_shipping_signature = AddressGateway._shared_signature
       options = [
         :paypal => [
           :payee_email,
@@ -81,6 +82,7 @@ module Braintree
           :custom_field,
           :description,
           :amount,
+          {:shipping => paypal_options_shipping_signature}
         ],
       ]
       [
@@ -135,8 +137,16 @@ module Braintree
       credit_card_signature = CreditCardGateway._update_signature - [:customer_id]
       credit_card_options = credit_card_signature.find { |item| item.respond_to?(:keys) && item.keys == [:options] }
       credit_card_options[:options] << :update_existing_token
+      paypal_options_shipping_signature = AddressGateway._shared_signature
       options = [
-        :paypal => [:payee_email, :order_id, :custom_field, :description, :amount],
+        :paypal => [
+          :payee_email,
+          :order_id,
+          :custom_field,
+          :description,
+          :amount,
+          {:shipping => paypal_options_shipping_signature}
+        ],
       ]
       [
         :company, :email, :fax, :first_name, :id, :last_name, :phone, :website,

data/lib/braintree/error_codes.rb

@@ -305,6 +305,9 @@ module Braintree
       CustomerDefaultPaymentMethodCardTypeIsNotAccepted = "81509"
       CustomerDoesNotHaveCreditCard = "91511"
       CustomerIdIsInvalid = "91510"
+      FailedAuthAdjustmentAllowRetry = "95603"
+      FailedAuthAdjustmentHardDecline = "95602"
+      FinalAuthSubmitForSettlementForDifferentAmount = "95601"
       HasAlreadyBeenRefunded = "91512"
       IdealPaymentNotComplete = "815141"
       IdealPaymentsCannotBeVaulted = "915150"

data/lib/braintree/granted_payment_instrument_update.rb

@@ -0,0 +1,19 @@
+module Braintree
+  class GrantedPaymentInstrumentUpdate
+    include BaseModule
+
+    attr_reader :grant_owner_merchant_id, :grant_recipient_merchant_id, :payment_method_nonce, :token, :updated_fields
+
+    def initialize(attributes)
+      set_instance_variables_from_hash(attributes)
+      @payment_method_nonce = attributes[:payment_method_nonce][:nonce]
+    end
+
+    class << self
+      protected :new
+      def _new(*args) # :nodoc:
+        self.new *args
+      end
+    end
+  end
+end

data/lib/braintree/payment_method_gateway.rb

@@ -72,6 +72,8 @@ module Braintree
         ApplePayCard._new(@gateway, response[:apple_pay_card])
       elsif response.has_key?(:android_pay_card)
         AndroidPayCard._new(@gateway, response[:android_pay_card])
+      elsif response.has_key?(:venmo_account)
+        VenmoAccount._new(@gateway, response[:venmo_account])
       else
         UnknownPaymentMethod._new(@gateway, response)
       end
@@ -148,6 +150,7 @@ module Braintree
 
     def self._signature(type) # :nodoc:
       billing_address_params = AddressGateway._shared_signature
+      paypal_options_shipping_signature = AddressGateway._shared_signature
       options = [
         :make_default, :verification_merchant_account_id, :verify_card, :venmo_sdk_session,
         :verification_amount,
@@ -157,6 +160,7 @@ module Braintree
           :custom_field,
           :description,
           :amount,
+          {:shipping => paypal_options_shipping_signature}
         ],
       ]
       signature = [
@@ -171,6 +175,8 @@ module Braintree
       when :create
         options << :fail_on_duplicate_payment_method
         signature << :customer_id
+        signature << :paypal_refresh_token
+        signature << :paypal_vault_without_upgrade
       when :update
         billing_address_params << {:options => [:update_existing]}
       else

data/lib/braintree/risk_data.rb

@@ -2,14 +2,14 @@ module Braintree
   class RiskData # :nodoc:
     include BaseModule
 
-    attr_reader :id, :decision
+    attr_reader :id, :decision, :device_data_captured
 
     def initialize(attributes)
       set_instance_variables_from_hash attributes unless attributes.nil?
     end
 
     def inspect
-      attr_order = [:id, :decision]
+      attr_order = [:id, :decision, :device_data_captured]
       formatted_attrs = attr_order.map do |attr|
         "#{attr}: #{send(attr).inspect}"
       end

data/lib/braintree/subscription.rb

@@ -34,6 +34,7 @@ module Braintree
     attr_reader :number_of_billing_cycles, :billing_day_of_month
     attr_reader :add_ons, :discounts
     attr_reader :descriptor
+    attr_reader :description
     attr_reader :current_billing_cycle
     attr_reader :updated_at, :created_at
     attr_reader :status_history
@@ -54,8 +55,8 @@ module Braintree
       Configuration.gateway.subscription.find(id)
     end
 
-    def self.retry_charge(subscription_id, amount=nil)
-      Configuration.gateway.transaction.retry_subscription_charge(subscription_id, amount)
+    def self.retry_charge(subscription_id, amount=nil, submit_for_settlement=false)
+      Configuration.gateway.transaction.retry_subscription_charge(subscription_id, amount, submit_for_settlement)
     end
 
     def self.search(&block)

data/lib/braintree/subscription_gateway.rb

@@ -67,7 +67,11 @@ module Braintree
         :trial_duration,
         :trial_duration_unit,
         :trial_period,
-        {:options => [:do_not_inherit_add_ons_or_discounts, :start_immediately]},
+        {:options => [
+          :do_not_inherit_add_ons_or_discounts,
+          :start_immediately,
+          {:paypal => [:description]},
+        ]},
         {:descriptor => [:name, :phone, :url]}
       ] + _add_on_discount_signature
     end
@@ -85,7 +89,8 @@ module Braintree
         {:options => [
           :prorate_charges,
           :replace_all_add_ons_and_discounts,
-          :revert_subscription_on_proration_failure
+          :revert_subscription_on_proration_failure,
+          {:paypal => [:description]},
         ]},
         {:descriptor => [:name, :phone, :url]}
       ] + _add_on_discount_signature

data/lib/braintree/transaction_gateway.rb

@@ -73,11 +73,14 @@ module Braintree
       _handle_transaction_response(response)
     end
 
-    def retry_subscription_charge(subscription_id, amount=nil)
+    def retry_subscription_charge(subscription_id, amount=nil, submit_for_settlement=false)
       attributes = {
         :amount => amount,
         :subscription_id => subscription_id,
-        :type => Transaction::Type::Sale
+        :type => Transaction::Type::Sale,
+        :options => {
+          :submit_for_settlement => submit_for_settlement
+        }
       }
       _do_create "/transactions", :transaction => attributes
     end
@@ -144,7 +147,7 @@ module Braintree
         :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,
         :billing_address_id, :payment_method_nonce, :three_d_secure_token,
-        :shared_payment_method_token, :shared_billing_address_id, :shared_customer_id, :shared_shipping_address_id,
+        :shared_payment_method_token, :shared_billing_address_id, :shared_customer_id, :shared_shipping_address_id, :shared_payment_method_nonce,
         {:risk_data => [:customer_browser, :customer_ip]},
         {:credit_card => [:token, :cardholder_name, :cvv, :expiration_date, :expiration_month, :expiration_year, :number]},
         {:customer => [:id, :company, :email, :fax, :first_name, :last_name, :phone, :website]},

data/lib/braintree/version.rb

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

data/lib/braintree/webhook_notification.rb

@@ -38,6 +38,8 @@ module Braintree
 
       ConnectedMerchantStatusTransitioned = "connected_merchant_status_transitioned"
       ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
+
+      GrantedPaymentInstrumentUpdate = "granted_payment_instrument_update"
     end
 
     attr_reader :subscription
@@ -51,6 +53,7 @@ module Braintree
     attr_reader :ideal_payment
     attr_reader :connected_merchant_status_transitioned
     attr_reader :connected_merchant_paypal_status_changed
+    attr_reader :granted_payment_instrument_update
 
     def self.parse(signature, payload)
       Configuration.gateway.webhook_notification.parse(signature, payload)
@@ -74,6 +77,7 @@ module Braintree
       @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)
     end
 
     def merchant_account

data/lib/braintree/webhook_testing_gateway.rb

@@ -67,6 +67,8 @@ module Braintree
         _ideal_payment_complete_sample_xml(id)
       when Braintree::WebhookNotification::Kind::IdealPaymentFailed
         _ideal_payment_failed_sample_xml(id)
+      when Braintree::WebhookNotification::Kind::GrantedPaymentInstrumentUpdate
+        _granted_payment_instrument_update_sample_xml(id)
       else
         _subscription_sample_xml(id)
       end
@@ -603,5 +605,25 @@ module Braintree
         </ideal-payment>
       XML
     end
+
+    def _granted_payment_instrument_update_sample_xml(id)
+
+      <<-XML
+        <granted-payment-instrument-update>
+          <grant-owner-merchant-id>vczo7jqrpwrsi2px</grant-owner-merchant-id>
+          <grant-recipient-merchant-id>cf0i8wgarszuy6hc</grant-recipient-merchant-id>
+          <payment-method-nonce>
+            <nonce>ee257d98-de40-47e8-96b3-a6954ea7a9a4</nonce>
+            <consumed type="boolean">false</consumed>
+            <locked type="boolean">false</locked>
+          </payment-method-nonce>
+          <token>abc123z</token>
+          <updated-fields type="array">
+            <item>expiration-month</item>
+            <item>expiration-year</item>
+          </updated-fields>
+        </granted-payment-instrument-update>
+      XML
+    end
   end
 end

data/lib/braintree/xml/generator.rb

@@ -6,6 +6,7 @@ module Braintree
       XML_TYPE_NAMES = {
         "Fixnum"     => "integer",
         "Bignum"     => "integer",
+        "Integer"    => "integer",
         "TrueClass"  => "boolean",
         "FalseClass" => "boolean",
         "Date"       => "datetime",

data/spec/integration/braintree/add_on_spec.rb

@@ -40,7 +40,7 @@ describe Braintree::AddOn do
 
       expect do
         gateway.add_on.all
-      end.to raise_error(Braintree::ConfigurationError, /public_key and private_key are required/)
+      end.to raise_error(Braintree::ConfigurationError, /access_token or public_key and private_key are required/)
     end
   end
 end

data/spec/integration/braintree/credit_card_spec.rb

@@ -150,6 +150,7 @@ describe Braintree::CreditCard do
       verification = credit_card.verification
       verification.risk_data.should respond_to(:id)
       verification.risk_data.should respond_to(:decision)
+      verification.risk_data.should respond_to(:device_data_captured)
     end
 
     it "exposes the gateway rejection reason on verification" do

data/spec/integration/braintree/customer_spec.rb

@@ -1493,6 +1493,15 @@ describe Braintree::Customer do
               :custom_field => "custom merchant field",
               :description => "merchant description",
               :amount => "1.23",
+              :shipping => {
+                :first_name => "first",
+                :last_name => "last",
+                :locality => "Austin",
+                :postal_code => "78729",
+                :street_address => "7700 W Parmer Ln",
+                :country_name => "US",
+                :region => "TX",
+              },
             },
           },
         )
@@ -1530,6 +1539,15 @@ describe Braintree::Customer do
               :custom_field => "custom merchant field",
               :description => "merchant description",
               :amount => "1.23",
+              :shipping => {
+                :first_name => "first",
+                :last_name => "last",
+                :locality => "Austin",
+                :postal_code => "78729",
+                :street_address => "7700 W Parmer Ln",
+                :country_name => "US",
+                :region => "TX",
+              },
             },
           },
         )

data/spec/integration/braintree/merchant_account_spec.rb

@@ -113,6 +113,33 @@ describe Braintree::MerchantAccount do
       result.merchant_accounts.first.status.should == "active"
       result.merchant_accounts.first.default.should == true
     end
+
+    it "returns all merchant accounts for read_only scoped grants" do
+      gateway = Braintree::Gateway.new(
+        :client_id => "client_id$#{Braintree::Configuration.environment}$integration_client_id",
+        :client_secret => "client_secret$#{Braintree::Configuration.environment}$integration_client_secret",
+        :logger => Logger.new("/dev/null")
+      )
+
+      code = Braintree::OAuthTestHelper.create_grant(gateway, {
+        :merchant_public_id => "integration_merchant_id",
+        :scope => "read_only"
+      })
+
+      result = gateway.oauth.create_token_from_code(
+        :code => code,
+        :scope => "read_only"
+      )
+
+      gateway = Braintree::Gateway.new(
+        :access_token => result.credentials.access_token,
+        :logger => Logger.new("/dev/null")
+      )
+
+      result = gateway.merchant_account.all
+      result.should be_success
+      result.merchant_accounts.count.should > 20
+    end
   end
 
   describe "create" do

data/spec/integration/braintree/oauth_spec.rb

@@ -113,6 +113,7 @@ describe "OAuth" do
         :scope => "read_write",
         :state => "baz_state",
         :landing_page => "signup",
+        :login_only => false,
         :user => {
           :country => "USA",
           :email => "foo@example.com",
@@ -159,6 +160,7 @@ describe "OAuth" do
       query["scope"].should == ["read_write"]
       query["state"].should == ["baz_state"]
       query["landing_page"].should == ["signup"]
+      query["login_only"].should == ["false"]
 
       query["user[country]"].should == ["USA"]
       query["business[name]"].should == ["14 Ladders"]

data/spec/integration/braintree/payment_method_spec.rb

@@ -85,6 +85,7 @@ describe Braintree::PaymentMethod do
       apple_pay_card = result.payment_method
       apple_pay_card.should be_a(Braintree::ApplePayCard)
       apple_pay_card.should_not be_nil
+      apple_pay_card.bin.should_not be_nil
       apple_pay_card.token.should == token
       apple_pay_card.card_type.should == Braintree::ApplePayCard::CardType::AmEx
       apple_pay_card.payment_instrument_name.should == "AmEx 41002"
@@ -552,6 +553,15 @@ describe Braintree::PaymentMethod do
               :custom_field => "custom merchant field",
               :description => "merchant description",
               :amount => "1.23",
+              :shipping => {
+                :first_name => "first",
+                :last_name => "last",
+                :locality => "Austin",
+                :postal_code => "78729",
+                :street_address => "7700 W Parmer Ln",
+                :country_name => "US",
+                :region => "TX",
+              },
             },
           },
         )
@@ -565,6 +575,41 @@ describe Braintree::PaymentMethod do
         found_paypal_account.should_not be_nil
       end
 
+      it "creates a billing agreement payment method from a refresh token" do
+        customer = Braintree::Customer.create.customer
+        result = Braintree::PaymentMethod.create(
+          :customer_id => customer.id,
+          :paypal_refresh_token => "some_future_payment_token",
+        )
+
+        result.should be_success
+        result.payment_method.should be_a(Braintree::PayPalAccount)
+        result.payment_method.billing_agreement_id.should eq("B_FAKE_ID")
+        token = result.payment_method.token
+
+        found_paypal_account = Braintree::PayPalAccount.find(token)
+        found_paypal_account.should_not be_nil
+        found_paypal_account.billing_agreement_id.should eq("B_FAKE_ID")
+      end
+
+      it "creates a billing agreement payment method from a refresh token without upgrading" do
+        customer = Braintree::Customer.create.customer
+        result = Braintree::PaymentMethod.create(
+          :customer_id => customer.id,
+          :paypal_refresh_token => "some_future_payment_token",
+          :paypal_vault_without_upgrade => true,
+        )
+
+        result.should be_success
+        result.payment_method.should be_a(Braintree::PayPalAccount)
+        result.payment_method.billing_agreement_id.should be_nil
+        token = result.payment_method.token
+
+        found_paypal_account = Braintree::PayPalAccount.find(token)
+        found_paypal_account.should_not be_nil
+        found_paypal_account.billing_agreement_id.should be_nil
+      end
+
       it "does not create a payment method from an unvalidated onetime paypal account nonce" do
         customer = Braintree::Customer.create.customer
         nonce = nonce_for_paypal_account(:access_token => "PAYPAL_ACCESS_TOKEN")
@@ -792,6 +837,30 @@ describe Braintree::PaymentMethod do
       end
     end
 
+    context "venmo accounts" do
+      it "finds the payment method with the given token" do
+        customer = Braintree::Customer.create!
+        payment_method_token = "PAYMENT_METHOD_TOKEN_#{rand(36**3).to_s(36)}"
+        result = Braintree::PaymentMethod.create(
+          :payment_method_nonce => Braintree::Test::Nonce::VenmoAccount,
+          :customer_id => customer.id,
+          :token => payment_method_token
+        )
+        result.should be_success
+
+        venmo_account = Braintree::PaymentMethod.find(payment_method_token)
+        venmo_account.should be_a(Braintree::VenmoAccount)
+        venmo_account.should_not be_nil
+        venmo_account.token.should == payment_method_token
+        venmo_account.default.should == true
+        venmo_account.image_url.should =~ /venmo/
+        venmo_account.username.should == 'venmojoe'
+        venmo_account.venmo_user_id.should == 'Venmo-Joe-1'
+        venmo_account.source_description.should == "Venmo Account: venmojoe"
+        venmo_account.customer_id.should == customer.id
+      end
+    end
+
     context "android pay cards" do
       it "finds the proxy card payment method with the given token" do
         customer = Braintree::Customer.create!

data/spec/integration/braintree/subscription_spec.rb

@@ -113,6 +113,31 @@ describe Braintree::Subscription do
         transaction.paypal_details.payer_email.should == "payer@example.com"
       end
 
+      it "creates a subscription when given a paypal description" do
+        customer = Braintree::Customer.create!
+        payment_method_result = Braintree::PaymentMethod.create(
+          :payment_method_nonce => Braintree::Test::Nonce::PayPalFuturePayment,
+          :customer_id => customer.id
+        )
+
+        result = Braintree::Subscription.create(
+          :payment_method_token => payment_method_result.payment_method.token,
+          :plan_id => SpecHelper::TriallessPlan[:id],
+          :options => {
+            :paypal => {
+              :description => "A great product",
+            },
+          },
+        )
+
+        result.should be_success
+        subscription = result.subscription
+        subscription.description.should == "A great product"
+        transaction = subscription.transactions[0]
+        transaction.paypal_details.payer_email.should == "payer@example.com"
+        transaction.paypal_details.description.should == "A great product"
+      end
+
       it "returns an error if the payment_method_nonce hasn't been vaulted" do
         customer = Braintree::Customer.create!
         result = Braintree::Subscription.create(
@@ -747,7 +772,7 @@ describe Braintree::Subscription do
       result.subscription.payment_method_token.should_not == @credit_card.token
     end
 
-    it "allows chaning the descriptors" do
+    it "allows changing the descriptors" do
       result = Braintree::Subscription.update(@subscription.id,
         :descriptor => {
           :name => 'aaa*1234',
@@ -762,6 +787,31 @@ describe Braintree::Subscription do
       result.subscription.descriptor.url.should == 'ebay.com'
     end
 
+    it "allows changing the paypal description" do
+      customer = Braintree::Customer.create!
+      payment_method = Braintree::PaymentMethod.create(
+        :payment_method_nonce => Braintree::Test::Nonce::PayPalFuturePayment,
+        :customer_id => customer.id
+      ).payment_method
+
+      subscription = Braintree::Subscription.create(
+        :payment_method_token => payment_method.token,
+        :plan_id => SpecHelper::TriallessPlan[:id]
+      ).subscription
+
+      result = Braintree::Subscription.update(
+        subscription.id,
+        :options => {
+          :paypal => {
+            :description => 'A great product',
+          },
+        },
+      )
+
+      result.success?.should == true
+      result.subscription.description.should == 'A great product'
+    end
+
     context "when successful" do
       it "returns a success response with the updated subscription if valid" do
         new_id = rand(36**9).to_s(36)
@@ -1653,5 +1703,41 @@ describe Braintree::Subscription do
       transaction.type.should == Braintree::Transaction::Type::Sale
       transaction.status.should == Braintree::Transaction::Status::Authorized
     end
+
+    it "is successful with subscription id and submit_for_settlement" do
+      subscription = Braintree::Subscription.create(
+        :payment_method_token => @credit_card.token,
+        :plan_id => SpecHelper::TriallessPlan[:id]
+      ).subscription
+      SpecHelper.make_past_due(subscription)
+
+      result = Braintree::Subscription.retry_charge(subscription.id, Braintree::Test::TransactionAmounts::Authorize, true)
+
+      result.success?.should == true
+      transaction = result.transaction
+
+      transaction.amount.should == BigDecimal.new(Braintree::Test::TransactionAmounts::Authorize)
+      transaction.processor_authorization_code.should_not be_nil
+      transaction.type.should == Braintree::Transaction::Type::Sale
+      transaction.status.should == Braintree::Transaction::Status::SubmittedForSettlement
+    end
+
+    it "is successful with subscription id, amount and submit_for_settlement" do
+      subscription = Braintree::Subscription.create(
+        :payment_method_token => @credit_card.token,
+        :plan_id => SpecHelper::TriallessPlan[:id]
+      ).subscription
+      SpecHelper.make_past_due(subscription)
+
+      result = Braintree::Subscription.retry_charge(subscription.id, Braintree::Test::TransactionAmounts::Authorize, true)
+
+      result.success?.should == true
+      transaction = result.transaction
+
+      transaction.amount.should == BigDecimal.new(Braintree::Test::TransactionAmounts::Authorize)
+      transaction.processor_authorization_code.should_not be_nil
+      transaction.type.should == Braintree::Transaction::Type::Sale
+      transaction.status.should == Braintree::Transaction::Status::SubmittedForSettlement
+    end
   end
 end

data/spec/integration/braintree/test_transaction_spec.rb

@@ -6,13 +6,13 @@ describe Braintree::TestTransaction do
     it "changes transaction status to settled" do
       sale_result = Braintree::Transaction.sale(
         :amount => "100",
-        :payment_method_nonce => Braintree::Test::Nonce::PayPalOneTimePayment,
+        :payment_method_nonce => Braintree::Test::Nonce::VisaCheckoutVisa,
         :options => {
         :submit_for_settlement => true
       }
       )
       sale_result.success?.should == true
-      sale_result.transaction.status.should == Braintree::Transaction::Status::Settling
+      sale_result.transaction.status.should == Braintree::Transaction::Status::SubmittedForSettlement
 
       settle_result = Braintree::TestTransaction.settle(sale_result.transaction.id)
       settle_result.transaction.status.should == Braintree::Transaction::Status::Settled
@@ -22,13 +22,13 @@ describe Braintree::TestTransaction do
     it "changes transaction status to settlement_confirmed" do
       sale_result = Braintree::Transaction.sale(
         :amount => "100",
-        :payment_method_nonce => Braintree::Test::Nonce::PayPalOneTimePayment,
+        :payment_method_nonce => Braintree::Test::Nonce::VisaCheckoutVisa,
         :options => {
           :submit_for_settlement => true
         }
       )
       sale_result.success?.should == true
-      sale_result.transaction.status.should == Braintree::Transaction::Status::Settling
+      sale_result.transaction.status.should == Braintree::Transaction::Status::SubmittedForSettlement
 
       settle_result = Braintree::TestTransaction.settlement_confirm(sale_result.transaction.id)
       settle_result.transaction.status.should == Braintree::Transaction::Status::SettlementConfirmed
@@ -38,13 +38,13 @@ describe Braintree::TestTransaction do
     it "changes transaction status to settlement_declined" do
       sale_result = Braintree::Transaction.sale(
         :amount => "100",
-        :payment_method_nonce => Braintree::Test::Nonce::PayPalOneTimePayment,
+        :payment_method_nonce => Braintree::Test::Nonce::VisaCheckoutVisa,
         :options => {
           :submit_for_settlement => true
         }
       )
       sale_result.success?.should == true
-      sale_result.transaction.status.should == Braintree::Transaction::Status::Settling
+      sale_result.transaction.status.should == Braintree::Transaction::Status::SubmittedForSettlement
 
       settle_result = Braintree::TestTransaction.settlement_decline(sale_result.transaction.id)
       settle_result.transaction.status.should == Braintree::Transaction::Status::SettlementDeclined
@@ -54,13 +54,13 @@ describe Braintree::TestTransaction do
     it "changes transaction status to settlement_pending" do
       sale_result = Braintree::Transaction.sale(
         :amount => "100",
-        :payment_method_nonce => Braintree::Test::Nonce::PayPalOneTimePayment,
+        :payment_method_nonce => Braintree::Test::Nonce::VisaCheckoutVisa,
         :options => {
           :submit_for_settlement => true
         }
       )
       sale_result.success?.should == true
-      sale_result.transaction.status.should == Braintree::Transaction::Status::Settling
+      sale_result.transaction.status.should == Braintree::Transaction::Status::SubmittedForSettlement
 
       settle_result = Braintree::TestTransaction.settlement_pending(sale_result.transaction.id)
       settle_result.transaction.status.should == Braintree::Transaction::Status::SettlementPending
@@ -70,7 +70,7 @@ describe Braintree::TestTransaction do
     it "returns a validation error when invalid transition is specified" do
       sale_result = Braintree::Transaction.sale(
         :amount => "100",
-        :payment_method_nonce => Braintree::Test::Nonce::PayPalOneTimePayment
+        :payment_method_nonce => Braintree::Test::Nonce::VisaCheckoutVisa
       )
       sale_result.success?.should == true
 
@@ -110,7 +110,7 @@ describe Braintree::TestTransaction do
 
           sale_result = transaction_gateway.sale(
             :amount => "100",
-            :payment_method_nonce => Braintree::Test::Nonce::PayPalOneTimePayment
+            :payment_method_nonce => Braintree::Test::Nonce::VisaCheckoutVisa
           )
           testing_gateway.settle(sale_result.transaction.id)
         end

data/spec/integration/braintree/transaction_spec.rb

@@ -123,7 +123,7 @@ describe Braintree::Transaction do
 
   describe "self.create" do
     describe "risk data" do
-      it "returns decision and id" do
+      it "returns decision, device_data_captured and id" do
         result = Braintree::Transaction.create(
           :type => "sale",
           :amount => 1_00,
@@ -135,6 +135,7 @@ describe Braintree::Transaction do
         result.transaction.risk_data.should be_a(Braintree::RiskData)
         result.transaction.risk_data.should respond_to(:id)
         result.transaction.risk_data.should respond_to(:decision)
+        result.transaction.risk_data.should respond_to(:device_data_captured)
       end
     end
 
@@ -1943,7 +1944,7 @@ describe Braintree::Transaction do
             }
           )
           result.success?.should == true
-          result.transaction.status.should == Braintree::Transaction::Status::Settling
+          result.transaction.status.should == Braintree::Transaction::Status::Settled
         end
       end
 
@@ -4622,50 +4623,18 @@ describe Braintree::Transaction do
         result.errors.for(:transaction).for(:paypal_account).first.code.should == Braintree::ErrorCodes::PayPalAccount::IncompletePayPalAccount
       end
     end
-
-    context "inline capture" do
-      it "includes processor_settlement_response_code and processor_settlement_response_text for settlement declined transactions" do
-        result = Braintree::Transaction.sale(
-          :amount => "100",
-          :payment_method_nonce => Braintree::Test::Nonce::PayPalFuturePayment,
-          :options => { :submit_for_settlement => true }
-        )
-
-        result.should be_success
-        Braintree::Configuration.gateway.testing.settlement_decline(result.transaction.id)
-
-        settlement_declined_transaction = Braintree::Transaction.find(result.transaction.id)
-        settlement_declined_transaction.processor_settlement_response_code.should == "4001"
-        settlement_declined_transaction.processor_settlement_response_text.should == "Settlement Declined"
-      end
-
-      it "includes processor_settlement_response_code and processor_settlement_response_text for settlement pending transactions" do
-        result = Braintree::Transaction.sale(
-          :amount => "100",
-          :payment_method_nonce => Braintree::Test::Nonce::PayPalFuturePayment,
-          :options => { :submit_for_settlement => true }
-        )
-
-        result.should be_success
-        Braintree::Configuration.gateway.testing.settlement_pending(result.transaction.id)
-
-        settlement_declined_transaction = Braintree::Transaction.find(result.transaction.id)
-        settlement_declined_transaction.processor_settlement_response_code.should == "4002"
-        settlement_declined_transaction.processor_settlement_response_text.should == "Settlement Pending"
-      end
-    end
   end
 
   context "shared payment method" do
     before(:each) do
-      partner_merchant_gateway = Braintree::Gateway.new(
+      @partner_merchant_gateway = Braintree::Gateway.new(
         :merchant_id => "integration_merchant_public_id",
         :public_key => "oauth_app_partner_user_public_key",
         :private_key => "oauth_app_partner_user_private_key",
         :environment => Braintree::Configuration.environment,
         :logger => Logger.new("/dev/null")
       )
-      @customer = partner_merchant_gateway.customer.create(
+      @customer = @partner_merchant_gateway.customer.create(
         :first_name => "Joe",
         :last_name => "Brown",
         :company => "ExampleCo",
@@ -4674,12 +4643,12 @@ describe Braintree::Transaction do
         :fax => "614.555.5678",
         :website => "www.example.com"
       ).customer
-      @address = partner_merchant_gateway.address.create(
+      @address = @partner_merchant_gateway.address.create(
         :customer_id => @customer.id,
         :first_name => "Testy",
         :last_name => "McTesterson"
       ).address
-      @credit_card = partner_merchant_gateway.credit_card.create(
+      @credit_card = @partner_merchant_gateway.credit_card.create(
         :customer_id => @customer.id,
         :cardholder_name => "Adam Davis",
         :number => Braintree::Test::CreditCardNumbers::Visa,
@@ -4705,6 +4674,7 @@ describe Braintree::Transaction do
         :access_token => access_token,
         :logger => Logger.new("/dev/null")
       )
+
     end
 
     it "oauth app details are returned on transaction created via nonce granting" do
@@ -4759,5 +4729,22 @@ describe Braintree::Transaction do
       result.transaction.facilitator_details.oauth_application_client_id.should == "client_id$#{Braintree::Configuration.environment}$integration_client_id"
       result.transaction.facilitator_details.oauth_application_name.should == "PseudoShop"
     end
+
+    it "facilitated details are returned on transaction created via a shared_payment_method_nonce" do
+      shared_nonce = @partner_merchant_gateway.payment_method_nonce.create(
+        @credit_card.token
+      ).payment_method_nonce.nonce
+
+      result = @granting_gateway.transaction.sale(
+        :shared_payment_method_nonce => shared_nonce,
+        :amount => Braintree::Test::TransactionAmounts::Authorize
+      )
+      result.transaction.facilitated_details.merchant_id.should == "integration_merchant_id"
+      result.transaction.facilitated_details.merchant_name.should == "14ladders"
+      result.transaction.facilitated_details.payment_method_nonce.should == nil
+      result.transaction.facilitator_details.should_not == nil
+      result.transaction.facilitator_details.oauth_application_client_id.should == "client_id$#{Braintree::Configuration.environment}$integration_client_id"
+      result.transaction.facilitator_details.oauth_application_name.should == "PseudoShop"
+    end
   end
 end

data/spec/unit/braintree/configuration_spec.rb

@@ -307,9 +307,18 @@ describe Braintree::Configuration do
   end
 
   describe "server" do
-    it "is localhost for development" do
+    it "is localhost or GATEWAY_HOST environment variable for development" do
       Braintree::Configuration.environment = :development
-      Braintree::Configuration.instantiate.server.should == "localhost"
+      old_gateway_url = ENV['GATEWAY_HOST']
+      begin
+        ENV['GATEWAY_HOST'] = nil
+        Braintree::Configuration.instantiate.server.should == "localhost"
+
+        ENV['GATEWAY_HOST'] = 'gateway'
+        Braintree::Configuration.instantiate.server.should == 'gateway'
+      ensure
+        ENV['GATEWAY_HOST'] = old_gateway_url
+      end
     end
 
     it "is api.braintreegateway.com for production" do

data/spec/unit/braintree/credit_card_verification_spec.rb

@@ -105,9 +105,15 @@ describe Braintree::CreditCardVerification do
 
   describe "risk_data" do
     it "initializes a RiskData object" do
-      verification = Braintree::CreditCardVerification._new(:risk_data => {:id => "123", :decision => "WOO YOU WON $1000 dollars" })
+      verification = Braintree::CreditCardVerification._new(:risk_data => {
+        :id => "123",
+        :decision => "WOO YOU WON $1000 dollars",
+        :device_data_captured => true
+      })
+
       verification.risk_data.id.should == "123"
       verification.risk_data.decision.should == "WOO YOU WON $1000 dollars"
+      verification.risk_data.device_data_captured.should == true
     end
 
     it "handles a nil risk_data" do

data/spec/unit/braintree/customer_spec.rb

@@ -123,7 +123,29 @@ describe Braintree::Customer do
           :billing_agreement_id,
           {:options => [:make_default]},
         ]},
-        {:options => [:paypal => [:payee_email, :order_id, :custom_field, :description, :amount]]},
+        {:options =>
+          [:paypal => [
+            :payee_email,
+            :order_id,
+            :custom_field,
+            :description,
+            :amount,
+            {:shipping => [
+              :company,
+              :country_code_alpha2,
+              :country_code_alpha3,
+              :country_code_numeric,
+              :country_name,
+              :extended_address,
+              :first_name,
+              :last_name,
+              :locality,
+              :postal_code,
+              :region,
+              :street_address,
+            ]}
+          ]]
+        },
         {:custom_fields => :_any_key_}
       ]
     end
@@ -182,7 +204,29 @@ describe Braintree::Customer do
             {:options => [:update_existing]}
           ]}
         ]},
-        {:options => [:paypal => [:payee_email, :order_id, :custom_field, :description, :amount]]},
+        {:options =>
+          [:paypal => [
+            :payee_email,
+            :order_id,
+            :custom_field,
+            :description,
+            :amount,
+            {:shipping => [
+              :company,
+              :country_code_alpha2,
+              :country_code_alpha3,
+              :country_code_numeric,
+              :country_name,
+              :extended_address,
+              :first_name,
+              :last_name,
+              :locality,
+              :postal_code,
+              :region,
+              :street_address,
+            ]}
+          ]]
+        },
         {:custom_fields => :_any_key_}
       ]
     end

data/spec/unit/braintree/risk_data_spec.rb

@@ -2,10 +2,11 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Braintree::RiskData do
   describe "#initialize" do
-    it "sets id and decision" do
-      risk_data = Braintree::RiskData.new(:id => "123", :decision => "YOU WON $1000 DOLLARS")
+    it "sets id, decision and device_data_captured" do
+      risk_data = Braintree::RiskData.new(:id => "123", :decision => "YOU WON $1000 DOLLARS", :device_data_captured => true)
       risk_data.id.should == "123"
       risk_data.decision.should == "YOU WON $1000 DOLLARS"
+      risk_data.device_data_captured.should be_truthy
     end
   end
 
@@ -13,9 +14,10 @@ describe Braintree::RiskData do
     it "prints the attributes" do
       details = Braintree::RiskData.new(
         :id => "123",
-        :decision => "YOU WON $1000 DOLLARS"
+        :decision => "YOU WON $1000 DOLLARS",
+        :device_data_captured => true
       )
-      details.inspect.should == %(#<RiskData id: "123", decision: "YOU WON $1000 DOLLARS">)
+      details.inspect.should == %(#<RiskData id: "123", decision: "YOU WON $1000 DOLLARS", device_data_captured: true>)
     end
   end
 end

data/spec/unit/braintree/webhook_notification_spec.rb

@@ -367,16 +367,35 @@ describe Braintree::WebhookNotification do
 
   context "account_updater_daily_report" do
     it "builds a sample notification for an account_updater_daily_report webhook" do
-        sample_notification = Braintree::WebhookTesting.sample_notification(
-          Braintree::WebhookNotification::Kind::AccountUpdaterDailyReport,
-          "my_id"
-        )
+      sample_notification = Braintree::WebhookTesting.sample_notification(
+        Braintree::WebhookNotification::Kind::AccountUpdaterDailyReport,
+        "my_id"
+      )
 
-        notification = Braintree::WebhookNotification.parse(sample_notification[:bt_signature], sample_notification[:bt_payload])
+      notification = Braintree::WebhookNotification.parse(sample_notification[:bt_signature], sample_notification[:bt_payload])
 
-        notification.kind.should == Braintree::WebhookNotification::Kind::AccountUpdaterDailyReport
-        notification.account_updater_daily_report.report_url.should == "link-to-csv-report"
-        notification.account_updater_daily_report.report_date.should == Date.parse("2016-01-14")
+      notification.kind.should == Braintree::WebhookNotification::Kind::AccountUpdaterDailyReport
+      notification.account_updater_daily_report.report_url.should == "link-to-csv-report"
+      notification.account_updater_daily_report.report_date.should == Date.parse("2016-01-14")
+    end
+  end
+
+  context "granted_payment_instrument_update" do
+    it "builds a sample notification for a granted_payment_instrument_update webhook" do
+      sample_notification = Braintree::WebhookTesting.sample_notification(
+        Braintree::WebhookNotification::Kind::GrantedPaymentInstrumentUpdate,
+        "my_id"
+      )
+
+      notification = Braintree::WebhookNotification.parse(sample_notification[:bt_signature], sample_notification[:bt_payload])
+      update = notification.granted_payment_instrument_update
+
+      notification.kind.should == Braintree::WebhookNotification::Kind::GrantedPaymentInstrumentUpdate
+      update.grant_owner_merchant_id.should == 'vczo7jqrpwrsi2px'
+      update.grant_recipient_merchant_id.should == 'cf0i8wgarszuy6hc'
+      update.payment_method_nonce.should == 'ee257d98-de40-47e8-96b3-a6954ea7a9a4'
+      update.token.should == 'abc123z'
+      update.updated_fields.should == ['expiration-month', 'expiration-year']
     end
   end
 

data/spec/unit/braintree/xml_spec.rb

@@ -99,6 +99,13 @@ describe Braintree::Xml do
       verify_to_xml_and_back hash
     end
 
+		context "Integer" do
+			it "works for integers" do
+				hash = { :root => {:foo => 1 } }
+				Braintree::Xml.hash_to_xml(hash).should include("<foo type=\"integer\">1</foo>")
+			end
+		end
+
 		context "BigDecimal" do
 			it "works for BigDecimals" do
 				hash = {:root => {:foo => BigDecimal.new("123.45")}}

data/spec/unit/braintree_spec.rb

@@ -6,6 +6,7 @@ describe Braintree do
     braintree_file = "#{lib_dir}/braintree.rb"
     File.exist?(braintree_file).should == true
     output = `ruby -r rubygems -I #{lib_dir} -e 'load #{braintree_file.inspect}; load #{braintree_file.inspect}' 2>&1`
+    output = output.gsub(/^.*warning: constant ::Fixnum is deprecated.*\n/, "")
     output.should == ""
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: braintree
 version: !ruby/object:Gem::Version
-  version: 2.78.0
+  version: 2.79.0
 platform: ruby
 authors:
 - Braintree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-23 00:00:00.000000000 Z
+date: 2017-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -88,6 +88,7 @@ files:
 - lib/braintree/facilitated_details.rb
 - lib/braintree/facilitator_details.rb
 - lib/braintree/gateway.rb
+- lib/braintree/granted_payment_instrument_update.rb
 - lib/braintree/http.rb
 - lib/braintree/ideal_payment.rb
 - lib/braintree/ideal_payment_gateway.rb
@@ -292,7 +293,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: braintree
-rubygems_version: 2.6.12
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Braintree Gateway Ruby Client Library