saucy 0.12.5 → 0.13.0

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+0.13.0
+
+* Populate braintree customer email with admin email its not set
+* Keep track of canceled accounts, this is a non-backwards compatible change and when upgrading saucy you will need to run the following:
+
+    bundle exec rake saucy_engine:install:migrations db:migrate
+
+* Allow users in an expired trial to delete their account
+
+With this release you will also want to regenerate the saucy features (`rails g saucy:features`), or look at the commit diffs and
+introduce the above two changes yourself.
+
 0.12.5
 
 * 0.12.3 and 0.12.14 were built using the wrong version of ruby/rubygems

data/Rakefile

@@ -5,6 +5,9 @@ require 'rubygems/package_task'
 require 'cucumber/rake/task'
 require 'rspec/core/rake_task'
 
+APP_RAKEFILE = File.expand_path("../tmp/aruba/testapp/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+
 desc 'Default: run all tests'
 task :default => [:spec, :cucumber]
 

data/app/models/canceled_account.rb

@@ -0,0 +1,18 @@
+class CanceledAccount < ActiveRecord::Base
+  attr_accessor :account
+
+  belongs_to :plan
+
+  before_validation :populate_from_account, :on => :create, :if => :account
+
+  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
+  end
+end

data/app/models/signup.rb

@@ -107,6 +107,7 @@ class Signup
   def populate_additional_account_fields
     account.name = "#{short_name}"
     account.keyword = "#{short_name}#{SecureRandom.hex(3)}"
+    account.billing_email ||= email
   end
 
   def populate_additional_user_fields

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

@@ -27,6 +27,14 @@
 
   <%= form.buttons do %>
     <%= form.commit_button "Upgrade" %>
+    <% if @account.expired? %>
+      <li>
+        <%= link_to t(".delete.expired", :default => "No thanks, just delete my account"),
+                      @account,
+                      :method  => :delete,
+                      :confirm => "Are you sure? All data will be irreversibly deleted." %>
+      </li>
+    <% end %>
   <% end %>
 <% end %>
 

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

@@ -37,6 +37,7 @@ Feature: Manage Plan
     Then I should see "Upgrade Your Plan"
     When I choose the "Basic" plan
     Then I should see "Billing Information"
+    And I should not see "No thanks, just delete my account"
     And I fill in "Cardholder name" with "Ralph Robot"
     And I fill in "Billing email" with "accounting@example.com"
     And I fill in "Card number" with "4111111111111111"

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

@@ -37,6 +37,15 @@ Feature: Trial plans
     And I should see "expired"
     And the "Temp" plan should be disabled
 
+  Scenario: Delete an account with an expired plan
+    Given a "Temp" account exists with a name of "Test" created 30 days ago
+    And I am signed in as an admin of the "Test" account
+    When I go to the projects page for the "Test" account
+    Then I should be on the upgrade plan page for the "Test" account
+    And I should see "expired"
+    When I follow "No thanks, just delete my account"
+    Then I should see "Your account has been deleted"
+
   Scenario: Sign up for a non-trial plan
     When I go to the list of plans page
     And I follow "Eternal"

data/lib/generators/saucy/install/install_generator.rb

@@ -16,6 +16,10 @@ DESC
         migration_template "create_saucy_tables.rb", "db/migrate/create_saucy_tables.rb"
       end
 
+      def rake_engine_migrations
+        rake("saucy_engine:install:migrations")
+      end
+
       def create_models
         directory "models", "app/models"
       end

data/lib/saucy/account.rb

@@ -33,6 +33,8 @@ module Saucy
 
       before_create :set_trial_expiration
       after_save :record_new_activations
+
+      before_destroy :create_canceled_account
     end
 
     module InstanceMethods
@@ -94,6 +96,12 @@ module Saucy
       def projects_count
         projects.active.count
       end
+
+      private
+
+      def create_canceled_account
+        CanceledAccount.create(:account => self)
+      end
     end
 
     module ClassMethods

data/spec/environment.rb

@@ -52,6 +52,7 @@ ActionController::Base.send :include, Rails.application.routes.url_helpers
 
 require "./lib/generators/saucy/features/templates/factories"
 require "./lib/generators/saucy/install/templates/create_saucy_tables"
+#Dir["./db/migrate/*.rb"].each {|file| require file }
 
 class ClearanceCreateUsers < ActiveRecord::Migration
   def self.up
@@ -94,3 +95,4 @@ 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

@@ -344,3 +344,16 @@ describe Account, "with coupon" do
     subject.reload.trial_expires_at.to_s.should == (free_months * 30).days.from_now.to_s
   end
 end
+
+describe Account, "when destroyed" do
+  subject { Factory(:account) }
+
+  before do
+    CanceledAccount.stubs(:create)
+  end
+
+  it "creates a canceled account record" do
+    subject.destroy
+    CanceledAccount.should have_received(:create).with(:account => subject)
+  end
+end

data/spec/models/canceled_account_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe CanceledAccount do
+  subject { CanceledAccount.create() }
+
+  it { should belong_to(:plan) }
+
+  it "doesn't populate anything" do
+    subject.name.should be_nil
+    subject.keyword.should be_nil
+  end
+end
+
+describe CanceledAccount, "given an account" do
+  let(:account) { Factory(:account, :billing_email => "billing@example.com") }
+
+  before do
+    Factory(:membership, :account => account)
+  end
+
+  subject { CanceledAccount.create(:account => account) }
+
+  it "populates its name and keyword from the given account" do
+    subject.name.should == account.name
+    subject.keyword.should == account.keyword
+  end
+
+  it "populates the billing_email from the customer's email from the given account" do
+    subject.billing_email.should_not be_nil
+    subject.billing_email.should == account.customer.email
+  end
+
+  it "saves the memberships and users as json from the given account" do
+    memberships_json = account.memberships.to_json(:include => { :user => { :only => [:email, :name, :created_at]}}, :only => [:admin, :created_at])
+    subject.memberships.should == memberships_json
+    JSON.parse(subject.memberships).should be
+  end
+
+  it "populates the plan from the given account" do
+    subject.plan_id.should == account.plan_id
+    subject.plan.should == account.plan
+  end
+
+  it "populates the started_at from the given account's creation date" do
+    subject.started_at.should == account.created_at
+  end
+end

data/spec/models/signup_spec.rb

@@ -89,6 +89,16 @@ describe Signup, "with a valid user and account" do
   it "gives it's user a name that is the first part of it's email" do
     subject.user.name.should == "user"
   end
+
+  it "uses the user's email as it's billing_email" do
+    subject.account.customer.email.should == email
+  end
+
+  it "uses doesn't override billing_email if one is supplied" do
+    new_signup = Factory.build(:signup, :email => email, :billing_email => "billing@example.com")
+    new_signup.save
+    new_signup.account.customer.email.should == "billing@example.com"
+  end
 end
 
 describe Signup, "with an email with symbols in it" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 37
+  hash: 43
   prerelease: 
   segments: 
   - 0
-  - 12
-  - 5
-  version: 0.12.5
+  - 13
+  - 0
+  version: 0.13.0
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -20,7 +20,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-07 00:00:00 Z
+date: 2011-10-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clearance
@@ -179,6 +179,7 @@ files:
 - app/helpers/limits_helper.rb
 - app/mailers/billing_mailer.rb
 - app/mailers/invitation_mailer.rb
+- app/models/canceled_account.rb
 - app/models/coupon.rb
 - app/models/invitation.rb
 - app/models/limit.rb
@@ -308,6 +309,7 @@ files:
 - spec/mailers/billing_mailer_spec.rb
 - spec/mailers/invitiation_mailer_spec.rb
 - spec/models/account_spec.rb
+- spec/models/canceled_account_spec.rb
 - spec/models/coupon_spec.rb
 - spec/models/invitation_spec.rb
 - spec/models/limit_spec.rb