braintree-rails 1.2.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56202c668de2552e6a850a95602e323bfebff239
-  data.tar.gz: 1c0f8bf6594cbfb8550d56cbd7be0589af412694
+  metadata.gz: 7dabcaf3edf7c518f2ded8a0382de5ac2ef468ab
+  data.tar.gz: 3e02fa5749ed2dbcfa863328cc2266312372a844
 SHA512:
-  metadata.gz: b11a071290144088a5e2c068957fdfcebace2b616c2e7801735843c324ae43d64f2534100918833233626aa834e003e91451dd12eb14d6f596e9c774ef2b5917
-  data.tar.gz: a5f3167d16569e8127f16c9188b212aa7114a831668edd34b164c54b65f0fcf2c7b7eaeb138371da7948bee333fd0a873a80318535b63b2a58450aed39c91978
+  metadata.gz: 431039d31483f5e450b067e32349b6987a843a4fd481000e8a8bebde02491af3baa54cf8b7b4e08b89eb20644c01a30d22924c14a781de20ed0ffd8be1d0a50f
+  data.tar.gz: 2a113fb29727e0108217f22a72e7392b19f98d47d6d3a20c545a4dd5c44992df5000b6290eba874975e508fd5e078b100072edd74905b5c29f8fc6e01e08e7f8

data/.gitignore

@@ -20,5 +20,7 @@ doc/
 *.DS_Store
 *.tag*
 tags
+.ruby-version
+.ruby-gemset
 .rvmrc
-test/config/braintree_auth.yml
+spec/config/braintree_auth.yml

data/.travis.yml

@@ -1,6 +1,15 @@
 language: ruby
+cache: bundler
+script: bundle exec rake ci:travis
 rvm:
-  - "1.9.2"
-  - "1.9.3"
-  - "2.0.0"
-  - "jruby-19mode"
+- 1.9.2
+- 1.9.3
+- 2.0.0
+- 2.1.0
+- jruby-19mode
+env:
+  global:
+  - secure: KV6QO8+zlfSlnZW9LhmDAeTUqnbdGu7axYyI0qAFjfHdROKTV/BaF8ZvOcX3CsveBjmEMLroIUu8G/pBUWJCQ/XC+TrEafhLQUHF8bo1xZdOJmMkjBiKsl3tu9ys2St3Oc2WIbo7YL7SeOuMlDG6xemIxs0H9kZjFxfqPBqS8Ew=
+  - secure: NVDIEcg9Yj87cbv9YZ294mPZx6ousZerha78jUJtVAMXnbhb/Lg8BrZFK5y8aiExc/LMKfdw28FdhcSkq002OxaUdA8Zcwr7ZjsGsKHasu2Dr2FzdzZgLXOedingZ1FyuzhqW40Q/aM0GgO0WGn+z2P9KLXRx7fxHg/R0QhIB+g=
+  - secure: r7NPGCo5yN6uXz6Zosov/x4iHpMMTq2mRTKhtfczEsu39L0S4+egsvbPf1bjobFWOgNu9fzCublphl/pXFf3Hv1JQfizS0escCMq9z0PUBJ2x1JzEZGqz5os2NqSCdoTRR3P7hzFNKCTF+JZJklvGxyKwev8kP3gcAtxb4GQypg=
+  - secure: mXj8rHJcSlLDseru8FsbcCVNHUTpdxG9PNxLqIvfn4SQnROrMYtd4IFuEGQn/wuzatsgFisB6uGpEqs6m0wUCPrMfShyN8ZnNPbF0qTvnq0uQemAIaoK2BSjPExWod6uNTe0sEg1Z+dX+SNfkkOruHXJ9t/ERsK52er1qodYJiE=

data/CHANGELOG.md

@@ -1,11 +1,15 @@
 ## Unreleased (master)
+### Enhancements
+  * Added Braintree Marketplace related models
+  
+## v1.2.3 (a9f5bf4), Jan 21 2014
 ### 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
+## v1.2.2 (dc21ba6), Oct 14 2013
 ### Bug Fixes
   * Fixed gemspec to only package necessary files to reduce the gem file size. (Thanks, @ivankocienski)
 

data/Gemfile

@@ -1,12 +1,11 @@
 source 'http://rubygems.org'
-gem 'braintree', '>= 2.16.0'
+gem 'braintree', '>= 2.28.0'
 gem 'activemodel', '>= 3.0'
 gem 'activesupport', '>= 3.0'
 
 group :test do
   gem 'rake'
-  gem 'minitest'
+  gem 'rspec'
   gem 'webmock'
-  gem 'turn'
-  gem 'simplecov'
+  gem 'coveralls', require: false
 end

data/Gemfile.lock

@@ -8,21 +8,41 @@ GEM
       i18n (= 0.6.1)
       multi_json (~> 1.0)
     addressable (2.3.4)
-    ansi (1.4.3)
-    braintree (2.22.0)
+    braintree (2.28.0)
       builder (>= 2.0.0)
     builder (3.0.4)
+    coveralls (0.7.0)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
     crack (0.3.2)
+    diff-lcs (1.2.5)
+    docile (1.1.3)
     i18n (0.6.1)
-    minitest (4.7.3)
-    multi_json (1.7.2)
+    mime-types (2.1)
+    multi_json (1.9.0)
     rake (10.0.4)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    turn (0.9.6)
-      ansi
+    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)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.18.1)
+    tins (1.0.0)
     webmock (1.11.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
@@ -33,9 +53,8 @@ PLATFORMS
 DEPENDENCIES
   activemodel (>= 3.0)
   activesupport (>= 3.0)
-  braintree (>= 2.16.0)
-  minitest
+  braintree (>= 2.28.0)
+  coveralls
   rake
-  simplecov
-  turn
+  rspec
   webmock

data/README.md

@@ -1,4 +1,4 @@
-# Welcome to braintree-rails [![Build Status](https://secure.travis-ci.org/lyang/braintree-rails.png)](http://travis-ci.org/lyang/braintree-rails) [![Code Climate](https://codeclimate.com/github/lyang/braintree-rails.png)](https://codeclimate.com/github/lyang/braintree-rails) [![Gem Version](https://badge.fury.io/rb/braintree-rails.png)](http://badge.fury.io/rb/braintree-rails)
+# [![Build Status](https://secure.travis-ci.org/lyang/braintree-rails.png)](http://travis-ci.org/lyang/braintree-rails) [![Coverage Status](https://coveralls.io/repos/lyang/braintree-rails/badge.png?branch=master)](https://coveralls.io/r/lyang/braintree-rails?branch=master) [![Code Climate](https://codeclimate.com/github/lyang/braintree-rails.png)](https://codeclimate.com/github/lyang/braintree-rails) [![Gem Version](https://badge.fury.io/rb/braintree-rails.png)](http://badge.fury.io/rb/braintree-rails)
 braintree-rails is a framework that wraps the official [braintree_ruby](https://github.com/braintree/braintree_ruby) client library and provides ActiveModel compatible models that can be easily fit into an rails app.
 
 BraintreeRails models have the same CRUD interface, can be used in Rails form helpers and url helpers. In addition, it has built in validations and callbacks. Even more, you can customize those quite easily.

data/Rakefile

@@ -1,4 +1,4 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'lib/env'))
 Dir.glob(File.join(ROOT_PATH, 'lib/tasks/*.rake')).each { |file| import file }
 
-task :default => ['test:all']
+task :default => ['spec:all']

data/braintree-rails.gemspec

@@ -9,15 +9,14 @@ Gem::Specification.new do |spec|
   spec.email       = 'github@linyang.me'
   spec.license     = 'MIT'
   spec.files       = `git ls-files`.split($/)
-  spec.test_files  = Dir['test/**']
+  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.16.0'
+  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 'minitest'
+  spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'webmock'
-  spec.add_development_dependency 'turn'
-  spec.add_development_dependency 'simplecov'
+  spec.add_development_dependency 'coveralls'
 end

data/lib/braintree_rails/address.rb

@@ -8,7 +8,7 @@ module BraintreeRails
       :as_association => [:company, :country_name, :extended_address, :first_name, :last_name, :locality, :postal_code, :region, :street_address]
     )
 
-    belongs_to :customer, :class => Customer, :foreign_key => :customer_id
+    belongs_to :customer, :class_name => "BraintreeRails::Customer", :foreign_key => :customer_id
 
     CountryNames = {
       :country_name => 0,

data/lib/braintree_rails/address_details.rb

@@ -0,0 +1,14 @@
+module BraintreeRails
+  class AddressDetails
+    include Model
+
+    singleton_class.not_supported_apis(:delete)
+    not_supported_apis(:create, :create!, :update, :update!, :destroy)
+
+    define_attributes(:as_association => [:street_address, :locality, :region, :postal_code])
+
+    def self.braintree_model_name
+      "merchant_account/#{name.demodulize.underscore}"
+    end
+  end
+end

data/lib/braintree_rails/address_details_validator.rb

@@ -0,0 +1,7 @@
+module BraintreeRails
+  class AddressDetailsValidator < Validator
+    Validations = [
+      [:street_address, :locality, :region, :postal_code, :presence => true]
+    ]
+  end
+end

data/lib/braintree_rails/association.rb

@@ -30,14 +30,14 @@ module BraintreeRails
           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))
