braintree 1.1.0 → 1.1.1

data/README.rdoc

@@ -57,6 +57,12 @@ Example of using bang method:
 We recommend using the bang methods when you assume that the data is valid and do not expect validations to fail.
 Otherwise, we recommend using the non-bang methods.
 
+== Tests
+
+The unit specs can be run by anyone on any system, but the integration specs are meant to be run against a local development
+server of our gateway code.  These integration specs are not meant for public consumption and will likely fail if run on
+your system.
+
 == License
 
 See the LICENSE file.

data/lib/braintree.rb

@@ -1,5 +1,6 @@
 require 'bigdecimal'
 require "cgi"
+require "date"
 require "digest/sha1"
 require "logger"
 require "net/http"

data/lib/braintree/ssl_expiration_check.rb

@@ -18,15 +18,15 @@ module Braintree
     end
 
     def self.production_expiration_date # :nodoc:
-      Date.new(2012, 1, 8)
+      Date.civil(2012, 1, 8)
     end
 
     def self.sandbox_expiration_date # :nodoc:
-      Date.new(2010, 12, 1)
+      Date.civil(2010, 12, 1)
     end
 
     def self.qa_expiration_date # :nodoc:
-      Date.new(2010, 12, 1)
+      Date.civil(2010, 12, 1)
     end
   end
 end

data/lib/braintree/subscription.rb

@@ -94,9 +94,7 @@ module Braintree
 
     def _init(attributes) # :nodoc:
       set_instance_variables_from_hash(attributes)
-      if self.price
-        instance_variable_set :@price, BigDecimal.new(self.price)
-      end  
+      @price = Util.to_big_decimal(price)
     end
 
     def self._update_signature # :nodoc:

data/lib/braintree/successful_result.rb

@@ -27,7 +27,7 @@ module Braintree
 
     def inspect # :nodoc:
       inspected_attributes = @attrs.map { |attr| "#{attr}:#{send(attr).inspect}" }
-      "#<#{self.class} #{inspected_attributes}>"
+      "#<#{self.class} #{inspected_attributes.join(" ")}>"
     end
 
     # Always returns true.

data/lib/braintree/test/transaction_amounts.rb

@@ -6,23 +6,5 @@ module Braintree
       Authorize = "1000.00"
       Decline = "2000.00"
     end
-
-    module Plans
-      TrialPlan = {
-        :description => "Plan for integration tests -- with trial",
-        :id => "integration_trial_plan",
-        :price => "43.21",
-        :trial_period => true,
-        :trial_duration => 2,
-        :trial_duration_unit => Subscription::TrialDurationUnit::Day
-      }
-
-      TriallessPlan = {
-        :description => "Plan for integration tests -- without a trial",
-        :id => "integration_trialless_plan",
-        :price => "12.34",
-        :trial_period => false
-      }
-    end
   end
 end

data/lib/braintree/transaction.rb

@@ -392,9 +392,7 @@ module Braintree
 
     def _init(attributes) # :nodoc:
       set_instance_variables_from_hash(attributes)
-      if self.amount
-        instance_variable_set :@amount, BigDecimal.new(self.amount)
-      end
+      @amount = Util.to_big_decimal(amount)
       @credit_card_details = CreditCardDetails.new(@credit_card)
       @customer_details = CustomerDetails.new(@customer)
       @billing_details = AddressDetails.new(@billing)

data/lib/braintree/util.rb

@@ -29,16 +29,15 @@ module Braintree
     end
 
     def self.symbolize_keys(hash)
-      hash.each do |key, value|
-        hash.delete(key)
-        hash[key.to_sym] = value
+      hash.inject({}) do |new_hash, (key, value)|
         if value.is_a?(Hash)
-          symbolize_keys(value)
+          value = symbolize_keys(value)
         elsif value.is_a?(Array) && value.all? { |v| v.is_a?(Hash) }
-          value.each { |v| symbolize_keys(v) }
+          value = value.map { |v| symbolize_keys(v) }
         end
+
+        new_hash.merge(key.to_sym => value)
       end
-      hash
     end
 
     def self.raise_exception_for_status_code(status_code)
@@ -58,6 +57,17 @@ module Braintree
       end
     end
 
+    def self.to_big_decimal(decimal)
+      case decimal
+      when BigDecimal, NilClass
+        decimal
+      when String
+        BigDecimal.new(decimal)
+      else
+        raise ArgumentError, "Argument must be a String or BigDecimal"
+      end
+    end
+
     def self.verify_keys(valid_keys, hash)
       flattened_valid_keys = _flatten_valid_keys(valid_keys)
       invalid_keys = _flatten_hash_keys(hash) - flattened_valid_keys

data/lib/braintree/version.rb

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

data/spec/integration/braintree/subscription_spec.rb

@@ -1,6 +1,23 @@
 require File.dirname(__FILE__) + "/../spec_helper"
 
 describe Braintree::Subscription do
+
+  TrialPlan = {
+    :description => "Plan for integration tests -- with trial",
+    :id => "integration_trial_plan",
+    :price => BigDecimal.new("43.21"),
+    :trial_period => true,
+    :trial_duration => 2,
+    :trial_duration_unit => Braintree::Subscription::TrialDurationUnit::Day
+  }
+
+  TriallessPlan = {
+    :description => "Plan for integration tests -- without a trial",
+    :id => "integration_trialless_plan",
+    :price => BigDecimal.new("12.34"),
+    :trial_period => false
+  }
+
   before(:each) do
     @credit_card = Braintree::Customer.create!(
       :credit_card => {
@@ -14,7 +31,7 @@ describe Braintree::Subscription do
     it "is successful with a miniumum of params" do
       result = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
-        :plan_id => Braintree::Test::Plans::TriallessPlan[:id]
+        :plan_id => TriallessPlan[:id]
       )
 
       date_format = /^\d{4}\D\d{1,2}\D\d{1,2}$/
@@ -36,7 +53,7 @@ describe Braintree::Subscription do
       new_id = rand(36**9).to_s(36)
       result = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
-        :plan_id => Braintree::Test::Plans::TriallessPlan[:id],
+        :plan_id => TriallessPlan[:id],
         :id => new_id
       )
 
@@ -50,7 +67,7 @@ describe Braintree::Subscription do
         it "with no trial" do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
-            :plan_id => Braintree::Test::Plans::TriallessPlan[:id]
+            :plan_id => TriallessPlan[:id]
           )
 
           result.subscription.trial_period.should == false
@@ -61,7 +78,7 @@ describe Braintree::Subscription do
         it "with a trial" do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
-            :plan_id => Braintree::Test::Plans::TrialPlan[:id]
+            :plan_id => TrialPlan[:id]
           )
 
           result.subscription.trial_period.should == true
@@ -72,7 +89,7 @@ describe Braintree::Subscription do
         it "can alter the trial period params" do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
-            :plan_id => Braintree::Test::Plans::TrialPlan[:id],
+            :plan_id => TrialPlan[:id],
             :trial_duration => 5,
             :trial_duration_unit => Braintree::Subscription::TrialDurationUnit::Month
           )
@@ -85,7 +102,7 @@ describe Braintree::Subscription do
         it "can override the trial_period param" do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
-            :plan_id => Braintree::Test::Plans::TrialPlan[:id],
+            :plan_id => TrialPlan[:id],
             :trial_period => false
           )
 
@@ -95,19 +112,19 @@ describe Braintree::Subscription do
         it "creates a transaction if no trial period" do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
-            :plan_id => Braintree::Test::Plans::TriallessPlan[:id]
+            :plan_id => TriallessPlan[:id]
           )
 
           result.subscription.transactions.size.should == 1
           result.subscription.transactions.first.should be_a(Braintree::Transaction)
-          result.subscription.transactions.first.amount.should == BigDecimal.new("12.34")
+          result.subscription.transactions.first.amount.should == TriallessPlan[:price]
           result.subscription.transactions.first.type.should == Braintree::Transaction::Type::Sale
         end
 
         it "doesn't create a transaction if there's a trial period" do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
-            :plan_id => Braintree::Test::Plans::TrialPlan[:id]
+            :plan_id => TrialPlan[:id]
           )
 
           result.subscription.transactions.size.should == 0
@@ -118,16 +135,16 @@ describe Braintree::Subscription do
         it "defaults to the plan's price" do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
-            :plan_id => Braintree::Test::Plans::TrialPlan[:id]
+            :plan_id => TrialPlan[:id]
           )
 
-          result.subscription.price.should == BigDecimal.new("43.21")
+          result.subscription.price.should == TrialPlan[:price]
         end
 
         it "can be overridden" do
           result = Braintree::Subscription.create(
             :payment_method_token => @credit_card.token,
-            :plan_id => Braintree::Test::Plans::TrialPlan[:id],
+            :plan_id => TrialPlan[:id],
             :price => 98.76
           )
 
@@ -140,7 +157,7 @@ describe Braintree::Subscription do
       it "has validation errors on id" do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => Braintree::Test::Plans::TrialPlan[:id],
+          :plan_id => TrialPlan[:id],
           :id => "invalid token"
         )
         result.success?.should == false
@@ -151,14 +168,14 @@ describe Braintree::Subscription do
         duplicate_token = "duplicate_token_#{rand(36**8).to_s(36)}"
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => Braintree::Test::Plans::TrialPlan[:id],
+          :plan_id => TrialPlan[:id],
           :id => duplicate_token
         )
         result.success?.should == true
 
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => Braintree::Test::Plans::TrialPlan[:id],
+          :plan_id => TrialPlan[:id],
           :id => duplicate_token
         )
         result.success?.should == false
@@ -168,7 +185,7 @@ describe Braintree::Subscription do
       it "trial duration required" do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => Braintree::Test::Plans::TrialPlan[:id],
+          :plan_id => TrialPlan[:id],
           :trial_period => true,
           :trial_duration => nil
         )
@@ -179,7 +196,7 @@ describe Braintree::Subscription do
       it "trial duration unit required" do
         result = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => Braintree::Test::Plans::TrialPlan[:id],
+          :plan_id => TrialPlan[:id],
           :trial_period => true,
           :trial_duration_unit => nil
         )
@@ -194,7 +211,7 @@ describe Braintree::Subscription do
     it "finds a subscription" do
       result = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
-        :plan_id => Braintree::Test::Plans::TriallessPlan[:id]
+        :plan_id => TriallessPlan[:id]
       )
       result.success?.should == true
 
@@ -213,7 +230,7 @@ describe Braintree::Subscription do
       @subscription = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :price => 54.32,
-        :plan_id => Braintree::Test::Plans::TriallessPlan[:id]
+        :plan_id => TriallessPlan[:id]
       ).subscription
     end
 
@@ -223,12 +240,12 @@ describe Braintree::Subscription do
         result = Braintree::Subscription.update(@subscription.id,
           :id => new_id,
           :price => 9999.88,
-          :plan_id => Braintree::Test::Plans::TrialPlan[:id]
+          :plan_id => TrialPlan[:id]
         )
 
         result.success?.should == true
         result.subscription.id.should =~ /#{new_id}/
-        result.subscription.plan_id.should == Braintree::Test::Plans::TrialPlan[:id]
+        result.subscription.plan_id.should == TrialPlan[:id]
         result.subscription.price.should == BigDecimal.new("9999.88")
       end
 
@@ -239,8 +256,7 @@ describe Braintree::Subscription do
 
         result.success?.should == true
         result.subscription.price.to_f.should == @subscription.price.to_f + 1
-        result.subscription.transactions.size.should == 
-          @subscription.transactions.size + 1
+        result.subscription.transactions.size.should == @subscription.transactions.size + 1
       end
 
       it "doesn't prorate if price decreases" do
@@ -250,8 +266,7 @@ describe Braintree::Subscription do
 
         result.success?.should == true
         result.subscription.price.to_f.should == @subscription.price.to_f - 1
-        result.subscription.transactions.size.should == 
-          @subscription.transactions.size
+        result.subscription.transactions.size.should == @subscription.transactions.size
       end
     end
 
@@ -259,7 +274,7 @@ describe Braintree::Subscription do
       before(:each) do
         @subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => Braintree::Test::Plans::TrialPlan[:id]
+          :plan_id => TrialPlan[:id]
         ).subscription
       end
 
@@ -293,7 +308,7 @@ describe Braintree::Subscription do
         duplicate_id = "new_id_#{rand(36**6).to_s(36)}"
         duplicate = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
-          :plan_id => Braintree::Test::Plans::TrialPlan[:id],
+          :plan_id => TrialPlan[:id],
           :id => duplicate_id
         )
         result = Braintree::Subscription.update(
@@ -308,7 +323,7 @@ describe Braintree::Subscription do
         subscription = Braintree::Subscription.create(
           :payment_method_token => @credit_card.token,
           :price => 54.32,
-          :plan_id => Braintree::Test::Plans::TriallessPlan[:id]
+          :plan_id => TriallessPlan[:id]
         ).subscription
 
         result = Braintree::Subscription.cancel(subscription.id)
@@ -329,7 +344,7 @@ describe Braintree::Subscription do
       subscription = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :price => 54.32,
-        :plan_id => Braintree::Test::Plans::TriallessPlan[:id]
+        :plan_id => TriallessPlan[:id]
       ).subscription
 
       result = Braintree::Subscription.cancel(subscription.id)
@@ -347,7 +362,7 @@ describe Braintree::Subscription do
       subscription = Braintree::Subscription.create(
         :payment_method_token => @credit_card.token,
         :price => 54.32,
-        :plan_id => Braintree::Test::Plans::TriallessPlan[:id]
+        :plan_id => TriallessPlan[:id]
       ).subscription
 
       result = Braintree::Subscription.cancel(subscription.id)

data/spec/unit/braintree/subscription_spec.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + "/../spec_helper"
+
+describe Braintree::Subscription do
+  context "price" do
+    it "accepts price as either a String or a BigDecimal" do
+      Braintree::Subscription.new(:price => "12.34", :transactions => []).price.should == BigDecimal.new("12.34")
+      Braintree::Subscription.new(:price => BigDecimal.new("12.34"), :transactions => []).price.should == BigDecimal.new("12.34")
+    end
+
+    it "blows up if price is not a string or BigDecimal" do
+      expect {
+        Braintree::Subscription.new(:price => 12.34, :transactions => [])
+      }.to raise_error(/Argument must be a String or BigDecimal/)
+    end
+  end
+end

data/spec/unit/braintree/transaction_spec.rb

@@ -99,6 +99,17 @@ describe Braintree::Transaction do
         :custom => "\n    "
       )
     end
+
+    it "accepts amount as either a String or a BigDecimal" do
+      Braintree::Transaction._new(:amount => "12.34").amount.should == BigDecimal.new("12.34")
+      Braintree::Transaction._new(:amount => BigDecimal.new("12.34")).amount.should == BigDecimal.new("12.34")
+    end
+
+    it "blows up if amount is not a string or BigDecimal" do
+      expect {
+        Braintree::Transaction._new(:amount => 12.34)
+      }.to raise_error(/Argument must be a String or BigDecimal/)
+    end
   end
 
   describe "inspect" do

data/spec/unit/braintree/util_spec.rb

@@ -1,6 +1,26 @@
 require File.dirname(__FILE__) + "/../spec_helper"
 
 describe Braintree::Util do
+  describe "self.symbolize_keys" do
+    it "does not modify the hash" do
+      original = {"a" => "b", "c" => "d"}
+      new = Braintree::Util.symbolize_keys(original)
+
+      original["a"].should == "b"
+      new[:a].should == "b"
+    end
+
+    it "symbolizes nested keys" do
+      hash = {"a" => {"b" => {"c" => "d" }}}
+      Braintree::Util.symbolize_keys(hash).should == {:a => {:b => {:c => "d"}}}
+    end
+
+    it "symbolizes nested keys in arrays" do
+      hash = {"a" => ["b" => {"c" => "d" }]}
+      Braintree::Util.symbolize_keys(hash).should == {:a => [:b => {:c => "d"}]}
+    end
+  end
+
   describe "self.verify_keys" do
     it "raises an exception if the hash contains an invalid key" do
       expect do
@@ -170,6 +190,25 @@ describe Braintree::Util do
     end
   end
 
+  describe "self.to_big_decimal" do
+    it "returns the BigDecimal when given a BigDecimal" do
+      Braintree::Util.to_big_decimal(BigDecimal.new("12.34")).should == BigDecimal.new("12.34")
+    end
+
+    it "returns a BigDecimal when given a string" do
+      Braintree::Util.to_big_decimal("12.34").should == BigDecimal.new("12.34")
+    end
+
+    it "returns nil when given nil" do
+      Braintree::Util.to_big_decimal(nil).should be_nil
+    end
+
+    it "blows up when not given a String or BigDecimal" do
+      expect {
+        Braintree::Util.to_big_decimal(12.34)
+      }.to raise_error(/Argument must be a String or BigDecimal/)
+    end
+  end
 
   describe "self.url_encode" do
     it "url encodes the given text" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: braintree
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Braintree Payment Solutions
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 -06:00
+date: 2010-02-26 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -81,6 +81,7 @@ files:
 - spec/unit/braintree/http_spec.rb
 - spec/unit/braintree/paged_collection_spec.rb
 - spec/unit/braintree/ssl_expiration_check_spec.rb
+- spec/unit/braintree/subscription_spec.rb
 - spec/unit/braintree/successful_result_spec.rb
 - spec/unit/braintree/transaction/credit_card_details_spec.rb
 - spec/unit/braintree/transaction/customer_details_spec.rb