braintree 2.13.2 → 2.13.3

data/lib/braintree/transaction.rb

@@ -53,6 +53,7 @@ module Braintree
     attr_reader :merchant_account_id
     attr_reader :order_id
     attr_reader :billing_details, :shipping_details
+    attr_reader :plan_id
     # The authorization code from the processor.
     attr_reader :processor_authorization_code
     # The response code from the processor.

data/lib/braintree/transparent_redirect_gateway.rb

@@ -40,6 +40,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.split("&").reject{|param| param =~ /\Ahash=/}.join("&")
+      query_string_without_hash = Util.url_decode(query_string_without_hash)
 
       if params[:http_status] == nil
         raise UnexpectedError, "expected query string to have an http_status param"

data/lib/braintree/util.rb

@@ -25,6 +25,10 @@ module Braintree
       end
     end
 
+    def self.url_decode(text)
+      CGI.unescape text.to_s
+    end
+
     def self.url_encode(text)
       CGI.escape text.to_s
     end

data/lib/braintree/version.rb

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

data/spec/integration/braintree/transaction_spec.rb

@@ -577,7 +577,7 @@ describe Braintree::Transaction do
       end
     end
 
-    it "snapshots add_ons and discounts from subscription" do
+    it "snapshots plan, add_ons and discounts from subscription" do
       customer = Braintree::Customer.create!(
         :credit_card => {
           :number => Braintree::Test::CreditCardNumbers::Visa,
@@ -619,6 +619,8 @@ describe Braintree::Transaction do
       result.success?.should be_true
       transaction = result.subscription.transactions.first
 
+      transaction.plan_id.should == SpecHelper::TriallessPlan[:id]
+
       transaction.add_ons.size.should == 2
       add_ons = transaction.add_ons.sort_by { |add_on| add_on.id }
 

data/spec/unit/braintree/transparent_redirect_spec.rb

@@ -65,6 +65,19 @@ describe Braintree::TransparentRedirect do
       end.to raise_error(Braintree::ForgedQueryString)
     end
 
+    it "does not raise ForgedQueryString if any parameter is url encoded" do
+      url_encoded_query_string_without_hash = "http_status=200&nested_param%5Bsub_param%5D=testing"
+      url_decoded_query_string_without_hash = Braintree::Util.url_decode(url_encoded_query_string_without_hash)
+
+      hash = Braintree::Digest.hexdigest(Braintree::Configuration.private_key, url_decoded_query_string_without_hash)
+
+      url_encoded_query_string = "#{url_encoded_query_string_without_hash}&hash=#{hash}"
+
+      expect do
+        Braintree::Configuration.gateway.transparent_redirect.parse_and_validate_query_string url_encoded_query_string
+      end.to_not raise_error(Braintree::ForgedQueryString)
+    end
+
     it "raises an AuthenticationError if authentication fails" do
       expect do
         Braintree::Configuration.gateway.transparent_redirect.parse_and_validate_query_string add_hash_to_query_string("http_status=401")

data/spec/unit/braintree/util_spec.rb

@@ -257,4 +257,10 @@ describe Braintree::Util do
       Braintree::Util.url_encode("foo?bar").should == "foo%3Fbar"
     end
   end
+
+  describe "self.url_decode" do
+    it "url encodes the given text" do
+      Braintree::Util.url_decode("foo%3Fbar").should == "foo?bar"
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: braintree
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: false
+  hash: 61
+  prerelease: 
   segments: 
   - 2
   - 13
-  - 2
-  version: 2.13.2
+  - 3
+  version: 2.13.3
 platform: ruby
 authors: 
 - Braintree
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-03 00:00:00 -06:00
+date: 2012-02-01 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.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Braintree Gateway Ruby Client Library