+            instance_variable_set("@#{name}", options[:class_name].constantize.new(value))
           end
         end
       end
 
       def define_association_writer(name, options)
         define_method("#{name}=") do |value|
-          value &&= options[:class].new(value)
+          value &&= options[:class_name].constantize.new(value)
           instance_variable_set("@#{name}", value)
         end
       end

data/lib/braintree_rails/braintree_ext.rb

@@ -1,7 +1,7 @@
 [Braintree::Plan, Braintree::Modification].each do |model|
   model.class_eval do
    def self.find(id)
-     all.find {|plan| plan.id == id}
+     all.find {|model| model.id == id}
    end
   end
 end
@@ -64,3 +64,29 @@ module Braintree
     end
   end
 end
+
+module Braintree
+  class MerchantAccount
+    alias_method :individual, :individual_details
+    alias_method :business, :business_details
+    alias_method :funding, :funding_details
+
+    class IndividualDetails
+      attr_reader :id
+      alias_method :address, :address_details
+    end
+
+    class BusinessDetails
+      attr_reader :id
+      alias_method :address, :address_details
+    end
+
+    class FundingDetails
+      attr_reader :id
+    end
+
+    class AddressDetails
+      attr_reader :id
+    end
+  end
+end

data/lib/braintree_rails/business_details.rb

@@ -0,0 +1,29 @@
+module BraintreeRails
+  class BusinessDetails
+    include Model
+
+    singleton_class.not_supported_apis(:delete)
+    not_supported_apis(:create, :create!, :update, :update!, :destroy)
+
+    define_attributes(:as_association => [:dba_name, :legal_name, :tax_id, :address])
+
+    has_one :address, :class_name => "BraintreeRails::AddressDetails"
+
+    def self.braintree_model_name
+      "merchant_account/#{name.demodulize.underscore}"
+    end
+
+    def add_errors(validation_errors)
+      address.add_errors(validation_errors) if address
+      super(validation_errors)
+    end
+
+    def attributes_for(action)
+      super.merge(address_attributes)
+    end
+
+    def address_attributes
+      address.present? ? {:address => address.attributes_for(:as_association)} : {}
+    end
+  end
+end

data/lib/braintree_rails/business_details_validator.rb

@@ -0,0 +1,12 @@
+module BraintreeRails
+  class BusinessDetailsValidator < Validator
+    Validations = [
+      [:legal_name, :presence => true, :if => Proc.new {|business| business.tax_id.present?}],
+      [:tax_id, :presence => true, :if => Proc.new {|business| business.legal_name.present?}],
+    ]
+
+    def validate(business)
+      validate_association(business, :address)
+    end
+  end
+end

data/lib/braintree_rails/configuration.rb

@@ -10,7 +10,7 @@ module BraintreeRails
     singleton_class.class_eval do
       delegate :custom_user_agent, :environment, :merchant_id, :public_key, :private_key, :logger, :to => Braintree::Configuration
       delegate :custom_user_agent=, :environment=, :merchant_id=, :public_key=, :private_key=, :logger=, :to => Braintree::Configuration
-      attr_accessor :mode, :require_postal_code, :require_street_address, :client_side_encryption_key
+      attr_accessor :mode, :require_postal_code, :require_street_address, :client_side_encryption_key, :default_merchant_account_id
     end
 
     self.custom_user_agent = "braintree-rails-#{Version}"

data/lib/braintree_rails/credit_card.rb

