saucy 0.10.9 → 0.10.10

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+0.10.10
+
+* Add additional Airbrake notifications on failure scenarios
+
 0.10.9
 
 * Follow-up to 0.10.8: Actually work irrespective of system TZ

data/Gemfile

@@ -14,6 +14,7 @@ gem "sinatra"
 gem "sham_rack"
 gem "braintree"
 gem "timecop"
+gem "airbrake"
 
 # used by the rails app in cucumber
 gem "cucumber-rails", :require => false

data/Gemfile.lock

@@ -28,6 +28,9 @@ GEM
       activemodel (= 3.0.5)
       activesupport (= 3.0.5)
     activesupport (3.0.5)
+    airbrake (3.0.4)
+      activesupport
+      builder
     arel (2.0.9)
     aruba (0.2.6)
       background_process
@@ -167,6 +170,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  airbrake
   aruba
   bourne
   braintree

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

@@ -24,10 +24,34 @@
     <%= 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." %>
+        <div id="account-deletion-warning">
+          <h3>Warning:</h3>
+          <p>
+            <%= t("saucy.account_deletion_effects_warning", :default => "When you cancel your Copycopter account, all of your text will be deleted from Copycopter.  All of your projects on your severs will revert to their defaults, and you will not be able to recover your customized copy that is stored in Copycopter.") %>
+          </p>
+
+          <%= link_to t("saucy.confirm_account_deletion", :default => "I understand, delete my account"),
+            @account,
+            :class => "button warning",
+            :method  => :delete,
+            :confirm => "Are you sure? All data will be irreversibly deleted." %>
+
+          <%= link_to t("saucy.cancel_account_deletion", :default => "On second thought, don't delete my account."),
+            root_path, :class => "cancel-account-deletion" %>
+        </div>
+
+        <%= link_to t(".delete", :default => "Delete my account"), "#", :class => "prompt-to-delete" %>
+
+        <% content_for :javascript do %>
+          <script type="text/javascript">
+            $(function() {
+              $("a.prompt-to-delete").click(function(event) {
+                $(event.target).hide();
+                $('#account-deletion-warning').slideDown();
+              });
+            });
+          </script>
+        <% end %>
       </li>
     <% end %>
   <% end %>

data/config/locales/en.yml

@@ -3,6 +3,9 @@ en:
   app_url: 'http://example.com'
   support_email: support@example.com
   saucy:
+    account_deletion_effects_warning: When you cancel your account, all of your data will be deleted from %{app_name}, and you will not be able to recover your data.
+    cancel_account_deletion: On second thought, don't delete my account.
+    confirm_account_deletion: I understand, delete my account
     billing_address: Billing Address
     errors:
       past_due:

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

@@ -24,12 +24,23 @@ Feature: Manage account
     When I follow "Users"
     Then I should see "captain@awesome.com"
 
+  @javascript
   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"
+    And I follow "Delete my account"
+    Then I should see "Warning"
+    When I follow "I understand"
     Then I should see "Your account has been deleted"
     When I go to the dashboard page
     Then I should not see "Chocolate"
 
+  @javascript
+  Scenario: Cancel deleting 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 my account"
+    And I follow "don't delete my account"
+    Then I should not see "Your account has been deleted"

data/lib/saucy/subscription.rb

@@ -1,3 +1,5 @@
+require 'airbrake'
+
 module Saucy
   module Subscription
     extend ActiveSupport::Concern
@@ -111,7 +113,20 @@ module Saucy
         if valid?
           result = Braintree::Customer.update(customer_token, customer_attributes)
           handle_customer_result(result)
+          if !result.success?
+            Airbrake.notify(
+              :error_class   => "Customer update",
+              :error_message => "Customer update failed",
+              :parameters    => { :customer_token => customer_token, :customer_attributes => customer_attributes }
+            )
+          end
           result.success?
+        else
+          Airbrake.notify(
+            :error_class   => "Subscription Validation",
+            :error_message => "Customer failed validation",
+            :parameters    => customer_attributes
+          )
         end
       end
 
@@ -176,6 +191,11 @@ module Saucy
       end
 
       def handle_errors(result, remote_errors)
+        Airbrake.notify(
+          :error_class   => "handle_errors",
+          :error_message => "handle_errors",
+          :parameters    => { :result => result, :remote_errors => remote_errors }
+        )
         if result && result.status == "processor_declined"
           errors[:card_number] << "was denied by the payment processor with the message: #{result.processor_response_text}"
         elsif result && result.status == "gateway_rejected"
@@ -203,6 +223,11 @@ module Saucy
           self.next_billing_date = zone.parse(result.subscription.next_billing_date)
           self.subscription_status = result.subscription.status
         else
+          Airbrake.notify(
+            :error_class   => "Subscription creation",
+            :error_message => "Subscription creation failed",
+            :parameters    => subscription_attributes
+          )
           false
         end
       end

data/public/saucy/stylesheets/screen.css

@@ -28,4 +28,8 @@ body {
 
 #container .search {
   float: right;
-}
+}
+
+div#account-deletion-warning {
+  display: none;
+}

data/spec/models/subscription_spec.rb

@@ -295,6 +295,8 @@ describe Account, "with a paid subscription" do
             :plan => Factory(:paid_plan))
   end
 
+  let(:merchant_time_zone) { ActiveSupport::TimeZone[Saucy::Configuration.merchant_account_time_zone] }
+
   it "gets marked as past due and updates its next_billing_date when subscriptions are updated and it has been rejected by the gateway" do
     next_billing_date_string = 2.months.from_now.to_s(:braintree_date)
     subscription = FakeBraintree.subscriptions[subject.subscription_token]
@@ -304,8 +306,7 @@ describe Account, "with a paid subscription" do
     Timecop.travel(subject.next_billing_date + 1.day) do
       Account.update_subscriptions!
       subject.reload.subscription_status.should == Braintree::Subscription::Status::PastDue
-      subject.next_billing_date.should == Time.parse(next_billing_date_string).in_time_zone(
-        Saucy::Configuration.merchant_account_time_zone)
+      subject.next_billing_date.should == merchant_time_zone.parse(next_billing_date_string)
       subject.past_due?.should be
     end
   end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
+  hash: 35
   prerelease: 
-  version: 0.10.9
+  segments: 
+  - 0
+  - 10
+  - 10
+  version: 0.10.10
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -15,85 +20,135 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-17 00:00:00 Z
+date: 2011-11-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: clearance
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 55
+        segments: 
+        - 0
+        - 11
+        - 2
         version: 0.11.2
   type: :runtime
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: formtastic
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 2
         version: "1.2"
   type: :runtime
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: railties
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
+        segments: 
+        - 3
+        - 0
+        - 3
         version: 3.0.3
   type: :runtime
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: braintree
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 2
+        - 6
+        - 2
         version: 2.6.2
   type: :runtime
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sham_rack
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 29
+        segments: 
+        - 1
+        - 3
+        - 3
         version: 1.3.3
   type: :runtime
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sinatra
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 1
+        - 2
         version: 1.1.2
   type: :runtime
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: aruba
+  name: airbrake
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 3
+        - 0
+        - 4
+        version: 3.0.4
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: aruba
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 2
+        - 6
         version: 0.2.6
   type: :development
-  prerelease: false
-  version_requirements: *id007
+  version_requirements: *id008
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
 executables: []
@@ -287,7 +342,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2922648281484856857
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -296,11 +351,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS