saucy 0.2.42 → 0.2.43

data/Gemfile

@@ -8,7 +8,7 @@ gem "thin"
 gem "clearance", :git => "git://github.com/thoughtbot/clearance.git", :require => false
 gem "shoulda", :require => false
 gem "bourne", :require => false
-gem "sqlite3-ruby", :require => false
+gem "sqlite3", :require => false
 gem "factory_girl", :require => false
 gem "sinatra"
 gem "sham_rack"

data/Gemfile.lock

@@ -9,33 +9,33 @@ GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4)
       rack (~> 1.2.1)
       rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.6)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    arel (2.0.9)
     aruba (0.2.6)
       background_process
       cucumber (~> 0.9.4)
@@ -93,9 +93,9 @@ GEM
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
-    mail (2.2.11)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
-      i18n (~> 0.5.0)
+      i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
@@ -103,22 +103,22 @@ GEM
       rake
     nokogiri (1.4.4)
     polyglot (0.3.1)
-    rack (1.2.1)
+    rack (1.2.2)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
@@ -147,7 +147,7 @@ GEM
     sinatra (1.1.2)
       rack (~> 1.1)
       tilt (~> 1.2)
-    sqlite3-ruby (1.3.2)
+    sqlite3 (1.3.3)
     term-ansicolor (1.0.5)
     thin (1.2.7)
       daemons (>= 1.0.9)
@@ -158,7 +158,7 @@ GEM
     timecop (0.3.5)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.25)
     xpath (0.1.3)
       nokogiri (~> 1.3)
 
@@ -185,6 +185,6 @@ DEPENDENCIES
   sham_rack
   shoulda
   sinatra
-  sqlite3-ruby
+  sqlite3
   thin
   timecop

data/app/controllers/accounts_controller.rb

@@ -16,6 +16,7 @@ class AccountsController < ApplicationController
     @signup.plan = @plan
     if @signup.save
       flash[:success] = "Account was created."
+      flash[:signup_plan_id] = @plan.id
       sign_in @signup.user
       redirect_to root_url
     else

data/app/controllers/plans_controller.rb

@@ -14,6 +14,7 @@ class PlansController < ApplicationController
     @plans = Plan.ordered
     @account = current_account
     if @account.save_customer_and_subscription!(params[:account])
+      flash[:upgrade_plan_id] = @account.plan_id
       redirect_to edit_account_path(@account), :notice => t('.update.notice', :default => "Plan changed successfully")
     else
       render :edit

data/spec/controllers/accounts_controller_spec.rb

@@ -60,6 +60,10 @@ describe AccountsController, "successful create for a confirmed user" do
   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 "sets the plan id in the flash" do
+    flash[:signup_plan_id].should == plan.id
+  end
 end
 
 describe AccountsController, "failed create" do

data/spec/controllers/plans_controller_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe PlansController, "successful update", :as => :account_admin do
+  before do
+    Account.stubs(:find_by_keyword! => account)
+    account.stubs(:save_customer_and_subscription! => true)
+    put :update, :account_id => account.to_param
+  end
+
+  it "sets the upgraded plan id in the flash" do
+    flash[:upgrade_plan_id].should == account.plan_id
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 67
+  hash: 65
   prerelease: 
   segments: 
   - 0
   - 2
-  - 42
-  version: 0.2.42
+  - 43
+  version: 0.2.43
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,12 +18,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-11 00:00:00 -05:00
+date: 2011-03-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -33,12 +33,12 @@ dependencies:
         - 1
         - 2
         version: "1.2"
-  requirement: *id001
-  prerelease: false
+  version_requirements: *id001
   name: formtastic
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -49,12 +49,12 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
-  requirement: *id002
-  prerelease: false
+  version_requirements: *id002
   name: railties
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -65,12 +65,12 @@ dependencies:
         - 6
         - 2
         version: 2.6.2
-  requirement: *id003
-  prerelease: false
+  version_requirements: *id003
   name: braintree
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -81,12 +81,12 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
-  requirement: *id004
-  prerelease: false
+  version_requirements: *id004
   name: sham_rack
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -97,12 +97,12 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
-  requirement: *id005
-  prerelease: false
+  version_requirements: *id005
   name: sinatra
+  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -113,9 +113,9 @@ dependencies:
         - 2
         - 6
         version: 0.2.6
-  requirement: *id006
-  prerelease: false
+  version_requirements: *id006
   name: aruba
+  prerelease: false
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
 executables: []
@@ -237,6 +237,7 @@ files:
 - spec/controllers/application_controller_spec.rb
 - spec/controllers/invitations_controller_spec.rb
 - spec/controllers/memberships_controller_spec.rb
+- spec/controllers/plans_controller_spec.rb
 - spec/controllers/profiles_controller_spec.rb
 - spec/controllers/projects_controller_spec.rb
 - spec/environment.rb
@@ -291,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: Clearance-based Rails engine for SaaS