saucy 0.6.1 → 0.7.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.7.0
+
+Split Saucy::Configuration.mailer_sender into support_email_address and manager_email_address.
+
 0.6.1
 
 Fix for this known bug in Rails 3.0.7

data/README.md

@@ -27,15 +27,21 @@ After you bundle, run the generator:
 
 You will want to include the `ensure_active_account` `before_filter` in any controller actions that you want to protect if the user is using an past due paid account.
 
-You will want to customize the from email address on billing and invite emails:
+You will want to customize the from email addresses.
 
-Saucy::Configuration.mailer_sender = "billingemail@example.com"
+Support email address for your application:
+
+    Saucy::Configuration.support_email_address = "support@example.com"
+
+Personalizable emails such as trial expiration notice and activation encouragement are sent from a product manager personal address:
+
+    Saucy::Configuration.manager_email_address = "manager@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.
+In addition, there are a number of strings such as application name, support url, automated emails, 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/app/mailers/billing_mailer.rb

@@ -6,7 +6,8 @@ class BillingMailer < ActionMailer::Base
          :subject  => I18n.t(:subject,
                              :scope   => [:saucy, :mailers, :billing_mailer, :receipt],
                              :default => "Subscription receipt"),
-         :from     => Saucy::Configuration.mailer_sender)
+         :reply_to => Saucy::Configuration.support_email_address,
+         :from     => Saucy::Configuration.support_email_address)
   end
 
   def problem(account, transaction)
@@ -15,25 +16,28 @@ class BillingMailer < ActionMailer::Base
          :subject  => I18n.t(:subject,
                              :scope   => [:saucy, :mailers, :billing_mailer, :problem],
                              :default => "Problem with subscription billing"),
-         :from     => Saucy::Configuration.mailer_sender)
+         :reply_to => Saucy::Configuration.support_email_address,
+         :from     => Saucy::Configuration.support_email_address)
   end
 
   def expiring_trial(account)
     @account = account
