saucy 0.3.3 → 0.3.4

data/README.md

@@ -32,6 +32,10 @@ You will want to customize the from email address on billing emails:
 
 Saucy::Configuration.mailer_sender = "billingemail@example.com"
 
+If you have an account with Braintree with multiple merchant accounts you'll want to configure the merchant account for this application:
+
+Saucy::Configuration.merchant_account_id = 'your merchant account id'
+
 In addition, there are a number of strings such as application name, support url, etc. that are provided and customized with i18n translations.  You can customize these in your app, and you can see what they are by looking at config/locales/en.yml in saucy.
 
 There is a `saucy:daily` rake task which should be run on a regular basis to send receipts and payment processing problem emails.

data/lib/saucy/configuration.rb

@@ -4,6 +4,7 @@ module Saucy
   class Configuration
     cattr_reader   :layouts
     cattr_accessor :mailer_sender
+    cattr_accessor :merchant_account_id
 
     def initialize
       @@mailer_sender = 'donotreply@example.com'

data/lib/saucy/subscription.rb

@@ -195,13 +195,15 @@ module Saucy
       def create_subscription
         result = Braintree::Subscription.create(
           :payment_method_token => credit_card.token,
-          :plan_id => plan_id
+          :plan_id              => plan_id,
+          :merchant_account_id  => Saucy::Configuration.merchant_account_id
         )
         if result.success?
           self.subscription_token = result.subscription.id
           self.next_billing_date = result.subscription.next_billing_date
           self.subscription_status = result.subscription.status
         else
+          p result
           false
         end
       end

data/spec/models/subscription_spec.rb

@@ -214,6 +214,20 @@ describe Account, "with a free plan" do
     subject.subscription.should_not be_nil
   end
 
+  it "passes up the merchant_account_id on the subscription when it's configured" do
+    Saucy::Configuration.merchant_account_id = 'test'
+    new_plan = Factory(:paid_plan, :name => "New Plan")
+    subject.save_customer_and_subscription!(:plan_id => new_plan.id,
+                                            :cardholder_name => "Ralph Robot", 
+                                            :billing_email => "ralph@example.com", 
+                                            :card_number => "4111111111111111", 
+                                            :verification_code => "123",
+                                            :expiration_month => 5, 
+                                            :expiration_year => 2012)
+
+    FakeBraintree.subscriptions[subject.subscription_token]["merchant_account_id"].should == 'test'
+  end
+
   it "doesn't create a credit card, and subscription when the plan is changed to a different free plan" do
     new_plan = Factory(:plan, :name => "New Plan")
     subject.save_customer_and_subscription!(:plan_id => new_plan.id)

data/spec/saucy_spec.rb

@@ -9,6 +9,10 @@ describe Saucy::Configuration do
     subject.mailer_sender.should_not be_nil
   end
 
+  it "has a nil merchant_account_id" do
+    subject.merchant_account_id.should be_nil
+  end
+
   it "can assign a mailer sender" do
     old_sender = subject.mailer_sender
     begin

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-22 00:00:00 -04:00
+date: 2011-03-24 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency