saucy 0.8.4 → 0.8.5

data/app/controllers/plans_controller.rb

@@ -13,12 +13,29 @@ class PlansController < ApplicationController
   def update
     @plans = Plan.ordered
     @account = current_account
-    Saucy::Configuration.notify("plan_upgraded", :account => @account,
-                                                 :request => request)
+    from_plan = @account.plan
+
     if @account.save_customer_and_subscription!(params[:account])
+      to_plan = @account.plan
+      notify_observers_of_plan_change(from_plan, to_plan)
       redirect_to edit_account_path(@account), :notice => t('.update.notice', :default => "Plan changed successfully")
     else
       render :edit
     end
   end
+
+  private
+
+  def notify_observers_of_plan_change(from_plan, to_plan)
+    notify_observers("plan_upgraded",   from_plan, to_plan) if from_plan.price < to_plan.price
+    notify_observers("plan_downgraded", from_plan, to_plan) if from_plan.price > to_plan.price
+  end
+
+  def notify_observers(event_name, from_plan, to_plan)
+    Saucy::Configuration.notify(event_name,
+                                :account   => @account,
+                                :request   => request,
+                                :from_plan => from_plan,
+                                :to_plan   => to_plan)
+  end
 end

data/spec/controllers/plans_controller_spec.rb

@@ -1,13 +1,71 @@
 require 'spec_helper'
 
-describe PlansController, "successful update", :as => :account_admin do
+describe PlansController, "successful upgrade", :as => :account_admin do
+  let!(:original_plan) { account.plan }
+  let!(:upgraded_plan) { Factory(:paid_plan) }
+
   before do
     Account.stubs(:find_by_keyword! => account)
-    account.stubs(:save_customer_and_subscription! => true)
-    put :update, :account_id => account.to_param
+    new_account_attributes = Factory.attributes_for(:paid_account).merge({
+      :plan_id => upgraded_plan.id
+    })
+    put :update, :account_id => account.to_param, :account => new_account_attributes
   end
 
   it "notifies observers" do
-    should notify_observers("plan_upgraded", :account => account, :request => request)
+    should notify_observers("plan_upgraded", :account => account, :request => request, :from_plan => original_plan, :to_plan => upgraded_plan)
+  end
+end
+
+describe PlansController, "successful downgrade", :as => :account_admin do
+  let!(:account) { Factory(:paid_account) }
+  let!(:original_plan) { account.plan }
+  let!(:downgraded_plan) { Factory(:plan) }
+
+  before do
+    Account.stubs(:find_by_keyword! => account)
+    new_account_attributes = Factory.attributes_for(:paid_account).merge({
+      :plan_id => downgraded_plan.id
+    })
+    put :update, :account_id => account.to_param, :account => new_account_attributes
+  end
+
+  it "notifies observers" do
+    should notify_observers("plan_downgraded", :account => account, :request => request, :from_plan => original_plan, :to_plan => downgraded_plan)
+  end
+end
+
+describe PlansController, "unsuccessful update", :as => :account_admin do
+  let!(:original_plan) { account.plan }
+  let!(:upgraded_plan) { Factory(:paid_plan) }
+
+  before do
+    Account.stubs(:find_by_keyword! => account)
+    account.stubs(:save_customer_and_subscription! => false)
+    new_account_attributes = Factory.attributes_for(:paid_account).merge({
+      :plan_id => upgraded_plan.id
+    })
+    put :update, :account_id => account.to_param, :account => new_account_attributes
+  end
+
+  it "does not notify observers" do
+    should_not notify_observers("plan_upgraded", :account => account, :request => request, :from_plan => original_plan, :to_plan => upgraded_plan)
+  end
+end
+
+describe PlansController, "successful update that does not change the plan", :as => :account_admin do
+  let!(:original_plan) { account.plan }
+
+  before do
+    Account.stubs(:find_by_keyword! => account)
+    new_account_attributes = Factory.attributes_for(:paid_account).merge({
+      :plan_id => original_plan.id
+    })
+    put :update, :account_id => account.to_param, :account => new_account_attributes
+  end
+
+  it "does not notify observers about upgrade or downgrade" do
+    should_not notify_observers("plan_upgraded",   :account => account, :request => request, :from_plan => original_plan, :to_plan => original_plan)
+    should_not notify_observers("plan_downgraded", :account => account, :request => request, :from_plan => original_plan, :to_plan => original_plan)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 53
   prerelease: 
   segments: 
   - 0
   - 8
-  - 4
-  version: 0.8.4
+  - 5
+  version: 0.8.5
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -22,8 +22,8 @@ date: 2011-06-28 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: clearance
   prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -35,11 +35,11 @@ dependencies:
         - 11
         - 0
         version: 0.11.0
-  type: :runtime
+  name: clearance
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: formtastic
   prerelease: false
+  type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -50,11 +50,11 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  type: :runtime
+  name: formtastic
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: railties
   prerelease: false
+  type: :runtime
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -66,11 +66,11 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  type: :runtime
+  name: railties
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: braintree
   prerelease: false
+  type: :runtime
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -82,11 +82,11 @@ dependencies:
         - 6
         - 2
         version: 2.6.2
-  type: :runtime
+  name: braintree
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sham_rack
   prerelease: false
+  type: :runtime
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -98,11 +98,11 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  type: :runtime
+  name: sham_rack
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
+  type: :runtime
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -114,11 +114,11 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  type: :runtime
+  name: sinatra
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
+  type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -130,7 +130,7 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
-  type: :development
+  name: aruba
   version_requirements: *id007
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com