braintree 2.12.0 → 2.13.0

data/braintree.gemspec

@@ -0,0 +1,17 @@
+$:.push File.expand_path("../lib", __FILE__)
+require 'braintree/version'
+
+Gem::Specification.new do |s|
+  s.name = "braintree"
+  s.summary = "Braintree Gateway Ruby Client Library"
+  s.description = "Ruby library for integrating with the Braintree Gateway"
+  s.version = Braintree::Version::String
+  s.author = "Braintree"
+  s.email = "code@getbraintree.com"
+  s.homepage = "http://www.braintreepayments.com/"
+  s.rubyforge_project = "braintree"
+  s.has_rdoc = false
+  s.files = Dir.glob ["README.rdoc", "LICENSE", "{lib,spec}/**/*.rb", "lib/**/*.crt", "*.gemspec"]
+  s.add_dependency "builder", ">= 2.0.0"
+end
+

data/lib/braintree.rb

@@ -14,60 +14,60 @@ require "zlib"
 
 require "builder"
 
-require File.dirname(__FILE__) + "/braintree/exceptions"
+require "braintree/exceptions"
 
-require File.dirname(__FILE__) + "/braintree/base_module"
-require File.dirname(__FILE__) + "/braintree/modification"
+require "braintree/base_module"
+require "braintree/modification"
 
-require File.dirname(__FILE__) + "/braintree/add_on"
-require File.dirname(__FILE__) + "/braintree/add_on_gateway"
-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/customer_search"
-require File.dirname(__FILE__) + "/braintree/descriptor"
-require File.dirname(__FILE__) + "/braintree/digest"
-require File.dirname(__FILE__) + "/braintree/discount"
-require File.dirname(__FILE__) + "/braintree/discount_gateway"
-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/plan"
-require File.dirname(__FILE__) + "/braintree/plan_gateway"
-require File.dirname(__FILE__) + "/braintree/settlement_batch_summary"
-require File.dirname(__FILE__) + "/braintree/settlement_batch_summary_gateway"
-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/subscription_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"
+require "braintree/add_on"
+require "braintree/add_on_gateway"
+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/customer_search"
+require "braintree/descriptor"
+require "braintree/digest"
+require "braintree/discount"
+require "braintree/discount_gateway"
+require "braintree/error_codes"
+require "braintree/error_result"
+require "braintree/errors"
+require "braintree/gateway"
+require "braintree/http"
+require "braintree/plan"
+require "braintree/plan_gateway"
+require "braintree/settlement_batch_summary"
+require "braintree/settlement_batch_summary_gateway"
+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/subscription_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"

data/lib/braintree/address_gateway.rb

@@ -31,6 +31,7 @@ module Braintree
 
     def find(customer_or_customer_id, address_id)
       customer_id = _determine_customer_id(customer_or_customer_id)
+      raise ArgumentError if address_id.nil? || address_id.strip.to_s == ""
       response = @config.http.get("/customers/#{customer_id}/addresses/#{address_id}")
       Address._new(@gateway, response[:address])
     rescue NotFoundError

data/lib/braintree/configuration.rb

@@ -101,7 +101,7 @@ module Braintree
       when :production
         "www.braintreegateway.com"
       when :qa
-        "qa-master.braintreegateway.com"
+        "qa.braintreegateway.com"
       when :sandbox
         "sandbox.braintreegateway.com"
       end

data/lib/braintree/credit_card_gateway.rb

@@ -41,6 +41,7 @@ module Braintree
     end
 
     def find(token)
+      raise ArgumentError if token.nil? || token.strip.to_s == ""
       response = @config.http.get "/payment_methods/#{token}"
       CreditCard._new(@gateway, response[:credit_card])
     rescue NotFoundError

data/lib/braintree/customer_gateway.rb

@@ -33,7 +33,7 @@ module Braintree
 
     def find(customer_id)
       raise ArgumentError, "customer_id contains invalid characters" unless customer_id.to_s =~ /\A[\w-]+\z/
-      raise ArgumentError, "customer_id cannot be blank" if customer_id.to_s == ""
+      raise ArgumentError, "customer_id cannot be blank" if customer_id.nil?|| customer_id.strip.to_s == ""
       response = @config.http.get("/customers/#{customer_id}")
       Customer._new(@gateway, response[:customer])
     rescue NotFoundError

data/lib/braintree/error_codes.rb

@@ -174,7 +174,8 @@ module Braintree
       CustomerIdIsInvalid = "91510"
       HasAlreadyBeenRefunded = "91512"
       MerchantAccountIdIsInvalid = "91513"
-      MerchantAccountIsSuspended = "91514"
+      MerchantAccountIsSuspended = "91515"
+      MerchantAccountDoesNotSupportRefunds = "91547"
       MerchantAccountNameIsInvalid = "91513" # Deprecated
       OrderIdIsTooLong = "91501"
       PaymentMethodConflict = "91515"

