braintree 1.0.1 → 1.1.0

data/lib/braintree/credit_card_verification.rb

@@ -2,8 +2,8 @@ module Braintree
   class CreditCardVerification
     include BaseModule
 
-    attr_reader :avs_error_response_code, :avs_postal_code_response_code,
-      :avs_street_address_response_code, :cvv_response_code, :status
+    attr_reader :avs_error_response_code, :avs_postal_code_response_code, :avs_street_address_response_code,
+      :cvv_response_code, :processor_response_code, :processor_response_text, :status
 
     def initialize(attributes) # :nodoc:
       set_instance_variables_from_hash(attributes)
@@ -11,7 +11,8 @@ module Braintree
 
     def inspect # :nodoc:
       attr_order = [
-        :status, :cvv_response_code, :avs_error_response_code,
+        :status, :processor_response_code, :processor_response_text,
+        :cvv_response_code, :avs_error_response_code,
         :avs_postal_code_response_code, :avs_street_address_response_code
       ]
       formatted_attrs = attr_order.map do |attr|

data/lib/braintree/customer.rb

@@ -1,10 +1,10 @@
 module Braintree
   class Customer
     include BaseModule
-    
+
     attr_reader :addresses, :company, :created_at, :credit_cards, :email, :fax, :first_name, :id, :last_name,
       :phone, :updated_at, :website, :custom_fields
-  
+
     # Returns a PagedCollection of all customers stored in the vault. Due to race conditions, this method
     # may not reliably return all customers stored in the vault.
     #
@@ -25,7 +25,7 @@ module Braintree
       end
       PagedCollection.new(attributes) { |page_number| Customer.all(:page => page_number) }
     end
-    
+
     # Creates a customer using the given +attributes+. If <tt>:id</tt> is not passed,
     # the gateway will generate it.
     #
@@ -47,7 +47,7 @@ module Braintree
       Util.verify_keys(_create_signature, attributes)
       _do_create "/customers", :customer => attributes
     end
-    
+
     def self.create!(attributes = {})
       return_object_or_raise(:customer) { create(attributes) }
     end
@@ -60,15 +60,15 @@ module Braintree
       params = TransparentRedirect.parse_and_validate_query_string query_string
       _do_create("/customers/all/confirm_transparent_redirect_request", :id => params[:id])
     end
-  
+
     def self.create_customer_transparent_redirect_url
       "#{Braintree::Configuration.base_merchant_url}/customers"
     end
-    
+
     def self.credit(customer_id, transaction_attributes)
       Transaction.credit(transaction_attributes.merge(:customer_id => customer_id))
     end
-    
+
     def self.credit!(customer_id, transaction_attributes)
        return_object_or_raise(:transaction){ credit(customer_id, transaction_attributes) }
     end
@@ -77,18 +77,18 @@ module Braintree
       Http.delete("/customers/#{customer_id}")
       SuccessfulResult.new
     end
-  
+
     def self.find(customer_id)
       response = Http.get("/customers/#{customer_id}")
       new(response[:customer])
     rescue NotFoundError
       raise NotFoundError, "customer with id #{customer_id.inspect} not found"
     end
-    
+
     def self.sale(customer_id, transaction_attributes)
       Transaction.sale(transaction_attributes.merge(:customer_id => customer_id))
     end
-    
+
     def self.sale!(customer_id, transaction_attributes)
        return_object_or_raise(:transaction){ sale(customer_id, transaction_attributes) }
     end
@@ -103,12 +103,12 @@ module Braintree
       end
       PagedCollection.new(attributes) { |page_number| Customer.transactions(customer_id, :page => page_number) }
     end
-    
+
     def self.update(customer_id, attributes)
       Util.verify_keys(_update_signature, attributes)
       _do_update(:put, "/customers/#{customer_id}", :customer => attributes)
     end
-    
+
     def self.update!(customer_id, attributes)
       return_object_or_raise(:customer) { update(customer_id, attributes) }
     end
