braintree 2.25.0 → 2.26.0

data/spec/unit/braintree/configuration_spec.rb

@@ -17,6 +17,32 @@ describe Braintree::Configuration do
     Braintree::Configuration.endpoint = Braintree::Configuration::DEFAULT_ENDPOINT
   end
 
+  describe "initialize" do
+    it "accepts merchant credentials" do
+      config = Braintree::Configuration.new(
+        :merchant_id => 'merchant_id',
+        :public_key => 'public_key',
+        :private_key => 'private_key'
+      )
+
+      config.merchant_id.should == 'merchant_id'
+      config.public_key.should == 'public_key'
+      config.private_key.should == 'private_key'
+    end
+
+    it "accepts partner credentials" do
+      config = Braintree::Configuration.new(
+        :partner_id => 'partner_id',
+        :public_key => 'public_key',
+        :private_key => 'private_key'
+      )
+
+      config.merchant_id.should == 'partner_id'
+      config.public_key.should == 'public_key'
+      config.private_key.should == 'private_key'
+    end
+  end
+
   describe "base_merchant_path" do
     it "returns /merchants/{merchant_id}" do
       Braintree::Configuration.instantiate.base_merchant_path.should == "/merchants/integration_merchant_id"
@@ -32,12 +58,12 @@ describe Braintree::Configuration do
 
     it "returns the expected url for the sandbox env" do
       Braintree::Configuration.environment = :sandbox
-      Braintree::Configuration.instantiate.base_merchant_url.should == "https://sandbox.braintreegateway.com:443/merchants/integration_merchant_id"
+      Braintree::Configuration.instantiate.base_merchant_url.should == "https://api.sandbox.braintreegateway.com:443/merchants/integration_merchant_id"
     end
 
     it "returns the expected url for the production env" do
       Braintree::Configuration.environment = :production
-      Braintree::Configuration.instantiate.base_merchant_url.should == "https://www.braintreegateway.com:443/merchants/integration_merchant_id"
+      Braintree::Configuration.instantiate.base_merchant_url.should == "https://api.braintreegateway.com:443/merchants/integration_merchant_id"
     end
   end
 
@@ -45,21 +71,21 @@ describe Braintree::Configuration do
     it "qa" do
       Braintree::Configuration.environment = :qa
       ca_file = Braintree::Configuration.instantiate.ca_file
-      ca_file.should match(/sandbox_braintreegateway_com.ca.crt$/)
+      ca_file.should match(/api_braintreegateway_com\.ca\.crt$/)
       File.exists?(ca_file).should == true
     end
 
     it "sandbox" do
       Braintree::Configuration.environment = :sandbox
       ca_file = Braintree::Configuration.instantiate.ca_file
-      ca_file.should match(/sandbox_braintreegateway_com.ca.crt$/)
+      ca_file.should match(/api_braintreegateway_com\.ca\.crt$/)
       File.exists?(ca_file).should == true
     end
 
     it "production" do
       Braintree::Configuration.environment = :production
       ca_file = Braintree::Configuration.instantiate.ca_file
-      ca_file.should match(/www_braintreegateway_com.ca.crt$/)
+      ca_file.should match(/api_braintreegateway_com\.ca\.crt$/)
       File.exists?(ca_file).should == true
     end
   end
@@ -187,14 +213,14 @@ describe Braintree::Configuration do
       Braintree::Configuration.instantiate.server.should == "localhost"
     end
 
-    it "is www.braintreegateway.com for production" do
+    it "is api.braintreegateway.com for production" do
       Braintree::Configuration.environment = :production
-      Braintree::Configuration.instantiate.server.should == "www.braintreegateway.com"
+      Braintree::Configuration.instantiate.server.should == "api.braintreegateway.com"
     end
 
-    it "is sandbox.braintreegateway.com for sandbox" do
+    it "is api.sandbox.braintreegateway.com for sandbox" do
       Braintree::Configuration.environment = :sandbox
-      Braintree::Configuration.instantiate.server.should == "sandbox.braintreegateway.com"
+      Braintree::Configuration.instantiate.server.should == "api.sandbox.braintreegateway.com"
     end
 
     it "is qa.braintreegateway.com for qa" do

data/spec/unit/braintree/credit_card_spec.rb

@@ -23,6 +23,7 @@ describe Braintree::CreditCard do
         :token,
         :venmo_sdk_payment_method_code,
         :device_data,
+        :fraud_merchant_id,
         {:options => [:make_default, :verification_merchant_account_id, :verify_card, :venmo_sdk_session, :fail_on_duplicate_payment_method]},
         {:billing_address => [
           :company,
@@ -57,6 +58,7 @@ describe Braintree::CreditCard do
         :token,
         :venmo_sdk_payment_method_code,
         :device_data,
+        :fraud_merchant_id,
         {:options => [:make_default, :verification_merchant_account_id, :verify_card, :venmo_sdk_session]},
         {:billing_address => [
           :company,

data/spec/unit/braintree/customer_spec.rb

@@ -94,6 +94,7 @@ describe Braintree::Customer do
           :token,
           :venmo_sdk_payment_method_code,
           :device_data,
+          :fraud_merchant_id,
           {:options => [:make_default, :verification_merchant_account_id, :verify_card, :venmo_sdk_session, :fail_on_duplicate_payment_method]},
           {:billing_address => [
             :company,
@@ -139,6 +140,7 @@ describe Braintree::Customer do
           :token,
           :venmo_sdk_payment_method_code,
           :device_data,
+          :fraud_merchant_id,
           {:options => [
             :make_default,
             :verification_merchant_account_id,

data/spec/unit/braintree/webhook_notification_spec.rb

@@ -15,19 +15,46 @@ describe Braintree::WebhookNotification do
       notification.timestamp.should be_close(Time.now.utc, 10)
     end
 
-    it "builds a sample notification for a partner user created webhook" do
+    it "builds a sample notification for a partner merchant connected webhook" do
       signature, payload = Braintree::WebhookTesting.sample_notification(
-        Braintree::WebhookNotification::Kind::PartnerUserCreated,
+        Braintree::WebhookNotification::Kind::PartnerMerchantConnected,
         "my_id"
       )
 
       notification = Braintree::WebhookNotification.parse(signature, payload)
 
-      notification.kind.should == Braintree::WebhookNotification::Kind::PartnerUserCreated
-      notification.partner_credentials.merchant_public_id.should == "public_id"
-      notification.partner_credentials.public_key.should == "public_key"
-      notification.partner_credentials.private_key.should == "private_key"
-      notification.partner_credentials.partner_user_id.should == "abc123"
+      notification.kind.should == Braintree::WebhookNotification::Kind::PartnerMerchantConnected
+      notification.partner_merchant.merchant_public_id.should == "public_id"
+      notification.partner_merchant.public_key.should == "public_key"
+      notification.partner_merchant.private_key.should == "private_key"
+      notification.partner_merchant.partner_merchant_id.should == "abc123"
+      notification.partner_merchant.client_side_encryption_key.should == "cse_key"
+      notification.timestamp.should be_close(Time.now.utc, 10)
+    end
+
+    it "builds a sample notification for a partner merchant disconnected webhook" do
+      signature, payload = Braintree::WebhookTesting.sample_notification(
+        Braintree::WebhookNotification::Kind::PartnerMerchantDisconnected,
+        "my_id"
+      )
+
+      notification = Braintree::WebhookNotification.parse(signature, payload)
+
+      notification.kind.should == Braintree::WebhookNotification::Kind::PartnerMerchantDisconnected
+      notification.partner_merchant.partner_merchant_id.should == "abc123"
+      notification.timestamp.should be_close(Time.now.utc, 10)
+    end
+
+    it "builds a sample notification for a partner merchant declined webhook" do
+      signature, payload = Braintree::WebhookTesting.sample_notification(
+        Braintree::WebhookNotification::Kind::PartnerMerchantDeclined,
+        "my_id"
+      )
+
+      notification = Braintree::WebhookNotification.parse(signature, payload)
+
+      notification.kind.should == Braintree::WebhookNotification::Kind::PartnerMerchantDeclined
+      notification.partner_merchant.partner_merchant_id.should == "abc123"
       notification.timestamp.should be_close(Time.now.utc, 10)
     end
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: braintree
 version: !ruby/object:Gem::Version
-  version: 2.25.0
-  prerelease: 
+  version: 2.26.0
 platform: ruby
 authors:
 - Braintree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -36,160 +33,160 @@ 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/merchant_account.rb
-- lib/braintree/test/venmo_sdk.rb
-- lib/braintree/webhook_testing.rb
+- lib/braintree/validation_error.rb
 - lib/braintree/webhook_testing_gateway.rb
-- lib/braintree/advanced_search.rb
-- lib/braintree/version.rb
-- lib/braintree/add_on.rb
-- lib/braintree/address.rb
-- lib/braintree/digest.rb
-- lib/braintree/settlement_batch_summary.rb
-- lib/braintree/error_codes.rb
-- lib/braintree/discount.rb
+- lib/braintree/transparent_redirect.rb
 - lib/braintree/webhook_notification.rb
-- lib/braintree/settlement_batch_summary_gateway.rb
 - lib/braintree/validation_error_collection.rb
+- lib/braintree/transaction.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/webhook_notification_gateway.rb
+- lib/braintree/transaction_search.rb
+- lib/braintree/transaction_gateway.rb
+- lib/braintree/add_on.rb
+- lib/braintree/resource_collection.rb
+- lib/braintree/address_gateway.rb
+- lib/braintree/successful_result.rb
+- lib/braintree/plan.rb
+- lib/braintree/subscription_search.rb
+- lib/braintree/descriptor.rb
+- lib/braintree/error_codes.rb
+- lib/braintree/xml.rb
+- lib/braintree/discount_gateway.rb
 - lib/braintree/xml/generator.rb
+- lib/braintree/xml/parser.rb
 - lib/braintree/xml/rexml.rb
 - lib/braintree/xml/libxml.rb
-- lib/braintree/xml/parser.rb
-- lib/braintree/exceptions.rb
-- lib/braintree/validation_error.rb
-- lib/braintree/resource_collection.rb
-- lib/braintree/xml.rb
-- lib/braintree/credit_card_verification.rb
-- lib/braintree/configuration.rb
-- lib/braintree/transaction.rb
+- lib/braintree/version.rb
+- lib/braintree/address.rb
+- lib/braintree/modification.rb
 - lib/braintree/http.rb
-- lib/braintree/address_gateway.rb
-- lib/braintree/subscription_gateway.rb
+- lib/braintree/digest.rb
+- lib/braintree/customer.rb
+- lib/braintree/gateway.rb
+- lib/braintree/base_module.rb
+- lib/braintree/advanced_search.rb
+- lib/braintree/settlement_batch_summary.rb
+- lib/braintree/errors.rb
 - lib/braintree/customer_gateway.rb
-- lib/braintree/plan_gateway.rb
+- lib/braintree/webhook_testing.rb
+- lib/braintree/credit_card.rb
+- lib/braintree/settlement_batch_summary_gateway.rb
+- lib/braintree/customer_search.rb
+- lib/braintree/address/country_names.rb
+- lib/braintree/util.rb
+- lib/braintree/subscription_gateway.rb
+- lib/braintree/discount.rb
+- lib/braintree/credit_card_verification.rb
+- lib/braintree/credit_card_gateway.rb
 - lib/braintree/credit_card_verification_search.rb
-- lib/braintree/successful_result.rb
+- lib/braintree/merchant_account_gateway.rb
+- lib/braintree/add_on_gateway.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/test/venmo_sdk.rb
+- lib/braintree/test/transaction_amounts.rb
+- lib/braintree/test/credit_card.rb
+- lib/braintree/test/merchant_account.rb
+- lib/braintree/merchant_account.rb
+- lib/braintree/subscription.rb
+- lib/braintree/plan_gateway.rb
+- lib/braintree/exceptions.rb
+- lib/braintree/error_result.rb
+- lib/braintree/configuration.rb
 - lib/braintree/transaction/subscription_details.rb
-- lib/braintree/transaction/disbursement_details.rb
+- lib/braintree/transaction/address_details.rb
+- lib/braintree/transaction/status_details.rb
 - lib/braintree/transaction/customer_details.rb
 - lib/braintree/transaction/credit_card_details.rb
-- lib/braintree/transaction/status_details.rb
-- lib/braintree/transaction/address_details.rb
-- lib/braintree/transaction_search.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/merchant_account.rb
-- lib/braintree/address/country_names.rb
-- lib/braintree/webhook_notification_gateway.rb
-- lib/braintree/merchant_account_gateway.rb
-- lib/braintree/customer.rb
-- lib/braintree/discount_gateway.rb
+- lib/braintree/transaction/disbursement_details.rb
 - lib/ssl/www_braintreegateway_com.ca.crt
-- lib/ssl/sandbox_braintreegateway_com.ca.crt
 - lib/ssl/securetrust_ca.crt
-- spec/script/httpsd.rb
+- lib/ssl/api_braintreegateway_com.ca.crt
+- lib/ssl/sandbox_braintreegateway_com.ca.crt
+- spec/integration/spec_helper.rb
+- spec/integration/braintree/error_codes_spec.rb
+- spec/integration/braintree/transparent_redirect_spec.rb
+- spec/integration/braintree/credit_card_verification_search_spec.rb
+- spec/integration/braintree/advanced_search_spec.rb
+- spec/integration/braintree/discount_spec.rb
+- spec/integration/braintree/credit_card_spec.rb
+- spec/integration/braintree/settlement_batch_summary_spec.rb
+- spec/integration/braintree/address_spec.rb
+- spec/integration/braintree/customer_search_spec.rb
+- spec/integration/braintree/credit_card_verification_spec.rb
+- spec/integration/braintree/plan_spec.rb
+- spec/integration/braintree/http_spec.rb
+- spec/integration/braintree/customer_spec.rb
+- spec/integration/braintree/add_on_spec.rb
+- spec/integration/braintree/transaction_spec.rb
+- spec/integration/braintree/transaction_search_spec.rb
+- spec/integration/braintree/subscription_spec.rb
+- spec/integration/braintree/test/transaction_amounts_spec.rb
+- spec/integration/braintree/merchant_account_spec.rb
 - spec/spec_helper.rb
+- spec/ssl/certificate.crt
+- spec/ssl/geotrust_global.crt
+- spec/ssl/privateKey.key
+- spec/httpsd.pid
+- spec/unit/braintree_spec.rb
 - spec/unit/spec_helper.rb
-- spec/unit/braintree/transaction_search_spec.rb
-- spec/unit/braintree/error_result_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/subscription_spec.rb
+- spec/unit/braintree/transparent_redirect_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/base_module_spec.rb
+- spec/unit/braintree/credit_card_spec.rb
+- spec/unit/braintree/xml_spec.rb
+- spec/unit/braintree/address_spec.rb
+- spec/unit/braintree/validation_error_collection_spec.rb
+- spec/unit/braintree/util_spec.rb
+- spec/unit/braintree/error_result_spec.rb
 - spec/unit/braintree/credit_card_verification_spec.rb
-- spec/unit/braintree/validation_error_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/parser_spec.rb
+- spec/unit/braintree/xml/libxml_spec.rb
 - spec/unit/braintree/configuration_spec.rb
-- spec/unit/braintree/validation_error_collection_spec.rb
-- spec/unit/braintree/merchant_account_spec.rb
 - spec/unit/braintree/errors_spec.rb
+- spec/unit/braintree/digest_spec.rb
+- spec/unit/braintree/validation_error_spec.rb
+- spec/unit/braintree/webhook_notification_spec.rb
+- spec/unit/braintree/subscription_search_spec.rb
+- spec/unit/braintree/http_spec.rb
+- spec/unit/braintree/customer_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_spec.rb
+- spec/unit/braintree/resource_collection_spec.rb
+- spec/unit/braintree/successful_result_spec.rb
+- spec/unit/braintree/transaction_search_spec.rb
+- spec/unit/braintree/subscription_spec.rb
+- spec/unit/braintree/merchant_account_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/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/merchant_account_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/unit/braintree/transaction/credit_card_details_spec.rb
 - spec/spec.opts
-- spec/ssl/geotrust_global.crt
-- spec/ssl/certificate.crt
-- spec/ssl/privateKey.key
+- spec/hacks/tcp_socket.rb
+- spec/script/httpsd.rb
 - braintree.gemspec
 homepage: http://www.braintreepayments.com/
 licenses: []
+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: 1.8.25
+rubygems_version: 2.0.6
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Braintree Gateway Ruby Client Library
 test_files: []