saucy 0.1.18 → 0.2.0

data/Gemfile

@@ -5,11 +5,14 @@ gem "rake"
 gem "rspec-rails", :require => false
 gem "rails", ">= 3.0.3"
 gem "thin"
-gem "clearance", :ref => '71d7c7f7a29ea757cf84fcc497cbc8ecf6cac211', :git => "git://github.com/thoughtbot/clearance.git", :require => false
+gem "clearance", :git => "git://github.com/thoughtbot/clearance.git", :require => false
 gem "shoulda", :require => false
 gem "bourne", :require => false
 gem "sqlite3-ruby", :require => false
 gem "factory_girl", :require => false
+gem "sinatra"
+gem "sham_rack"
+gem "braintree"
 
 # used by the rails app in cucumber
 gem "cucumber-rails", :require => false

data/Gemfile.lock

@@ -1,7 +1,6 @@
 GIT
   remote: git://github.com/thoughtbot/clearance.git
-  revision: 71d7c7f7a29ea757cf84fcc497cbc8ecf6cac211
-  ref: 71d7c7f7a29ea757cf84fcc497cbc8ecf6cac211
+  revision: 7fb410051e0e7cce758883c98ec7b13824265cd0
   specs:
     clearance (0.9.1)
       rails (~> 3.0.0)
@@ -43,6 +42,8 @@ GEM
     background_process (1.2)
     bourne (1.0)
       mocha (= 0.9.8)
+    braintree (2.6.2)
+      builder
     builder (2.1.2)
     capybara (0.4.0)
       celerity (>= 0.7.9)
@@ -140,7 +141,12 @@ GEM
       ffi (~> 0.6.3)
       json_pure
       rubyzip
+    sham_rack (1.3.3)
+      rack
     shoulda (2.11.3)
+    sinatra (1.1.2)
+      rack (~> 1.1)
+      tilt (~> 1.2)
     sqlite3-ruby (1.3.2)
     term-ansicolor (1.0.5)
     thin (1.2.7)
@@ -148,6 +154,7 @@ GEM
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
     thor (0.14.6)
+    tilt (1.2.1)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
     tzinfo (0.3.23)
@@ -160,6 +167,7 @@ PLATFORMS
 DEPENDENCIES
   aruba
   bourne
+  braintree
   capybara
   clearance!
   cucumber
@@ -173,6 +181,8 @@ DEPENDENCIES
   rails (>= 3.0.3)
   rake
   rspec-rails
+  sham_rack
   shoulda
+  sinatra
   sqlite3-ruby
   thin

data/README.md

@@ -0,0 +1,75 @@
+Saucy
+=====
+
+Saucy is a Rails engine for monthly subscription-style SaaS apps.
+
+Example scenarios covered by Saucy:
+
+* I sign up for "Free" plan under new account "thoughtbot"
+* I am an admin and can be reached at "dan@example.com"
+* I create a project "Hoptoad"
+* I upgrade to the "Basic" plan and my credit card is charged
+* I now have permissions to add users and projects to the "thoughtbot" account
+* I invite "joe@example.com" to "Hoptoad"
+* I create a project "Trajectory"
+* I invite "mike@example.com" to "Trajectory"
+
+Installation
+------------
+
+In your Gemfile:
+
+    gem "saucy", :git => 'git@github.com:thoughtbot/saucy.git'
+
+After you bundle, run the generators:
+
+    rails generate saucy:install
+    rails generate saucy:views
+
+Development environment
+-----------------------
+
+Plans need to exist for users to sign up for. In db/seeds.rb:
+
+    %w(free expensive mega-expensive).each do |plan_name|
+      Plan.find_or_create_by_name(plan_name)
+    end
+
+Then run: rake db:seed
+
+Test environment
+----------------
+
+Generate the Braintree Fake for your specs:
+
+    rails generate saucy:specs
+
+Generate feature coverage:
+
+    rails generate saucy:features
+
+To use seed data in your Cucumber, add this to features/support/seed.rb:
+
+    require Rails.root.join('db','seeds')
+
+Customization
+-------------
+
+To change the layout for a controller inside of saucy, add a line like this to
+your config/application.rb:
+
+    config.saucy.layouts.accounts.index = "custom"
+
+Your layout should yield(:header) in order to get the headers from saucy views.
+
+To extend the ProjectsController:
+
+    class ProjectsController < ApplicationController
+      include Saucy::ProjectsController
+
+      def edit
+        super
+        @deleters = @project.deleters
+      end
+    end
+

data/app/controllers/accounts_controller.rb

@@ -9,8 +9,10 @@ class AccountsController < ApplicationController
   end
 
   def create
+    @plan = Plan.find(params[:plan_id])
     @signup = Signup.new(params[:signup])
     @signup.user = current_user
+    @signup.plan = @plan
     if @signup.save
       flash[:success] = "Account was created."
       sign_in @signup.user

data/app/controllers/billings_controller.rb

@@ -0,0 +1,22 @@
+class BillingsController < ApplicationController
+  def show
+  end
+
+  def edit
+    @account = current_account
+
+    @account.cardholder_name = @account.credit_card.cardholder_name
+    @account.billing_email = @account.customer.email
+    @account.expiration_month = @account.credit_card.expiration_month
+    @account.expiration_year = @account.credit_card.expiration_year
+  end
+
+  def update
+    @account = current_account
+    if @account.save_braintree!(params[:account])
+      redirect_to account_billing_path(@account), :notice => t('.update.notice', :default => "Billing information updated successfully")
+    else
+      render :edit
+    end
+  end
+end

data/app/controllers/plans_controller.rb

@@ -4,4 +4,16 @@ class PlansController < ApplicationController
   def index
     @plans = Plan.all
   end
+
+  def edit
+    @plans = Plan.all
+    @account = current_account
+  end
+
+  def update
+    @plans = Plan.all
+    @account = current_account
+    @account.save_braintree!(params[:account])
+    redirect_to edit_account_path(@account), :notice => t('.update.notice', :default => "Plan changed successfully")
+  end
 end

data/app/models/limit.rb

@@ -0,0 +1,5 @@
+class Limit < ActiveRecord::Base
+  belongs_to :plan
+
+  validates_presence_of :name, :value
+end

data/app/models/signup.rb

@@ -9,6 +9,13 @@ class Signup
     :account => {
       :name    => :account_name,
       :keyword => :keyword,
+      :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
     },
     :user => {
       :name                  => :user_name,
@@ -18,8 +25,9 @@ class Signup
     }
   }.freeze
 
-  attr_accessor :account_name, :keyword, :user_name, :email, :password,
-    :password_confirmation
+  attr_accessor :account_name, :keyword, :user_name, :billing_email, :password,
+    :password_confirmation, :cardholder_name, :email, :card_number, 
+    :expiration_month, :expiration_year, :plan, :verification_code
 
   def initialize(attributes = {})
     attributes.each do |attribute, value|
@@ -38,8 +46,14 @@ class Signup
     delegate_attributes_for(:user) unless existing_user
 
     if valid?
-      save!
-      true
+      begin
+        save!
+        true
+      rescue ActiveRecord::RecordNotSaved
+        delegate_errors_for(:account)
+        delegate_errors_for(:user)
+        false
+      end
     else
       false
     end
@@ -68,8 +82,8 @@ class Signup
 
   def membership
     @membership ||= Membership.new(:user    => user,
-                                                  :account => account,
-                                                  :admin   => true)
+                                   :account => account,
+                                   :admin   => true)
   end
 
   def valid?

data/app/views/accounts/_tab_bar.html.erb

@@ -3,6 +3,8 @@
     <li class="accounts"><%= link_to "Account Info", edit_account_url(current_account) %></li>
     <li class="projects"><%= link_to "Projects", account_projects_url(current_account) %></li>
     <li class="users"><%= link_to "Users", account_memberships_url(current_account) %></li>
-    <li class="billing"><a href="#">Billing</a></li>
+    <% if current_account.plan.billed? %>
+      <li class="billing"><%= link_to "Billing", account_billing_path(current_account) %></li>
+    <% end -%>
   </ul>
 </div>

data/app/views/accounts/edit.html.erb

@@ -4,6 +4,12 @@
 
 <%= render :partial => 'tab_bar' %>
 
+<div class="plan current">
+  <h3>Your Plan</h3>
+  <%= render @account.plan %>
+  <%= link_to "Upgrade", edit_account_plan_path(@account) %>
+</div>
+
 <%= content_tag_for :div, @account do -%>
   <%= semantic_form_for @account do |form| %>
     <%= form.inputs do %>

data/app/views/accounts/new.html.erb

@@ -7,20 +7,30 @@
 
   <h5 class="legend">Basic Information</h5>
   <%= form.inputs do %>
-    <%= form.input :account_name, :label => 'Company Name', :hint => account_url(Account.new(:keyword => 'keyword')).html_safe %>
+    <%= form.input :account_name, :label => 'Company Name', :hint => account_url(Account.new(:keyword => 'keyword')).html_safe, :required => true %>
     <%= form.input :keyword, :wrapper_html => { :style => 'display: none' } %>
   <% end %>
 
   <% unless signed_in? -%>
     <h5 class="legend">User Information</h5>
     <%= form.inputs do %>
-      <%= form.input :user_name, :label => "Your name" %>
-      <%= form.input :email %>
-      <%= form.input :password %>
+      <%= form.input :user_name, :label => "Your name", :required => true  %>
+      <%= form.input :email, :required => true  %>
+      <%= form.input :password, :required => true  %>
       <%= form.input :password_confirmation, :label => "Confirm password", :required => true %>
     <% end -%>
   <% end -%>
 
+  <div class="plan chosen">
+    <h3>You're signing up for:</h3>
+    <%= render @plan %>
+  </div>
+
+  <% if @plan.billed? -%>
+    <h5 class="legend">Billing Information</h5>
+    <%= render :partial => 'billings/form', :locals => { :form => form } %>
+  <% end -%>
+
   <%= form.buttons do %>
     <%= form.commit_button "Sign up" %>
   <% end %>

data/app/views/billings/_form.html.erb

@@ -0,0 +1,8 @@
+<%= form.inputs do %>
+  <%= form.input :cardholder_name, :required => true %>
+  <%= form.input :billing_email, :required => true, :hint => "We'll send receipts and billing issues to this address." %>
+  <%= form.input :card_number, :required => true, :input_html => { :autocomplete => "off" } %>
+  <%= form.input :verification_code, :required => true, :input_html => { :autocomplete => "off" } %>
+  <%= form.input :expiration_month, :collection => [['January', '01'], ['February', '02'], ['March', '03'], ['April', '04'], ['May', '05'], ['June', '06'], ['July', '07'], ['August', '08'], ['September', '09'], ['October', '10'], ['November', '11'], ['December', '12']], :required => true %>
+  <%= form.input :expiration_year, :collection => (Date.today.year..(Date.today.year+10)).to_a, :required => true %>
+<% end -%>

data/app/views/billings/edit.html.erb

@@ -0,0 +1,11 @@
+<%= content_for :header do -%>
+  <h2>Billing Information</h2>
+<% end -%>
+
+<%= semantic_form_for @account, :url => account_billing_path(@account) do |form| %>
+  <%= render :partial => 'billings/form', :locals => { :form => form } %>
+
+  <%= form.buttons do %>
+    <%= form.commit_button "Update" %>
+  <% end %>
+<% end %>

data/app/views/billings/show.html.erb

@@ -0,0 +1,3 @@
+<div class="current_credit_card">
+  We're currently charging the credit card ending in <%= current_account.credit_card.last_4 %>. <%= link_to "Change", edit_account_billing_path(current_account) %>
+</div>

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

@@ -0,0 +1,2 @@
+<p class="name"><%= plan.name %></p>
+<p class="price"><% if plan.billed? %>$<%= plan.price %>/month<% else %>Free<% end %></p>

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

@@ -0,0 +1,23 @@
+<%= content_for :header do -%>
+  <h2>Upgrade Your Plan</h2>
+<% end -%>
+
+<%= semantic_form_for @account, :url => account_plan_path(@account) do |form| %>
+  <%= form.inputs :class => "radio optional" do %>
+    <% @plans.each do |plan| -%>
+      <%= content_tag :li, :class => "#{'disabled' if !@account.can_change_plan_to?(plan)}" do %>
+        <%= form.label :plan_id, render(plan), :value => plan.id %>
+        <%= form.radio_button :plan_id, plan.id, :disabled => !@account.can_change_plan_to?(plan) %>
+      <% end %>
+    <% end -%>
+  <% end %>
+
+  <% if !@account.credit_card -%>
+    <h5 class="legend">Billing Information</h5>
+    <%= render :partial => 'billings/form', :locals => { :form => form } %>
+  <% end -%>
+
+  <%= form.buttons do %>
+    <%= form.commit_button "Upgrade" %>
+  <% end %>
+<% end %>

data/config/routes.rb

@@ -4,6 +4,8 @@ Rails.application.routes.draw do
   resources :accounts, :only => [:index, :edit, :update]
 
   through :accounts do
+    resource  :billing
+    resource  :plan
     resources :projects
     resources :memberships, :only => [:index, :edit, :update, :destroy]
     resources :invitations, :only => [:show, :update, :new, :create]

data/features/run_features.feature

@@ -25,6 +25,7 @@ Feature: generate a saucy application and run rake
 
   Scenario: generate a saucy application and run rake
     When I successfully run "rails generate saucy:install"
+    And I successfully run "rails generate saucy:specs"
     And I successfully run "rails generate saucy:features"
     And I successfully run "rake db:migrate"
     And I run "rake"
@@ -37,6 +38,7 @@ Feature: generate a saucy application and run rake
 
   Scenario: A new saucy app with custom views
     When I successfully run "rails generate saucy:install"
+    And I successfully run "rails generate saucy:specs"
     And I successfully run "rails generate saucy:features"
     And I successfully run "rails generate saucy:views"
     And I successfully run "rake db:migrate"
@@ -51,6 +53,7 @@ Feature: generate a saucy application and run rake
 
   Scenario: A new saucy app with custom layouts
     When I successfully run "rails generate saucy:install"
+    And I successfully run "rails generate saucy:specs"
     And I successfully run "rails generate saucy:features"
     And I successfully run "rake db:migrate"
     And I add a custom layout to the accounts index
@@ -64,6 +67,7 @@ Feature: generate a saucy application and run rake
 
   Scenario: run specs
     When I successfully run "rails generate saucy:install"
+    And I successfully run "rails generate saucy:specs"
     And I successfully run "rails generate saucy:features"
     And I successfully run "rake db:migrate"
     And I copy the specs for this project

data/lib/generators/saucy/features/features_generator.rb

@@ -12,6 +12,7 @@ DESC
       def copy_feature_files
         directory "features", "features/saucy"
         directory "step_definitions", "features/step_definitions/saucy"
+        directory "support", "features/support/saucy"
         template "README", "features/saucy/README"
         template "README", "features/step_definitions/saucy/README"
         empty_directory "spec"
@@ -47,6 +48,9 @@ DESC
     when /sign up page for the "([^"]+)" plan$/i
       plan = Plan.find_by_name!($1)
       new_plan_account_path(plan)
+    when /^the billing page for the "([^"]+)" account$/
+      account = Account.find_by_name!($1)
+      account_billing_path(account)
         PATHS
 
         replace_in_file "features/support/paths.rb",

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

@@ -14,8 +14,9 @@ Factory.define :user do |user|
 end
 
 Factory.define :account do |f|
-  f.name     { Factory.next(:name) }
-  f.keyword  { Factory.next(:name) }
+  f.name        { Factory.next(:name) }
+  f.keyword     { Factory.next(:name) }
+  f.association :plan
 end
 
 Factory.define :membership do |f|
@@ -30,6 +31,7 @@ Factory.define :signup do |f|
   f.email                 { Factory.next :email }
   f.password              { "password" }
   f.password_confirmation { "password" }
+  f.association           :plan
 end
 
 Factory.define :project do |f|
@@ -51,3 +53,13 @@ end
 Factory.define :plan do |f|
   f.name 'Free'
 end
+
+Factory.define :paid_plan, :parent => :plan do |f|
+  f.name 'Paid'
+  f.price 1
+end
+
+Factory.define :limit do |f|
+  f.name        { Factory.next(:name) }
+  f.association :plan
+end