@@ -2,8 +2,8 @@ module BraintreeRails
   class CreditCard
     include Model
     define_attributes(
-      :create => [:billing_address, :cardholder_name, :customer_id, :expiration_date, :expiration_month, :expiration_year, :number, :cvv, :options, :token],
-      :update => [:billing_address, :cardholder_name, :expiration_date, :expiration_month, :expiration_year, :options, :number, :cvv],
+      :create => [:billing_address, :cardholder_name, :customer_id, :expiration_date, :expiration_month, :expiration_year, :number, :cvv, :options, :token, :device_data],
+      :update => [:billing_address, :cardholder_name, :expiration_date, :expiration_month, :expiration_year, :options, :number, :cvv, :device_data],
       :readonly => [
         :bin, :card_type, :commercial, :country_of_issuance, :created_at, :debit, :durbin_regulated, :default,
         :expired, :healthcare, :issuing_bank, :last_4, :payroll, :prepaid, :unique_number_identifier, :updated_at
@@ -11,10 +11,10 @@ module BraintreeRails
       :as_association => [:cardholder_name, :cvv, :expiration_date, :expiration_month, :expiration_year, :number]
     )
 
-    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
+    has_many   :transactions,    :class_name => "BraintreeRails::Transactions"
+    has_many   :subscriptions,   :class_name => "BraintreeRails::Subscriptions"
+    belongs_to :customer,        :class_name => "BraintreeRails::Customer",       :foreign_key => :customer_id
+    has_one    :billing_address, :class_name => "BraintreeRails::BillingAddress"
 
     alias_method :id, :token
     alias_method :id=, :token=

data/lib/braintree_rails/credit_card_validator.rb

@@ -12,26 +12,11 @@ module BraintreeRails
       [:expiration_date, :presence => true, :if => Proc.new { |credit_card| credit_card.new_record? && credit_card.expiration_month.blank? }],
       [:expiration_month, :numericality => { :only_integer => true, :greater_than_or_equal_to => 1, :less_than_or_equal_to => 12 }, :if => Proc.new { Configuration.mode == Configuration::Mode::S2S }],
       [:expiration_year, :numericality => { :only_integer => true, :greater_than_or_equal_to => 1976, :less_than_or_equal_to => 2200 }, :if => Proc.new { Configuration.mode == Configuration::Mode::S2S }],
+      [:billing_address, :presence => true, :if => Proc.new {Configuration.require_postal_code || Configuration.require_street_address}],
     ]
 
     def validate(credit_card)
-      has_valid_billing_address(credit_card) if validate_billing_address?
-    end
-
-    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 invalid")
-          billing_address.errors.full_messages.each do |message|
-            errors.add(:base, message)
-          end
-        end
-      end
-    end
-
-    def validate_billing_address?
-      Configuration.require_postal_code || Configuration.require_street_address
+      validate_association(credit_card, :billing_address)
     end
   end
 end

data/lib/braintree_rails/customer.rb

@@ -3,16 +3,16 @@ module BraintreeRails
     include Model
 
     define_attributes(
-      :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],
+      :create => [:company, :custom_fields, :email, :fax, :first_name, :id, :last_name, :options, :phone, :website, :credit_card, :device_data],
+      :update => [:company, :custom_fields, :email, :fax, :first_name, :last_name, :options, :phone, :website, :credit_card, :device_data],
       :readonly => [:created_at, :updated_at],
       :as_association => [:id, :company, :email, :fax, :first_name, :last_name, :phone, :website]
     )
 
-    has_many :addresses,    :class => Addresses
-    has_many :transactions, :class => Transactions
-    has_many :credit_cards, :class => CreditCards
-    has_one  :credit_card,  :class => CreditCard
+    has_many :addresses,    :class_name => "BraintreeRails::Addresses"
+    has_many :transactions, :class_name => "BraintreeRails::Transactions"
+    has_many :credit_cards, :class_name => "BraintreeRails::CreditCards"
+    has_one  :credit_card,  :class_name => "BraintreeRails::CreditCard"
 
     def ensure_model(model)
       if Braintree::Transaction::CustomerDetails === model

data/lib/braintree_rails/customer_validator.rb

@@ -6,18 +6,7 @@ module BraintreeRails
     ]
 
     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
+      validate_association(customer, :credit_card)
     end
   end
 end

data/lib/braintree_rails/funding_details.rb

@@ -0,0 +1,17 @@
+module BraintreeRails
+  class FundingDetails
+    include Model
+
+    singleton_class.not_supported_apis(:delete)
+    not_supported_apis(:create, :create!, :update, :update!, :destroy)
+
+    define_attributes(
+      :readonly => [:account_number_last_4],
+      :as_association => [:destination, :email, :mobile_phone, :account_number, :routing_number]
+    )
+
+    def self.braintree_model_name
+      "merchant_account/#{name.demodulize.underscore}"
+    end
+  end
+end

data/lib/braintree_rails/funding_details_validator.rb

@@ -0,0 +1,10 @@
+module BraintreeRails
+  class FundingDetailsValidator < Validator
+    Validations = [
+      [:destination, :presence => true, :inclusion => {:in => [Braintree::MerchantAccount::FundingDestination::Bank, Braintree::MerchantAccount::FundingDestination::Email, Braintree::MerchantAccount::FundingDestination::MobilePhone]}],
+      [:email, :presence => true, :if => Proc.new {|business| business.destination == Braintree::MerchantAccount::FundingDestination::Email}],
+      [:mobile_phone, :presence => true, :if => Proc.new {|business| business.destination == Braintree::MerchantAccount::FundingDestination::MobilePhone}],
+      [:account_number, :routing_number, :presence => true, :if => Proc.new {|business| business.destination == Braintree::MerchantAccount::FundingDestination::Bank}],
+    ]
+  end
+end