braintree 2.88.0 → 2.89.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c971a0bacc5df30ce7c762b37047e83bb86b6036
-  data.tar.gz: 8adfabbcb3d4855170eb3c2e66d6ecd5b8e48a7d
+  metadata.gz: 1dbdc2a3360539354ac8dee567e437609b10047e
+  data.tar.gz: b79dfe5dc9dc997325c094d76e35fe8e952cfe54
 SHA512:
-  metadata.gz: 78286324c7e94afc9281390b7ae4f465a34e823d97e7bdb268ebd899becd492db89ba0695ccf99f07bdf3c3fb854dffb26a1e85ba8a314e1808ec3f1096ac378
-  data.tar.gz: ca5421117f2d7e2d324cf65651071ff1fb3e26eecfeb175a2d8a6efc08a8cb95188cfcdd3b6270a023bc76f76bd0588df2033ffa6051ba3264c48c36387f78d9
+  metadata.gz: 2997abeff62b6067f00979a8fb13d215f7716dcdd994f3451e77c09d0ecf2649dc267e3dfaadc165e6e36c54a915be58fe1b6ad1930ec641dffe8b3f72232e32
+  data.tar.gz: 6f0d883162764a99a777d84c33c9ff04a41c175a1acde9ec10738e10fde37ee9e46a66dd99882b5219cbd2153125362eb0aef641231d4766131aaac9f777142d

data/lib/braintree/configuration.rb

@@ -123,6 +123,9 @@ module Braintree
         @environment = parser.environment
       elsif options[:access_token]
         parser.parse_access_token(options[:access_token])
+
+        _check_for_mixed_environment(options[:environment], parser.environment)
+
         @access_token = parser.access_token
         @environment = parser.environment
         @merchant_id = parser.merchant_id
@@ -145,6 +148,12 @@ module Braintree
       end
     end
 
+    def _check_for_mixed_environment(options_environment, token_environment)
+      if options_environment && options_environment.to_sym != token_environment.to_sym
+        warn "Braintree::Gateway should not be initialized with mixed environments: environment parameter and access_token do not match, environment from access_token is used."
+      end
+    end
+
     def api_version # :nodoc:
       API_VERSION
     end

data/lib/braintree/connected_merchant_paypal_status_changed.rb

@@ -6,6 +6,8 @@ module Braintree
     attr_reader :merchant_public_id
     attr_reader :oauth_application_client_id
 
+    alias_method :merchant_id, :merchant_public_id
+
     def initialize(attributes)
       set_instance_variables_from_hash(attributes)
     end

data/lib/braintree/connected_merchant_status_transitioned.rb

@@ -6,6 +6,8 @@ module Braintree
     attr_reader :oauth_application_client_id
     attr_reader :status
 
+    alias_method :merchant_id, :merchant_public_id
+
     def initialize(attributes)
       set_instance_variables_from_hash(attributes)
     end

data/lib/braintree/disbursement.rb

@@ -2,8 +2,14 @@ module Braintree
   class Disbursement
     include BaseModule
 
+    module Types
+      Credit = "credit"
+      Debit  = "debit"
+    end
+
     attr_reader :amount
     attr_reader :disbursement_date
+    attr_reader :disbursement_type
     attr_reader :exception_message
     attr_reader :follow_up_action
     attr_reader :id
@@ -35,6 +41,14 @@ module Braintree
       "#<#{self.class} #{nice_attributes.join(', ')}>"
     end
 
+    def debit?
+      disbursement_type == Types::Debit
+    end
+
+    def credit?
+      disbursement_type == Types::Credit
+    end
+
     class << self
       protected :new
       def _new(*args) # :nodoc:

data/lib/braintree/error_codes.rb

@@ -406,6 +406,7 @@ module Braintree
       TypeIsInvalid = "91523"
       TypeIsRequired = "91524"
       UnsupportedVoiceAuthorization = "91539"
+      TransactionSourceIsInvalid = "915133"
 
       module Options
         SubmitForSettlementIsRequiredForCloning = "91544"

data/lib/braintree/transaction/paypal_details.rb

@@ -9,6 +9,7 @@ module Braintree
       attr_reader :debug_id
       attr_reader :description
       attr_reader :image_url
+      attr_reader :payee_id
       attr_reader :payee_email
       attr_reader :payer_email
       attr_reader :payer_first_name

data/lib/braintree/transaction_gateway.rb

@@ -215,11 +215,12 @@ module Braintree
           :add_billing_address_to_payment_method,
           :store_shipping_address_in_vault,
           :venmo_sdk_session,
+          :payee_id,
           :payee_email,
           :skip_advanced_fraud_checking,
           :skip_avs,
           :skip_cvv,
-          {:paypal => [:custom_field, :payee_email, :description, {:supplementary_data => :_any_key_}]},
+          {:paypal => [:custom_field, :payee_id, :payee_email, :description, {:supplementary_data => :_any_key_}]},
           {:three_d_secure => [:required]},
           {:amex_rewards => [:request_id, :points, :currency_amount, :currency_iso_code]},
           {:venmo => [:profile_id]}
@@ -227,7 +228,7 @@ module Braintree
         },
         {:custom_fields => :_any_key_},
         {:descriptor => [:name, :phone, :url]},
-        {:paypal_account => [:email, :token, :paypal_data, :payee_email]},
+        {:paypal_account => [:email, :token, :paypal_data, :payee_id, :payee_email]},
         {:industry => [:industry_type, {:data => [:folio_number, :check_in_date, :check_out_date, :travel_package, :lodging_check_in_date, :lodging_check_out_date, :departure_date, :lodging_name, :room_rate]}]},
         {: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]}

data/lib/braintree/version.rb

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

data/lib/braintree/webhook_notification.rb

@@ -30,13 +30,13 @@ module Braintree
       PartnerMerchantConnected = "partner_merchant_connected"
       PartnerMerchantDisconnected = "partner_merchant_disconnected"
       PartnerMerchantDeclined = "partner_merchant_declined"
-      OAuthAccessRevoked = "oauth_access_revoked"
 
       AccountUpdaterDailyReport = "account_updater_daily_report"
 
       IdealPaymentComplete = "ideal_payment_complete"
       IdealPaymentFailed = "ideal_payment_failed"
 
+      OAuthAccessRevoked = "oauth_access_revoked"
       ConnectedMerchantStatusTransitioned = "connected_merchant_status_transitioned"
       ConnectedMerchantPayPalStatusChanged = "connected_merchant_paypal_status_changed"
 

data/lib/braintree/webhook_testing_gateway.rb

@@ -153,14 +153,6 @@ module Braintree
       XML
     end
 
-    def _oauth_access_revoked_sample_xml(id)
-      <<-XML
-        <oauth-application-revocation>
-          <merchant-id>abc123</merchant-id>
-        </oauth-application-revocation>
-      XML
-    end
-
     def _merchant_account_approved_sample_xml(id)
 
       <<-XML
@@ -587,6 +579,15 @@ module Braintree
         XML
     end
 
+    def _oauth_access_revoked_sample_xml(id)
+      <<-XML
+        <oauth-application-revocation>
+          <merchant-id>#{id}</merchant-id>
+          <oauth-application-client-id>oauth_application_client_id</oauth-application-client-id>
+        </oauth-application-revocation>
+      XML
+    end
+
     def _ideal_payment_complete_sample_xml(id)
 
       <<-XML

data/spec/integration/braintree/transaction_spec.rb

@@ -1046,6 +1046,20 @@ describe Braintree::Transaction do
     end
 
     context "transaction_source" do
+      it "marks a transactions as recurring_first" do
+        result = Braintree::Transaction.create(
+          :type => "sale",
+          :amount => Braintree::Test::TransactionAmounts::Authorize,
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "12/12",
+          },
+          :transaction_source => "recurring_first"
+        )
+        result.success?.should == true
+        result.transaction.recurring.should == true
+      end
+
       it "marks a transactions as recurring" do
         result = Braintree::Transaction.create(
           :type => "sale",
@@ -1060,6 +1074,20 @@ describe Braintree::Transaction do
         result.transaction.recurring.should == true
       end
 
+      it "marks a transactions as merchant" do
+        result = Braintree::Transaction.create(
+          :type => "sale",
+          :amount => Braintree::Test::TransactionAmounts::Authorize,
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "12/12",
+          },
+          :transaction_source => "merchant"
+        )
+        result.success?.should == true
+        result.transaction.recurring.should == false
+      end
+
       it "marks a transactions as moto" do
         result = Braintree::Transaction.create(
           :type => "sale",
@@ -1073,6 +1101,20 @@ describe Braintree::Transaction do
         result.success?.should == true
         result.transaction.recurring.should == false
       end
+
+      it "handles validation when transaction source invalid" do
+        result = Braintree::Transaction.create(
+          :type => "sale",
+          :amount => Braintree::Test::TransactionAmounts::Authorize,
+          :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "12/12",
+          },
+          :transaction_source => "invalid_value"
+        )
+        result.success?.should == false
+        result.errors.for(:transaction).on(:transaction_source)[0].code.should == Braintree::ErrorCodes::Transaction::TransactionSourceIsInvalid
+      end
     end
 
     context "store_in_vault_on_success" do
