saucy 0.14.3 → 0.14.5

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

@@ -29,4 +29,4 @@ Feature: Sign up
     And 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"
+    Then I should be on the new project page for the newest account by "email@person.com"

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

@@ -18,7 +18,7 @@ Feature: Sign up with coupon
     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"
+    Then I should be on the new project page for the newest account by "email@person.com"
 
   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
@@ -28,4 +28,3 @@ Feature: Sign up with coupon
     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/features/sign_up_paid.feature

@@ -38,7 +38,7 @@ Feature: Sign up
     And I fill in "ZIP or Postal Code" with "02110"
     And I select "United States of America" from "Country"
     And I press "Sign up"
-    Then I should see "created"
+    Then I should be on the new project page for the newest account by "email@person.com"
 
   Scenario: User signs up for a paid plan with an invalid credit card number
     Given that the credit card "4111112" is invalid

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

@@ -20,7 +20,7 @@ Feature: Trial plans
     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"
+    Then I should be on the new project page for the newest account by "email@person.com"
 
   Scenario: use an account during the trial
     Given a "Temp" account exists with a name of "Test" created 29 days ago

data/lib/saucy/account.rb

@@ -83,6 +83,14 @@ module Saucy
         self.trial_expires_at = number_free_days.days.from_now(created_at || Time.zone.now)
       end
 
+      def reset_trial_expiration(length_in_days = nil)
+        new_length                       = length_in_days || Saucy::Configuration.trial_length
+        new_trial_start_date             = [trial_expires_at, Time.zone.now].max
+        self.trial_expires_at            = new_length.days.from_now(new_trial_start_date)
+        self.notified_of_completed_trial = false
+        self.notified_of_expiration      = false
+      end
+
       def record_new_activations
         if activated_changed? && activated?
           Saucy::Notifications.notify_observers("activated", :account => self)

data/lib/saucy/projects_controller.rb

@@ -24,7 +24,6 @@ module Saucy
       def create
         @project = current_account.projects.build(params[:project])
         if @project.save
-          flash[:notice] = "Project successfully created"
           redirect_to project_url(@project)
         else
           render :action => :new
@@ -40,8 +39,7 @@ module Saucy
         @project = current_project
         set_project_account_if_moving
         if @project.update_attributes params[:project]
-          flash[:success] = 'Project was updated.'
-          redirect_to account_projects_url(@project.account)
+          redirect_to account_projects_url(@project.account), :notice => 'Project was updated.'
         else
           render :action => :edit
         end
@@ -53,8 +51,7 @@ module Saucy
 
       def destroy
         current_project.destroy
-        flash[:success] = "Project has been deleted"
-        redirect_to account_projects_url(current_project.account)
+        redirect_to account_projects_url(current_project.account), :notice => "Project has been deleted"
       end
 
       def index

data/lib/saucy/subscription.rb

@@ -223,7 +223,7 @@ module Saucy
         Airbrake.notify(nil,
           :error_class   => "handle_errors",
           :error_message => "handle_errors",
-          :parameters    => { :result => result, :remote_errors => remote_errors }
+          :parameters    => { :result => result.inspect, :remote_errors => remote_errors.inspect }
         )
         if result && result.status == "processor_declined"
           errors[:card_number] << "was denied by the payment processor with the message: #{result.processor_response_text}"
@@ -239,8 +239,12 @@ module Saucy
               errors[:expiration_month] << error.message.gsub("Expiration month ", "")
             elsif error.attribute == "expiration_year"
               errors[:expiration_year] << error.message.gsub("Expiration year ", "")
+            else
+              errors[:card_number] << error.message
             end
           end
+        else
+          errors[:card_number] << "there was an unknown status"
         end
       end
 

data/lib/saucy/version.rb

@@ -1,3 +1,3 @@
 module Saucy
-  VERSION = '0.14.3'
+  VERSION = '0.14.5'
 end

data/saucy.gemspec

@@ -18,8 +18,8 @@ Gem::Specification.new do |s|
   s.email   = %q{support@thoughtbot.com}
   s.homepage = "http://github.com/thoughtbot/saucy"
 
-  s.add_dependency('clearance', '~> 0.11.2')
-  s.add_dependency('formtastic', '>= 1.2')
+  s.add_dependency('clearance', '~> 0.14.0')
+  s.add_dependency('formtastic', '~> 1.2.4')
   s.add_dependency('railties', '>= 3.0.3')
   s.add_dependency('braintree', '>= 2.6.2')
   s.add_dependency('sham_rack', '1.3.3')

data/spec/controllers/accounts_controller_spec.rb

@@ -66,8 +66,6 @@ describe AccountsController, "successful create for a confirmed user" do
     signup.should have_received(:user=).with(user)
   end
 
-  it { should set_the_flash.to(/created/i) }
-  it { should_not set_the_flash.to(/confirm/i) }
   it { should be_signed_in.as(user) }
 
   it "notifies observers" do
@@ -223,11 +221,13 @@ describe AccountsController, "destroy", :as => :account_admin do
 end
 
 describe AccountsController, "permissions", :as => :account_member do
-  it { should deny_access.
-                on(:get, :edit, :id => account.to_param).
-                flash(/admin/) }
-  it { should deny_access.
-                on(:put, :update, :id => account.to_param).
-                flash(/admin/) }
-end
+  context "get to account edit" do
+    before { get :edit, :id => account.to_param }
+    it { should deny_access :flash => "You must be an admin to access that page." }
+  end
 
+  context "put to account update" do
+    before { put :update, :id => account.to_param }
+    it { should deny_access :flash => "You must be an admin to access that page." }
+  end
+end

data/spec/controllers/admin/trial_extensions_controller_spec.rb

@@ -0,0 +1,67 @@
+require 'spec_helper'
+
+describe Admin::TrialExtensionsController, "routes" do
+  it { should route(:post, "/admin/accounts/test/trial_extensions").to(:action => :create, :account_id => 'test') }
+end
+
+describe Admin::TrialExtensionsController, "post create without http auth" do
+  before { post :create, :account_id => "test" }
+  it { should respond_with(:unauthorized) }
+end
+
+describe Admin::TrialExtensionsController, "post create with http auth" do
+  let(:account) { Factory(:account, :keyword => 'test') }
+  before do
+    http_basic_auth_sign_in 'admin', 'admin'
+    post :create, :account_id => account.keyword
+  end
+  it { should redirect_to(admin_account_path(account.keyword)) }
+end
+
+describe Admin::TrialExtensionsController, "extending an unexpired trial" do
+  let(:plan)    { Factory(:plan, :trial => true) }
+  let(:account) { Factory(:account, :keyword => 'test', :plan => plan) }
+  let!(:original_trial_expiration_date) { account.trial_expires_at }
+  before do
+    http_basic_auth_sign_in 'admin', 'admin'
+    post :create, :account_id => account.keyword
+    account.reload
+  end
+  it "extends the trial by the standard saucy trial length" do
+    difference_in_dates = (account.trial_expires_at - original_trial_expiration_date)
+    difference_in_dates.should == Saucy::Configuration.trial_length.days
+  end
+end
+
+describe Admin::TrialExtensionsController, "extending an expired trial" do
+  let(:plan)    { Factory(:plan, :trial => true) }
+  let(:account) { Factory(:account, :keyword => 'test', :plan => plan) }
+  before do
+    Timecop.freeze(1.day.ago.beginning_of_day) do
+      account.update_attribute(:trial_expires_at, 60.days.ago)
+      http_basic_auth_sign_in 'admin', 'admin'
+      post :create, :account_id => account.keyword
+      account.reload
+    end
+  end
+  it "extends the trial out from today by the standard saucy trial length" do
+    Timecop.freeze(1.day.ago.beginning_of_day) do
+      difference_in_dates = (account.trial_expires_at - Time.zone.now)
+      difference_in_dates.should == Saucy::Configuration.trial_length.days
+    end
+  end
+end
+
+describe Admin::TrialExtensionsController, "extending an invalid account" do
+  let(:plan)    { Factory(:plan, :trial => true) }
+  let(:account) { Factory(:account, :keyword => 'test', :plan => plan) }
+  before do
+    account.update_attribute(:keyword, '!@#$%')
+
+    http_basic_auth_sign_in 'admin', 'admin'
+    post :create, :account_id => account.keyword
+    account.reload
+  end
+  it { should render_template('admin/accounts/show') }
+  it { should set_the_flash.to(/cannot/i) }
+end

data/spec/controllers/invitations_controller_spec.rb

@@ -13,13 +13,19 @@ end
 
 describe InvitationsController, "permissions" do
   let(:account) { Factory(:account) }
-  before { sign_in }
-  it { should deny_access.
-                on(:get, :new, :account_id => account.to_param).
-                flash(/admin/) }
-  it { should deny_access.
-                on(:post, :create, :account_id => account.to_param).
-                flash(/admin/) }
+  before do
+    sign_in
+  end
+
+  context "on get to new" do
+    before { get :new, :account_id => account.to_param }
+    it { should deny_access :flash => "You must be an admin to access that page." }
+  end
+
+  context "on post to create" do
+    before { post :create, :account_id => account.to_param }
+    it { should deny_access :flash => "You must be an admin to access that page." }
+  end
 end
 
 describe InvitationsController, "new", :as => :account_admin do

data/spec/controllers/memberships_controller_spec.rb

@@ -13,13 +13,16 @@ end
 
 describe MembershipsController, "permissions", :as => :account_member do
   let(:membership) { Factory(:membership, :account => account) }
-  it { should deny_access.
-                on(:get, :index, :account_id => account.to_param).
-                flash(/admin/) }
-  it { should deny_access.
-                on(:get, :edit, :id         => membership.to_param,
-                                :account_id => account.to_param).
-                flash(/admin/) }
+
+  context "on get to index" do
+    before { get :index, :account_id => account.to_param }
+    it { should deny_access :flash => "You must be an admin to access that page." }
+  end
+
+  context "on get to edit" do
+    before { get :edit, :id => membership.to_param, :account_id => account.to_param }
+    it { should deny_access :flash => "You must be an admin to access that page." }
+  end
 end
 
 describe MembershipsController, "index", :as => :account_admin do

data/spec/controllers/profiles_controller_spec.rb

@@ -6,8 +6,14 @@ describe ProfilesController, "routes" do
 end
 
 describe ProfilesController, "signed out" do
-  it { should deny_access.on(:get, :edit) }
-  it { should deny_access.on(:put, :update) }
+  context "on get to edit" do
+    before { get :edit }
+    it { should deny_access }
+  end
+  context "on put to update" do
+    before { put :update }
+    it { should deny_access }
+  end
 end
 
 describe ProfilesController, "edit", :as => :user do

data/spec/controllers/projects_controller_spec.rb

@@ -183,22 +183,26 @@ describe ProjectsController, "index", :as => :account_admin do
 end
 
 describe ProjectsController, "as a non-admin", :as => :project_member do
-  it { should deny_access.on(:get, :edit, :id         => project.to_param,
-                                          :account_id => account.to_param).
-                          flash(/admin/) }
-
-  it { should deny_access.on(:put, :update, :id         => project.to_param,
-                                            :account_id => account.to_param).
-                          flash(/admin/) }
-
-  it { should deny_access.on(:delete, :destroy, :id         => project.to_param,
-                                                :account_id => account.to_param).
-                          flash(/admin/) }
-
-  it { should deny_access.on(:get, :new, :account_id => account.to_param).flash(/admin/) }
-
-  it { should deny_access.on(:post, :create, :account_id => account.to_param).
-                          flash(/admin/) }
+  context "on get to edit" do
+    before { get :edit, :id => project.to_param, :account_id => account.to_param }
+    it { should deny_access :flash => "You must be an admin to access that page." }
+  end
+  context "on put to update" do
+    before { put :update, :id => project.to_param, :account_id => account.to_param }
+    it { should deny_access :flash => "You must be an admin to access that page." }
+  end
+  context "on delete to destroy" do
+    before { delete :destroy, :id => project.to_param, :account_id => account.to_param }
+    it { should deny_access :flash => "You must be an admin to access that page." }
+  end
+  context "on get to new" do
+    before { get :new, :account_id => account.to_param }
+    it { should deny_access :flash => "You must be an admin to access that page." }
+  end
+  context "on post to create" do
+    before { post :create, :account_id => account.to_param }
+    it { should deny_access :flash => "You must be an admin to access that page." }
+  end
 end
 
 describe ProjectsController, "show for a duplicate project keyword", :as => :project_admin do

data/spec/environment.rb

@@ -9,6 +9,9 @@ require 'bourne'
 
 FileUtils.rm_f(File.join(PROJECT_ROOT, 'tmp', 'test.sqlite3'))
 
+Clearance.configure do |config|
+end
+
 class ApplicationController < ActionController::Base
   include Clearance::Authentication
   include Saucy::AccountAuthorization
@@ -90,9 +93,6 @@ class ClearanceMailer
   end
 end
 
-Clearance.configure do |config|
-end
-
 ClearanceCreateUsers.suppress_messages { ClearanceCreateUsers.migrate(:up) }
 CreateSaucyTables.suppress_messages { CreateSaucyTables.migrate(:up) }
 ActiveRecord::Migrator.up(ActiveRecord::Migrator.migrations_paths)

data/spec/models/account_spec.rb

@@ -133,6 +133,35 @@ describe Account do
     account.should_not be_expired
   end
 
+  it "extends the trial period on unexpired accounts" do
+    Timecop.freeze do
+      plan = Factory.stub(:plan, :trial => true)
+      account = Factory(:account, :plan => plan)
+      original_expiration = account.trial_expires_at
+
+      account.reset_trial_expiration
+
+      (account.trial_expires_at - original_expiration).should == Saucy::Configuration.trial_length.days
+    end
+  end
+
+  it "resets the trial period and emails on expired accounts" do
+    Timecop.freeze do
+      plan = Factory.stub(:plan, :trial => true)
+      account = Factory(:account,
+                        :plan => plan,
+                        :notified_of_completed_trial => true,
+                        :notified_of_expiration => true,
+                        :created_at => 1.year.ago)
+
+      account.reset_trial_expiration
+
+      (account.trial_expires_at - Time.zone.now).should == Saucy::Configuration.trial_length.days
+      account.notified_of_expiration.should be_false
+      account.notified_of_completed_trial.should be_false
+    end
+  end
+
   context "with expiring accounts" do
     before do
       trial   = Factory(:plan, :trial => true)

data/spec/models/subscription_spec.rb

@@ -16,7 +16,7 @@ describe Account do
   it "manifests braintree processor_declined errors as errors on number and doesn't save" do
     FakeBraintree.failures["4111111111111112"] = { "message" => "Do Not Honor", "code" => "2000", "status" => "processor_declined" }
     account = Factory.build(:paid_account,
-                            :card_number => "4111111111111112", 
+                            :card_number => "4111111111111112",
                             :plan => Factory(:paid_plan))
     account.save.should_not be
     FakeBraintree.customers.should be_empty
@@ -27,7 +27,7 @@ describe Account do
   it "manifests braintree gateway_rejected errors as errors on number and doesn't save" do
     FakeBraintree.failures["4111111111111112"] = { "message" => "Gateway Rejected: cvv", "code" => "N", "status" => "gateway_rejected" }
     account = Factory.build(:paid_account,
-                            :card_number => "4111111111111112", 
+                            :card_number => "4111111111111112",
                             :plan => Factory(:paid_plan))
     account.save.should_not be
     FakeBraintree.customers.should be_empty
