braintree 2.6.0 → 2.6.1

data/lib/braintree.rb

@@ -17,51 +17,51 @@ require "builder"
 module Braintree
 end
 
-require "braintree/exceptions"
-require "braintree/base_module"
-require "braintree/modification"
+require File.dirname(__FILE__) + "/braintree/exceptions"
+require File.dirname(__FILE__) + "/braintree/base_module"
+require File.dirname(__FILE__) + "/braintree/modification"
 
-require "braintree/add_on"
-require "braintree/address/country_names"
-require "braintree/address"
-require "braintree/address_gateway"
-require "braintree/advanced_search"
-require "braintree/configuration"
-require "braintree/credit_card"
-require "braintree/credit_card_gateway"
-require "braintree/credit_card_verification"
-require "braintree/customer"
-require "braintree/customer_gateway"
-require "braintree/digest"
-require "braintree/discount"
-require "braintree/error_codes"
-require "braintree/error_result"
-require "braintree/errors"
-require "braintree/gateway"
-require "braintree/http"
-require "braintree/resource_collection"
-require "braintree/subscription"
-require "braintree/subscription_gateway"
-require "braintree/subscription_search"
-require "braintree/successful_result"
-require "braintree/test/credit_card_numbers"
-require "braintree/test/transaction_amounts"
-require "braintree/transaction"
-require "braintree/transaction/address_details"
-require "braintree/transaction/credit_card_details"
-require "braintree/transaction/customer_details"
-require "braintree/transaction_gateway"
-require "braintree/transaction_search"
-require "braintree/transaction/status_details"
-require "braintree/transparent_redirect"
-require "braintree/transparent_redirect_gateway"
-require "braintree/util"
-require "braintree/validation_error"
-require "braintree/validation_error_collection"
-require "braintree/version"
-require "braintree/xml"
-require "braintree/xml/generator"
-require "braintree/xml/libxml"
-require "braintree/xml/rexml"
-require "braintree/xml/parser"
+require File.dirname(__FILE__) + "/braintree/add_on"
+require File.dirname(__FILE__) + "/braintree/address/country_names"
+require File.dirname(__FILE__) + "/braintree/address"
+require File.dirname(__FILE__) + "/braintree/address_gateway"
+require File.dirname(__FILE__) + "/braintree/advanced_search"
+require File.dirname(__FILE__) + "/braintree/configuration"
+require File.dirname(__FILE__) + "/braintree/credit_card"
+require File.dirname(__FILE__) + "/braintree/credit_card_gateway"
+require File.dirname(__FILE__) + "/braintree/credit_card_verification"
+require File.dirname(__FILE__) + "/braintree/customer"
+require File.dirname(__FILE__) + "/braintree/customer_gateway"
+require File.dirname(__FILE__) + "/braintree/digest"
+require File.dirname(__FILE__) + "/braintree/discount"
+require File.dirname(__FILE__) + "/braintree/error_codes"
+require File.dirname(__FILE__) + "/braintree/error_result"
+require File.dirname(__FILE__) + "/braintree/errors"
+require File.dirname(__FILE__) + "/braintree/gateway"
+require File.dirname(__FILE__) + "/braintree/http"
+require File.dirname(__FILE__) + "/braintree/resource_collection"
+require File.dirname(__FILE__) + "/braintree/subscription"
+require File.dirname(__FILE__) + "/braintree/subscription_gateway"
+require File.dirname(__FILE__) + "/braintree/subscription_search"
+require File.dirname(__FILE__) + "/braintree/successful_result"
+require File.dirname(__FILE__) + "/braintree/test/credit_card_numbers"
+require File.dirname(__FILE__) + "/braintree/test/transaction_amounts"
+require File.dirname(__FILE__) + "/braintree/transaction"
+require File.dirname(__FILE__) + "/braintree/transaction/address_details"
+require File.dirname(__FILE__) + "/braintree/transaction/credit_card_details"
+require File.dirname(__FILE__) + "/braintree/transaction/customer_details"
+require File.dirname(__FILE__) + "/braintree/transaction_gateway"
+require File.dirname(__FILE__) + "/braintree/transaction_search"
+require File.dirname(__FILE__) + "/braintree/transaction/status_details"
+require File.dirname(__FILE__) + "/braintree/transparent_redirect"
+require File.dirname(__FILE__) + "/braintree/transparent_redirect_gateway"
+require File.dirname(__FILE__) + "/braintree/util"
+require File.dirname(__FILE__) + "/braintree/validation_error"
+require File.dirname(__FILE__) + "/braintree/validation_error_collection"
+require File.dirname(__FILE__) + "/braintree/version"
+require File.dirname(__FILE__) + "/braintree/xml"
+require File.dirname(__FILE__) + "/braintree/xml/generator"
+require File.dirname(__FILE__) + "/braintree/xml/libxml"
+require File.dirname(__FILE__) + "/braintree/xml/rexml"
+require File.dirname(__FILE__) + "/braintree/xml/parser"
 