data/lib/braintree/subscription_gateway.rb

@@ -24,6 +24,7 @@ module Braintree
     end
 
     def find(id)
+      raise ArgumentError if id.nil? || id.strip.to_s == ""
       response = @config.http.get "/subscriptions/#{id}"
       Subscription._new(@gateway, response[:subscription])
     rescue NotFoundError

data/lib/braintree/transaction.rb

@@ -39,6 +39,8 @@ module Braintree
     module Type # :nodoc:
       Credit = "credit" # :nodoc:
       Sale = "sale" # :nodoc:
+
+      All = constants.map { |c| const_get(c) }
     end
 
     attr_reader :avs_error_response_code, :avs_postal_code_response_code, :avs_street_address_response_code

data/lib/braintree/transaction_gateway.rb

@@ -31,6 +31,7 @@ module Braintree
     end
 
     def find(id)
+      raise ArgumentError if id.nil? || id.strip.to_s == ""
       response = @config.http.get "/transactions/#{id}"
       Transaction._new(@gateway, response[:transaction])
     rescue NotFoundError

data/lib/braintree/transaction_search.rb

@@ -56,7 +56,7 @@ module Braintree
       Transaction::Source::ControlPanel,
       Transaction::Source::Recurring
     ]
-    multiple_value_field :type
+    multiple_value_field :type, :allows => Transaction::Type::All
 
     key_value_fields :refund
 

data/lib/braintree/version.rb

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

data/spec/integration/braintree/http_spec.rb

@@ -88,7 +88,7 @@ describe Braintree::Http do
       it "rejects when the certificate isn't verified by our certificate authority (self-signed)" do
         config = Braintree::Configuration.instantiate
         config.stub(:ssl?).and_return(true)
-        config.stub(:port).and_return(8443)
+        config.stub(:port).and_return(SSL_TEST_PORT)
 
         start_ssl_server do
           expect do
@@ -104,7 +104,7 @@ describe Braintree::Http do
           File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "ssl", "geotrust_global.crt"))
         )
         config.stub(:ssl?).and_return(true)
-        config.stub(:port).and_return(8443)
+        config.stub(:port).and_return(SSL_TEST_PORT)
 
         start_ssl_server do
           expect do

data/spec/integration/braintree/transaction_search_spec.rb

@@ -381,6 +381,17 @@ describe Braintree::Transaction, "search" do
       end
     end
 
+    context "invalid search" do
+      it "raises an exception on invalid transaction type" do
+        expect do
+          collection = Braintree::Transaction.search do |search|
+            search.customer_id.is "9171566"
+            search.type.is "settled"
+          end
+        end.to raise_error(ArgumentError)
+      end
+    end
+
     context "range fields" do
       context "amount" do
         it "searches on amount" do

data/spec/integration/spec_helper.rb

@@ -1,5 +1,6 @@
 unless defined?(INTEGRATION_SPEC_HELPER_LOADED)
   INTEGRATION_SPEC_HELPER_LOADED = true
+  SSL_TEST_PORT = ENV['SSL_TEST_PORT'] || 8443
 
   require File.dirname(__FILE__) + "/../spec_helper"
   require File.dirname(__FILE__) + "/../hacks/tcp_socket"
@@ -10,11 +11,12 @@ unless defined?(INTEGRATION_SPEC_HELPER_LOADED)
     FileUtils.rm(web_server_pid_file) if File.exist?(web_server_pid_file)
     command = File.expand_path(File.join(File.dirname(__FILE__), "..", "script", "httpsd.rb"))
     `#{command} #{web_server_pid_file}`
-    TCPSocket.wait_for_service :host => "127.0.0.1", :port => 8443
+    TCPSocket.wait_for_service :host => "127.0.0.1", :port => SSL_TEST_PORT
 
     yield
 
     10.times { unless File.exists?(web_server_pid_file); sleep 1; end }
+  ensure
     Process.kill "INT", File.read(web_server_pid_file).to_i
   end
 

data/spec/script/httpsd.rb

@@ -12,7 +12,7 @@ cert = OpenSSL::X509::Certificate.new(File.read(cert_file))
 pid_file = ARGV[0]
 
 s = WEBrick::HTTPServer.new(
-  :Port => 8443,
+  :Port => (ENV['SSL_TEST_PORT'] || 8443),
   :Logger => WEBrick::Log::new(nil, WEBrick::Log::ERROR),
   :DocumentRoot => File.join(File.dirname(__FILE__)),
   :ServerType => WEBrick::Daemon,

data/spec/unit/braintree/address_spec.rb

@@ -66,6 +66,18 @@ describe Braintree::Address do
         Braintree::Address.find("spaces not allowed", "address_id")
       end.to raise_error(ArgumentError, "customer_id contains invalid characters")
     end
+
+    it "raises an error if address_id is blank" do
+      expect do
+        Braintree::Address.find("customer_id", "")
+      end.to raise_error(ArgumentError)
+    end
+
+    it "raises an error if address_id is blank" do
+      expect do
+        Braintree::Address.find("customer_id", nil)
+      end.to raise_error(ArgumentError)
+    end
   end
 
   describe "self.new" do

data/spec/unit/braintree/configuration_spec.rb

@@ -195,6 +195,11 @@ describe Braintree::Configuration do
       Braintree::Configuration.environment = :sandbox
       Braintree::Configuration.instantiate.server.should == "sandbox.braintreegateway.com"
     end
+
+    it "is qa.braintreegateway.com for qa" do
+      Braintree::Configuration.environment = :qa
+      Braintree::Configuration.instantiate.server.should == "qa.braintreegateway.com"
+    end
   end
 
   describe "ssl?" do

data/spec/unit/braintree/credit_card_spec.rb

@@ -119,6 +119,26 @@ describe Braintree::CreditCard do
     end
   end
 
+  describe "self.find" do
+    it "raises error if passed empty string" do
+      expect do
+        Braintree::CreditCard.find("")
+      end.to raise_error(ArgumentError)
+    end
+
+    it "raises error if passed invalid string" do
+      expect do
+        Braintree::CreditCard.find("\t")
+      end.to raise_error(ArgumentError)
+    end
+
+    it "raises error if passed nil" do
+      expect do
+        Braintree::CreditCard.find(nil)
+      end.to raise_error(ArgumentError)
+    end
+  end
+
   describe "inspect" do
     it "includes the token first" do
       output = Braintree::CreditCard._new(:gateway, :token => "cc123").inspect

data/spec/unit/braintree/customer_spec.rb

@@ -41,6 +41,20 @@ describe Braintree::Customer do
     end
   end
 
+  describe "self.find" do
+    it "raises an exception if the id is blank" do
+      expect do
+        Braintree::Customer.find("  ")
+      end.to raise_error(ArgumentError)
+    end
+
+    it "raises an exception if the id is nil" do
+      expect do
+        Braintree::Customer.find(nil)
+      end.to raise_error(ArgumentError)
+    end
+  end
+
   describe "self.update" do
     it "raises an exception if hash includes an invalid key" do
       expect do

data/spec/unit/braintree/subscription_spec.rb

@@ -22,6 +22,26 @@ describe Braintree::Subscription do
     end
   end
 
+  describe "self.find" do
+    it "raises error if passed empty string" do
+      expect do
+        Braintree::Subscription.find("")
+      end.to raise_error(ArgumentError)
+    end
+
+    it "raises error if passed empty string wth space" do
+      expect do
+        Braintree::Subscription.find(" ")
+      end.to raise_error(ArgumentError)
+    end
+
+    it "raises error if passed nil" do
+      expect do
+        Braintree::Subscription.find(nil)
+      end.to raise_error(ArgumentError)
+    end
+  end
+
   describe "self.search" do
     it "only allows specified values for status" do
       lambda do

data/spec/unit/braintree/transaction_spec.rb

@@ -25,6 +25,26 @@ describe Braintree::Transaction do
     end
   end
 
+  describe "self.find" do
+    it "raises error if passed empty string" do
+      expect do
+        Braintree::Transaction.find("")
+      end.to raise_error(ArgumentError)
+    end
+
+    it "raises error if passed empty string wth space" do
+      expect do
+        Braintree::Transaction.find(" ")
+      end.to raise_error(ArgumentError)
+    end
+
+    it "raises error if passed nil" do
+      expect do
+        Braintree::Transaction.find(nil)
+      end.to raise_error(ArgumentError)
+    end
+  end
+
   describe "self.create_transaction_url" do
     it "returns the url" do
       port = Braintree::Configuration.instantiate.port

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: braintree
 version: !ruby/object:Gem::Version 
-  hash: 63
-  prerelease: 
+  hash: 59
+  prerelease: false
   segments: 
   - 2
-  - 12
+  - 13
   - 0
-  version: 2.12.0
+  version: 2.13.0
 platform: ruby
 authors: 
 - Braintree
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-06 00:00:00 -05:00
+date: 2011-11-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,6 +154,7 @@ files:
 - lib/ssl/sandbox_braintreegateway_com.ca.crt
 - lib/ssl/securetrust_ca.crt
 - lib/ssl/www_braintreegateway_com.ca.crt
+- braintree.gemspec
 has_rdoc: true
 homepage: http://www.braintreepayments.com/
 licenses: []
@@ -184,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: braintree
-rubygems_version: 1.6.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Braintree Gateway Ruby Client Library