braintree-rails 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dabcaf3edf7c518f2ded8a0382de5ac2ef468ab
-  data.tar.gz: 3e02fa5749ed2dbcfa863328cc2266312372a844
+  metadata.gz: beb78e264daf6f5aa910f0f22a037a401de719ee
+  data.tar.gz: 964ddabe92b7e24904d9fc2a7611c3eb7f57721f
 SHA512:
-  metadata.gz: 431039d31483f5e450b067e32349b6987a843a4fd481000e8a8bebde02491af3baa54cf8b7b4e08b89eb20644c01a30d22924c14a781de20ed0ffd8be1d0a50f
-  data.tar.gz: 2a113fb29727e0108217f22a72e7392b19f98d47d6d3a20c545a4dd5c44992df5000b6290eba874975e508fd5e078b100072edd74905b5c29f8fc6e01e08e7f8
+  metadata.gz: 45abffe047116fef0dff574b3bc833afa11e1c44af7c1019776b387f5f80123d0e4bf186200fa0f6bac331d1cda858080ef50d864d7656d367afb5d74c133c4e
+  data.tar.gz: 1c45542fe5e4ce03cd46a8b2e00f0a289c4f5fdbc643b7af83624c21962b317a09636c019eda5bd7b1b5fecd421ce1ddb300bfa5c126ab272b25e3e730af3745

data/.travis.yml

@@ -2,10 +2,11 @@ language: ruby
 cache: bundler
 script: bundle exec rake ci:travis
 rvm:
-- 1.9.2
 - 1.9.3
 - 2.0.0
 - 2.1.0
+- 2.1.1
+- 2.1.2
 - jruby-19mode
 env:
   global:

data/CHANGELOG.md

@@ -1,6 +1,18 @@
 ## Unreleased (master)
+### Enhancements
+  * Added `service_fee_amount` to `BraintreeRails::Transaction`. (Thanks, @KELiON)
+  * Enhanced validation error parsing so that they can be customized/i18n-ed
+
+### Bug Fixes
+  * Fixed deprecation warnings about validator setup. (Thanks, @JWesorick)
+
+## v1.3.0 (74bd8df), Apr 18 2014
 ### Enhancements
   * Added Braintree Marketplace related models
+  * Allow device_data to be passed through for Fraud tools integration
+
+### Bug Fixes
+  * Fixed a bug where it failed to load some models under some circumstances. (Thanks, @mbhnyc and @tmak)
   
 ## v1.2.3 (a9f5bf4), Jan 21 2014
 ### Enhancements

data/Gemfile.lock

@@ -1,50 +1,64 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.2.13)
-      activesupport (= 3.2.13)
-      builder (~> 3.0.0)
-    activesupport (3.2.13)
-      i18n (= 0.6.1)
-      multi_json (~> 1.0)
-    addressable (2.3.4)
-    braintree (2.28.0)
+    activemodel (4.1.8)
+      activesupport (= 4.1.8)
+      builder (~> 3.1)
+    activesupport (4.1.8)
+      i18n (~> 0.6, >= 0.6.9)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.1)
+      tzinfo (~> 1.1)
+    addressable (2.3.6)
+    braintree (2.38.0)
       builder (>= 2.0.0)
-    builder (3.0.4)
-    coveralls (0.7.0)
+    builder (3.2.2)
+    coveralls (0.7.2)
       multi_json (~> 1.3)
-      rest-client
+      rest-client (= 1.6.7)
       simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    crack (0.3.2)
+      term-ansicolor (= 1.2.2)
+      thor (= 0.18.1)
+    crack (0.4.2)
+      safe_yaml (~> 1.0.0)
     diff-lcs (1.2.5)
-    docile (1.1.3)
-    i18n (0.6.1)
-    mime-types (2.1)
-    multi_json (1.9.0)
-    rake (10.0.4)
+    docile (1.1.5)
+    i18n (0.6.11)
+    json (1.8.1)
+    mime-types (2.4.3)
+    minitest (5.4.3)
+    multi_json (1.10.1)
+    rake (10.4.2)
     rest-client (1.6.7)
       mime-types (>= 1.16)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    simplecov (0.8.2)
+    rspec (3.1.0)
+      rspec-core (~> 3.1.0)
+      rspec-expectations (~> 3.1.0)
+      rspec-mocks (~> 3.1.0)
+    rspec-core (3.1.7)
+      rspec-support (~> 3.1.0)
+    rspec-expectations (3.1.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.1.0)
+    rspec-mocks (3.1.3)
+      rspec-support (~> 3.1.0)
+    rspec-support (3.1.2)
+    safe_yaml (1.0.4)
+    simplecov (0.9.1)
       docile (~> 1.1.0)
