saucy 0.2.8.1 → 0.2.9

data/app/controllers/accounts_controller.rb

@@ -46,6 +46,12 @@ class AccountsController < ApplicationController
     end
   end
 
+  def destroy
+    current_account.destroy
+    flash[:success] = "Your account has been deleted."
+    redirect_to root_url
+  end
+
   private
 
   def current_account

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

@@ -5,9 +5,8 @@
 <%= render :partial => 'tab_bar' %>
 
 <div class="plan current">
-  <h3>Your Plan</h3>
+  <h3>Your Plan (<%= link_to "Upgrade", edit_account_plan_path(current_account), :id => "upgrade-account" %>)</h3>
   <%= render @account.plan %>
-  <%= link_to "Upgrade", edit_account_plan_path(@account) %>
 </div>
 
 <%= content_tag_for :div, @account do -%>
@@ -19,6 +18,12 @@
 
     <%= form.buttons do %>
       <%= form.commit_button "Update" %>
+      <li>
+        <%= link_to t(".delete", :default => "Delete my account"),
+                    @account,
+                    :method  => :delete,
+                    :confirm => "Are you sure? All data will be irreversibly deleted." %>
+      </li>
     <% end %>
   <% end %>
 <% end -%>

data/config/routes.rb

@@ -1,7 +1,7 @@
 require 'saucy/routing_extensions'
 
 Rails.application.routes.draw do
-  resources :accounts, :only => [:index, :edit, :update]
+  resources :accounts, :only => [:index, :edit, :update, :destroy]
 
   through :accounts do
     resource  :billing

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

@@ -24,3 +24,13 @@ Feature: Manage account
     Then I should see "Projection"
     When I follow "Users"
     Then I should see "captain@awesome.com"
+
+  Scenario: Delete account
+    Given an account exists with a name of "Chocolate"
+    And I am signed in as an admin of the "Chocolate" account
+    When I go to the settings page for the "Chocolate" account
+    And I follow "Delete"
+    Then I should see "Your account has been deleted"
+    When I go to the dashboard page
+    Then I should not see "Chocolate"
+

data/lib/saucy/account.rb

@@ -38,6 +38,7 @@ module Saucy
 
       before_create :create_customer
       before_create :create_subscription, :if => :billed?
+      after_destroy :destroy_customer
 
       memoize :customer
       memoize :subscription
@@ -170,6 +171,10 @@ module Saucy
         handle_customer_result(result)
       end
 
+      def destroy_customer
+        Braintree::Customer.delete(customer_token)
+      end
+
       def handle_customer_result(result)
         if result.success?
           self.customer_token = result.customer.id

data/lib/saucy/fake_braintree.rb

@@ -84,6 +84,11 @@ ShamRack.at("www.braintreegateway.com", 443).sinatra do
     end
   end
 
+  delete "/merchants/:merchant_id/customers/:id" do
+    FakeBraintree.customers[params["id"]] = nil
+    [200, { "Content-Encoding" => "gzip" }, ActiveSupport::Gzip.compress("")]
+  end
+
   post "/merchants/:merchant_id/subscriptions" do
     "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<subscription>\n  <plan-id type=\"integer\">2</plan-id>\n  <payment-method-token>b22x</payment-method-token>\n</subscription>\n"
     subscription = Hash.from_xml(request.body).delete("subscription")

data/spec/controllers/accounts_controller_spec.rb

@@ -8,6 +8,7 @@ describe AccountsController, "routes" do
                 to(:action => :create, :plan_id => :abc) }
   it { should route(:put, "/accounts/1").to(:action => :update, :id => 1) }
   it { should route(:get, "/accounts/1/edit").to(:action => :edit, :id => 1) }
+  it { should route(:delete, "/accounts/1").to(:action => :destroy, :id => 1) }
 end
 
 describe AccountsController, "new" do
@@ -183,6 +184,26 @@ describe AccountsController, "edit", :as => :account_admin do
   end
 end
 
+describe AccountsController, "destroy", :as => :account_admin do
+  before do
+    Account.stubs(:find_by_keyword! => account)
+    account.stubs(:destroy)
+    delete :destroy, :id => account.to_param
+  end
+
+  it "redirects to the root url" do
+    should redirect_to("/")
+  end
+
+  it "sets the flash" do
+    should set_the_flash.to(/deleted/i)
+  end
+
+  it "deletes the account" do
+    account.should have_received(:destroy)
+  end
+end
+
 describe AccountsController, "permissions", :as => :account_member do
   it { should deny_access.
                 on(:get, :edit, :id => account.to_param).

data/spec/models/account_spec.rb

@@ -180,6 +180,11 @@ describe Account, "with a paid plan" do
     subject.customer.email.should == "jrobot@example.com"
     subject.credit_card.cardholder_name.should == "Jim Robot"
   end
+
+  it "deletes the customer when deleted" do
+    subject.destroy
+    FakeBraintree.customers[subject.customer_token].should be_nil
+  end
 end
 
 describe Account, "with a free plan" do

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 125
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 2
-  - 8
-  - 1
-  version: 0.2.8.1
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,13 +17,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 -05:00
+date: 2011-01-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: formtastic
+  type: :runtime
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: formtastic
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -34,12 +34,12 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: railties
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: railties
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -50,12 +50,12 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  type: :runtime
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: braintree
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: braintree
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,12 +66,12 @@ dependencies:
         - 6
         - 2
         version: 2.6.2
-  type: :runtime
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: sham_rack
+  type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: sham_rack
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -82,12 +82,12 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  type: :runtime
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  type: :runtime
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: sinatra
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -98,12 +98,12 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  type: :runtime
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: aruba
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: aruba
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -114,8 +114,7 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
-  type: :development
-  version_requirements: *id006
+  requirement: *id006
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
 executables: []