data/lib/braintree/address/country_names.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 module Braintree
   class Address
     CountryNames = [
@@ -248,4 +249,4 @@ module Braintree
     ["Zambia", "ZM", "ZMB", "894"],
     ["Zimbabwe", "ZW", "ZWE", "716"]]
   end
-end
+end

data/lib/braintree/util.rb

@@ -99,8 +99,10 @@ module Braintree
       end.sort
     end
 
-    def self._flatten_hash_keys(hash, namespace = nil)
-      hash.inject([]) do |result, (key, value)|
+    def self._flatten_hash_keys(element, namespace = nil)
+      element = [element] if element.is_a?(String)
+
+      element.inject([]) do |result, (key, value)|
         full_key = (namespace ? "#{namespace}[#{key}]" : key.to_s)
         if value.is_a?(Hash)
           result += _flatten_hash_keys(value, full_key)

data/lib/braintree/version.rb

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

data/spec/integration/braintree/address_spec.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Address do
   describe "self.create" do
@@ -47,6 +48,16 @@ describe Braintree::Address do
       result.address.country_code_numeric.should == "016"
     end
 
+    it "accepts utf-8 country names" do
+      customer = Braintree::Customer.create!
+      result = Braintree::Address.create(
+        :customer_id => customer.id,
+        :country_name => "Åland"
+      )
+      result.success?.should == true
+      result.address.country_name.should == "Åland"
+    end
+
     it "returns an error response given inconsistent country codes" do
       customer = Braintree::Customer.create!
       result = Braintree::Address.create(

data/spec/integration/braintree/advanced_search_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::AdvancedSearch do
   before(:each) do

data/spec/integration/braintree/credit_card_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::CreditCard do
   describe "self.create" do

data/spec/integration/braintree/customer_spec.rb

@@ -1,4 +1,5 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+# encoding: utf-8
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Customer do
   describe "self.all" do
@@ -62,11 +63,28 @@ describe Braintree::Customer do
       last_name = "Mu\303\261oz"
       result = Braintree::Customer.create(:first_name => first_name, :last_name => last_name)
       result.success?.should == true
-      result.customer.first_name.should == first_name
-      result.customer.last_name.should == last_name
-      found_customer = Braintree::Customer.find(result.customer.id)
-      found_customer.first_name.should == first_name
-      found_customer.last_name.should == last_name
+
+      if RUBY_VERSION =~ /^1.8/
+        result.customer.first_name.should == first_name
+        result.customer.last_name.should == last_name
+
+        found_customer = Braintree::Customer.find(result.customer.id)
+        found_customer.first_name.should == first_name
+        found_customer.last_name.should == last_name
+      elsif RUBY_VERSION =~ /^1.9/
+        result.customer.first_name.should == "José"
+        result.customer.first_name.bytes.map {|b| b.to_s(8)}.should == ["112", "157", "163", "303", "251"]
+        result.customer.last_name.should == "Muñoz"
+        result.customer.last_name.bytes.map {|b| b.to_s(8)}.should == ["115", "165", "303", "261", "157", "172"]
+
+        found_customer = Braintree::Customer.find(result.customer.id)
+        found_customer.first_name.should == "José"
+        found_customer.first_name.bytes.map {|b| b.to_s(8)}.should == ["112", "157", "163", "303", "251"]
+        found_customer.last_name.should == "Muñoz"
+        found_customer.last_name.bytes.map {|b| b.to_s(8)}.should == ["115", "165", "303", "261", "157", "172"]
+      else
+        raise "unknown ruby version: #{RUBY_VERSION.inspect}"
+      end
     end
 
     it "returns an error response if invalid" do

data/spec/integration/braintree/error_codes_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::ErrorCodes do
   describe Braintree::ErrorCodes::CreditCard do

data/spec/integration/braintree/http_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Http do
   describe "self._handle_response" do
@@ -161,7 +161,7 @@ describe Braintree::Http do
           Braintree::Configuration.environment = :qa
           config = Braintree::Configuration.instantiate
           config.stub(:base_merchant_path).and_return("/")
-          config.stub(:ca_file).and_return(nil)
+          config.stub(:ca_file).and_return("does_not_exist")
 
           expect do
             config.http._http_do(Net::HTTP::Get, "/login")

data/spec/integration/braintree/subscription_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Subscription do
 

data/spec/integration/braintree/test/transaction_amounts_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Braintree::Test::TransactionAmounts do
   describe "Authorize" do

data/spec/integration/braintree/transaction_search_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Transaction, "search" do
   context "advanced" do

data/spec/integration/braintree/transaction_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Transaction do
   describe "self.create" do

data/spec/integration/braintree/transparent_redirect_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::TransparentRedirect do
   it "raises a DownForMaintenanceError when app is in maintenance mode on TR requests" do

data/spec/unit/braintree/address_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Address do
   describe "==" do

data/spec/unit/braintree/base_module_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::BaseModule do
   describe "return_object_or_raise" do

data/spec/unit/braintree/configuration_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Configuration do
 

data/spec/unit/braintree/credit_card_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::CreditCard do
   describe "self.create" do

data/spec/unit/braintree/credit_card_verification_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::CreditCardVerification do
   describe "inspect" do

data/spec/unit/braintree/customer_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Customer do
   describe "inspect" do

data/spec/unit/braintree/digest_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Digest do
   describe "self.hexdigest" do

data/spec/unit/braintree/error_result_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::ErrorResult do
   describe "initialize" do

data/spec/unit/braintree/errors_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Errors do
   describe "for" do

data/spec/unit/braintree/http_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Http do
   describe "self._format_and_sanitize_body_for_log" do

data/spec/unit/braintree/resource_collection_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe "Braintree::ResourceCollection" do
   describe "enumeration" do

data/spec/unit/braintree/subscription_search_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 module Braintree
   describe SubscriptionSearch do

data/spec/unit/braintree/subscription_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Subscription do
   def default_params

data/spec/unit/braintree/successful_result_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::SuccessfulResult do
   describe "initialize" do

data/spec/unit/braintree/transaction/credit_card_details_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Braintree::Transaction::CreditCardDetails do
   describe "expiration_date" do

data/spec/unit/braintree/transaction/customer_details_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Braintree::Transaction::CustomerDetails do
   describe "inspect" do

data/spec/unit/braintree/transaction_search_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::TransactionSearch do
 	it "overrides previous 'is' with new 'is' for the same field" do

data/spec/unit/braintree/transaction_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Transaction do
   describe "self.create" do

data/spec/unit/braintree/transparent_redirect_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::TransparentRedirect do
   describe "self.create_credit_card_data" do

data/spec/unit/braintree/util_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Util do
   describe "self.symbolize_keys" do

data/spec/unit/braintree/validation_error_collection_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::ValidationErrorCollection do
 

data/spec/unit/braintree/validation_error_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::ValidationError do
   describe "initialize" do

data/spec/unit/braintree/xml/libxml_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Braintree::Xml::Libxml do
   describe "self.parse" do

data/spec/unit/braintree/xml/parser_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Braintree::Xml::Parser do
   describe "self.hash_from_xml" do

data/spec/unit/braintree/xml/rexml_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper")
 
 describe Braintree::Xml::Rexml do
   describe "self.parse" do

data/spec/unit/braintree/xml_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
 
 describe Braintree::Xml do
   describe "self.hash_from_xml" do

data/spec/unit/braintree_spec.rb

@@ -1,8 +1,8 @@
-require File.dirname(__FILE__) + "/spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/spec_helper")
 
 describe Braintree do
   it "doesn't produce warnings if loading braintree.rb twice" do
-    lib_dir = File.dirname(__FILE__) + "/../../lib"
+    lib_dir = File.expand_path(File.dirname(__FILE__) + "/../../lib")
     braintree_file = "#{lib_dir}/braintree.rb"
     File.exist?(braintree_file).should == true
     output = `ruby -r rubygems -I #{lib_dir} -e 'load #{braintree_file.inspect}; load #{braintree_file.inspect}' 2>&1`

data/spec/unit/spec_helper.rb

@@ -1 +1 @@
-require File.dirname(__FILE__) + "/../spec_helper"
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: braintree
 version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: false
   segments: 
   - 2
   - 6
-  - 0
-  version: 2.6.0
+  - 1
+  version: 2.6.1
 platform: ruby
 authors: 
 - Braintree Payment Solutions
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-20 00:00:00 -05:00
+date: 2010-09-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -143,23 +146,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: braintree
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Braintree Gateway Ruby Client Library