-      multi_json
+      multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    term-ansicolor (1.3.0)
-      tins (~> 1.0)
+    term-ansicolor (1.2.2)
+      tins (~> 0.8)
     thor (0.18.1)
-    tins (1.0.0)
-    webmock (1.11.0)
-      addressable (>= 2.2.7)
+    thread_safe (0.3.4)
+    tins (0.13.2)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    webmock (1.20.4)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
 
 PLATFORMS

data/braintree-rails.gemspec

@@ -12,11 +12,11 @@ Gem::Specification.new do |spec|
   spec.test_files  = Dir['spec/**']
   spec.homepage    = 'https://github.com/lyang/braintree-rails'
   spec.required_ruby_version = '>= 1.9.2'
-  spec.add_runtime_dependency 'braintree', '>= 2.28.0'
-  spec.add_runtime_dependency 'activemodel', '>= 3.0'
-  spec.add_runtime_dependency 'activesupport', '>= 3.0'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'coveralls'
+  spec.add_runtime_dependency 'braintree', '>= 2.28.0', '< 3'
+  spec.add_runtime_dependency 'activemodel', '>= 3.0', '< 5'
+  spec.add_runtime_dependency 'activesupport', '>= 3.0', '< 5'
+  spec.add_development_dependency 'rake', '~> 10'
+  spec.add_development_dependency 'rspec', '~> 3'
+  spec.add_development_dependency 'webmock', '~> 1'
+  spec.add_development_dependency 'coveralls', '~> 0'
 end

data/lib/braintree_rails/address.rb

@@ -76,4 +76,4 @@ module BraintreeRails
       sync_country_name_attributes(attribute, index)
     end
   end
-end
+end

data/lib/braintree_rails/address_validator.rb

@@ -8,4 +8,4 @@ module BraintreeRails
       [:postal_code, :presence => true, :format => { :with => /\A[- a-z0-9]+\z/i}, :if => Proc.new { |address| address.errors[:postal_code].blank? && Configuration.require_postal_code }]
     ]
   end
-end
+end

data/lib/braintree_rails/api_error.rb

@@ -12,4 +12,4 @@ module BraintreeRails
       "#<#{self.class} (#{code}) #{message}>"
     end
   end
-end
+end

data/lib/braintree_rails/billing_address.rb

@@ -3,5 +3,9 @@ module BraintreeRails
     def self.braintree_model_name
       superclass.braintree_model_name
     end
+
+    def extract_errors(errors)
+      errors.for(:billing_address) || errors.for(:billing)
+    end
   end
-end
+end

data/lib/braintree_rails/business_details.rb

@@ -26,4 +26,4 @@ module BraintreeRails
       address.present? ? {:address => address.attributes_for(:as_association)} : {}
     end
   end
-end
+end

data/lib/braintree_rails/credit_card.rb

@@ -45,7 +45,7 @@ module BraintreeRails
     end
 
     def add_errors(validation_errors)
-      billing_address.add_errors(validation_errors.except(:base)) if billing_address
+      billing_address.add_errors(extract_errors(validation_errors)) if billing_address
       super(validation_errors)
     end
 
@@ -75,4 +75,4 @@ module BraintreeRails
       changed.include?(:expiration_month) || changed.include?(:expiration_year)
     end
   end
-end
+end

data/lib/braintree_rails/customer.rb

@@ -29,7 +29,7 @@ module BraintreeRails
     end
 
     def add_errors(validation_errors)
-      credit_card.add_errors(validation_errors.except(:base)) if credit_card
+      credit_card.add_errors(extract_errors(validation_errors)) if credit_card
       super(validation_errors)
     end
 
@@ -45,4 +45,4 @@ module BraintreeRails
       credit_card.present? ? {:credit_card => credit_card.attributes_for(action).except(:customer_id, :token)} : {}
     end
   end
-end
+end

data/lib/braintree_rails/individual_details.rb

@@ -29,4 +29,4 @@ module BraintreeRails
       address.present? ? {:address => address.attributes_for(:as_association)} : {}
     end
   end
-end
+end

data/lib/braintree_rails/merchant_account.rb

@@ -20,9 +20,13 @@ module BraintreeRails
     after_create :reload, :if => :persisted?
 
     def add_errors(validation_errors)
