braintree-rails 1.2.2 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57414c4ea8df5541d2cd778d119faf881ba79701
-  data.tar.gz: 0db1cce99d56b85da28f190701fdf0f01203ef55
+  metadata.gz: 56202c668de2552e6a850a95602e323bfebff239
+  data.tar.gz: 1c0f8bf6594cbfb8550d56cbd7be0589af412694
 SHA512:
-  metadata.gz: a6fb3ebeca4008a5ab5262cf3ac6840537c27747099e7b1bbf6acde6b910d1e28d31903459f876cb95a95fab86ace1efe11a303feb62ad2333d8a4ffe5d7784c
-  data.tar.gz: a667b40488b6593ee9ff5875ebf65b61ef465a7e96c980152ddc01fbbac915dfe3501f4c97e023e0da87b1c299451b762ce0eb5cc9076a9231472d5ba3423f39
+  metadata.gz: b11a071290144088a5e2c068957fdfcebace2b616c2e7801735843c324ae43d64f2534100918833233626aa834e003e91451dd12eb14d6f596e9c774ef2b5917
+  data.tar.gz: a5f3167d16569e8127f16c9188b212aa7114a831668edd34b164c54b65f0fcf2c7b7eaeb138371da7948bee333fd0a873a80318535b63b2a58450aed39c91978

data/.travis.yml

@@ -4,4 +4,3 @@ rvm:
   - "1.9.3"
   - "2.0.0"
   - "jruby-19mode"
-  - "rbx-19mode"

data/CHANGELOG.md

@@ -1,4 +1,13 @@
 ## Unreleased (master)
+### Enhancements
+  * Customer create/update now accepts an optional :credit_card params.
+
+### Bug Fixes
+  * Fixed a bug where it failed to update credit card expiry date when only expiration year changed. (Thanks, @vedanova)
+  
+## v1.2.2 (370fab4), Oct 14 2013
+### Bug Fixes
+  * Fixed gemspec to only package necessary files to reduce the gem file size. (Thanks, @ivankocienski)
 
 ## v1.2.1 (370fab4), Jul 01 2013
 ### Enhancements

data/lib/braintree_rails/association.rb

@@ -27,11 +27,11 @@ module BraintreeRails
 
       def define_association_reader(name, options)
         define_method(name) do
-          value = instance_variable_get("@#{name}")
-          return value if value.present?
-          value = self.send(options[:foreign_key])
-          value &&= options[:class].new(value)
-          instance_variable_set("@#{name}", value)
+          if value = instance_variable_get("@#{name}")
+            return value
+          elsif options[:foreign_key] && value = send(options[:foreign_key])
+            instance_variable_set("@#{name}", options[:class].new(value))
+          end
         end
       end
 

data/lib/braintree_rails/credit_card.rb

@@ -14,11 +14,13 @@ module BraintreeRails
     has_many   :transactions,    :class => Transactions
     has_many   :subscriptions,   :class => Subscriptions
     belongs_to :customer,        :class => Customer,       :foreign_key => :customer_id
+    has_one    :billing_address, :class => BillingAddress
 
     alias_method :id, :token
     alias_method :id=, :token=
 
     around_persist :clear_encryped_attributes
+    before_update :normalize_expiration_date, :if => :expiry_date_changed?
 
     def ensure_model(model)
       if Braintree::Transaction::CreditCardDetails === model
@@ -42,10 +44,6 @@ module BraintreeRails
       "#{bin}******#{last_4}"
     end
 
-    def billing_address=(value)
-      @billing_address = value && BillingAddress.new(value)
-    end
-
     def add_errors(validation_errors)
       billing_address.add_errors(validation_errors.except(:base)) if billing_address
       super(validation_errors)
@@ -67,5 +65,14 @@ module BraintreeRails
         self.send(encrypted_attribute, nil)
       end
     end
+
+    def normalize_expiration_date
+      self.expiration_date = [self.expiration_month, self.expiration_year].join("/")
+      self.expiration_month = self.expiration_year = nil
+    end
+
+    def expiry_date_changed?
+      changed.include?(:expiration_month) || changed.include?(:expiration_year)
+    end
   end
 end

data/lib/braintree_rails/credit_card_validator.rb

@@ -15,14 +15,14 @@ module BraintreeRails
     ]
 
     def validate(credit_card)
-      have_valid_billing_address(credit_card) if validate_billing_address?
+      has_valid_billing_address(credit_card) if validate_billing_address?
     end
 
-    def have_valid_billing_address(credit_card)
+    def has_valid_billing_address(credit_card)
       credit_card.instance_eval do
         errors.add(:billing_address, "is empty") and return if billing_address.blank?
         if billing_address.invalid?
-          errors.add(:billing_address, "is not valid")
+          errors.add(:billing_address, "is invalid")
           billing_address.errors.full_messages.each do |message|
             errors.add(:base, message)
           end

data/lib/braintree_rails/customer.rb

@@ -3,8 +3,8 @@ module BraintreeRails
     include Model
 
     define_attributes(
-      :create => [:company, :custom_fields, :email, :fax, :first_name, :id, :last_name, :options, :phone, :website],
-      :update => [:company, :custom_fields, :email, :fax, :first_name, :last_name, :options, :phone, :website],
+      :create => [:company, :custom_fields, :email, :fax, :first_name, :id, :last_name, :options, :phone, :website, :credit_card],
+      :update => [:company, :custom_fields, :email, :fax, :first_name, :last_name, :options, :phone, :website, :credit_card],
       :readonly => [:created_at, :updated_at],
       :as_association => [:id, :company, :email, :fax, :first_name, :last_name, :phone, :website]
     )
@@ -12,6 +12,7 @@ module BraintreeRails
     has_many :addresses,    :class => Addresses
     has_many :transactions, :class => Transactions
     has_many :credit_cards, :class => CreditCards
+    has_one  :credit_card,  :class => CreditCard
 
     def ensure_model(model)
       if Braintree::Transaction::CustomerDetails === model
@@ -27,8 +28,21 @@ module BraintreeRails
       "#{first_name} #{last_name}".strip
     end
 
+    def add_errors(validation_errors)
+      credit_card.add_errors(validation_errors.except(:base)) if credit_card
+      super(validation_errors)
+    end
+
+    def attributes_for(action)
+      super.merge(credit_card_attributes(action))
+    end
+
     def default_credit_card
       credit_cards.find(&:default?)
     end
+
+    def credit_card_attributes(action)
+      credit_card.present? ? {:credit_card => credit_card.attributes_for(action).except(:customer_id, :token)} : {}
+    end
   end
 end

data/lib/braintree_rails/customer_validator.rb

@@ -4,5 +4,20 @@ module BraintreeRails
       [:id, :format => {:with => /\A[-_a-z0-9]*\z/i}, :length => {:maximum => 36}, :exclusion => {:in => %w(all new)}],
       [:first_name, :last_name, :company, :website, :phone, :fax, :length => {:maximum => 255}]
     ]
+
+    def validate(customer)
+      validate_credit_card(customer) if customer.credit_card.present?
+    end
+
+    def validate_credit_card(customer)
+      customer.instance_eval do
+        if credit_card.invalid?
+          errors.add(:credit_card, "is invalid")
+          credit_card.errors.full_messages.each do |message|
+            errors.add(:base, message)
+          end
+        end
+      end
+    end
   end
 end

data/lib/braintree_rails/version.rb

@@ -1,3 +1,3 @@
 module BraintreeRails
-  Version = "1.2.2"
+  Version = "1.2.3"
 end

data/test/integration/braintree_rails/credit_card_integration_test.rb

@@ -46,6 +46,31 @@ describe 'Credit Card Integration' do
     braintree_credit_card.billing_address.postal_code.must_equal '56789'
   end
 
+  it 'should be able to update just expiration year' do
+    customer = BraintreeRails::Customer.create!(:id => 'customer_id', :first_name => 'Brain', :last_name => 'Tree')
+    credit_card = customer.credit_cards.create!(credit_card_hash.merge(:expiration_month => '07', :expiration_year => '2012'))
+
+    credit_card.update_attributes!(:cardholder_name => 'Foo Bar', :number => '4111111111111111', :options => {:verify_card => true}, :expiration_month => '07', :expiration_year => '2013', :billing_address => address_hash.merge(:postal_code => '56789'))
+    braintree_credit_card = Braintree::CreditCard.find(credit_card.id)
+    braintree_credit_card.cardholder_name.must_equal 'Foo Bar'
+    braintree_credit_card.billing_address.postal_code.must_equal '56789'
+    braintree_credit_card.expiration_month.must_equal '07'
+    braintree_credit_card.expiration_year.must_equal '2013'
+  end
+
+  it 'should be able to update by expiration date' do
+    customer = BraintreeRails::Customer.create!(:id => 'customer_id', :first_name => 'Brain', :last_name => 'Tree')
+    credit_card = customer.credit_cards.create!(credit_card_hash.merge(:expiration_month => '07', :expiration_year => '2012'))
+
+    credit_card.update_attributes!(:cardholder_name => 'Foo Bar', :number => '4111111111111111', :options => {:verify_card => true}, :expiration_date => '08/2013', :billing_address => address_hash.merge(:postal_code => '56789'))
+    braintree_credit_card = Braintree::CreditCard.find(credit_card.id)
+    braintree_credit_card.cardholder_name.must_equal 'Foo Bar'
+    braintree_credit_card.billing_address.postal_code.must_equal '56789'
+    braintree_credit_card.expiration_month.must_equal '08'
+    braintree_credit_card.expiration_year.must_equal '2013'
+    braintree_credit_card.expiration_date.must_equal '08/2013'
+  end
+
   it 'should be able to destroy existing credit card' do
     braintree_customer = Braintree::Customer.create!(:id => 'customer_id', :first_name => 'Brain', :last_name => 'Tree', :credit_card => credit_card_hash)
     credit_card = BraintreeRails::CreditCard.new(braintree_customer.credit_cards.first.token)

data/test/integration/braintree_rails/customer_integration_test.rb

@@ -22,6 +22,12 @@ describe 'Customer Integration' do
     braintree_customer.last_name.must_equal 'Tree'
   end
 
+  it 'should be able to create new customer with a credit card' do
+    customer = BraintreeRails::Customer.create(:first_name => 'Brain', :last_name => 'Tree', :credit_card => credit_card_hash)
+    braintree_customer = Braintree::Customer.find(customer.id)
+    braintree_customer.credit_cards.count.must_equal 1
+  end
+
   it 'should be able to update existing customer' do
     customer = BraintreeRails::Customer.create!(:first_name => 'Brain', :last_name => 'Tree')
     customer.update_attributes!(:first_name => 'Foo', :last_name => 'Bar')
@@ -31,6 +37,14 @@ describe 'Customer Integration' do
     braintree_customer.last_name.must_equal 'Bar'
   end
 
+  it 'should be able to update existing customer with new credit card' do
+    customer = BraintreeRails::Customer.create(:first_name => 'Brain', :last_name => 'Tree', :credit_card => credit_card_hash)
+    customer.update_attributes!(:first_name => 'Foo', :last_name => 'Bar', :credit_card => credit_card_hash.merge(:cardholder_name => "FooBar"))
+
+    braintree_customer = Braintree::Customer.find(customer.id)
+    braintree_customer.credit_cards.first.cardholder_name.must_equal "FooBar"
+  end
+
   it 'should be able to destroy existing customer' do
     customer = BraintreeRails::Customer.create!(:first_name => 'Brain', :last_name => 'Tree')
     customer.destroy

data/test/unit/braintree_rails/customer_test.rb

@@ -123,6 +123,18 @@ describe BraintreeRails::Customer do
         customer.errors[attribute].wont_be :blank?
       end
     end
+
+    describe 'credit_card' do
+      it 'is valid if new credit card is valid' do
+        customer = BraintreeRails::Customer.new(:credit_card => credit_card_hash)
+        customer.valid?.must_equal true
+      end
+
+      it 'is not valid if new credit card is invalid' do
+        customer = BraintreeRails::Customer.new(:credit_card => credit_card_hash.except(:number))
+        customer.valid?.must_equal false
+      end
+    end
   end
 
   describe 'persistence' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: braintree-rails
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
 platform: ruby
 authors:
 - Lin Yang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: braintree