@@ -38,13 +38,35 @@ describe Account do
   it "manifests braintree gateway_rejected errors as errors on number and doesn't save" do
     FakeBraintree.failures["4111111111111112"] = { "message" => "Credit card number is invalid.", "errors" => { "customer" => { "errors" => [], "credit-card" => { "errors" => [{ "message" => "Credit card number is invalid.", "code" => 81715, "attribute" => :number }] }}}}
     account = Factory.build(:paid_account,
-                            :card_number => "4111111111111112", 
+                            :card_number => "4111111111111112",
                             :plan => Factory(:paid_plan))
     account.save.should_not be
     FakeBraintree.customers.should be_empty
     account.persisted?.should_not be
     account.errors[:card_number].any? { |e| e =~ /is invalid/ }.should be
-   end
+  end
+
+  it "manifests braintree gateway_rejected unknown errors and doesn't save" do
+    FakeBraintree.failures["4111111111111112"] = { "message" => "Credit card number is invalid.", "errors" => { "customer" => { "errors" => [], "credit-card" => { "errors" => [{ "message" => "There was an unkown error.", "code" => 81715, "attribute" => :unknown }] }}}}
+    account = Factory.build(:paid_account,
+                            :card_number => "4111111111111112",
+                            :plan => Factory(:paid_plan))
+    account.save.should_not be
+    FakeBraintree.customers.should be_empty
+    account.persisted?.should_not be
+    account.errors[:card_number].any? { |e| e =~ /There was an unkown error./ }.should be
+  end
+
+  it "manifests braintree unknown status error" do
+    FakeBraintree.failures["4111111111111112"] = { "message" => "Do Not Honor", "code" => "2000", "status" => "unknown" }
+    account = Factory.build(:paid_account,
+                            :card_number => "4111111111111112",
+                            :plan => Factory(:paid_plan))
+    account.save.should_not be
+    FakeBraintree.customers.should be_empty
+    account.persisted?.should_not be
+    account.errors[:card_number].any? { |e| e =~ /unknown status/ }.should be
+  end
 end
 
 describe Account, "given free and paid plans" do
@@ -139,10 +161,10 @@ describe Account, "with a paid plan" do
   context "updating customer credit card information when changed" do
     before do
       subject.save_customer_and_subscription!(:billing_email => "jrobot@example.com",
-                                              :cardholder_name => "Jim Robot", 
+                                              :cardholder_name => "Jim Robot",
                                               :card_number => "4111111111111115",
                                               :verification_code => "123",
-                                              :expiration_month => 5, 
+                                              :expiration_month => 5,
                                               :expiration_year => 2013)
     end
 
@@ -170,10 +192,10 @@ describe Account, "with a paid plan" do
   context "updating customer credit card billing address information when changed" do
     before do
       subject.save_customer_and_subscription!(:billing_email => "jrobot@example.com",
-                                              :cardholder_name => "Jim Robot", 
+                                              :cardholder_name => "Jim Robot",
                                               :card_number => "4111111111111115",
                                               :verification_code => "123",
-                                              :expiration_month => 5, 
+                                              :expiration_month => 5,
                                               :expiration_year => 2013,
                                               :street_address => "1 E Main St",
                                               :extended_address => "Suite 3",
@@ -322,7 +344,7 @@ end
 
 describe Account, "with a paid subscription" do
   subject do
-    Factory(:paid_account, 
+    Factory(:paid_account,
             :plan => Factory(:paid_plan))
   end
 
@@ -358,7 +380,7 @@ describe Account, "with a paid subscription" do
     end
 
     it "delivers the rest of the emails even if one fails" do
-      Factory(:paid_account, 
+      Factory(:paid_account,
               :plan => Factory(:paid_plan))
       Timecop.travel(subject.next_billing_date + 1.day) do
         Account.update_subscriptions!
@@ -545,7 +567,7 @@ end
 
 describe Account, "with a paid subscription that is past due" do
   subject do
-    Factory(:paid_account, 
+    Factory(:paid_account,
             :plan => Factory(:paid_plan))
   end