braintree 2.85.0 → 2.86.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0d64ca677afdd3bc219c98009af627b4cbfaaaa
-  data.tar.gz: a5c8eafe9e54ce75579959bface19399b59ecf8e
+  metadata.gz: 7d16d946caac139ce933b07a194e06074d6bf721
+  data.tar.gz: 88a89e4cf504034189c75129b1b1e65d2bfeb66d
 SHA512:
-  metadata.gz: fc4bed06b88725a62739b7f2c2b014b19b42aaeb55a4ab7eb2d559aeb2c136b6d14ff60c684fbe44f2943a3c3119ec1be4eaba9adfda8a17601d05f63f79d993
-  data.tar.gz: 93eac87bd236a4923440f96413c19aad8ddf09bbbd7c2ab633bfe6ccd6645d70c737ce643de9204833bf585b2a811308a1f84f3d89c7526f8c9e691410523dd7
+  metadata.gz: fab396847ee1626b764b26210c10e7a3eaaf5b2eea6e8e25254ccebd2d4dd92326291a7bc211c8e7073a28c29170176254ea14d99c08a530283d4efe99b07021
+  data.tar.gz: 4994c09be6eaf8a57e698248902114cf9671ac64a10d1dd05638a643f94b30904a967fdb1cc06b0ed12d2b4622f5d250a288d79c097a83d5c6e350d6851d5435

data/lib/braintree/client_token_gateway.rb

@@ -28,7 +28,7 @@ module Braintree
     def self._generate_signature # :nodoc:
       [
         :address_id, :customer_id, :proxy_merchant_id, :merchant_account_id,
-        :version, :sepa_mandate_acceptance_location, :sepa_mandate_type,
+        :version,
         {:options => [:make_default, :verify_card, :fail_on_duplicate_payment_method]}
       ]
     end

data/lib/braintree/dispute/evidence.rb

@@ -3,7 +3,8 @@ module Braintree
     class Evidence # :nodoc:
       include BaseModule
 
-      attr_reader :comment,
+      attr_reader :category,
+        :comment,
         :created_at,
         :id,
         :sent_to_processor_at,
@@ -13,7 +14,7 @@ module Braintree
 
       def initialize(attributes)
         unless attributes.nil?
-          @tag = attributes.delete(:category)
+          @tag = attributes[:category]
           set_instance_variables_from_hash attributes
         end
         @sent_to_processor_at = Date.parse(sent_to_processor_at) unless sent_to_processor_at.nil?

data/lib/braintree/dispute_gateway.rb

@@ -20,13 +20,23 @@ module Braintree
       raise NotFoundError, "dispute with id #{dispute_id} not found"
     end
 
-    def add_file_evidence(dispute_id, document_upload_id)
+    def add_file_evidence(dispute_id, document_id_or_request)
       raise ArgumentError, "dispute_id contains invalid characters" unless dispute_id.to_s =~ /\A[\w-]+\z/
       raise ArgumentError, "dispute_id cannot be blank" if dispute_id.nil? || dispute_id.to_s.strip == ""
-      raise ArgumentError, "document_upload_id contains invalid characters" unless document_upload_id.to_s =~ /\A[\w-]+\z/
-      raise ArgumentError, "document_upload_id cannot be blank" if document_upload_id.nil? || dispute_id.to_s.strip == ""
+      raise ArgumentError, "document_id_or_request cannot be blank" if document_id_or_request.nil?
 
-      params = {document_upload_id: document_upload_id}
+      request = document_id_or_request.is_a?(Hash) ? document_id_or_request : { document_id: document_id_or_request }
+
+      raise ArgumentError, "document_id contains invalid characters" unless request[:document_id].to_s =~ /\A[\w-]+\z/
+      raise ArgumentError, "document_id cannot be blank" if request[:document_id].nil? || dispute_id.to_s.strip == ""
+      raise ArgumentError, "category must be a string" if request[:category] && !request[:category].is_a?(String)
+
+      params = {
+        evidence: {
+          document_upload_id: request[:document_id],
+          category: request[:category],
+        }
+      }
       response = @config.http.post("#{@config.base_merchant_path}/disputes/#{dispute_id}/evidence", params)
 
       if response[:evidence]
@@ -48,15 +58,20 @@ module Braintree
       request = content_or_request.is_a?(String) ? { content: content_or_request } : content_or_request
 
       raise ArgumentError, "content cannot be blank" if request[:content].nil? || request[:content].to_s.strip == ""
-      raise ArgumentError, "request can only contain the keys [:content, :tag, :sequence_number]" if (request.keys - [:content, :tag, :sequence_number]).any?
+      raise ArgumentError, "request can only contain the keys [:content, :category, :sequence_number]" if (request.keys - [:category, :content, :tag, :sequence_number]).any?
       raise ArgumentError, "sequence_number must be an integer" if request[:sequence_number] && request[:sequence_number].to_s.match(/\D/)
       raise ArgumentError, "tag must be a string" if request[:tag] && !request[:tag].is_a?(String)
+      raise ArgumentError, "category must be a string" if request[:category] && !request[:category].is_a?(String)
+
+      warn "[DEPRECATED] tag as an option is deprecated. Please use category" if request[:tag]
+
+      category = request[:category] || request[:tag]
 
       params_for_http_post = {
         evidence: {
           comments: request[:content]
         }.tap do |evidence_params|
-          evidence_params[:category] = request[:tag] if request[:tag]
+          evidence_params[:category] = category if category
           evidence_params[:sequence_number] = request[:sequence_number] if request[:sequence_number]
         end
       }

data/lib/braintree/error_codes.rb

@@ -152,6 +152,23 @@ module Braintree
       CanOnlyAddEvidenceDocumentToDispute = "95703"
       CanOnlyAcceptOpenDispute = "95704"
       CanOnlyFinalizeOpenDispute = "95705"
+      CanOnlyCreateEvidenceWithValidCategory = "95706"
+      EvidenceContentDateInvalid = "95707"
+      EvidenceContentTooLong = "95708"
+      EvidenceContentARNTooLong = "95709"
+      EvidenceContentPhoneTooLong = "95710"
+      EvidenceCategoryTextOnly = "95711"
+      EvidenceCategoryDocumentOnly = "95712"
+      EvidenceCategoryNotForReasonCode = "95713"
+      EvidenceCategoryDuplicate = "95714"
+      EvidenceContentEmailInvalid = "95715"
+
+      DigitalGoodsMissingEvidence = "95720"
+      DigitalGoodsMissingDownloadDate = "95721"
+      NonDisputedPriorTransactionEvidenceMissingARN = "95722"
+      NonDisputedPriorTransactionEvidenceMissingDate = "95723"
+      RecurringTransactionEvidenceMissingDate = "95724"
+      RecurringTransactionEvidenceMissingARN = "95725"
     end
 
     module DocumentUpload

data/lib/braintree/payment_method_gateway.rb

@@ -27,8 +27,6 @@ module Braintree
         SuccessfulResult.new(:payment_method => CoinbaseAccount._new(@gateway, response[:coinbase_account]))
       elsif response[:us_bank_account]
         SuccessfulResult.new(:payment_method => UsBankAccount._new(@gateway, response[:us_bank_account]))
-      elsif response[:europe_bank_account]
-        SuccessfulResult.new(:payment_method => EuropeBankAccount._new(@gateway, response[:europe_bank_account]))
       elsif response[:apple_pay_card]
         SuccessfulResult.new(:payment_method => ApplePayCard._new(@gateway, response[:apple_pay_card]))
       elsif response[:android_pay_card]

data/lib/braintree/paypal_account.rb

@@ -7,6 +7,7 @@ module Braintree
     attr_reader :customer_id
     attr_reader :email
     attr_reader :image_url
+    attr_reader :payer_id
     attr_reader :subscriptions
     attr_reader :token
     attr_reader :updated_at

data/lib/braintree/version.rb

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

data/spec/integration/braintree/client_api/client_token_spec.rb

@@ -188,19 +188,18 @@ describe Braintree::ClientToken do
     end
 
     context "SEPA" do
-      it "includes the SEPA options for a SEPA merchant" do
+      it "raises error for passing in sepa related params" do
         with_altpay_merchant do
           result = Braintree::Customer.create
           customer_id = result.customer.id
 
-          raw_client_token = Braintree::ClientToken.generate(
-            :customer_id => customer_id,
-            :sepa_mandate_acceptance_location => "Hamburg, Germany",
-            :sepa_mandate_type => Braintree::EuropeBankAccount::MandateType::Business
-          )
-          client_token = decode_client_token(raw_client_token)
-
-          client_token["authorizationFingerprint"].should include("sepa_mandate_type=business")
+          expect do
+            Braintree::ClientToken.generate(
+              :customer_id => customer_id,
+              :sepa_mandate_acceptance_location => "Hamburg, Germany",
+              :sepa_mandate_type => Braintree::EuropeBankAccount::MandateType::Business
+            )
+          end.to raise_error(ArgumentError, "invalid keys: sepa_mandate_acceptance_location, sepa_mandate_type")
         end
       end
     end

data/spec/integration/braintree/dispute_spec.rb

@@ -3,6 +3,12 @@ require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 require File.expand_path(File.dirname(__FILE__) + "/client_api/spec_helper")
 
 describe Braintree::Dispute do
+  let(:document_upload) do
+    file = File.new("#{File.dirname(__FILE__)}/../../fixtures/files/bt_logo.png", "r")
+    response = Braintree::DocumentUpload.create({:kind => Braintree::DocumentUpload::Kind::EvidenceDocument, :file => file})
+    document_upload = response.document_upload
+  end
+
   let(:transaction) do
     result = Braintree::Transaction.sale(
       :amount => '10.00',
@@ -46,16 +52,11 @@ describe Braintree::Dispute do
   end
 
   describe "self.add_file_evidence" do
-    let(:document_upload) do
-      file = File.new("#{File.dirname(__FILE__)}/../../fixtures/files/bt_logo.png", "r")
-      response = Braintree::DocumentUpload.create({:kind => Braintree::DocumentUpload::Kind::EvidenceDocument, :file => file})
-      document_upload = response.document_upload
-    end
-
-    it "creates text evidence for the dispute" do
+    it "creates file evidence for the dispute" do
       result = Braintree::Dispute.add_file_evidence(dispute.id, document_upload.id)
 
       result.success?.should == true
+      result.evidence.category.should be_nil
       result.evidence.comment.should be_nil
       result.evidence.created_at.between?(Time.now - 10, Time.now).should == true
       result.evidence.id.should =~ /^\w{16,}$/
@@ -87,6 +88,14 @@ describe Braintree::Dispute do
       expected_evidence.comment.should be_nil
       expected_evidence.url.should include("bt_logo.png")
     end
+
+    it "creates file evidence with a category when provided" do
+      result = Braintree::Dispute.add_file_evidence(dispute.id, {category: "GENERAL", document_id: document_upload.id})
+
+      result.success?.should == true
+      result.evidence.category.should == "GENERAL"
+      result.evidence.url.should include("bt_logo.png")
+    end
   end
 
   describe "self.add_text_evidence" do
@@ -94,6 +103,7 @@ describe Braintree::Dispute do
       result = Braintree::Dispute.add_text_evidence(dispute.id, "text evidence")
 
       result.success?.should == true
+      result.evidence.category.should == nil
       result.evidence.comment.should == "text evidence"
       result.evidence.created_at.between?(Time.now - 10, Time.now).should == true
       result.evidence.id.should =~ /^\w{16,}$/
@@ -131,6 +141,7 @@ describe Braintree::Dispute do
       result = Braintree::Dispute.add_text_evidence(dispute.id, { content: "123456789", tag: "REFUND_ID", sequence_number: 7 })
 
       result.success?.should == true
+      result.evidence.category.should == "REFUND_ID"
       result.evidence.comment.should == "123456789"
       result.evidence.created_at.between?(Time.now - 10, Time.now).should == true
       result.evidence.id.should =~ /^\w{16,}$/
@@ -227,4 +238,66 @@ describe Braintree::Dispute do
       result.errors.for(:dispute)[0].message.should == "Evidence can only be removed from disputes that are in an Open state"
     end
   end
+
+  context "categorized evidence" do
+    it "fails to create file evidence for an unsupported category" do
+      result = Braintree::Dispute.add_file_evidence(dispute.id, {category: "NOTREALCATEGORY", document_id: document_upload.id})
+
+      result.success?.should == false
+      result.errors.for(:dispute)[0].code.should == Braintree::ErrorCodes::Dispute::CanOnlyCreateEvidenceWithValidCategory
+    end
+
+    it "fails to create text evidence for an unsupported category" do
+      result = Braintree::Dispute.add_text_evidence(dispute.id, {category: "NOTREALCATEGORY", content: "evidence"})
+
+      result.success?.should == false
+      result.errors.for(:dispute)[0].code.should == Braintree::ErrorCodes::Dispute::CanOnlyCreateEvidenceWithValidCategory
+    end
+
+    it "fails to create text evidence for a file only category MERCHANT_WEBSITE_OR_APP_ACCESS" do
+      result = Braintree::Dispute.add_text_evidence(dispute.id, {category: "MERCHANT_WEBSITE_OR_APP_ACCESS", content: "evidence"})
+
+      result.success?.should == false
+      result.errors.for(:dispute)[0].code.should == Braintree::ErrorCodes::Dispute::EvidenceCategoryDocumentOnly
+    end
+
+    it "fails to create file evidence for a text only category DEVICE_ID" do
+      result = Braintree::Dispute.add_file_evidence(dispute.id, {category: "DEVICE_ID", document_id: document_upload.id})
+
+      result.success?.should == false
+      result.errors.for(:dispute)[0].code.should == Braintree::ErrorCodes::Dispute::EvidenceCategoryTextOnly
+    end
+
+    it "fails to create evidence with an invalid date time format" do
+      result = Braintree::Dispute.add_text_evidence(dispute.id, {category: "DOWNLOAD_DATE_TIME", content: "baddate"})
+
+      result.success?.should == false
+      result.errors.for(:dispute)[0].code.should == Braintree::ErrorCodes::Dispute::EvidenceContentDateInvalid
+    end
+
+    it "successfully creates text evidence with an valid date time format" do
+      result = Braintree::Dispute.add_text_evidence(dispute.id, {category: "DOWNLOAD_DATE_TIME", content: "2018-10-20T18:00:00-0500"})
+
+      result.success?.should == true
+    end
+
+    it "fails to finalize a dispute with digital goods missing" do
+      Braintree::Dispute.add_text_evidence(dispute.id, {category: "DEVICE_ID", content: "iphone_id"})
+      result = Braintree::Dispute.finalize(dispute.id)
+
+      result.success?.should == false
+      error_codes = result.errors.for(:dispute).map(&:code)
+
+      error_codes.should include(Braintree::ErrorCodes::Dispute::DigitalGoodsMissingDownloadDate)
+      error_codes.should include(Braintree::ErrorCodes::Dispute::DigitalGoodsMissingEvidence)
+    end
+
+    it "fails to finalize a dispute with partial non-disputed transaction information provided" do
+      Braintree::Dispute.add_text_evidence(dispute.id, {category: "PRIOR_NON_DISPUTED_TRANSACTION_ARN", content: "123"})
+      result = Braintree::Dispute.finalize(dispute.id)
+
+      result.success?.should == false
+      result.errors.for(:dispute)[0].code.should == Braintree::ErrorCodes::Dispute::NonDisputedPriorTransactionEvidenceMissingDate
+    end
+  end
 end

data/spec/integration/braintree/payment_method_spec.rb

@@ -200,6 +200,18 @@ describe Braintree::PaymentMethod do
       venmo_account.customer_id.should == customer.id
     end
 
+    it "raise server error when we attempt to create europe bank account payment method" do
+      customer = Braintree::Customer.create.customer
+      token = SecureRandom.hex(16)
+      expect do
+        Braintree::PaymentMethod.create(
+          :payment_method_nonce => Braintree::Test::Nonce::Europe,
+          :customer_id => customer.id,
+          :token => token
+        )
+      end.to raise_error(Braintree::ServerError)
+    end
+
     it "allows passing the make_default option alongside the nonce" do
       customer = Braintree::Customer.create!
       result = Braintree::CreditCard.create(
@@ -534,10 +546,12 @@ describe Braintree::PaymentMethod do
         result.should be_success
         result.payment_method.should be_a(Braintree::PayPalAccount)
         result.payment_method.image_url.should_not be_nil
+        result.payment_method.payer_id.should_not be_nil
         token = result.payment_method.token
 
         found_paypal_account = Braintree::PayPalAccount.find(token)
         found_paypal_account.should_not be_nil
+        found_paypal_account.payer_id.should_not be_nil
       end
 
       it "creates a billing agreement payment method from a refresh token" do
@@ -550,11 +564,13 @@ describe Braintree::PaymentMethod do
         result.should be_success
         result.payment_method.should be_a(Braintree::PayPalAccount)
         result.payment_method.billing_agreement_id.should eq("B_FAKE_ID")
+        result.payment_method.payer_id.should_not be_nil
         token = result.payment_method.token
 
         found_paypal_account = Braintree::PayPalAccount.find(token)
         found_paypal_account.should_not be_nil
         found_paypal_account.billing_agreement_id.should eq("B_FAKE_ID")
+        found_paypal_account.payer_id.should_not be_nil
       end
 
       it "creates a billing agreement payment method from a refresh token without upgrading" do

data/spec/unit/braintree/dispute_spec.rb

@@ -130,6 +130,29 @@ describe Braintree::Dispute do
         Braintree::Dispute.add_file_evidence("dispute_id", 8675309)
       end.to_not raise_error
     end
+
+    describe "with optional params" do
+      it "does not raise an exception if the optional parameters are valid" do
+        Braintree::Http.stub(:new).and_return double.as_null_object
+        expect do
+          Braintree::Dispute.add_file_evidence("dispute_id", { category: "GENERAL", document_id: "document_id" })
+        end.to_not raise_error
+      end
+
+      it "raises an exception if the optional params contain invalid keys" do
+        expect do
+          Braintree::Dispute.add_file_evidence("dispute_id", { random_param: "" })
+        end.to raise_error(ArgumentError)
+      end
+
+      it "raises an exception if the param tag is not a string" do
+        Braintree::Http.stub(:new).and_return double.as_null_object
+
+        expect do
+          Braintree::Dispute.add_file_evidence("dispute_id", { category: 3, document_id: "document_id" })
+        end.to raise_error(ArgumentError)
+      end
+    end
   end
 
   describe "self.add_text_evidence" do
@@ -173,26 +196,40 @@ describe Braintree::Dispute do
 
     describe "with optional params" do
       it "does not raise an exception if the optional parameters are valid" do
+        Braintree::Http.stub(:new).and_return double.as_null_object
         expect do
-          Braintree::Dispute.add_text_evidence("dispute_id", nil, { tag: "", sequence_number: 3 })
-        end.to raise_error
+          Braintree::Dispute.add_text_evidence("dispute_id", { content: "a", tag: "", sequence_number: 3 })
+        end.to_not raise_error
+      end
+
+      it "does not raise an exception if the category parameter is provided" do
+        Braintree::Http.stub(:new).and_return double.as_null_object
+        expect do
+          Braintree::Dispute.add_text_evidence("dispute_id", { content: "a", category: "", sequence_number: 3 })
+        end.to_not raise_error
       end
 
       it "raises an exception if the optional params contain invalid keys" do
         expect do
-          Braintree::Dispute.add_text_evidence("dispute_id", nil, { random_param: "" })
+          Braintree::Dispute.add_text_evidence("dispute_id", { random_param: "" })
         end.to raise_error(ArgumentError)
       end
 
       it "raises an exception if sequence_number is provided and not an integer" do
         expect do
-          Braintree::Dispute.add_text_evidence("dispute_id", nil, { sequence_number: "abc" })
+          Braintree::Dispute.add_text_evidence("dispute_id", { sequence_number: "abc" })
         end.to raise_error(ArgumentError)
       end
 
       it "raises an exception if the param tag is not a string" do
         expect do
-          Braintree::Dispute.add_text_evidence("dispute_id", nil, { tag: 3 })
+          Braintree::Dispute.add_text_evidence("dispute_id", { tag: 3 })
+        end.to raise_error(ArgumentError)
+      end
+
+      it "raises an exception if the param category is not a string" do
+        expect do
+          Braintree::Dispute.add_text_evidence("dispute_id", { category: 3 })
         end.to raise_error(ArgumentError)
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: braintree
 version: !ruby/object:Gem::Version
-  version: 2.85.0
+  version: 2.86.0
 platform: ruby
 authors:
 - Braintree
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-15 00:00:00.000000000 Z
+date: 2018-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -185,7 +185,6 @@ files:
 - spec/fixtures/files/gif_extension_bt_logo.gif
 - spec/fixtures/files/malformed_pdf.pdf
 - spec/hacks/tcp_socket.rb
-- spec/httpsd.pid
 - spec/integration/braintree/add_on_spec.rb
 - spec/integration/braintree/address_spec.rb
 - spec/integration/braintree/advanced_search_spec.rb

data/spec/httpsd.pid

@@ -1 +0,0 @@
-2671