braintree 2.31.0 → 2.32.1

data/spec/integration/spec_helper.rb

@@ -24,4 +24,26 @@ unless defined?(INTEGRATION_SPEC_HELPER_LOADED)
     config = Braintree::Configuration.gateway.config
     config.http.post "/modifications/create_modification_for_tests", :modification => attributes
   end
+
+  def with_other_merchant(merchant_id, public_key, private_key, &block)
+    old_merchant_id = Braintree::Configuration.merchant_id
+    old_public_key = Braintree::Configuration.public_key
+    old_private_key = Braintree::Configuration.private_key
+
+    Braintree::Configuration.merchant_id = merchant_id
+    Braintree::Configuration.public_key = public_key
+    Braintree::Configuration.private_key = private_key
+
+    begin
+      yield
+    ensure
+      Braintree::Configuration.merchant_id = old_merchant_id
+      Braintree::Configuration.public_key = old_public_key
+      Braintree::Configuration.private_key = old_private_key
+    end
+  end
+
+  def with_altpay_merchant(&block)
+    with_other_merchant("altpay_merchant", "altpay_merchant_public_key", "altpay_merchant_private_key", &block)
+  end
 end

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ unless defined?(SPEC_HELPER_LOADED)
     DefaultMerchantAccountId = "sandbox_credit_card"
     NonDefaultMerchantAccountId = "sandbox_credit_card_non_default"
     NonDefaultSubMerchantAccountId = "sandbox_sub_merchant_account"
+    ThreeDSecureMerchantAccountId = "three_d_secure_merchant_account"
 
     TrialPlan = {
       :description => "Plan for integration tests -- with trial",
@@ -84,14 +85,19 @@ unless defined?(SPEC_HELPER_LOADED)
 
     def self.make_past_due(subscription, number_of_days_past_due = 1)
       Braintree::Configuration.instantiate.http.put(
-                                                    "/subscriptions/#{subscription.id}/make_past_due?days_past_due=#{number_of_days_past_due}"
-                                                    )
+        "/subscriptions/#{subscription.id}/make_past_due?days_past_due=#{number_of_days_past_due}"
+      )
     end
 
     def self.settle_transaction(transaction_id)
       Braintree::Configuration.instantiate.http.put("/transactions/#{transaction_id}/settle")
     end
 
+    def self.create_3ds_verification(merchant_account_id, params)
+      response = Braintree::Configuration.instantiate.http.post("/three_d_secure/create_verification/#{merchant_account_id}", :three_d_secure_verification => params)
+      response[:three_d_secure_verification][:three_d_secure_token]
+    end
+
     def self.stub_time_dot_now(desired_time)
       Time.class_eval do
         class << self

data/spec/unit/braintree/customer_spec.rb

@@ -28,6 +28,9 @@ describe Braintree::Customer do
       output.should include(%q(last_name: "Smith"))
       output.should include(%q(phone: "802-483-5932"))
       output.should include(%q(website: "patrick.smith.com"))
