braintree 2.13.0 → 2.13.1

data/lib/braintree/configuration.rb

@@ -2,9 +2,10 @@ module Braintree
   # See http://www.braintreepayments.com/docs/ruby
   class Configuration
     API_VERSION = "2" # :nodoc:
+    DEFAULT_ENDPOINT = "www" # :nodoc:
 
     class << self
-      attr_writer :custom_user_agent, :logger, :merchant_id, :public_key, :private_key
+      attr_writer :custom_user_agent, :endpoint, :logger, :merchant_id, :public_key, :private_key
     end
     attr_reader :merchant_id, :public_key, :private_key
 
@@ -34,6 +35,7 @@ module Braintree
     def self.instantiate # :nodoc:
       config = new(
         :custom_user_agent => @custom_user_agent,
+        :endpoint => @endpoint,
         :environment => environment,
         :logger => logger,
         :merchant_id => merchant_id,
@@ -47,7 +49,7 @@ module Braintree
     end
 
     def initialize(options = {})
-      [:environment, :merchant_id, :public_key, :private_key, :custom_user_agent, :logger].each do |attr|
+      [:endpoint, :environment, :merchant_id, :public_key, :private_key, :custom_user_agent, :logger].each do |attr|
         instance_variable_set "@#{attr}", options[attr]
       end
     end
@@ -73,6 +75,10 @@ module Braintree
       end
     end
 
+    def endpoint
+      @endpoint || DEFAULT_ENDPOINT
+    end
+
     def http # :nodoc:
       Http.new(self)
     end
@@ -99,7 +105,7 @@ module Braintree
       when :development
         "localhost"
       when :production
-        "www.braintreegateway.com"
+        "#{endpoint}.braintreegateway.com"
       when :qa
         "qa.braintreegateway.com"
       when :sandbox

data/lib/braintree/customer.rb

@@ -108,6 +108,7 @@ module Braintree
       set_instance_variables_from_hash(attributes)
       @credit_cards = (@credit_cards || []).map { |pm| CreditCard._new gateway, pm }
       @addresses = (@addresses || []).map { |addr| Address._new gateway, addr }
+      @custom_fields = attributes[:custom_fields].is_a?(Hash) ? attributes[:custom_fields] : {}
     end
 
     # See http://www.braintreepayments.com/docs/ruby/transactions/create_from_vault

data/lib/braintree/transaction.rb

@@ -172,6 +172,7 @@ module Braintree
       @status_history = attributes[:status_history] ? attributes[:status_history].map { |s| StatusDetails.new(s) } : []
       @tax_amount = Util.to_big_decimal(tax_amount)
       @descriptor = Descriptor.new(@descriptor)
+      @custom_fields = attributes[:custom_fields].is_a?(Hash) ? attributes[:custom_fields] : {}
       add_ons.map! { |attrs| AddOn._new(attrs) } if add_ons
       discounts.map! { |attrs| Discount._new(attrs) } if discounts
     end

data/lib/braintree/version.rb

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

data/spec/integration/braintree/customer_spec.rb

@@ -211,6 +211,16 @@ describe Braintree::Customer do
       result.customer.custom_fields[:store_me].should == "custom value"
     end
 
+    it "returns empty hash for custom fields when blank" do
+      result = Braintree::Customer.create(
+        :first_name => "Bill",
+        :last_name => "Gates",
+        :custom_fields => { :store_me => "" }
+      )
+      result.success?.should == true
+      result.customer.custom_fields.should == {}
+    end
+
     it "returns nested errors if credit card and/or billing address are invalid" do
       result = Braintree::Customer.create(
         :email => "invalid",

data/spec/integration/braintree/transaction_spec.rb

@@ -396,6 +396,23 @@ describe Braintree::Transaction do
       result.transaction.custom_fields.should == {:store_me => "custom value"}
     end
 
+    it "returns nil if a custom field is not defined" do
+      create_result = Braintree::Transaction.sale(
+        :amount => Braintree::Test::TransactionAmounts::Authorize,
+        :credit_card => {
+          :number => Braintree::Test::CreditCardNumbers::Visa,
+          :expiration_date => "12/2012"
+        },
+        :custom_fields => {
+          :store_me => ""
+        }
+      )
+
+      result = Braintree::Transaction.find(create_result.transaction.id)
+
+      result.custom_fields.should == {}
+    end
+
     it "returns an error if custom_field is not registered" do
       result = Braintree::Transaction.create(
         :type => "sale",

data/spec/unit/braintree/configuration_spec.rb

@@ -11,9 +11,10 @@ describe Braintree::Configuration do
 
   after do
     Braintree::Configuration.merchant_id = @original_merchant_id
-    Braintree::Configuration.public_key  = @original_public_key
+    Braintree::Configuration.public_key = @original_public_key
     Braintree::Configuration.private_key = @original_private_key
     Braintree::Configuration.environment = @original_environment
+    Braintree::Configuration.endpoint = Braintree::Configuration::DEFAULT_ENDPOINT
   end
 
   describe "base_merchant_path" do
@@ -180,7 +181,7 @@ describe Braintree::Configuration do
 
   end
 
-  describe "self.server" do
+  describe "server" do
     it "is localhost for development" do
       Braintree::Configuration.environment = :development
       Braintree::Configuration.instantiate.server.should == "localhost"
@@ -200,6 +201,12 @@ describe Braintree::Configuration do
       Braintree::Configuration.environment = :qa
       Braintree::Configuration.instantiate.server.should == "qa.braintreegateway.com"
     end
+
+    it "can by changed by configuring the production endpoint" do
+      Braintree::Configuration.environment = :production
+      Braintree::Configuration.endpoint = "custom-endpoint"
+      Braintree::Configuration.instantiate.server.should == "custom-endpoint.braintreegateway.com"
+    end
   end
 
   describe "ssl?" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: braintree
 version: !ruby/object:Gem::Version 
-  hash: 59
-  prerelease: false
+  hash: 57
+  prerelease: 
   segments: 
   - 2
   - 13
-  - 0
-  version: 2.13.0
+  - 1
+  version: 2.13.1
 platform: ruby
 authors: 
 - Braintree
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-03 00:00:00 -05:00
+date: 2011-11-16 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.4.2
 signing_key: 
 specification_version: 3
 summary: Braintree Gateway Ruby Client Library