saucy 0.8.2 → 0.8.3

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+0.8.3
+
+Added coupon support. In your app, add the following migration:
+
+    class AddCoupons < ActiveRecord::Migration
+      def self.up
+        create_table :coupons do |table|
+          table.string :name, :default => "", :null => false
+          table.integer :free_months, :default => 1, :null => false
+        end
+        add_column :accounts, :coupon_id, :integer
+      end
+
+      def self.down
+        remove_column :accounts, :coupon_id
+        drop_table :coupons
+      end
+    end
+
 0.8.2
 
 Added a uniqueness validation and database constraint for member_id/project_id on permissions. This prevents somebody from being added to the same project twice, which would display it multiple times in the project index and dropdown. When upgrading, make sure this index is in place:

data/app/controllers/accounts_controller.rb

@@ -1,4 +1,6 @@
 class AccountsController < ApplicationController
+  include Saucy::Coupons
+
   before_filter :authorize, :only => [:index, :edit, :update]
   before_filter :authorize_admin, :except => [:new, :create, :index]
   before_filter :ensure_active_account, :only => [:edit, :update]
@@ -12,10 +14,13 @@ class AccountsController < ApplicationController
   end
 
   def create
-    @plan = Plan.find(params[:plan_id])
+    @plan   = Plan.find(params[:plan_id])
     @signup = Signup.new(params[:signup])
-    @signup.user = current_user
-    @signup.plan = @plan
+
+    @signup.coupon = Coupon.find_by_name(session[:coupon_name])
+    @signup.user   = current_user
+    @signup.plan   = @plan
+
     if @signup.save
       Saucy::Configuration.notify("account_created", :request => request,
                                                      :account => @signup.account)

data/app/helpers/coupons_helper.rb

@@ -0,0 +1,7 @@
+module CouponsHelper
+  def days_until_expiration
+    if session[:coupon_name] && @coupon ||= Coupon.find_by_name(session[:coupon_name])
+      @coupon.free_months * 30
+    end
+  end
+end

data/app/models/coupon.rb

@@ -0,0 +1,4 @@
+class Coupon < ActiveRecord::Base
+  has_many :accounts
+  validates_presence_of :name
+end

data/app/models/signup.rb

@@ -7,13 +7,13 @@ class Signup
 
   FIELDS = {
     :account => {
-      :cardholder_name => :cardholder_name, 
-      :billing_email => :billing_email, 
-      :card_number => :card_number, 
-      :expiration_month => :expiration_month, 
-      :expiration_year => :expiration_year,
+      :cardholder_name   => :cardholder_name,
+      :billing_email     => :billing_email,
+      :card_number       => :card_number,
+      :expiration_month  => :expiration_month,
+      :expiration_year   => :expiration_year,
       :verification_code => :verification_code,
-      :plan => :plan
+      :plan              => :plan
     },
     :user => {
       :email    => :email,
@@ -21,8 +21,8 @@ class Signup
     }
   }.freeze
 
-  attr_accessor :billing_email, :password, :cardholder_name, :email, 
-    :card_number, :expiration_month, :expiration_year, :plan, :verification_code
+  attr_accessor :billing_email, :password, :cardholder_name, :email,
+    :card_number, :expiration_month, :expiration_year, :plan, :verification_code, :coupon
 
   def initialize(attributes = {})
     if attributes
@@ -43,7 +43,7 @@ class Signup
     populate_additional_account_fields
 
     if !existing_user
-      delegate_attributes_for(:user) 
+      delegate_attributes_for(:user)
       populate_additional_user_fields
     end
 
@@ -154,6 +154,7 @@ class Signup
   end
 
   def save!
+    account.coupon = coupon
     Account.transaction do
       account.save!
       user.save!

data/app/views/plans/_plan.html.erb

@@ -11,8 +11,11 @@
 </p>
 <ul class="features">
   <% if plan.trial? -%>
-    <li class="trial"><%= t(".trial_will_expire",
-                            :default => "Your trial will expire after 30 days.") %></li>
+    <li class="trial">
+      <%= t(".trial_will_expire",
+            :default => "Your trial will expire after %{days_until_expiration} days.",
+            :days_until_expiration => days_until_expiration) %>
+    </li>
   <% else -%>
     <% plan.limits.numbered.each do |limit| %>
       <%= content_tag_for :li, limit, :class => limit.name do %>

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

@@ -69,3 +69,7 @@ Factory.define :limit do |f|
   f.name        { Factory.next(:name) }
   f.association :plan
 end
+
+Factory.define :coupon do |factory|
+  factory.name { "RAMEN" }
+end

data/lib/generators/saucy/features/templates/features/sign_up_coupon.feature

@@ -0,0 +1,31 @@
+Feature: Sign up with coupon
+
+  In order to try the site with extended time
+  As a user
+  I want to use a coupon provided to me
+
+  Background:
+    Given the following plan exists:
+      | name | price | trial |
+      | Free | 0     | true  |
+    And the following coupon exists:
+      | name  | free months |
+      | RAMEN | 3           |
+
+  Scenario: Sign up for a trial plan with coupon
+    When I sign up with the "RAMEN" coupon for the "Free" plan
+    Then I should see "Your trial will expire after 90 days"
+    When I fill in "Email" with "email@person.com"
+    And I fill in "Password" with "password"
+    And I press "Sign up"
+    Then I should see "created"
+
+  Scenario: Receive a reminder about an expiring trial plan with coupon
+    Given a "Free" account with "RAMEN" coupon exists with a name of "Test" created 83 days ago
+    And a user exists with an email of "admin@example.com"
+    And "admin@example.com" is an admin of the "Test" account
+    When the daily Saucy jobs are processed
+    And I sign in as "admin@example.com"
+    And I follow the link sent to "admin@example.com" with subject "Your trial is expiring soon"
+    Then I should be on the upgrade plan page for the "Test" account
+

data/lib/generators/saucy/features/templates/step_definitions/account_steps.rb

@@ -3,6 +3,17 @@ Given /^an? "([^"]+)" account exists with a name of "([^"]*)" created (\d+) days
   Factory(:account, :created_at => days.to_i.days.ago, :plan => plan, :name => account_name)
 end
 
+Given /^a "([^"]*)" account with "([^"]*)" coupon exists with a name of "([^"]*)" created (\d+) days ago$/ do |plan_name, coupon_name, account_name, days|
+  plan   = Plan.find_by_name!(plan_name)
+  coupon = Coupon.find_by_name!(coupon_name)
+  Factory(:account, :created_at => days.to_i.days.ago, :plan => plan, :coupon => coupon, :name => account_name)
+end
+
+Given /^I sign up with the "([^"]*)" coupon for the "([^"]+)" plan$/ do |coupon_name, plan_name|
+  plan = Plan.find_by_name!(plan_name)
+  visit new_plan_account_path(plan, :coupon => coupon_name)
+end
+
 Given /^the "([^"]*)" account was created (\d+) days ago$/ do |account_name, days|
   Account.find_by_name!(account_name).tap do |account|
     account.created_at = days.to_i.days.ago

data/lib/generators/saucy/install/templates/create_saucy_tables.rb

@@ -12,6 +12,7 @@ class CreateSaucyTables < ActiveRecord::Migration
 
     create_table :accounts do |table|
       table.belongs_to :plan
+      table.belongs_to :coupon
       table.string   :name
       table.string   :keyword
       table.datetime :created_at
@@ -28,11 +29,17 @@ class CreateSaucyTables < ActiveRecord::Migration
       table.datetime :trial_expires_at
     end
     add_index :accounts, :plan_id
+    add_index :accounts, :coupon_id
     add_index :accounts, :keyword, :unique => true
     add_index :accounts, :next_billing_date
     add_index :accounts, :created_at
     add_index :accounts, :trial_expires_at
 
+    create_table :coupons, :force => true do |t|
+      t.string  :name,        :default => "", :null => false
+      t.integer :free_months, :default => 1,  :null => false
+    end
+
     create_table :invitations do |table|
       table.string   :email
       table.integer  :account_id

data/lib/saucy.rb

@@ -7,4 +7,4 @@ require 'saucy/account_authorization'
 require 'saucy/configuration'
 require 'saucy/engine'
 require 'saucy/projects_controller'
-
+require 'saucy/coupons'

data/lib/saucy/account.rb

@@ -16,6 +16,7 @@ module Saucy
                             :conditions => { 'memberships.admin' => false }
 
       belongs_to :plan
+      belongs_to :coupon
 
       delegate :free?, :billed?, :trial?, :to => :plan
 
@@ -69,7 +70,12 @@ module Saucy
       end
 
       def set_trial_expiration
-        self.trial_expires_at = 30.days.from_now(created_at || Time.now)
+        number_free_days = if coupon
+                             30 * coupon.free_months
+                           else
+                             30
+                           end
+        self.trial_expires_at = number_free_days.days.from_now(created_at || Time.now)
       end
 
       def users_count

data/lib/saucy/coupons.rb

@@ -0,0 +1,15 @@
+module Saucy
+  module Coupons
+    extend ActiveSupport::Concern
+
+    included do
+      before_filter :set_coupon_cookie
+    end
+
+    def set_coupon_cookie
+      if params[:coupon] && coupon = Coupon.find_by_name(params[:coupon])
+        session[:coupon_name] ||= params[:coupon]
+      end
+    end
+  end
+end

data/lib/saucy/engine.rb

@@ -23,6 +23,10 @@ module Saucy
       ActionView::Base.send :include, LimitsHelper
     end
 
+    initializer 'coupons.helper' do |app|
+      ActionView::Base.send :include, CouponsHelper
+    end
+
     {:short_date => "%x"}.each do |k, v|
       Time::DATE_FORMATS[k] = v
     end

data/spec/controllers/accounts_controller_spec.rb

@@ -12,7 +12,7 @@ describe AccountsController, "routes" do
 end
 
 describe AccountsController, "new" do
-  let(:signup) { stub('signup') }
+  let(:signup) { stub('signup', :coupon= => nil) }
   let(:plan) { Factory(:plan) }
 
   before do
@@ -40,6 +40,7 @@ describe AccountsController, "successful create for a confirmed user" do
   let(:account) { Factory.stub(:account) }
   let(:signup) { stub('signup', :user    => user,
                                 :user=   => nil,
+                                :coupon= => nil,
                                 :plan=   => plan,
                                 :account => account) }
   let(:signup_attributes) { "attributes" }
@@ -76,7 +77,7 @@ describe AccountsController, "successful create for a confirmed user" do
 end
 
 describe AccountsController, "failed create" do
-  let(:signup) { stub('signup', :user= => nil, :plan= => plan) }
+  let(:signup) { stub('signup', :user= => nil, :coupon= => nil, :plan= => plan) }
   let(:signup_attributes) { "attributes" }
   let(:plan) { Factory(:plan) }
 

data/spec/models/account_spec.rb

@@ -7,9 +7,10 @@ describe Account do
   it { should have_many(:users).through(:memberships) }
   it { should have_many(:projects) }
   it { should belong_to(:plan) }
+  it { should belong_to(:coupon) }
 
   it { should validate_uniqueness_of(:keyword) }
-  it { should validate_presence_of(  :name) }
+  it { should validate_presence_of(:name) }
   it { should validate_presence_of(:keyword) }
   it { should validate_presence_of(:plan_id) }
 
@@ -216,3 +217,13 @@ describe Account do
   end
 end
 
+describe Account, "with coupon" do
+  let(:free_months) { 3 }
+  let(:coupon) { Factory(:coupon, :free_months => free_months) }
+
+  subject { Factory(:account, :coupon => coupon) }
+
+  it "sets the trial expires at based on coupon free months" do
+    subject.reload.trial_expires_at.to_s.should == (free_months * 30).days.from_now.to_s
+  end
+end

data/spec/models/coupon_spec.rb

@@ -0,0 +1,6 @@
+require 'spec_helper'
+
+describe Coupon do
+  it { should have_many(:accounts) }
+  it { should validate_presence_of(:name) }
+end

data/spec/models/signup_spec.rb

@@ -175,3 +175,18 @@ describe Signup, "with an account that doesn't save" do
     subject.save.should_not be
   end
 end
+
+describe Signup, "with coupon" do
+  let(:coupon) { Factory(:coupon) }
+
+  subject { Factory.build(:signup) }
+
+  before do
+    subject.coupon = coupon
+    subject.save
+  end
+
+  it "saves coupon to account" do
+    subject.account.reload.coupon.should == coupon
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,11 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 -04:00
+date: 2011-06-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: clearance
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -34,11 +35,11 @@ dependencies:
         - 11
         - 0
         version: 0.11.0
+  type: :runtime
   version_requirements: *id001
-  name: clearance
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: formtastic
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -49,11 +50,11 @@ dependencies:
         - 1
         - 2
         version: "1.2"
+  type: :runtime
   version_requirements: *id002
-  name: formtastic
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: railties
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -65,11 +66,11 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
+  type: :runtime
   version_requirements: *id003
-  name: railties
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: braintree
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -81,11 +82,11 @@ dependencies:
         - 6
         - 2
         version: 2.6.2
+  type: :runtime
   version_requirements: *id004
-  name: braintree
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: sham_rack
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -97,11 +98,11 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
+  type: :runtime
   version_requirements: *id005
-  name: sham_rack
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: sinatra
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -113,11 +114,11 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
+  type: :runtime
   version_requirements: *id006
-  name: sinatra
-  prerelease: false
 - !ruby/object:Gem::Dependency 
-  type: :development
+  name: aruba
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -129,9 +130,8 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
+  type: :development
   version_requirements: *id007
-  name: aruba
-  prerelease: false
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
 executables: []
@@ -154,9 +154,11 @@ files:
 - app/controllers/memberships_controller.rb
 - app/controllers/plans_controller.rb
 - app/controllers/profiles_controller.rb
+- app/helpers/coupons_helper.rb
 - app/helpers/limits_helper.rb
 - app/mailers/billing_mailer.rb
 - app/mailers/invitation_mailer.rb
+- app/models/coupon.rb
 - app/models/invitation.rb
 - app/models/limit.rb
 - app/models/membership.rb
@@ -225,6 +227,7 @@ files:
 - lib/saucy/account.rb
 - lib/saucy/account_authorization.rb
 - lib/saucy/configuration.rb
+- lib/saucy/coupons.rb
 - lib/saucy/engine.rb
 - lib/saucy/fake_braintree.rb
 - lib/saucy/layouts.rb
@@ -253,6 +256,7 @@ files:
 - lib/generators/saucy/features/templates/features/new_account.feature
 - lib/generators/saucy/features/templates/features/project_dropdown.feature
 - lib/generators/saucy/features/templates/features/sign_up.feature
+- lib/generators/saucy/features/templates/features/sign_up_coupon.feature
 - lib/generators/saucy/features/templates/features/sign_up_paid.feature
 - lib/generators/saucy/features/templates/features/trial_plans.feature
 - lib/generators/saucy/features/templates/README
@@ -268,6 +272,7 @@ files:
 - spec/mailers/billing_mailer_spec.rb
 - spec/mailers/invitiation_mailer_spec.rb
 - spec/models/account_spec.rb
+- spec/models/coupon_spec.rb
 - spec/models/invitation_spec.rb
 - spec/models/limit_spec.rb
 - spec/models/membership_spec.rb
@@ -317,7 +322,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS