braintree 2.27.1 → 2.28.0

data/braintree.gemspec

@@ -6,6 +6,7 @@ Gem::Specification.new do |s|
   s.summary = "Braintree Gateway Ruby Client Library"
   s.description = "Ruby library for integrating with the Braintree Gateway"
   s.version = Braintree::Version::String
+  s.license = "MIT"
   s.author = "Braintree"
   s.email = "code@getbraintree.com"
   s.homepage = "http://www.braintreepayments.com/"

data/lib/braintree/merchant_account.rb

@@ -25,6 +25,10 @@ module Braintree
       Configuration.gateway.merchant_account.create(attributes)
     end
 
+    def self.find(attributes)
+      Configuration.gateway.merchant_account.find(attributes)
+    end
+
     def self.update(id, attributes)
       Configuration.gateway.merchant_account.update(id, attributes)
     end

data/lib/braintree/merchant_account_gateway.rb

@@ -11,6 +11,14 @@ module Braintree
       _do_create "/merchant_accounts/create_via_api", :merchant_account => attributes
     end
 
+    def find(merchant_account_id)
+      raise ArgumentError if merchant_account_id.nil? || merchant_account_id.to_s.strip == ""
+      response = @config.http.get "/merchant_accounts/#{merchant_account_id}"
+      MerchantAccount._new(@gateway, response[:merchant_account])
+    rescue NotFoundError
+      raise NotFoundError, "Merchant account with id #{merchant_account_id} not found"
+    end
+
     def update(merchant_account_id, attributes)
       Util.verify_keys(MerchantAccountGateway._update_signature, attributes)
       _do_update "/merchant_accounts/#{merchant_account_id}/update_via_api", :merchant_account => attributes

data/lib/braintree/version.rb

@@ -1,8 +1,8 @@
 module Braintree
   module Version
     Major = 2
-    Minor = 27
-    Tiny = 1
+    Minor = 28
+    Tiny = 0
 
     String = "#{Major}.#{Minor}.#{Tiny}"
   end

data/spec/httpsd.pid

@@ -0,0 +1 @@
+5472

data/spec/integration/braintree/merchant_account_spec.rb

@@ -134,6 +134,27 @@ describe Braintree::MerchantAccount do
     end
   end
 
+  describe "find" do
+    it "finds the merchant account with the given token" do
+      result = Braintree::MerchantAccount.create(VALID_APPLICATION_PARAMS)
+      result.should be_success
+      result.merchant_account.status.should == Braintree::MerchantAccount::Status::Pending
+
+      id = result.merchant_account.id
+      merchant_account = Braintree::MerchantAccount.find(id)
+
+      merchant_account.status.should == Braintree::MerchantAccount::Status::Active
+      merchant_account.individual_details.first_name.should == VALID_APPLICATION_PARAMS[:individual][:first_name]
+      merchant_account.individual_details.last_name.should == VALID_APPLICATION_PARAMS[:individual][:last_name]
+    end
+
+    it "raises a NotFoundError exception if merchant account cannot be found" do
+      expect do
+        Braintree::MerchantAccount.find("non-existant")
+      end.to raise_error(Braintree::NotFoundError, 'Merchant account with id non-existant not found')
+    end
+  end
+
   describe "update" do
     it "updates the Merchant Account info" do
       params = VALID_APPLICATION_PARAMS.clone

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braintree
 version: !ruby/object:Gem::Version
-  version: 2.27.1
+  version: 2.28.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -36,144 +36,146 @@ files:
 - README.rdoc
 - LICENSE
 - lib/braintree.rb
-- lib/braintree/settlement_batch_summary_gateway.rb
-- lib/braintree/discount.rb
-- lib/braintree/base_module.rb
-- lib/braintree/xml.rb
-- lib/braintree/customer.rb
-- lib/braintree/validation_error.rb
-- lib/braintree/transaction_gateway.rb
-- lib/braintree/gateway.rb
-- lib/braintree/exceptions.rb
-- lib/braintree/customer_gateway.rb
-- lib/braintree/credit_card_verification.rb
-- lib/braintree/digest.rb
-- lib/braintree/credit_card.rb
-- lib/braintree/discount_gateway.rb
-- lib/braintree/subscription.rb
-- lib/braintree/util.rb
-- lib/braintree/configuration.rb
-- lib/braintree/merchant_account.rb
-- lib/braintree/credit_card_gateway.rb
-- lib/braintree/resource_collection.rb
-- lib/braintree/merchant_account_gateway.rb
-- lib/braintree/address/country_names.rb
-- lib/braintree/credit_card_verification_search.rb
-- lib/braintree/version.rb
-- lib/braintree/plan.rb
-- lib/braintree/error_codes.rb
-- lib/braintree/validation_error_collection.rb
-- lib/braintree/address_gateway.rb
-- lib/braintree/subscription_gateway.rb
-- lib/braintree/webhook_notification_gateway.rb
-- lib/braintree/add_on.rb
+- lib/braintree/subscription_search.rb
+- lib/braintree/modification.rb
+- lib/braintree/errors.rb
 - lib/braintree/test/credit_card.rb
 - lib/braintree/test/transaction_amounts.rb
-- lib/braintree/test/venmo_sdk.rb
 - lib/braintree/test/merchant_account.rb
-- lib/braintree/xml/rexml.rb
+- lib/braintree/test/venmo_sdk.rb
+- lib/braintree/webhook_testing.rb
+- lib/braintree/webhook_testing_gateway.rb
+- lib/braintree/advanced_search.rb
+- lib/braintree/version.rb
+- lib/braintree/add_on.rb
+- lib/braintree/address.rb
+- lib/braintree/digest.rb
+- lib/braintree/settlement_batch_summary.rb
+- lib/braintree/error_codes.rb
+- lib/braintree/discount.rb
+- lib/braintree/webhook_notification.rb
+- lib/braintree/settlement_batch_summary_gateway.rb
+- lib/braintree/validation_error_collection.rb
+- lib/braintree/credit_card_verification_gateway.rb
+- lib/braintree/credit_card.rb
+- lib/braintree/customer_search.rb
+- lib/braintree/util.rb
+- lib/braintree/transparent_redirect.rb
 - lib/braintree/xml/generator.rb
+- lib/braintree/xml/rexml.rb
 - lib/braintree/xml/libxml.rb
 - lib/braintree/xml/parser.rb
-- lib/braintree/transparent_redirect.rb
-- lib/braintree/plan_gateway.rb
-- lib/braintree/transaction_search.rb
-- lib/braintree/customer_search.rb
-- lib/braintree/transparent_redirect_gateway.rb
-- lib/braintree/webhook_notification.rb
-- lib/braintree/webhook_testing_gateway.rb
-- lib/braintree/webhook_testing.rb
-- lib/braintree/credit_card_verification_gateway.rb
-- lib/braintree/descriptor.rb
-- lib/braintree/modification.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/http.rb
+- lib/braintree/address_gateway.rb
+- lib/braintree/subscription_gateway.rb
+- lib/braintree/customer_gateway.rb
+- lib/braintree/merchant_account/business_details.rb
+- lib/braintree/merchant_account/funding_details.rb
 - lib/braintree/merchant_account/individual_details.rb
 - lib/braintree/merchant_account/address_details.rb
-- lib/braintree/merchant_account/funding_details.rb
-- lib/braintree/merchant_account/business_details.rb
-- lib/braintree/add_on_gateway.rb
+- lib/braintree/plan_gateway.rb
+- lib/braintree/credit_card_verification_search.rb
 - lib/braintree/successful_result.rb
-- lib/braintree/advanced_search.rb
-- lib/braintree/subscription_search.rb
-- lib/braintree/error_result.rb
-- lib/braintree/settlement_batch_summary.rb
-- lib/braintree/address.rb
 - lib/braintree/settlement_batch.rb
-- lib/braintree/transaction/disbursement_details.rb
-- lib/braintree/transaction/status_details.rb
-- lib/braintree/transaction/address_details.rb
+- lib/braintree/plan.rb
+- lib/braintree/gateway.rb
+- lib/braintree/transparent_redirect_gateway.rb
+- lib/braintree/base_module.rb
+- lib/braintree/add_on_gateway.rb
 - lib/braintree/transaction/subscription_details.rb
+- lib/braintree/transaction/disbursement_details.rb
 - lib/braintree/transaction/customer_details.rb
 - lib/braintree/transaction/credit_card_details.rb
-- lib/braintree/errors.rb
-- lib/braintree/http.rb
-- lib/ssl/api_braintreegateway_com.ca.crt
-- lib/ssl/securetrust_ca.crt
+- 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/ssl/www_braintreegateway_com.ca.crt
 - lib/ssl/sandbox_braintreegateway_com.ca.crt
-- spec/spec.opts
-- spec/ssl/privateKey.key
-- spec/ssl/certificate.crt
-- spec/ssl/geotrust_global.crt
-- spec/hacks/tcp_socket.rb
+- lib/ssl/securetrust_ca.crt
+- lib/ssl/api_braintreegateway_com.ca.crt
 - spec/script/httpsd.rb
-- spec/unit/braintree_spec.rb
-- spec/unit/braintree/credit_card_spec.rb
-- spec/unit/braintree/errors_spec.rb
-- spec/unit/braintree/subscription_search_spec.rb
-- spec/unit/braintree/util_spec.rb
-- spec/unit/braintree/address_spec.rb
-- spec/unit/braintree/subscription_spec.rb
+- spec/spec_helper.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/transparent_redirect_spec.rb
-- spec/unit/braintree/resource_collection_spec.rb
 - spec/unit/braintree/http_spec.rb
-- spec/unit/braintree/merchant_account_spec.rb
-- spec/unit/braintree/customer_spec.rb
-- spec/unit/braintree/error_result_spec.rb
+- spec/unit/braintree/subscription_spec.rb
+- spec/unit/braintree/credit_card_verification_search_spec.rb
+- spec/unit/braintree/subscription_search_spec.rb
 - spec/unit/braintree/successful_result_spec.rb
 - spec/unit/braintree/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/libxml_spec.rb
-- spec/unit/braintree/credit_card_verification_search_spec.rb
-- spec/unit/braintree/base_module_spec.rb
-- spec/unit/braintree/transaction_spec.rb
 - spec/unit/braintree/configuration_spec.rb
-- spec/unit/braintree/xml_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/modification_spec.rb
-- spec/unit/braintree/digest_spec.rb
-- spec/unit/braintree/transaction/customer_details_spec.rb
+- spec/unit/braintree/util_spec.rb
+- spec/unit/braintree/base_module_spec.rb
+- spec/unit/braintree/address_spec.rb
+- spec/unit/braintree/transparent_redirect_spec.rb
 - spec/unit/braintree/transaction/deposit_details_spec.rb
 - spec/unit/braintree/transaction/credit_card_details_spec.rb
-- spec/unit/braintree/transaction_search_spec.rb
-- spec/unit/spec_helper.rb
-- spec/integration/braintree/credit_card_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/plan_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/subscription_spec.rb
 - spec/integration/braintree/transparent_redirect_spec.rb
-- spec/integration/braintree/http_spec.rb
-- spec/integration/braintree/merchant_account_spec.rb
-- spec/integration/braintree/customer_spec.rb
-- spec/integration/braintree/credit_card_verification_spec.rb
-- spec/integration/braintree/test/transaction_amounts_spec.rb
-- spec/integration/braintree/settlement_batch_summary_spec.rb
-- spec/integration/braintree/credit_card_verification_search_spec.rb
-- spec/integration/braintree/transaction_spec.rb
-- spec/integration/braintree/customer_search_spec.rb
+- spec/integration/braintree/credit_card_spec.rb
 - spec/integration/braintree/discount_spec.rb
-- spec/integration/braintree/transaction_search_spec.rb
-- spec/integration/spec_helper.rb
-- spec/spec_helper.rb
+- spec/spec.opts
+- spec/ssl/geotrust_global.crt
+- spec/ssl/certificate.crt
+- spec/ssl/privateKey.key
 - braintree.gemspec
 homepage: http://www.braintreepayments.com/
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -192,7 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: braintree
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Braintree Gateway Ruby Client Library