+      propergate_errors_to_associations(extract_errors(validation_errors))
+      super(validation_errors)
+    end
+
+    def propergate_errors_to_associations(validation_errors)
       [individual, business, funding].each do |association|
-        association.add_errors(validation_errors.except(:base)) if association
-        super(validation_errors)
+        association.add_errors(validation_errors) if association
       end
     end
 

data/lib/braintree_rails/model.rb

@@ -40,17 +40,15 @@ module BraintreeRails
       end
 
       def add_errors(validation_errors)
-        validation_errors.each do |attribute, message|
-          if attribute.to_s == 'base'
-            Array(message).each do |msg|
-              self.errors.add(attribute, msg)
-            end
-          elsif respond_to?(attribute)
-            self.errors.add(attribute, message)
-          end
+        Array(extract_errors(validation_errors)).each do |error|
+          self.errors.add(error.attribute.to_sym, error.code.to_sym, message:BraintreeRails::ApiError.new(error.message, error.code))
         end
       end
 
+      def extract_errors(validation_errors)
+        validation_errors.for(self.class.braintree_model_name.to_sym)
+      end
+
       def ==(other)
         return false unless other.is_a?(self.class) || other.is_a?(self.class.braintree_model_class)
         id == other.id
@@ -73,4 +71,4 @@ module BraintreeRails
       receiver.extend         ClassMethods
     end
   end
-end
+end

data/lib/braintree_rails/persistence.rb

@@ -116,7 +116,7 @@ module BraintreeRails
         run_callbacks context do
           result = yield
           if result.respond_to?(:success?) && !result.success?
-            add_errors(extract_errors(result))
+            add_errors(result.errors)
             false
           else
             new_record = result.respond_to?(self.class.braintree_model_name) ? result.send(self.class.braintree_model_name) : result
@@ -124,24 +124,6 @@ module BraintreeRails
           end
         end
       end
-
-      def extract_errors(result)
-        base_errors(result).merge(attribute_errors(result))
-      end
-
-      def base_errors(result)
-        all_messages = result.message.split("\n")
-        base_messages = all_messages - attribute_errors(result).values.map(&:to_s)
-        base_messages.empty? ? {} : {'base' => base_messages}
-      end
-
-      def attribute_errors(result)
-        result.errors.inject({}) do |hash, error|
-          next hash if error.attribute.to_s == 'base'
-          hash[error.attribute.to_s] = BraintreeRails::ApiError.new(error.message, error.code)
-          hash
-        end
-      end
     end
 
     def self.included(receiver)
@@ -154,4 +136,4 @@ module BraintreeRails
       end
     end
   end
-end
+end

data/lib/braintree_rails/shipping_address.rb

@@ -3,5 +3,9 @@ module BraintreeRails
     def self.braintree_model_name
       superclass.braintree_model_name
     end
+
+    def extract_errors(errors)
+      errors.for(:shipping_address) || errors.for(:shipping)
+    end
   end
-end
+end

data/lib/braintree_rails/transaction.rb

@@ -6,7 +6,7 @@ module BraintreeRails
 
     define_attributes(
       :create => [
-        :amount, :billing, :channel, :custom_fields, :customer_id, :descriptor, :merchant_account_id,
+        :amount, :billing, :channel, :custom_fields, :customer_id, :descriptor, :merchant_account_id, :service_fee_amount,
         :options, :order_id, :payment_method_token, :purchase_order_number, :recurring, :shipping,
         :tax_amount, :tax_exempt, :type, :venmo_sdk_payment_method_code, :device_data
       ],
@@ -64,7 +64,7 @@ module BraintreeRails
     end
 
     def add_errors(validation_errors)
-      propergate_errors_to_associations(validation_errors)
+      propergate_errors_to_associations(extract_errors(validation_errors))
       super(validation_errors)
     end
 
@@ -80,9 +80,9 @@ module BraintreeRails
 
     protected
 
-    def propergate_errors_to_associations(validation_errors)
+    def propergate_errors_to_associations(errors)
       [customer, credit_card, billing, shipping].each do |association|
-        association.add_errors(validation_errors.except('base')) if association
+        association.add_errors(errors) if association
       end
     end
 
@@ -116,4 +116,4 @@ module BraintreeRails
       end
     end
   end
-end
+end

data/lib/braintree_rails/transaction_validator.rb

@@ -8,7 +8,7 @@ module BraintreeRails
       [:status, :inclusion => {:in => [Braintree::Transaction::Status::Authorized, Braintree::Transaction::Status::SubmittedForSettlement]}, :on => :void]
     ]
 
