braintree 2.75.0 → 2.76.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7add957a34ab8172520fbd04d8b0205c9dfb3b1e
-  data.tar.gz: 6d2c78ae970aa3590e43427ddb4412ae3f8c5571
+  metadata.gz: f42a6a1794be0f659dc3cea9f5e84bff6e1d4e75
+  data.tar.gz: efdb9c09c2b5961fc4358af6f7d397ac4a304c53
 SHA512:
-  metadata.gz: 3432c5ba3ddca0d3284a3565791b4623545a14ce90ca56219ce12fed6ccb7987611f6d0177ab4c10712749e15c830e9d0822406844ad860d924308c86d74c4ab
-  data.tar.gz: 680e39fd812b590489921526c07d5deebc0fdfc3807d8e4e1f3d66ce48e97f50eeff3fed79de73b9d37d35c02f058077a704197b30b47b95d5fbfa011b6f4e9f
+  metadata.gz: aaea5122d23bf61d943af46e50bd768b70efcfb2aede98c857e2ae36c84851b9871dffccafbfadeafca384101ec0b9dee2a5d69bd7ec3c664228836a5ef2da0d
+  data.tar.gz: e10e87bb06504b7119ff25ae558422a12d6ff88f614580a30af194eb8985b9b6655fb94b3c5fe8d65d5be8d96ccb3fead07214a73e2c3ec289fc09946c4cf7df

data/lib/braintree/merchant.rb

@@ -4,9 +4,9 @@ module Braintree
 
     attr_reader :id, :email, :company_name, :country_code_alpha2, :country_code_alpha3, :country_code_numeric, :country_name, :merchant_accounts
 
-    def initialize(attributes) # :nodoc:
+    def initialize(gateway, attributes) # :nodoc:
       @merchant_accounts = attributes.delete(:merchant_accounts).map do |merchant_account|
-        MerchantAccount._new(Configuration.gateway, merchant_account)
+        MerchantAccount._new(gateway, merchant_account)
       end
 
       set_instance_variables_from_hash(attributes)

data/lib/braintree/merchant_gateway.rb

@@ -25,7 +25,7 @@ module Braintree
 
       if response.has_key?(:response) && response[:response][:merchant]
         Braintree::SuccessfulResult.new(
-          :merchant => Merchant._new(response[:response][:merchant]),
+          :merchant => Merchant._new(@gateway, response[:response][:merchant]),
           :credentials => OAuthCredentials._new(response[:response][:credentials])
         )
       elsif response[:api_error_response]

data/lib/braintree/version.rb

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

data/spec/httpsd.pid

@@ -1 +1 @@
-26882
+13345

data/spec/integration/braintree/merchant_spec.rb

@@ -52,6 +52,32 @@ describe Braintree::MerchantGateway do
       errors[0].code.should == Braintree::ErrorCodes::Merchant::PaymentMethodsAreInvalid
     end
 
+    context "credentials" do
+      around(:each) do |example|
+        old_merchant_id_value = Braintree::Configuration.merchant_id
+        example.run
+        Braintree::Configuration.merchant_id = old_merchant_id_value
+      end
+
+      it "allows using a merchant_id passed in through Gateway" do
+        Braintree::Configuration.merchant_id = nil
+
+        gateway = Braintree::Gateway.new(
+          :client_id => "client_id$#{Braintree::Configuration.environment}$integration_client_id",
+          :client_secret => "client_secret$#{Braintree::Configuration.environment}$integration_client_secret",
+          :merchant_id => "integration_merchant_id",
+          :logger => Logger.new("/dev/null"),
+        )
+        result = gateway.merchant.create(
+          :email => "name@email.com",
+          :country_code_alpha3 => "USA",
+          :payment_methods => ["credit_card", "paypal"]
+        )
+
+        result.should be_success
+      end
+    end
+
     context "multiple currencies" do
       before(:each) do
         @gateway = Braintree::Gateway.new(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: braintree
 version: !ruby/object:Gem::Version
-  version: 2.75.0
+  version: 2.76.0
 platform: ruby
 authors:
 - Braintree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -272,7 +272,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: braintree
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Braintree Gateway Ruby Client Library