@@ -1544,6 +1586,81 @@ describe Braintree::Transaction do
         result.transaction.should_not be_nil
       end
 
+      it "can create a transaction with a payee id" do
+        customer = Braintree::Customer.create!
+        nonce = nonce_for_new_payment_method(
+          :paypal_account => {
+            :consent_code => "PAYPAL_CONSENT_CODE",
+          }
+        )
+        nonce.should_not be_nil
+
+        result = Braintree::Transaction.create(
+          :type => "sale",
+          :amount => Braintree::Test::TransactionAmounts::Authorize,
+          :payment_method_nonce => nonce,
+          :paypal_account => {
+            :payee_id => "fake-payee-id"
+          }
+        )
+
+        result.success?.should == true
+        result.transaction.paypal_details.should_not be_nil
+        result.transaction.paypal_details.debug_id.should_not be_nil
+        result.transaction.paypal_details.payee_id.should == "fake-payee-id"
+      end
+
+      it "can create a transaction with a payee id in the options params" do
+        customer = Braintree::Customer.create!
+        nonce = nonce_for_new_payment_method(
+          :paypal_account => {
+            :consent_code => "PAYPAL_CONSENT_CODE",
+          }
+        )
+        nonce.should_not be_nil
+
+        result = Braintree::Transaction.create(
+          :type => "sale",
+          :amount => Braintree::Test::TransactionAmounts::Authorize,
+          :payment_method_nonce => nonce,
+          :paypal_account => {},
+          :options => {
+            :payee_id => "fake-payee-id"
+          }
+        )
+
+        result.success?.should == true
+        result.transaction.paypal_details.should_not be_nil
+        result.transaction.paypal_details.debug_id.should_not be_nil
+        result.transaction.paypal_details.payee_id.should == "fake-payee-id"
+      end
+
+      it "can create a transaction with a payee id in options.paypal" do
+        customer = Braintree::Customer.create!
+        nonce = nonce_for_new_payment_method(
+          :paypal_account => {
+            :consent_code => "PAYPAL_CONSENT_CODE",
+          }
+        )
+        nonce.should_not be_nil
+
+        result = Braintree::Transaction.create(
+          :type => "sale",
+          :amount => Braintree::Test::TransactionAmounts::Authorize,
+          :payment_method_nonce => nonce,
+          :options => {
+            :paypal => {
+              :payee_id => "fake-payee-id"
+            }
+          }
+        )
+
+        result.success?.should == true
+        result.transaction.paypal_details.should_not be_nil
+        result.transaction.paypal_details.debug_id.should_not be_nil
+        result.transaction.paypal_details.payee_id.should == "fake-payee-id"
+      end
+
       it "can create a transaction with a payee email" do
         customer = Braintree::Customer.create!
         nonce = nonce_for_new_payment_method(

data/spec/unit/braintree/configuration_spec.rb

@@ -1,3 +1,5 @@
+require 'stringio'
+
 require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Configuration do
@@ -65,6 +67,33 @@ describe Braintree::Configuration do
       end.to raise_error(Braintree::ConfigurationError, /mixed credential types/)
     end
 
+    context "mixed environments" do
+      before do
+        @original_stderr = $stderr
+        $stderr = StringIO.new
+      end
+
+      after do
+        $stderr = @original_stderr
+      end
+
+      it "warns if both environment and access_token are provided and their environments differ" do
+        Braintree::Configuration.new(
+          :access_token => "access_token$development$integration_merchant_id$fb27c79dd",
+          :environment => "sandbox",
+        )
+        $stderr.string.should == "Braintree::Gateway should not be initialized with mixed environments: environment parameter and access_token do not match, environment from access_token is used.\n"
+      end
+
+      it "does not warn if both environment and access_token are provided and their environments match" do
+        Braintree::Configuration.new(
+          :access_token => "access_token$development$integration_merchant_id$fb27c79dd",
+          :environment => "development",
+        )
+        $stderr.string.should == ""
+      end
+    end
+
     it "accepts proxy params" do
       config = Braintree::Configuration.new(
         :proxy_address => 'localhost',

data/spec/unit/braintree/disbursement_spec.rb

@@ -76,4 +76,56 @@ describe Braintree::Disbursement do
       disbursement.success?.should == true
     end
   end
+
+  describe "credit?" do
+    subject do
+      described_class._new(
+        :gateway,
+        merchant_account: {
+          id: "sandbox_master_merchant_account",
+          status: "active",
+        },
+        success: true,
+        amount: "100.00",
+        disbursement_type: type,
+        disbursement_date: "2013-04-10",
+      )
+    end
+
+    context "when the disbursement type is credit" do
+      let(:type) { described_class::Types::Credit }
+      it { is_expected.to be_credit }
+    end
+
+    context "when the disbursement type is not credit" do
+      let(:type) { described_class::Types::Debit }
+      it { is_expected.not_to be_credit }
+    end
+  end
+
+  describe "debit?" do
+    subject do
+      described_class._new(
+        :gateway,
+        merchant_account: {
+          id: "sandbox_master_merchant_account",
+          status: "active",
+        },
+        success: true,
+        amount: "100.00",
+        disbursement_type: type,
+        disbursement_date: "2013-04-10",
+      )
+    end
+
+    context "when the disbursement type is debit" do
+      let(:type) { described_class::Types::Debit }
+      it { is_expected.to be_debit }
+    end
+
+    context "when the disbursement type is not debit" do
+      let(:type) { described_class::Types::Credit }
+      it { is_expected.not_to be_debit }
+    end
+  end
 end

data/spec/unit/braintree/webhook_notification_spec.rb

@@ -58,19 +58,6 @@ describe Braintree::WebhookNotification do
       notification.timestamp.should be_within(10).of(Time.now.utc)
     end
 
-    it 'builds a sample notification for OAuth application revocation' do
-      sample_notification = Braintree::WebhookTesting.sample_notification(
-        Braintree::WebhookNotification::Kind::OAuthAccessRevoked,
-        'my_id'
-      )
-
-      notification = Braintree::WebhookNotification.parse(sample_notification[:bt_signature], sample_notification[:bt_payload])
-
-      expect(notification.kind).to eq(Braintree::WebhookNotification::Kind::OAuthAccessRevoked)
-      expect(notification.oauth_access_revocation.merchant_id).to eq('abc123')
-      expect(notification.timestamp).to be_within(10).of(Time.now.utc)
-    end
-
     it "builds a sample notification with a source merchant ID" do
       sample_notification = Braintree::WebhookTesting.sample_notification(
         Braintree::WebhookNotification::Kind::SubscriptionWentPastDue,
@@ -107,6 +94,7 @@ describe Braintree::WebhookNotification do
 
         status_transitioned = notification.connected_merchant_status_transitioned
         status_transitioned.merchant_public_id.should == "my_id"
+        status_transitioned.merchant_id.should == "my_id"
         status_transitioned.oauth_application_client_id.should == "oauth_application_client_id"
         status_transitioned.status.should == "new_status"
       end
@@ -123,9 +111,25 @@ describe Braintree::WebhookNotification do
 
         paypal_status_changed = notification.connected_merchant_paypal_status_changed
         paypal_status_changed.merchant_public_id.should == "my_id"
+        paypal_status_changed.merchant_id.should == "my_id"
         paypal_status_changed.oauth_application_client_id.should == "oauth_application_client_id"
         paypal_status_changed.action.should == "link"
       end
+
+      it 'builds a sample notification for OAuth application revocation' do
+        sample_notification = Braintree::WebhookTesting.sample_notification(
+          Braintree::WebhookNotification::Kind::OAuthAccessRevoked,
+          'my_id'
+        )
+
+        notification = Braintree::WebhookNotification.parse(sample_notification[:bt_signature], sample_notification[:bt_payload])
+
+        notification.kind.should == Braintree::WebhookNotification::Kind::OAuthAccessRevoked
+        notification.oauth_access_revocation.merchant_id.should == "my_id"
+        notification.oauth_access_revocation.oauth_application_client_id.should == "oauth_application_client_id"
+        notification.timestamp.should be_within(10).of(Time.now.utc)
+      end
+
     end
 
     context "disputes" do

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: braintree
 version: !ruby/object:Gem::Version
-  version: 2.88.0
+  version: 2.89.0
 platform: ruby
 authors:
 - Braintree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-20 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
 description: Ruby library for integrating with the Braintree Gateway
@@ -295,17 +295,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: braintree
-rubygems_version: 2.6.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Braintree Gateway Ruby Client Library