-    mail(:to      => account.admin_emails,
-         :subject => I18n.t(:subject,
+    mail(:to       => account.admin_emails,
+         :subject  => I18n.t(:subject,
                             :scope   => [:billing_mailer, :expiring_trial],
                             :default => "Your trial is expiring soon"),
-         :from    => Saucy::Configuration.mailer_sender)
+         :reply_to => Saucy::Configuration.support_email_address,
+         :from     => Saucy::Configuration.manager_email_address)
   end
 
   def new_unactivated(account)
     @account = account
-    mail(:to      => account.admin_emails,
-         :subject => I18n.t(:subject,
+    mail(:to       => account.admin_emails,
+         :subject  => I18n.t(:subject,
                             :scope    => [:billing_mailer, :new_unactivated],
                             :default  => "A check in from %{app_name}",
                             :app_name => t("app_name")),
-         :from    => Saucy::Configuration.mailer_sender)
+         :reply_to => Saucy::Configuration.support_email_address,
+         :from     => Saucy::Configuration.manager_email_address)
   end
 end

data/app/mailers/invitation_mailer.rb

@@ -13,6 +13,6 @@ class InvitationMailer < ActionMailer::Base
   private
 
   def sender_name_and_support_address
-    %{"#{@invitation.sender_name}" <#{Saucy::Configuration.mailer_sender}>}
+    %{"#{@invitation.sender_name}" <#{Saucy::Configuration.support_email_address}>}
   end
 end

data/lib/generators/saucy/features/templates/factories.rb

@@ -18,6 +18,16 @@ Factory.define :account do |f|
   f.association :plan
 end
 
+Factory.define :paid_account, :parent => :account do |f|
+  f.cardholder_name   { "Ralph Robot"       }
+  f.billing_email     { "ralph@example.com" }
+  f.card_number       { "4111111111111111"  }
+  f.verification_code { "123"               }
+  f.expiration_month  { 5                   }
+  f.expiration_year   { 2012                }
+  f.association :plan, :factory => :paid_plan
+end
+
 Factory.define :membership do |f|
   f.association :user
   f.association :account

data/lib/saucy/configuration.rb

@@ -3,12 +3,14 @@ require 'saucy/layouts'
 module Saucy
   class Configuration
     cattr_reader   :layouts
-    cattr_accessor :mailer_sender
+    cattr_accessor :manager_email_address
+    cattr_accessor :support_email_address
     cattr_accessor :merchant_account_id
     cattr_accessor :observers
 
     def initialize
-      @@mailer_sender = 'donotreply@example.com'
+      @@manager_email_address = 'manager@example.com'
+      @@support_email_address = 'support@example.com'
       @@layouts       = Layouts.new
       @@observers     = []
     end

data/spec/mailers/billing_mailer_spec.rb

@@ -0,0 +1,58 @@
+require 'spec_helper'
+
+describe "with an account and transaction" do
+  let(:account) { Factory(:paid_account) }
+
+  before do
+    subscription = FakeBraintree.subscriptions[account.subscription_token]
+    subscription["transactions"] = [FakeBraintree.generated_transaction]
+  end
+
+  describe BillingMailer, "receipt" do
+    subject { BillingMailer.receipt(account, account.subscription.transactions.first) }
+
+    it "sends the receipt mail from the support address" do
+      subject.from.should == [Saucy::Configuration.support_email_address]
+    end
+
+    it "sets the receipt mail reply-to to the support address" do
+      subject.reply_to.should == [Saucy::Configuration.support_email_address]
+    end
+  end
+
+  describe BillingMailer, "problem" do
+    subject { BillingMailer.problem(account, account.subscription.transactions.first) }
+
+    it "sends the problem mail from the support address" do
+      subject.from.should == [Saucy::Configuration.support_email_address]
+    end
+
+    it "sets the problem mail reply-to to the support address" do
+      subject.reply_to.should == [Saucy::Configuration.support_email_address]
+    end
+  end
+
+  describe BillingMailer, "expiring trial" do
+    subject { BillingMailer.expiring_trial(account) }
+
+    it "sends the expiring trial mail from the support address" do
+      subject.from.should == [Saucy::Configuration.manager_email_address]
+    end
+
+    it "sets the expiring trial mail reply-to to the support address" do
+      subject.reply_to.should == [Saucy::Configuration.support_email_address]
+    end
+  end
+
+  describe BillingMailer, "new unactivated" do
+    subject { BillingMailer.expiring_trial(account) }
+
+    it "sends the new unactivated mail from the support address" do
+      subject.from.should == [Saucy::Configuration.manager_email_address]
+    end
+
+    it "sets the new unactivated mail reply-to to the support address" do
+      subject.reply_to.should == [Saucy::Configuration.support_email_address]
+    end
+  end
+end

data/spec/mailers/invitiation_mailer_spec.rb

@@ -14,6 +14,6 @@ describe InvitationMailer, "invitation" do
   end
 
   it "sends from the support address" do
-    subject.from.should == [Saucy::Configuration.mailer_sender]
+    subject.from.should == [Saucy::Configuration.support_email_address]
   end
 end

data/spec/saucy_spec.rb

@@ -5,8 +5,12 @@ describe Saucy::Configuration do
     subject.layouts.should be_a(Saucy::Layouts)
   end
 
-  it "has a mailer_sender" do
-    subject.mailer_sender.should_not be_nil
+  it "has a manager_email_address" do
+    subject.manager_email_address.should_not be_nil
+  end
+
+  it "has a support_email_address" do
+    subject.support_email_address.should_not be_nil
   end
 
   it "has a nil merchant_account_id" do
@@ -30,13 +34,23 @@ describe Saucy::Configuration do
     end
   end
 
-  it "can assign a mailer sender" do
-    old_sender = subject.mailer_sender
+  it "can assign a manager email address" do
+    old_address = subject.manager_email_address
+    begin
+      subject.manager_email_address = 'newsender@example.com'
+      subject.manager_email_address.should == 'newsender@example.com'
+    ensure
+      subject.manager_email_address = old_address
+    end
+  end
+
+  it "can assign a support email address" do
+    old_address = subject.support_email_address
     begin
-      subject.mailer_sender = 'newsender@example.com'
-      subject.mailer_sender.should == 'newsender@example.com'
+      subject.support_email_address = 'newsender@example.com'
+      subject.support_email_address.should == 'newsender@example.com'
     ensure
-      subject.mailer_sender = old_sender
+      subject.support_email_address = old_address
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
-  - 6
-  - 1
-  version: 0.6.1
+  - 7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,12 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-03 00:00:00 -04:00
+date: 2011-05-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: clearance
   prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -35,11 +35,11 @@ dependencies:
         - 11
         - 0
         version: 0.11.0
-  type: :runtime
+  name: clearance
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: formtastic
   prerelease: false
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -50,11 +50,11 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  type: :runtime
+  name: formtastic
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: railties
   prerelease: false
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,11 +66,11 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  type: :runtime
+  name: railties
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: braintree
   prerelease: false
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -82,11 +82,11 @@ dependencies:
         - 6
         - 2
         version: 2.6.2
-  type: :runtime
+  name: braintree
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sham_rack
   prerelease: false
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -98,11 +98,11 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  type: :runtime
+  name: sham_rack
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
+  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -114,11 +114,11 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  type: :runtime
+  name: sinatra
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
+  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -130,7 +130,7 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
-  type: :development
+  name: aruba
   version_requirements: *id007
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
@@ -262,6 +262,7 @@ files:
 - spec/controllers/projects_controller_spec.rb
 - spec/environment.rb
 - spec/layouts_spec.rb
+- spec/mailers/billing_mailer_spec.rb
 - spec/mailers/invitiation_mailer_spec.rb
 - spec/models/account_spec.rb
 - spec/models/invitation_spec.rb
@@ -313,7 +314,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS