saucy 0.15.2 → 0.16.0

data/.gitignore

@@ -6,3 +6,5 @@ tmp
 pkg
 *.gem
 tags
+*.log
+*.sqlite3

data/CHANGELOG.md

@@ -1,11 +1,7 @@
-0.15.2
+0.16.0
 
-* Re-released 0.15.1 to fix "Illformed requirement ["#<Syck::DefaultKey:0x000001046de4d0> 1.3.3"]" errors
-* No code changes
-
-0.15.1
-
-* CanceledAccount now stores the subscription_token of the account it was canceled from.
+* Removed routing extensions. To upgrade, replace all `through` entries in routes.rb with `resources`.
+* Email the support email address whenever an account is canceled
 
 0.15.0
 

data/Gemfile

@@ -2,13 +2,4 @@ source "http://rubygems.org"
 
 gemspec
 
-# used by the rails app in cucumber
-gem "cucumber-rails", '~> 1.0.6', :require => false
-gem "capybara", :require => false
-gem "factory_girl_rails", :require => false
-gem "formtastic", '~> 1.2.4', :require => false
-gem "database_cleaner", :require => false
-gem "dynamic_form", :require => false
-gem "launchy", :require => false
-gem "jquery-rails", :require => false
-gem "selenium-webdriver", "~> 2.16.0"
+gem "minitest", "~> 2.6.1", :platforms => :ruby_19

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    saucy (0.15.2)
+    saucy (0.16.0)
       airbrake (~> 3.0.4)
       braintree (>= 2.6.2)
       clearance (~> 0.14.0)
@@ -45,6 +45,7 @@ GEM
     airbrake (3.0.9)
       activesupport
       builder
+    ansi (1.4.2)
     arel (2.2.1)
     aruba (0.4.6)
       bcat (>= 0.6.1)
@@ -71,6 +72,13 @@ GEM
     clearance (0.14.0)
       diesel (~> 0.1.5)
       rails (>= 3.0)
+    coffee-rails (3.1.1)
+      coffee-script (>= 2.2.0)
+      railties (~> 3.1.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.2.0)
     cucumber (1.0.6)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
@@ -81,7 +89,7 @@ GEM
       capybara (>= 1.1.1)
       cucumber (>= 1.0.6)
       nokogiri (>= 1.5.0)
-    daemons (1.1.4)
+    daemons (1.0.10)
     database_cleaner (0.6.7)
     diesel (0.1.5)
       railties
@@ -89,15 +97,25 @@ GEM
     dynamic_form (1.1.4)
     erubis (2.7.0)
     eventmachine (0.12.10)
+    execjs (1.3.0)
+      multi_json (~> 1.0)
     factory_girl (2.1.0)
     factory_girl_rails (1.2.0)
       factory_girl (~> 2.1.0)
       railties (>= 3.0.0)
+    fake_braintree (0.2.0)
+      activesupport
+      braintree (~> 2.5)
+      capybara
+      i18n
+      mongrel (~> 1.2.0.pre)
+      sinatra
     ffi (1.0.11)
     formtastic (1.2.4)
       actionpack (>= 2.3.7)
       activesupport (>= 2.3.7)
       i18n (~> 0.4)
+    gem_plugin (0.2.3)
     gherkin (2.4.21)
       json (>= 1.4.6)
     hike (1.2.1)
@@ -113,8 +131,12 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
+    minitest (2.6.2)
     mocha (0.9.8)
       rake
+    mongrel (1.2.0.pre2)
+      daemons (~> 1.0.10)
+      gem_plugin (~> 0.2.3)
     multi_json (1.0.4)
     nokogiri (1.5.0)
     polyglot (0.3.3)
@@ -162,6 +184,12 @@ GEM
       railties (~> 3.0)
       rspec (~> 2.6.0)
     rubyzip (0.9.5)
+    sass (3.1.12)
+    sass-rails (3.1.5)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
+      sass (~> 3.1.10)
+      tilt (~> 1.3.2)
     selenium-webdriver (2.16.0)
       childprocess (>= 0.2.5)
       ffi (~> 1.0.9)
@@ -180,7 +208,7 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
     term-ansicolor (1.0.7)
-    thin (1.2.11)
+    thin (1.3.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
       rack (>= 1.0.0)
@@ -190,7 +218,12 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
+    turn (0.8.2)
+      ansi (>= 1.2.2)
     tzinfo (0.3.31)
+    uglifier (1.2.3)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -201,21 +234,27 @@ DEPENDENCIES
   aruba (~> 0.4)
   bourne
   capybara
+  coffee-rails (~> 3.1.1)
   cucumber (~> 1.0.6)
   cucumber-rails (~> 1.0.6)
   database_cleaner
   dynamic_form
   factory_girl
   factory_girl_rails
+  fake_braintree (~> 0.2.0)
   formtastic (~> 1.2.4)
   jquery-rails
   launchy
+  minitest (~> 2.6.1)
   rails (>= 3.0.3)
   rake
   rspec-rails
+  sass-rails (~> 3.1.5)
   saucy!
   selenium-webdriver (~> 2.16.0)
   shoulda-matchers (~> 1.0.0)
   sqlite3
   thin
   timecop
+  turn (= 0.8.2)
+  uglifier (>= 1.0.3)

data/README.md

@@ -133,6 +133,11 @@ You can also customize the default trial length of 30 days, and the timing of ex
 * Saucy::Configuration.unactivated_notice_on - An integer. The day of the trial in which the unactivated notice should be sent.
 * Saucy::Configuration.expiring_notice_on - An integer. The number of days remaining that the expiration warning notice should be sent on.
 
+## Development
+
+Development for the 0.15.x series should happen in the `0.15.x-development`
+branch. The master branch should be used for 0.16 development.b
+
 ## Gotchas
 
 Make sure you don't do this in ApplicationController:

data/Rakefile

@@ -8,11 +8,20 @@ require 'rspec/core/rake_task'
 desc 'Default: run all tests'
 task :default => [:spec, :cucumber]
 
-Cucumber::Rake::Task.new(:cucumber) do |t|
-  t.fork = true
-  t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress')]
+namespace :cucumber do
+  Cucumber::Rake::Task.new(:engine) do |t|
+    t.fork = true
+    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress'), 'features/engine/*.feature']
+  end
+
+  Cucumber::Rake::Task.new(:integration) do |t|
+    t.fork = true
+    t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'progress'), 'features/integration/*.feature']
+  end
 end
 
+task :cucumber => ["cucumber:engine", "cucumber:integration"]
+
 RSpec::Core::RakeTask.new do |t|
   t.pattern = "spec/**/*_spec.rb"
   t.rspec_opts = "--format progress"

data/app/controllers/accounts_controller.rb

@@ -34,7 +34,8 @@ class AccountsController < ApplicationController
   def index
     if current_user.projects.size == 1
       flash.keep
-      redirect_to project_path(current_user.projects.first)
+      project = current_user.projects.first
+      redirect_to account_project_path(project.account, project)
     else
       @accounts = current_user.accounts
     end

data/app/mailers/billing_mailer.rb

@@ -50,4 +50,12 @@ class BillingMailer < ActionMailer::Base
          :reply_to => Saucy::Configuration.support_email_address,
          :from     => Saucy::Configuration.manager_email_address)
   end
+
+  def cancelation_notification(canceled_account)
+    @canceled_account = canceled_account
+    mail(:to       => Saucy::Configuration.support_email_address,
+         :subject  => "#{t("app_name")} Account Canceled",
+         :reply_to => Saucy::Configuration.support_email_address,
+         :from     => Saucy::Configuration.support_email_address)
+  end
 end

data/app/models/canceled_account.rb

@@ -5,15 +5,20 @@ class CanceledAccount < ActiveRecord::Base
 
   before_validation :populate_from_account, :on => :create, :if => :account
 
+  after_create :send_notification
+
   private
 
   def populate_from_account
-    self.name               = account.name
-    self.keyword            = account.keyword
-    self.billing_email      = account.customer.email
-    self.memberships        = account.memberships.to_json(:include => { :user => { :only => [:email, :name, :created_at]}}, :only => [:admin, :created_at])
-    self.plan               = account.plan
-    self.started_at         = account.created_at
-    self.subscription_token = account.subscription_token
+    self.name          = account.name
+    self.keyword       = account.keyword
+    self.billing_email = account.customer.email
+    self.memberships   = account.memberships.to_json(:include => { :user => { :only => [:email, :name, :created_at]}}, :only => [:admin, :created_at])
+    self.plan          = account.plan
+    self.started_at    = account.created_at
+  end
+
+  def send_notification
+    BillingMailer.cancelation_notification(self).deliver if account
   end
 end

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

@@ -4,7 +4,7 @@
   <ul class="projects">
     <% projects.each do |project| -%>
       <%= content_tag_for :li, project do -%>
-        <%= link_to h(project.name), project_path(project) %>
+        <%= link_to h(project.name), account_project_path(account, project) %>
       <% end -%>
     <% end -%>
   </ul>

data/app/views/billing_mailer/cancelation_notification.text.erb

@@ -0,0 +1,3 @@
+The <%= @canceled_account.name %> (<%= @canceled_account.plan.name %>) account was just canceled. 
+
+Billing emai: <%= @canceled_account.billing_email %>

data/app/views/invitation_mailer/invitation.text.erb

@@ -2,5 +2,5 @@ You have been invited to join the <%= @invitation.account_name %> account.
 
 Go to the following URL to accept this invitation:
 
-<%= invitation_url(@invitation) %>
+<%= account_invitation_url(@invitation.account, @invitation) %>
 

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

@@ -2,7 +2,7 @@
   <h2>Accept invitation to <%= @invitation.account_name %></h2>
 <% end -%>
 
-<%= semantic_form_for @invitation do |form| %>
+<%= semantic_form_for [current_account, @invitation] do |form| %>
   <h5 class="legend">I am a new user</h5>
   <%= form.inputs :class => 'new_user' do -%>
     <%= form.input :new_user_email, :label => 'Email' %>

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

@@ -3,14 +3,14 @@
 <% end -%>
 
 <div class="actions">
-  <%= link_to @membership, :method  => :delete, :confirm => "Are you sure?" do %>
+  <%= link_to [current_account, @membership], :method  => :delete, :confirm => "Are you sure?" do %>
     <span class="delete_item">Remove <%= @membership.user.name %> from <%= current_account.name %></span>
   <% end -%>
 </div>
 
 <%= render :partial => 'accounts/subnav' %>
 
-<%= semantic_form_for @membership do |form| -%>
+<%= semantic_form_for [current_account, @membership] do |form| -%>
   <%= form.inputs do -%>
     <%= form.input :admin, :label => "#{@membership.user.name} is an Admin on #{current_account.name}" %>
     <%= form.input :projects, :as => :check_boxes, :collection => @projects, :label => "#{@membership.user.name} belongs to these projects:" %>

data/app/views/memberships/index.html.erb

@@ -7,7 +7,7 @@
 <ul class="users">
   <% @memberships.each do |membership| -%>
     <%= content_tag_for :li, membership.user do -%>
-      <%= link_to [:edit, membership] do %>
+      <%= link_to [:edit, current_account, membership] do %>
         <%= membership.name %> <span>(<%= membership.email %>)</span>
       <% end -%>
     <% end -%>

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

@@ -4,18 +4,18 @@
   <% else %>
     <%= form.input :account, :as => :hidden, :value => current_account.id %>
   <% end -%>
-  <%= form.input :name, :hint => project_url(form.object).html_safe %>
+  <%= form.input :name, :hint => account_project_url(account, project).html_safe %>
   <%= form.input :keyword, :wrapper_html => { :style => 'display: none' } %>
-  <% if form.object.persisted? -%>
+  <% if project.persisted? -%>
     <%= form.input :archived, :hint => t('project.archived.hint', :default => "Archived project don't count against your project total. You cannot create or edit content.") %>
   <% end -%>
   <%= form.input :users, :label        => "Admins",
                          :as           => :check_boxes,
-                         :collection   => form.object.account.admins,
+                         :collection   => project.account.admins,
                          :wrapper_html => { :id => "project_admins_input" },
                          :input_html   => { :disabled => true } %>
-  <% if form.object.account.non_admins.any? -%>
-    <%= form.input :users, :as => :check_boxes, :collection => form.object.account.non_admins %>
+  <% if account.non_admins.any? -%>
+    <%= form.input :users, :as => :check_boxes, :collection => account.non_admins %>
   <% end -%>
 <% end %>
 

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

@@ -3,7 +3,7 @@
 <% end -%>
 
 <div class="actions">
-  <%= link_to project_path(@project), :method  => 'delete', :confirm => 'Are you sure you want to delete this project and all associated content?', :class => 'action' do %>
+  <%= link_to account_project_path(current_account, @project), :method  => 'delete', :confirm => 'Are you sure you want to delete this project and all associated content?', :class => 'action' do %>
     <span class="delete_item">Remove this project</span>
   <% end -%>
 </div>
@@ -12,7 +12,7 @@
 <%= render :partial => 'accounts/subnav' %>
 
 <%= semantic_form_for @project, :url => account_project_url(current_account, @project) do |form| %>
-  <%= render 'form', :form => form %>
+  <%= render 'form', :form => form, :project => @project, :account => current_account %>
 
   <%= form.buttons do %>
     <%= form.commit_button %>

data/app/views/projects/index.html.erb

@@ -8,7 +8,7 @@
 <ul class="projects active">
   <% @active_projects.each do |project| -%>
     <%= content_tag_for :li, project do -%>
-      <%= link_to h(project.name), edit_project_path(project), :class => "edit" %>
+      <%= link_to h(project.name), edit_account_project_path(current_account, project), :class => "edit" %>
     <% end -%>
   <% end -%>
 </ul>
@@ -20,8 +20,8 @@
   <ul class="projects archived">
     <% @archived_projects.each do |project| -%>
       <%= content_tag_for :li, project do -%>
-        <%= link_to h(project.name), edit_project_path(project), :class => "edit" %>
-        <%= link_to "View Project", project_path(project), :class => "view" %>
+        <%= link_to h(project.name), edit_account_project_path(current_account, project), :class => "edit" %>
+        <%= link_to "View Project", account_project_path(current_account, project), :class => "view" %>
       <% end -%>
     <% end -%>
   </ul>

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

@@ -5,7 +5,7 @@
 <%= render :partial => 'accounts/subnav' %>
 
 <%= semantic_form_for(@project, :url => account_projects_url(current_account)) do |form| %>
-  <%= render 'form', :form => form %>
+  <%= render 'form', :form => form, :project => @project, :account => current_account %>
   <%= form.buttons do -%>
     <%= form.commit_button %>
     <li><%= link_to 'Cancel', account_projects_path(current_account) %></li>

data/app/views/shared/_project_dropdown.html.erb

@@ -2,7 +2,7 @@
   <ul id="project-selection">
     <li>
       <h1>
-        <%= link_to current_project? ? project_path(current_project) : root_url do -%>
+        <%= link_to current_project? ? account_project_path(current_account, current_project) : root_url do -%>
           <% if current_project? -%>
             <span><%= current_project.name %></span>
           <% else %>
@@ -15,11 +15,11 @@
       </h1>
       <ul>
         <% current_user.projects.active.each do |project| %>
-          <li><%= link_to project.name, project_path(project) -%></li>
+          <li><%= link_to project.name, account_project_path(project.account, project) -%></li>
         <% end %>
         <% if current_user.memberships.admin.any? -%>
           <li>
-            <%= link_to current_account? && current_user.admin_of?(current_account) ? new_project_path(current_account) : new_project_path(current_user.memberships.admin.first.account) do %>
+            <%= link_to current_account? && current_user.admin_of?(current_account) ? new_account_project_path(current_account) : new_account_project_path(current_user.memberships.admin.first.account) do %>
               &#43; Create a new project
             <% end %>
           </li>

data/config/routes.rb

@@ -1,9 +1,5 @@
-require 'saucy/routing_extensions'
-
 Rails.application.routes.draw do
-  resources :accounts, :only => [:index, :edit, :update, :destroy]
-
-  through :accounts do
+  resources :accounts, :only => [:index, :edit, :update, :destroy] do
     resource  :billing
     resource  :plan
     resources :projects
@@ -16,7 +12,7 @@ Rails.application.routes.draw do
   end
 
   resource :profile, :only => [:edit, :update]
-  
+
   namespace :admin do
     resources :accounts, :only => [:index, :show] do
       get :search, :on => :collection

data/cucumber.yml

@@ -0,0 +1 @@
+default: --strict features -r features