braintree 2.13.1 → 2.13.2

data/lib/braintree/error_codes.rb

@@ -188,6 +188,7 @@ module Braintree
       ProcessorDoesNotSupportCredits = "91546"
       ProcessorDoesNotSupportVoiceAuthorizations = "91545"
       PurchaseOrderNumberIsTooLong = "91537"
+      PurchaseOrderNumberIsInvalid = "91548"
       RefundAmountIsTooLarge = "91521"
       SettlementAmountIsTooLarge = "91522"
       SubscriptionDoesNotBelongToCustomer = "91529"

data/lib/braintree/transparent_redirect_gateway.rb

@@ -39,7 +39,7 @@ module Braintree
 
     def parse_and_validate_query_string(query_string) # :nodoc:
       params = Util.symbolize_keys(Util.parse_query_string(query_string))
-      query_string_without_hash = query_string[/(.*)&hash=.*/, 1]
+      query_string_without_hash = query_string.split("&").reject{|param| param =~ /\Ahash=/}.join("&")
 
       if params[:http_status] == nil
         raise UnexpectedError, "expected query string to have an http_status param"

data/lib/braintree/version.rb

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

data/spec/integration/braintree/transaction_spec.rb

@@ -713,19 +713,45 @@ describe Braintree::Transaction do
         result.transaction.purchase_order_number.should be_nil
       end
 
-      it "has validation errors" do
-        result = Braintree::Transaction.sale(
-          :amount => Braintree::Test::TransactionAmounts::Authorize,
-          :credit_card => {
+      context "validations" do
+        it "tax_amount" do
+          result = Braintree::Transaction.sale(
+            :amount => Braintree::Test::TransactionAmounts::Authorize,
+            :credit_card => {
             :number => Braintree::Test::CreditCardNumbers::Visa,
             :expiration_date => "05/2009"
           },
-          :tax_amount => 'abcd',
-          :purchase_order_number => 'a' * 18
-        )
-        result.success?.should == false
-        result.errors.for(:transaction).on(:tax_amount)[0].code.should == Braintree::ErrorCodes::Transaction::TaxAmountFormatIsInvalid
-        result.errors.for(:transaction).on(:purchase_order_number)[0].code.should == Braintree::ErrorCodes::Transaction::PurchaseOrderNumberIsTooLong
+            :tax_amount => 'abcd'
+          )
+          result.success?.should == false
+          result.errors.for(:transaction).on(:tax_amount)[0].code.should == Braintree::ErrorCodes::Transaction::TaxAmountFormatIsInvalid
+        end
+
+        it "purchase_order_number length" do
+          result = Braintree::Transaction.sale(
+            :amount => Braintree::Test::TransactionAmounts::Authorize,
+            :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "05/2009"
+          },
+            :purchase_order_number => 'a' * 18
+          )
+          result.success?.should == false
+          result.errors.for(:transaction).on(:purchase_order_number)[0].code.should == Braintree::ErrorCodes::Transaction::PurchaseOrderNumberIsTooLong
+        end
+
+        it "purchase_order_number format" do
+          result = Braintree::Transaction.sale(
+            :amount => Braintree::Test::TransactionAmounts::Authorize,
+            :credit_card => {
+            :number => Braintree::Test::CreditCardNumbers::Visa,
+            :expiration_date => "05/2009"
+          },
+            :purchase_order_number => "\303\237\303\245\342\210\202"
+          )
+          result.success?.should == false
+          result.errors.for(:transaction).on(:purchase_order_number)[0].code.should == Braintree::ErrorCodes::Transaction::PurchaseOrderNumberIsInvalid
+        end
       end
     end
 

data/spec/unit/braintree/transparent_redirect_spec.rb

@@ -31,6 +31,24 @@ describe Braintree::TransparentRedirect do
       result.should == {:one => "1", :two => "2", :http_status => "200", :hash => hash}
     end
 
+    it "returns the parsed query string params if the hash is valid and hash is first parameter" do
+      query_string_without_hash = "one=1&two=2&http_status=200"
+      hash = Braintree::Digest.hexdigest(Braintree::Configuration.private_key, query_string_without_hash)
+
+      query_string_with_hash = "hash=#{hash}&#{query_string_without_hash}"
+      result = Braintree::Configuration.gateway.transparent_redirect.parse_and_validate_query_string query_string_with_hash
+      result.should == {:one => "1", :two => "2", :http_status => "200", :hash => hash}
+    end
+
+    it "returns the parsed query string params regardless of hash position if the hash is valid" do
+      query_string_without_hash = "one=1&two=2&http_status=200"
+      hash = Braintree::Digest.hexdigest(Braintree::Configuration.private_key, query_string_without_hash)
+
+      query_string_with_hash = "one=1&hash=#{hash}&two=2&http_status=200"
+      result = Braintree::Configuration.gateway.transparent_redirect.parse_and_validate_query_string query_string_with_hash
+      result.should == {:one => "1", :two => "2", :http_status => "200", :hash => hash}
+    end
+
     it "raises Braintree::ForgedQueryString if the hash param is not valid" do
       query_string_without_hash = "http_status=200&one=1&two=2"
       hash = Digest::SHA1.hexdigest("invalid#{query_string_without_hash}")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: braintree
 version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: 
+  hash: 63
+  prerelease: false
   segments: 
   - 2
   - 13
-  - 1
-  version: 2.13.1
+  - 2
+  version: 2.13.2
 platform: ruby
 authors: 
 - Braintree
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 -06:00
+date: 2012-01-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: braintree
-rubygems_version: 1.4.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Braintree Gateway Ruby Client Library