-    def setup(*)
+    def initialize(*)
       self.class.model_class.class_eval do
         define_model_callbacks :submit_for_settlement, :refund, :void
       end

data/lib/braintree_rails/validator.rb

@@ -27,7 +27,7 @@ module BraintreeRails
       name.chomp('Validator').constantize
     end
 
-    def setup(*)
+    def initialize(*)
       self.class.setup
     end
 

data/lib/braintree_rails/version.rb

@@ -1,3 +1,3 @@
 module BraintreeRails
-  Version = "1.3.0"
+  Version = "1.4.0"
 end

data/spec/fixtures/merchant_account.xml

@@ -4,4 +4,4 @@
   <id>default_merchant_account_id</id>
   <currency-iso-code>USD</currency-iso-code>
   <sub-merchant-account type="boolean">false</sub-merchant-account>
-</merchant-account>
+</merchant-account>

data/spec/fixtures/transaction_error.xml

@@ -1,44 +1,89 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <api-error-response>
-  <message>Credit card type is not accepted by this merchant account.
-Credit card number is invalid.</message>
   <errors>
+    <errors type="array"/>
     <transaction>
+      <errors type="array">
+        <error>
+          <code>91577</code>
+          <attribute type="symbol">merchant_account_id</attribute>
+          <message>Merchant account does not support payment instrument.</message>
+        </error>
+      </errors>
+      <billing>
+        <errors type="array">
+          <error>
+            <code>81809</code>
+            <attribute type="symbol">postal_code</attribute>
+            <message>Postal code may contain no more than 9 letter or number characters.</message>
+          </error>
+        </errors>
+      </billing>
+      <shipping>
+        <errors type="array">
+          <error>
+            <code>81809</code>
+            <attribute type="symbol">postal_code</attribute>
+            <message>Postal code may contain no more than 9 letter or number characters.</message>
+          </error>
+        </errors>
+      </shipping>
       <credit-card>
         <errors type="array">
           <error>
-            <code>81715</code>
-            <message>Credit card number is invalid.</message>
+            <code>81703</code>
             <attribute type="symbol">number</attribute>
+            <message>Credit card type is not accepted by this merchant account.</message>
+          </error>
+          <error>
+            <code>81714</code>
+            <attribute type="symbol">number</attribute>
+            <message>Credit card number is required.</message>
+          </error>
+          <error>
+            <code>81725</code>
+            <attribute type="symbol">base</attribute>
+            <message>Credit card must include number, payment_method_nonce, or venmo_sdk_payment_method_code.</message>
           </error>
         </errors>
       </credit-card>
-      <errors type="array"/>
-      <billing>
-        <errors type="array"/>
-      </billing>
     </transaction>
-    <errors type="array"/>
   </errors>
   <params>
     <transaction>
-      <type>sale</type>
+      <device-session-id>66866b285afd0d816de617983444f13d</device-session-id>
+      <fraud-merchant-id>600000</fraud-merchant-id>
+      <amount>7</amount>
       <billing>
-        <country-code-numeric>840</country-code-numeric>
+        <company>BraintreeRails</company>
+        <country-name>United States of America</country-name>
+        <first-name>Braintree</first-name>
+        <last-name>Rails</last-name>
+        <locality>San Francisco</locality>
+        <postal-code>1234567890</postal-code>
         <region>California</region>
-        <first-name>Wall</first-name>
-        <company>Pixar</company>
-        <locality>Junk Montain</locality>
-        <street-address>Junk Rd</street-address>
-        <last-name>E</last-name>
-        <postal-code>12345</postal-code>
+        <street-address>185 Berry St</street-address>
       </billing>
-      <amount>2001</amount>
+      <shipping>
+        <company>BraintreeRails</company>
+        <country-name>United States of America</country-name>
+        <first-name>Braintree</first-name>
+        <last-name>Rails</last-name>
+        <locality>San Francisco</locality>
+        <postal-code>0123456789</postal-code>
+        <region>California</region>
+        <street-address>185 Berry St</street-address>
+      </shipping>
+      <type>sale</type>
       <credit-card>
         <expiration-month>01</expiration-month>
-        <cardholder-name>Wall-E</cardholder-name>
         <expiration-year>1976</expiration-year>
       </credit-card>
     </transaction>
   </params>
-</api-error-response>
+  <message>Merchant account does not support payment instrument.
+Credit card type is not accepted by this merchant account.
+Credit card number is required.
+Credit card must include number, payment_method_nonce, or venmo_sdk_payment_method_code.
+Postal code may contain no more than 9 letter or number characters.</message>
+</api-error-response>