saucy 0.14.5 → 0.15.0

data/.gitignore

@@ -1,6 +1,8 @@
+.bundle
 ~
 *.swp
 *.swo
 tmp
 pkg
 *.gem
+tags

data/CHANGELOG.md

@@ -1,8 +1,15 @@
+0.15.0
+
+* Signup accepts a "quick" flag that will cause existing users to sign in instead of creating a new account.
+
 0.14.5
 
 * Upgrade to clearance 0.14.0. (Motivated by getting rid of some redundant flashes)
 * Remove Account and Project creation flashes
 
+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 as they have been changed to account for certain flash messages no longer being present.
+
 0.14.3
 
 * Redirect to upgrade page if beyond limit

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    saucy (0.14.4)
+    saucy (0.15.0)
       airbrake (~> 3.0.4)
       braintree (>= 2.6.2)
       clearance (~> 0.14.0)
@@ -171,13 +171,13 @@ GEM
       rack
     shoulda-matchers (1.0.0)
     sinatra (1.3.2)
-      rack (>= 1.3.6, ~> 1.3)
+      rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
-      tilt (>= 1.3.3, ~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
     sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (!= 1.3.0, ~> 1.1)
+      tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
     term-ansicolor (1.0.7)
     thin (1.2.11)

data/app/models/signup.rb

@@ -29,7 +29,8 @@ class Signup
 
   attr_accessor :billing_email, :password, :cardholder_name, :email,
     :card_number, :expiration_month, :expiration_year, :plan, :verification_code, :coupon,
-    :street_address, :extended_address, :locality, :region, :postal_code, :country_name
+    :street_address, :extended_address, :locality, :region, :postal_code, :country_name,
+    :quick
 
   def initialize(attributes = {})
     if attributes
@@ -69,7 +70,7 @@ class Signup
   end
 
   def account
-    @account ||= Account.new
+    @account ||= existing_account_in_quick_mode || Account.new
   end
 
   def user
@@ -161,12 +162,30 @@ class Signup
     end
   end
 
+  def existing_account_in_quick_mode
+     if quick?
+       existing_account
+     end
+  end
+
+  def quick?
+    quick
+  end
+
+  def existing_account
+    if existing_user
+      existing_user.accounts.first
+    end
+  end
+
   def save!
     account.coupon = coupon
     Account.transaction do
       account.save!
       user.save!
-      membership.save!
+      unless existing_account_in_quick_mode
+        membership.save!
+      end
     end
   end
 end

data/lib/saucy/version.rb

@@ -1,3 +1,3 @@
 module Saucy
-  VERSION = '0.14.5'
+  VERSION = '0.15.0'
 end

data/spec/models/signup_spec.rb

@@ -152,7 +152,11 @@ describe Signup, "valid with a signed in user" do
   it_should_behave_like "valid signup"
   let!(:user) { Factory(:user) }
   subject { Factory.build(:signup, :user => user, :password => '') }
-  before { @result = subject.save }
+
+  before do
+    Factory(:membership, :user => user)
+    @result = subject.save
+  end
 
   it "doesn't create a user" do
     User.count.should == 1
@@ -200,3 +204,40 @@ describe Signup, "with coupon" do
     subject.account.reload.coupon.should == coupon
   end
 end
+
+describe Signup, "in quick mode with existing email" do
+  it_should_behave_like "valid signup"
+  let(:email) { "user@example.com" }
+  let(:password) { "test" }
+  let!(:account) { Factory(:account) }
+  let!(:user) { Factory(:user, :email => email, :password => password) }
+  subject { Factory.build(:signup, :email => email, :password => password, :quick => true) }
+
+  before do
+    Factory(:membership, :user => user, :account => account)
+    @result = subject.save
+  end
+
+  it "doesn't create a user" do
+    User.count.should == 1
+  end
+
+  it "uses the user's existing account" do
+    user.reload.accounts.should == [account]
+  end
+end
+
+describe Signup, "in quick mode with unknown email" do
+  it_should_behave_like "valid signup"
+  let(:email) { "user@example.com" }
+  subject { Factory.build(:signup, :email => email, :quick => true) }
+  before { @result = subject.save }
+
+  it "saves the user" do
+    subject.user.should be_persisted
+  end
+
+  it "assigns the user to a new account" do
+    subject.user.reload.accounts.should include(subject.account)
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 35
   prerelease: 
   segments: 
   - 0
-  - 14
-  - 5
-  version: 0.14.5
+  - 15
+  - 0
+  version: 0.15.0
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -20,12 +20,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-01-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: clearance
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -36,12 +34,12 @@ dependencies:
         - 14
         - 0
         version: 0.14.0
+  requirement: *id001
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: formtastic
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: clearance
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -52,12 +50,12 @@ dependencies:
         - 2
         - 4
         version: 1.2.4
+  requirement: *id002
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: railties
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: formtastic
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -68,12 +66,12 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
+  requirement: *id003
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: braintree
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: railties
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -84,12 +82,12 @@ dependencies:
         - 6
         - 2
         version: 2.6.2
+  requirement: *id004
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: sham_rack
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: braintree
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -100,12 +98,12 @@ dependencies:
         - 3
         - 3
         version: 1.3.3
+  requirement: *id005
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: sham_rack
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -116,12 +114,12 @@ dependencies:
         - 1
         - 2
         version: 1.1.2
+  requirement: *id006
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: airbrake
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: sinatra
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -132,12 +130,12 @@ dependencies:
         - 0
         - 4
         version: 3.0.4
+  requirement: *id007
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: aruba
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: airbrake
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -147,12 +145,12 @@ dependencies:
         - 0
         - 4
         version: "0.4"
+  requirement: *id008
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: shoulda-matchers
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: aruba
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -163,12 +161,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  requirement: *id009
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: bourne
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  name: shoulda-matchers
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -177,12 +175,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id010
   type: :development
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  name: bourne
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -191,12 +189,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id011
   type: :development
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: factory_girl
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  name: sqlite3
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -205,12 +203,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id012
   type: :development
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: timecop
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  name: factory_girl
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -219,12 +217,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id013
   type: :development
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  name: timecop
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -233,12 +231,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id014
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  name: rake
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -249,12 +247,12 @@ dependencies:
         - 0
         - 6
         version: 1.0.6
+  requirement: *id015
   type: :development
-  version_requirements: *id015
-- !ruby/object:Gem::Dependency 
-  name: rspec-rails
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  name: cucumber
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -263,12 +261,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id016
   type: :development
-  version_requirements: *id016
-- !ruby/object:Gem::Dependency 
-  name: rails
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  name: rspec-rails
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -279,12 +277,12 @@ dependencies:
         - 0
         - 3
         version: 3.0.3
+  requirement: *id017
   type: :development
-  version_requirements: *id017
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id018 !ruby/object:Gem::Requirement 
+  name: rails
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -293,8 +291,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id018
   type: :development
-  version_requirements: *id018
+  prerelease: false
+  name: thin
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
 executables: []
@@ -304,7 +304,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .bundle/config
 - .gitignore
 - .rspec
 - CHANGELOG.md
@@ -463,7 +462,7 @@ files:
 - spec/environment.rb
 - spec/layouts_spec.rb
 - spec/mailers/billing_mailer_spec.rb
-- spec/mailers/invitiation_mailer_spec.rb
+- spec/mailers/invitation_mailer_spec.rb
 - spec/models/account_spec.rb
 - spec/models/canceled_account_spec.rb
 - spec/models/coupon_spec.rb
@@ -546,7 +545,7 @@ test_files:
 - spec/environment.rb
 - spec/layouts_spec.rb
 - spec/mailers/billing_mailer_spec.rb
-- spec/mailers/invitiation_mailer_spec.rb
+- spec/mailers/invitation_mailer_spec.rb
 - spec/models/account_spec.rb
 - spec/models/canceled_account_spec.rb
 - spec/models/coupon_spec.rb

data/.bundle/config

@@ -1,2 +0,0 @@
---- {}
-