+      output.should include(%q(addresses: []))
+      output.should include(%q(credit_cards: []))
+      output.should include(%q(paypal_accounts: []))
       output.should include(%Q(created_at: #{customer.created_at.inspect}))
       output.should include(%Q(updated_at: #{customer.updated_at.inspect}))
     end
@@ -82,6 +85,7 @@ describe Braintree::Customer do
         :phone,
         :website,
         :device_data,
+        :payment_method_nonce,
         {:credit_card => [
           :billing_address_id,
           :cardholder_name,
@@ -129,6 +133,7 @@ describe Braintree::Customer do
         :phone,
         :website,
         :device_data,
+        :payment_method_nonce,
         {:credit_card => [
           :billing_address_id,
           :cardholder_name,
@@ -207,13 +212,28 @@ describe Braintree::Customer do
       customer = Braintree::Customer._new(
         :gateway,
         :credit_cards => [
-          {:token => "pm1"},
-          {:token => "pm2"}
+          {:token => "credit_card_1"},
+          {:token => "credit_card_2"}
+        ],
+        :paypal_accounts => [
+          {:token => "paypal_1"},
+          {:token => "paypal_2"}
         ]
       )
+
       customer.credit_cards.size.should == 2
-      customer.credit_cards[0].token.should == "pm1"
-      customer.credit_cards[1].token.should == "pm2"
+      customer.credit_cards[0].token.should == "credit_card_1"
+      customer.credit_cards[1].token.should == "credit_card_2"
+
+      customer.paypal_accounts.size.should == 2
+      customer.paypal_accounts[0].token.should == "paypal_1"
+      customer.paypal_accounts[1].token.should == "paypal_2"
+
+      customer.payment_methods.count.should == 4
+      customer.payment_methods.map(&:token).should include("credit_card_1")
+      customer.payment_methods.map(&:token).should include("credit_card_2")
+      customer.payment_methods.map(&:token).should include("paypal_1")
+      customer.payment_methods.map(&:token).should include("paypal_2")
     end
   end
 

data/spec/unit/braintree/payment_method_spec.rb

@@ -0,0 +1,25 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+
+describe Braintree::PaymentMethod do
+  describe "find" do
+    it "handles an unknown payment method type" do
+      unknown_response = {:unknown_payment_method => {:token => 1234, :default => true}}
+      http_instance = mock(:get => unknown_response)
+      Braintree::Http.stub(:new).and_return(http_instance)
+      unknown_payment_method = Braintree::PaymentMethod.find("UNKNOWN_PAYMENT_METHOD_TOKEN")
+
+      unknown_payment_method.token.should == 1234
+      unknown_payment_method.default?.should be_true
+    end
+  end
+
+  describe "timestamps" do
+    it "exposes created_at and updated_at" do
+      now = Time.now
+      paypal_account = Braintree::PayPalAccount._new(:gateway, :updated_at => now, :created_at => now)
+
+      paypal_account.created_at.should == now
+      paypal_account.updated_at.should == now
+    end
+  end
+end

data/spec/unit/braintree/paypal_account_spec.rb

@@ -0,0 +1,31 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+
+describe Braintree::PayPalAccount do
+  describe "self.update" do
+    it "raises an exception if attributes contain an invalid key" do
+      expect do
+        Braintree::PayPalAccount.update("some_token", :invalid_key => 'val')
+      end.to raise_error(ArgumentError, "invalid keys: invalid_key")
+    end
+  end
+
+  describe "default?" do
+    it "is true if the paypal account is the default payment method for the customer" do
+      Braintree::PayPalAccount._new(:gateway, :default => true).default?.should == true
+    end
+
+    it "is false if the paypal account is not the default payment methodfor the customer" do
+      Braintree::PayPalAccount._new(:gateway, :default => false).default?.should == false
+    end
+  end
+
+  describe "timestamps" do
+    it "exposes created_at and updated_at" do
+      now = Time.now
+      paypal_account = Braintree::PayPalAccount._new(:gateway, :updated_at => now, :created_at => now)
+
+      paypal_account.created_at.should == now
+      paypal_account.updated_at.should == now
+    end
+  end
+end

data/spec/unit/braintree/unknown_payment_method_spec.rb

@@ -0,0 +1,29 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+
+describe Braintree::PayPalAccount do
+  describe "token" do
+    it "has a token identifier" do
+      params = {:unknown_payment_method => {:token => 1234, :default => true}}
+      Braintree::UnknownPaymentMethod.new(params).token.should == 1234
+    end
+  end
+
+  describe "image_url" do
+    it "has a image_url" do
+      params = {:unknown_payment_method => {:token => 1234, :default => true}}
+      Braintree::UnknownPaymentMethod.new(params).image_url.should == "https://assets.braintreegateway.com/payment_method_logo/unknown.png"
+    end
+  end
+
+  describe "default?" do
+    it "is true if the paypal account is the default payment method for the customer" do
+      params = {:unknown_payment_method => {:token => 1234, :default => true}}
+      Braintree::UnknownPaymentMethod.new(params).should be_default
+    end
+
+    it "is false if the paypal account is not the default payment methodfor the customer" do
+      params = {:unknown_payment_method => {:token => 1234, :default => false}}
+      Braintree::UnknownPaymentMethod.new(params).should_not be_default
+    end
+  end
+end

metadata

@@ -1,27 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: braintree
 version: !ruby/object:Gem::Version
-  version: 2.31.0
+  version: 2.32.1
+  prerelease: 
 platform: ruby
 authors:
 - Braintree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 2.0.0
 description: Ruby library for integrating with the Braintree Gateway
@@ -30,182 +33,200 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - README.rdoc
-- braintree.gemspec
-- lib/braintree.rb
-- lib/braintree/add_on.rb
-- lib/braintree/add_on_gateway.rb
-- lib/braintree/address.rb
-- lib/braintree/address/country_names.rb
-- lib/braintree/address_gateway.rb
-- lib/braintree/advanced_search.rb
+- LICENSE
+- lib/braintree/payment_method.rb
+- lib/braintree/payment_method_gateway.rb
 - lib/braintree/base_module.rb
-- lib/braintree/client_token.rb
-- lib/braintree/client_token_gateway.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/settlement_batch_summary_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/disbursement.rb
-- lib/braintree/discount.rb
-- lib/braintree/discount_gateway.rb
-- lib/braintree/dispute.rb
+- lib/braintree/merchant_account_gateway.rb
+- lib/braintree/xml.rb
+- lib/braintree/unknown_payment_method.rb
+- lib/braintree/sepa_bank_account_gateway.rb
+- lib/braintree/resource_collection.rb
+- lib/braintree/client_token_gateway.rb
 - lib/braintree/error_codes.rb
-- lib/braintree/error_result.rb
 - lib/braintree/errors.rb
-- lib/braintree/exceptions.rb
-- lib/braintree/gateway.rb
-- lib/braintree/http.rb
-- lib/braintree/merchant_account.rb
-- lib/braintree/merchant_account/address_details.rb
-- lib/braintree/merchant_account/business_details.rb
+- lib/braintree/discount_gateway.rb
+- lib/braintree/webhook_notification_gateway.rb
+- lib/braintree/customer.rb
+- lib/braintree/transaction_gateway.rb
+- lib/braintree/error_result.rb
 - lib/braintree/merchant_account/funding_details.rb
+- lib/braintree/merchant_account/business_details.rb
+- lib/braintree/merchant_account/address_details.rb
 - lib/braintree/merchant_account/individual_details.rb
-- lib/braintree/merchant_account_gateway.rb
-- lib/braintree/modification.rb
-- lib/braintree/plan.rb
-- lib/braintree/plan_gateway.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/sha256_digest.rb
+- lib/braintree/settlement_batch.rb
+- lib/braintree/webhook_testing_gateway.rb
+- lib/braintree/http.rb
+- lib/braintree/add_on_gateway.rb
+- lib/braintree/gateway.rb
+- lib/braintree/customer_gateway.rb
 - lib/braintree/signature_service.rb
-- lib/braintree/subscription.rb
-- lib/braintree/subscription_gateway.rb
-- lib/braintree/subscription_search.rb
+- lib/braintree/sepa_bank_account.rb
+- lib/braintree/paypal_account_gateway.rb
+- lib/braintree/credit_card_verification_gateway.rb
+- lib/braintree/payment_instrument_type.rb
+- lib/braintree/credit_card.rb
+- lib/braintree/transaction/paypal_details.rb
+- lib/braintree/transaction/disbursement_details.rb
+- lib/braintree/transaction/address_details.rb
+- lib/braintree/transaction/subscription_details.rb
+- lib/braintree/transaction/customer_details.rb
+- lib/braintree/transaction/credit_card_details.rb
+- lib/braintree/transaction/status_details.rb
 - lib/braintree/successful_result.rb
+- lib/braintree/discount.rb
+- lib/braintree/subscription_search.rb
+- lib/braintree/test_transaction.rb
+- lib/braintree/disbursement.rb
+- lib/braintree/credit_card_verification.rb
+- lib/braintree/dispute.rb
+- lib/braintree/customer_search.rb
+- lib/braintree/modification.rb
+- lib/braintree/validation_error_collection.rb
+- lib/braintree/merchant_account.rb
+- lib/braintree/test/venmo_sdk.rb
+- lib/braintree/test/nonce.rb
 - lib/braintree/test/credit_card.rb
 - lib/braintree/test/merchant_account.rb
 - lib/braintree/test/transaction_amounts.rb
-- lib/braintree/test/venmo_sdk.rb
+- lib/braintree/add_on.rb
+- lib/braintree/client_token.rb
+- lib/braintree/advanced_search.rb
+- lib/braintree/validation_error.rb
+- lib/braintree/subscription.rb
+- lib/braintree/webhook_testing.rb
+- lib/braintree/version.rb
+- lib/braintree/exceptions.rb
 - lib/braintree/transaction.rb
-- lib/braintree/transaction/address_details.rb
-- lib/braintree/transaction/credit_card_details.rb
-- lib/braintree/transaction/customer_details.rb
-- lib/braintree/transaction/disbursement_details.rb
-- lib/braintree/transaction/status_details.rb
-- lib/braintree/transaction/subscription_details.rb
-- lib/braintree/transaction_gateway.rb
 - lib/braintree/transaction_search.rb
-- lib/braintree/transparent_redirect.rb
-- lib/braintree/transparent_redirect_gateway.rb
+- lib/braintree/configuration.rb
+- lib/braintree/subscription_gateway.rb
+- lib/braintree/address_gateway.rb
 - lib/braintree/util.rb
-- lib/braintree/validation_error.rb
-- lib/braintree/validation_error_collection.rb
-- lib/braintree/version.rb
+- lib/braintree/plan.rb
+- lib/braintree/transparent_redirect_gateway.rb
+- lib/braintree/credit_card_gateway.rb
+- lib/braintree/paypal_account.rb
 - lib/braintree/webhook_notification.rb
-- lib/braintree/webhook_notification_gateway.rb
-- lib/braintree/webhook_testing.rb
-- lib/braintree/webhook_testing_gateway.rb
-- lib/braintree/xml.rb
-- lib/braintree/xml/generator.rb
+- lib/braintree/digest.rb
+- lib/braintree/plan_gateway.rb
+- lib/braintree/descriptor.rb
+- lib/braintree/xml/rexml.rb
 - lib/braintree/xml/libxml.rb
 - lib/braintree/xml/parser.rb
-- lib/braintree/xml/rexml.rb
-- lib/ssl/api_braintreegateway_com.ca.crt
-- lib/ssl/sandbox_braintreegateway_com.ca.crt
+- lib/braintree/xml/generator.rb
+- lib/braintree/settlement_batch_summary.rb
+- lib/braintree/testing_gateway.rb
+- lib/braintree/address/country_names.rb
+- lib/braintree/address.rb
+- lib/braintree/transparent_redirect.rb
+- lib/braintree.rb
 - lib/ssl/securetrust_ca.crt
+- lib/ssl/api_braintreegateway_com.ca.crt
 - lib/ssl/www_braintreegateway_com.ca.crt
+- lib/ssl/sandbox_braintreegateway_com.ca.crt
+- spec/spec.opts
+- spec/spec_helper.rb
 - spec/hacks/tcp_socket.rb
-- spec/httpsd.pid
-- spec/integration/braintree/add_on_spec.rb
-- spec/integration/braintree/address_spec.rb
+- spec/integration/braintree/transaction_spec.rb
+- spec/integration/braintree/disbursement_spec.rb
+- spec/integration/braintree/customer_spec.rb
+- spec/integration/braintree/transparent_redirect_spec.rb
 - spec/integration/braintree/advanced_search_spec.rb
-- spec/integration/braintree/client_api/client_token_spec.rb
-- spec/integration/braintree/client_api/spec_helper.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/disbursement_spec.rb
-- spec/integration/braintree/discount_spec.rb
-- spec/integration/braintree/error_codes_spec.rb
 - spec/integration/braintree/http_spec.rb
-- spec/integration/braintree/merchant_account_spec.rb
+- spec/integration/braintree/discount_spec.rb
 - spec/integration/braintree/plan_spec.rb
+- spec/integration/braintree/client_api/spec_helper.rb
+- spec/integration/braintree/client_api/client_token_spec.rb
 - spec/integration/braintree/settlement_batch_summary_spec.rb
-- spec/integration/braintree/subscription_spec.rb
+- spec/integration/braintree/test_transaction_spec.rb
+- spec/integration/braintree/credit_card_verification_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/braintree/customer_search_spec.rb
+- spec/integration/braintree/paypal_account_spec.rb
+- spec/integration/braintree/merchant_account_spec.rb
+- spec/integration/braintree/subscription_spec.rb
+- spec/integration/braintree/error_codes_spec.rb
+- spec/integration/braintree/add_on_spec.rb
+- spec/integration/braintree/credit_card_spec.rb
+- spec/integration/braintree/payment_method_spec.rb
+- spec/integration/braintree/address_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/ssl/geotrust_global.crt
+- spec/unit/braintree/errors_spec.rb
+- spec/unit/braintree/successful_result_spec.rb
+- spec/unit/braintree/transaction_spec.rb
+- spec/unit/braintree/disbursement_spec.rb
+- spec/unit/braintree/customer_spec.rb
+- spec/unit/braintree/validation_error_spec.rb
+- spec/unit/braintree/transparent_redirect_spec.rb
+- spec/unit/braintree/credit_card_verification_search_spec.rb
+- spec/unit/braintree/unknown_payment_method_spec.rb
+- spec/unit/braintree/http_spec.rb
 - spec/unit/braintree/client_token_spec.rb
+- spec/unit/braintree/transaction/customer_details_spec.rb
+- spec/unit/braintree/transaction/deposit_details_spec.rb
+- spec/unit/braintree/transaction/credit_card_details_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/xml_spec.rb
+- spec/unit/braintree/base_module_spec.rb
+- spec/unit/braintree/modification_spec.rb
 - spec/unit/braintree/credit_card_verification_spec.rb
-- spec/unit/braintree/customer_spec.rb
-- spec/unit/braintree/digest_spec.rb
-- spec/unit/braintree/disbursement_spec.rb
-- spec/unit/braintree/dispute_spec.rb
+- spec/unit/braintree/transaction_search_spec.rb
+- spec/unit/braintree/webhook_notification_spec.rb
 - spec/unit/braintree/error_result_spec.rb
-- spec/unit/braintree/errors_spec.rb
-- spec/unit/braintree/http_spec.rb
-- spec/unit/braintree/merchant_account_spec.rb
-- spec/unit/braintree/modification_spec.rb
-- spec/unit/braintree/resource_collection_spec.rb
-- spec/unit/braintree/sha256_digest_spec.rb
 - spec/unit/braintree/signature_service_spec.rb
 - spec/unit/braintree/subscription_search_spec.rb
+- spec/unit/braintree/paypal_account_spec.rb
+- spec/unit/braintree/digest_spec.rb
+- spec/unit/braintree/merchant_account_spec.rb
 - spec/unit/braintree/subscription_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/deposit_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/credit_card_spec.rb
+- spec/unit/braintree/dispute_spec.rb
+- spec/unit/braintree/sha256_digest_spec.rb
 - spec/unit/braintree/validation_error_collection_spec.rb
-- spec/unit/braintree/validation_error_spec.rb
-- spec/unit/braintree/webhook_notification_spec.rb
-- spec/unit/braintree/xml/libxml_spec.rb
 - spec/unit/braintree/xml/parser_spec.rb
+- spec/unit/braintree/xml/libxml_spec.rb
 - spec/unit/braintree/xml/rexml_spec.rb
-- spec/unit/braintree/xml_spec.rb
-- spec/unit/braintree_spec.rb
+- spec/unit/braintree/payment_method_spec.rb
+- spec/unit/braintree/util_spec.rb
+- spec/unit/braintree/resource_collection_spec.rb
+- spec/unit/braintree/address_spec.rb
 - spec/unit/spec_helper.rb
+- spec/unit/braintree_spec.rb
+- spec/script/httpsd.rb
+- braintree.gemspec
 homepage: http://www.braintreepayments.com/
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: braintree
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Braintree Gateway Ruby Client Library
 test_files: []