@@ -121,25 +121,25 @@ module Braintree
       params = TransparentRedirect.parse_and_validate_query_string(query_string)
       _do_update(:post, "/customers/all/confirm_transparent_redirect_request", :id => params[:id])
     end
-  
+
     def initialize(attributes) # :nodoc:
       set_instance_variables_from_hash(attributes)
       @credit_cards = (@credit_cards || []).map { |pm| CreditCard._new pm }
       @addresses = (@addresses || []).map { |addr| Address._new addr }
     end
-    
+
     def credit(transaction_attributes)
       Customer.credit(id, transaction_attributes)
     end
-    
+
     def credit!(transaction_attributes)
       return_object_or_raise(:transaction) { credit(transaction_attributes) }
     end
-    
+
     def delete
       Customer.delete(id)
     end
-    
+
     def inspect # :nodoc:
       first = [:id]
       last = [:addresses, :credit_cards]
@@ -149,11 +149,11 @@ module Braintree
       end
       "#<#{self.class} #{nice_attributes.join(', ')}>"
     end
-    
+
     def sale(transaction_attributes)
       Customer.sale(id, transaction_attributes)
     end
-    
+
     def sale!(transaction_attributes)
       return_object_or_raise(:transaction) { sale(transaction_attributes) }
     end
@@ -172,9 +172,9 @@ module Braintree
         ErrorResult.new(response[:api_error_response])
       else
         raise "expected :customer or :errors"
-      end      
+      end
     end
-    
+
     def update!(attributes)
       return_object_or_raise(:customer) { update(attributes) }
     end
@@ -228,7 +228,7 @@ module Braintree
 
     def self._new(*args) # :nodoc:
       self.new *args
-    end  
+    end
 
     def self._update_signature # :nodoc:
       [ :company, :email, :fax, :first_name, :id, :last_name, :phone, :website, {:custom_fields => :_any_key_} ]

data/lib/braintree/digest.rb

@@ -6,14 +6,8 @@ module Braintree
 
     def self._hmac_sha1(key, message)
       key_digest = ::Digest::SHA1.digest(key)
-      inner_padding = "\x36" * 64
-      outer_padding = "\x5c" * 64
-      0.upto(19) do |i|
-        inner_padding[i] ^= key_digest[i]
-        outer_padding[i] ^= key_digest[i]
-      end
-      inner_hash = ::Digest::SHA1.digest(inner_padding + message.to_s)
-      ::Digest::SHA1.hexdigest(outer_padding + inner_hash)
+      sha1 = OpenSSL::Digest::Digest.new("sha1")
+      OpenSSL::HMAC.hexdigest(sha1, key_digest, message.to_s)
     end
   end
 end

data/lib/braintree/error_codes.rb

@@ -1,7 +1,7 @@
 module Braintree
   # The ErrorCodes module provides constants for validation errors.
   # The constants should be used to check for a specific validation error in a ValidationErrorCollection.
-  # The error messages returned from the server may change, but the codes will remain the same. 
+  # The error messages returned from the server may change, but the codes will remain the same.
   module ErrorCodes
     module Address
       CannotBeBlank = "81801"
@@ -35,7 +35,7 @@ module Braintree
       ExpirationYearIsInvalid = "81713"
       NumberIsRequired = "81714"
       NumberIsInvalid = "81715"
-      NumberInvalidLength = "81716"
+      NumberHasInvalidLength = "81716"
       NumberMustBeTestNumber = "81717"
       TokenInvalid = "91718"
       TokenIsInUse = "91719"
@@ -62,7 +62,19 @@ module Braintree
       WebsiteIsTooLong = "81615"
       WebsiteIsInvalid = "81616"
     end
-    
+
+    module Subscription
+      CannotEditCanceledSubscription = "81901"
+      IdIsInUse =  "81902"
+      PriceCannotBeBlank = "81903"
+      PriceFormatIsInvalid = "81904"
+      StatusIsCanceled = "81905"
+      TokenFormatIsInvalid = "81906"
+      TrialDurationFormatIsInvalid =  "81907"
+      TrialDurationIsRequired = "81908"
+      TrialDurationUnitIsInvalid =  "81909"
+    end
+
     module Transaction
       AmountCannotBeNegative = "81501"
       AmountIsRequired = "81502"
@@ -73,6 +85,7 @@ module Braintree
       CannotSubmitForSettlement = "91507"
       CreditCardIsRequired = "91508"
       CustomerDefaultPaymentMethodCardTypeIsNotAccepted = "81509"
+      CustomFieldIsInvalid = "91526"
       CustomerIdIsInvalid = "91510"
       CustomerDoesNotHaveCreditCard = "91511"
       HasAlreadyBeenRefunded = "91512"

data/lib/braintree/error_result.rb

@@ -1,4 +1,4 @@
-module Braintree 
+module Braintree
   # An ErrorResult will be returned from non-bang methods when
   # validations fail. It will provide access to the params passed
   # to the server. The params are primarily useful for re-populaing
@@ -16,9 +16,9 @@ module Braintree
   #     end
   #   end
   class ErrorResult
-  
-    attr_reader :credit_card_verification, :errors, :params 
-  
+
+    attr_reader :credit_card_verification, :errors, :params
+
     def initialize(data) # :nodoc:
       @params = data[:params]
       if data[:verification]
@@ -30,7 +30,7 @@ module Braintree
     def inspect # :nodoc:
       "#<#{self.class} params:{...} errors:<#{@errors._inner_inspect}>>"
     end
-    
+
     # Always returns false.
     def success?
       false

data/lib/braintree/exceptions.rb

@@ -0,0 +1,58 @@
+module Braintree # :nodoc:
+  # Super class for all Braintree exceptions.
+  class BraintreeError < ::StandardError; end
+
+  # Raised when authentication fails. This may be caused by an incorrect <tt>Braintree::Configuration</tt>
+  class AuthenticationError < BraintreeError; end
+
+  # Raised when the API key being used is not authorized to perform the attempted action according
+  # to the roles assigned to the user who owns the API key.
+  class AuthorizationError < BraintreeError; end
+
+  # Raised when the Braintree gem is not completely configured. See <tt>Braintree::Configuration</tt>.
+  class ConfigurationError < BraintreeError
+    def initialize(setting, message) # :nodoc:
+      super "Braintree::Configuration.#{setting} #{message}"
+    end
+  end
+
+  # Raised when the gateway is down for maintenance.
+  class DownForMaintenanceError < BraintreeError; end
+
+  # Raised from methods that confirm transparent request requests
+  # when the given query string cannot be verified. This may indicate
+  # an attempted hack on the merchant's transparent redirect
+  # confirmation URL.
+  class ForgedQueryString < BraintreeError; end
+
+  # Raised when a record could not be found.
+  class NotFoundError < BraintreeError; end
+
+  # Raised when an unexpected server error occurs.
+  class ServerError < BraintreeError; end
+
+  # Raised when the SSL certificate fails verification.
+  class SSLCertificateError < BraintreeError; end
+
+  # Raised when an error occurs that the client library is not built to handle.
+  # This shouldn't happen.
+  class UnexpectedError < BraintreeError; end
+
+  # Raised from bang methods when validations fail.
+  class ValidationsFailed < BraintreeError
+    attr_reader :error_result
+
+    def initialize(error_result)
+      @error_result = error_result
+    end
+
+    def inspect
+      "#<#{self.class} error_result: #{@error_result.inspect}>"
+    end
+
+    def to_s
+      inspect
+    end
+  end
+end
+

data/lib/braintree/http.rb

@@ -1,6 +1,6 @@
 module Braintree
   module Http # :nodoc:
-    
+
     def self.delete(path)
       response = _http_do Net::HTTP::Delete, path
       if response.code.to_i == 200
@@ -9,7 +9,7 @@ module Braintree
         Util.raise_exception_for_status_code(response.code)
       end
     end
-    
+
     def self.get(path)
       response = _http_do Net::HTTP::Get, path
       if response.code.to_i == 200
@@ -18,7 +18,7 @@ module Braintree
         Util.raise_exception_for_status_code(response.code)
       end
     end
-    
+
     def self.post(path, params = nil)
       response = _http_do Net::HTTP::Post, path, _build_xml(params)
       if response.code.to_i == 200 || response.code.to_i == 201 || response.code.to_i == 422
@@ -27,7 +27,7 @@ module Braintree
         Util.raise_exception_for_status_code(response.code)
       end
     end
-    
+
     def self.put(path, params = nil)
       response = _http_do Net::HTTP::Put, path, _build_xml(params)
       if response.code.to_i == 200 || response.code.to_i == 201 || response.code.to_i == 422
@@ -41,7 +41,7 @@ module Braintree
       return nil if params.nil?
       Braintree::Xml.hash_to_xml params
     end
-    
+
     def self._http_do(http_verb, path, body = nil)
       connection = Net::HTTP.new(Configuration.server, Configuration.port)
       if Configuration.ssl?
@@ -80,11 +80,11 @@ module Braintree
         raise UnexpectedError, "expected a gzip'd response"
       end
     end
-    
+
     def self._current_time
       Time.now.utc.strftime("%d/%b/%Y %H:%M:%S %Z")
     end
-    
+
     def self._format_and_sanitize_body_for_log(input_xml)
       formatted_xml = input_xml.gsub(/^/, "[Braintree] ")
       formatted_xml = formatted_xml.gsub(/<number>(.{6}).+?(.{4})<\/number>/, '<number>\1******\2</number>')

data/lib/braintree/paged_collection.rb

@@ -2,9 +2,9 @@ module Braintree
   class PagedCollection
     include BaseModule
     include Enumerable
-    
+
     attr_reader :current_page_number, :items, :next_page_number, :page_size, :previous_page_number, :total_items
-    
+
     def initialize(attributes, &block) # :nodoc:
       set_instance_variables_from_hash attributes
       @paging_block = block
@@ -14,11 +14,11 @@ module Braintree
     def [](index)
       @items[index]
     end
-   
-    # Yields each item on the current page. 
+
+    # Yields each item on the current page.
     def each(&block)
       @items.each(&block)
-    end  
+    end
 
     # Returns the first item from the current page.
     def first
@@ -29,27 +29,27 @@ module Braintree
     def last_page?
       current_page_number == total_pages
     end
-   
-    # Retrieves the next page of records. 
+
+    # Retrieves the next page of records.
     def next_page
       if last_page?
         return nil
       end
       @paging_block.call(next_page_number)
     end
-   
-    # The next page number. Returns +nil+ if on the last page. 
+
+    # The next page number. Returns +nil+ if on the last page.
     def next_page_number
       last_page? ? nil : current_page_number + 1
     end
-   
-    # Returns the total number of pages. 
+
+    # Returns the total number of pages.
     def total_pages
-      total = total_items / page_size 
+      total = total_items / page_size
       if total_items % page_size != 0
         total += 1
-      end  
+      end
       total
-    end  
+    end
   end
 end

data/lib/braintree/ssl_expiration_check.rb

@@ -7,7 +7,8 @@ module Braintree
     def self.check_dates # :nodoc:
       {
         "QA" => qa_expiration_date,
-        "Sandbox" => sandbox_expiration_date
+        "Sandbox" => sandbox_expiration_date,
+        "Production" => production_expiration_date
       }.each do |host, expiration_date|
         if Date.today + (3 * 30) > expiration_date
           Configuration.logger.warn "[Braintree] The SSL Certificate for the #{host} environment will expire on #{expiration_date}. Please check for an updated client library."
@@ -16,6 +17,9 @@ module Braintree
       @ssl_expiration_dates_checked = true
     end
 
+    def self.production_expiration_date # :nodoc:
+      Date.new(2012, 1, 8)
+    end
 
     def self.sandbox_expiration_date # :nodoc:
       Date.new(2010, 12, 1)