saucy 0.5.1 → 0.5.2

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+0.5.2
+
+Simplifies the signup process to asking users for just an email and password. 
+Overall this should be seamless upgrade but you may have made other changes in
+your application which might conflict, just pay attention when you upgrade.
+
+You'll defintely want to make sure you regerate the saucy features with this upgrade:
+
+    rails g saucy:features
+
 0.5.1
 
 Add an index to the archived column for projects
@@ -17,8 +27,8 @@ account. An introduced headers to these two lists. Archived projects have
 a "View Project" link, which is how the user can view an archived project. 
 You will probably want to style this list, headers, and link.
 
-It also adds an Archive link on the project's edit page. You will probably
-want to style this link.
+It also adds an Archive/Unarchive link on the project's edit page. You will probably
+want to style these links.
 
 It is up to your application to provide any additional logic about what
 limitations are present for archived projects (for example, not being able to

data/app/models/signup.rb

@@ -7,8 +7,6 @@ class Signup
 
   FIELDS = {
     :account => {
-      :name    => :account_name,
-      :keyword => :keyword,
       :cardholder_name => :cardholder_name, 
       :billing_email => :billing_email, 
       :card_number => :card_number, 
@@ -18,16 +16,13 @@ class Signup
       :plan => :plan
     },
     :user => {
-      :name                  => :user_name,
-      :email                 => :email,
-      :password              => :password,
-      :password_confirmation => :password_confirmation,
+      :email    => :email,
+      :password => :password,
     }
   }.freeze
 
-  attr_accessor :account_name, :keyword, :user_name, :billing_email, :password,
-    :password_confirmation, :cardholder_name, :email, :card_number, 
-    :expiration_month, :expiration_year, :plan, :verification_code
+  attr_accessor :billing_email, :password, :cardholder_name, :email, 
+    :card_number, :expiration_month, :expiration_year, :plan, :verification_code
 
   def initialize(attributes = {})
     if attributes
@@ -45,7 +40,12 @@ class Signup
 
   def save
     delegate_attributes_for(:account)
-    delegate_attributes_for(:user) unless existing_user
+    populate_additional_account_fields
+
+    if !existing_user
+      delegate_attributes_for(:user) 
+      populate_additional_user_fields
+    end
 
     if valid?
       begin
@@ -94,11 +94,21 @@ class Signup
     errors.empty?
   end
 
-  def email_confirmed?
-    user.email_confirmed?
+  private
+
+  def short_name
+    email.split(/@/).first if email.present?
+  end
+
+  def populate_additional_account_fields
+    account.name = "#{short_name}"
+    account.keyword = "#{short_name}#{SecureRandom.hex(3)}"
   end
 
-  private
+  def populate_additional_user_fields
+    user.name = short_name
+    user.password_confirmation = password
+  end
 
   def delegate_attributes_for(model_name)
     FIELDS[model_name].each do |target, source|
@@ -115,7 +125,7 @@ class Signup
   def delegate_errors_for(model_name)
     fields = FIELDS[model_name]
     send(model_name).errors.each do |field, message|
-      errors.add(fields[field], message)
+      errors.add(fields[field], message) if fields[field]
     end
   end
 

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

@@ -1,5 +1,5 @@
 <% content_for :header do -%>
-  <h2>Settings for <span><%= current_account.name %></span></h2>
+  <h2>Account Settings</h2>
 <% end -%>
 
 <%= render :partial => 'subnav' %>

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

@@ -9,20 +9,14 @@
     <%= link_to "Change this plan", plans_path %>
   </div>
 
-  <h5 class="legend">Basic Information</h5>
-  <%= form.inputs do %>
-    <%= form.input :account_name, :label => 'Company Name', :hint => account_url(Account.new(:keyword => 'keyword')).html_safe, :required => true %>
-    <%= form.input :keyword, :wrapper_html => { :style => 'display: none' } %>
-  <% end %>
-
   <% unless signed_in? -%>
     <h5 class="legend">User Information</h5>
     <%= form.inputs do %>
-      <%= form.input :user_name, :label => "Your name", :required => true  %>
       <%= form.input :email, :required => true  %>
       <%= form.input :password, :required => true  %>
-      <%= form.input :password_confirmation, :label => "Confirm password", :required => true %>
     <% end -%>
+  <% else -%>
+    <p id="existing-user-text">Your existing user, <strong><%= current_user.name %></strong>, will be added as the first administrator on this new account.</p>
   <% end -%>
 
   <% if @plan.billed? -%>

data/app/views/shared/_saucy_javascript.html.erb

@@ -1,15 +1,15 @@
 <%= content_for :javascript do -%>
   <%= javascript_tag do %>
     $(function() {
-      $('#signup_account_name_input p.inline-hints, #project_name_input p.inline-hints').each(function(index) {
+      $('#project_name_input p.inline-hints').each(function(index) {
         $(this).html($(this).text().replace("keyword", "<span>keyword</span>"))
       });
-      $('#signup_account_name, #project_name').keyup(function(){
+      $('#project_name').keyup(function(){
         var mainPart = /^([\w\s]*)(\W*)/.exec($(this).val())[1];
         mainPart = mainPart.replace(/ /g, "").toLowerCase();
         if(mainPart == "") mainPart = "keyword";
         $(this).siblings('p.inline-hints').find('span').text(mainPart);
-        $('#signup_keyword, #project_keyword').val(mainPart);
+        $('#project_keyword').val(mainPart);
       });
 
       $.fn.updateSelectedPlan = function() {

data/lib/generators/saucy/features/features_generator.rb

@@ -54,8 +54,9 @@ DESC
     when /^the upgrade plan page for the "([^"]+)" account$/
       account = Account.find_by_name!($1)
       edit_account_plan_path(account)
-    when /^the new project page for the "([^"]+)" account$/
-      account = Account.find_by_name!($1)
+    when /^the new project page for the newest account by "([^"]*)"$/
+      user = User.find_by_email!($1)
+      account = user.accounts.order("created_at desc").first
       new_account_project_path(account)
         PATHS
 

data/lib/generators/saucy/features/templates/factories.rb

@@ -25,12 +25,8 @@ Factory.define :membership do |f|
 end
 
 Factory.define :signup do |f|
-  f.account_name          { Factory.next(:name) }
-  f.keyword               { Factory.next(:name) }
-  f.user_name             { "test user" }
   f.email                 { Factory.next :email }
   f.password              { "password" }
-  f.password_confirmation { "password" }
   f.association           :plan
 end
 

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

@@ -8,7 +8,6 @@ Feature: Manage account
     And I am signed in as an admin of the "Test" account
     When I go to the settings page
     And I follow "Test"
-    Then I should see "Settings for Test"
     When I fill in "Account name" with "Name Change"
     And I press "Update"
     When I follow "Name Change"

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

@@ -90,5 +90,4 @@ Feature: Manage Billing
     And I follow "Change"
     And I follow "Billing"
     And I follow "Account Info"
-    Then I should see "Settings for Test"
-
+    Then I should be on the settings page for the "Test" account

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

@@ -8,41 +8,26 @@ Feature: user adds a new account
     When I go to the sign up page for the "Free" plan
     And I fill in "Email" with "user@example.com"
     And I fill in "Password" with "test"
-    And I fill in "Company Name" with "Robots"
-    And I fill in "Keyword" with "robots"
-    And I should see "http://www.example.com/accounts/keyword"
     And I press "Sign up"
     Then I should see "created"
     But I should not see "Instructions for confirming"
-    And I should be on the new project page for the "Robots" account
-    When I go to the settings page
-    And I follow "Robots"
-    Then the "Keyword" field should contain "robots"
+    And I should be on the new project page for the newest account by "user@example.com"
 
   Scenario: sign up for two accounts
     When I go to the sign up page for the "Free" plan
     And I fill in "Email" with "email@person.com"
     And I fill in "Password" with "password"
-    And I fill in "Confirm password" with "password"
-    And I fill in "Your name" with "Robot"
-    And I fill in "Company Name" with "Robots, Inc"
-    And I fill in "Keyword" with "robots"
     And I press "Sign up"
     Then I should see "created"
-    And I should be on the new project page for the "Robots, Inc" account
-    When I go to the settings page
-    And I follow "Robots, Inc"
-    Then the "Keyword" field should contain "robots"
+    And I should be on the new project page for the newest account by "email@person.com"
     When I go to the settings page
+    Then I should see 1 account
     And I follow "Add new account"
     And I follow "Free"
-    And I fill in "Company Name" with "Machines"
-    And I fill in "Keyword" with "machines"
+    Then I should see "Your existing user, email, will be added as the first administrator on this new account."
     And I press "Sign up"
     Then I should see "created"
     But I should not see "Instructions for confirming"
-    And I should be on the new project page for the "Machines" account
+    And I should be on the new project page for the newest account by "email@person.com"
     When I go to the settings page
-    And I follow "Machines"
-    Then the "Keyword" field should contain "machines"
-
+    Then I should see 2 accounts

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

@@ -19,7 +19,6 @@ Feature: Sign up
     Then I should see "Free"
     And I fill in "Email" with "invalidemail"
     And I fill in "Password" with "password"
-    And I fill in "Confirm password" with ""
     And I should not see "Billing Information"
     And I press "Sign up"
     Then the form should have inline error messages
@@ -29,9 +28,5 @@ Feature: Sign up
     And I follow "Free"
     And I fill in "Email" with "email@person.com"
     And I fill in "Password" with "password"
-    And I fill in "Confirm password" with "password"
-    And I fill in "Your name" with "Robot"
-    And I fill in "Company Name" with "Robots, Inc"
-    And I fill in "Keyword" with "robotsinc"
     And I press "Sign up"
     Then I should see "created"

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

@@ -15,7 +15,6 @@ Feature: Sign up
     And the "Verification code" field should have autocomplete off
     And I fill in "Email" with "invalidemail"
     And I fill in "Password" with "password"
-    And I fill in "Confirm password" with ""
     And I should see "Billing Information"
     And I press "Sign up"
     Then the form should have inline error messages
@@ -26,10 +25,6 @@ Feature: Sign up
     When I follow "Paid"
     And I fill in "Email" with "email@person.com"
     And I fill in "Password" with "password"
-    And I fill in "Confirm password" with "password"
-    And I fill in "Your name" with "Robot"
-    And I fill in "Company Name" with "Robots, Inc"
-    And I fill in "Keyword" with "robotsinc"
     And I fill in "Cardholder name" with "Ralph Robot"
     And I fill in "Billing email" with "accounting@example.com"
     And I fill in "Card number" with "4111111111111111"
@@ -45,10 +40,6 @@ Feature: Sign up
     And I follow "Paid"
     And I fill in "Email" with "email@person.com"
     And I fill in "Password" with "password"
-    And I fill in "Confirm password" with "password"
-    And I fill in "Your name" with "Robot"
-    And I fill in "Company Name" with "Robots, Inc"
-    And I fill in "Keyword" with "robotsinc"
     And I fill in "Cardholder name" with "Ralph Robot"
     And I fill in "Billing email" with "accounting@example.com"
     And I fill in "Card number" with "4111112"
@@ -64,10 +55,6 @@ Feature: Sign up
     And I follow "Paid"
     And I fill in "Email" with "email@person.com"
     And I fill in "Password" with "password"
-    And I fill in "Confirm password" with "password"
-    And I fill in "Your name" with "Robot"
-    And I fill in "Company Name" with "Robots, Inc"
-    And I fill in "Keyword" with "robotsinc"
     And I fill in "Cardholder name" with "Ralph Robot"
     And I fill in "Billing email" with "accounting@example.com"
     And I fill in "Card number" with "4111111111111111"

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

@@ -19,10 +19,6 @@ Feature: Trial plans
     But I should not see "users"
     When I fill in "Email" with "email@person.com"
     And I fill in "Password" with "password"
-    And I fill in "Confirm password" with "password"
-    And I fill in "Your name" with "Robot"
-    And I fill in "Company Name" with "Robots, Inc"
-    And I fill in "Keyword" with "robotsinc"
     And I press "Sign up"
     Then I should see "created"
 
@@ -73,4 +69,4 @@ Feature: Trial plans
     Then an email with subject "A check in" should be sent to "admin@example.com"
     When I sign in as "admin@example.com/password"
     And I follow the link sent to "admin@example.com" with subject "A check in"
-    Then I should be on the new project page for the "Test" account
+    Then I should be on the new project page for the newest account by "admin@example.com"

data/lib/generators/saucy/features/templates/step_definitions/account_steps.rb

@@ -17,3 +17,14 @@ Given /^the following limit exists for the "([^"]*)" account:$/ do |account_name
     end
   end
 end
+
+When /^I follow "([^"]*)" for the "([^"]*)" account$/ do |link_text, account_name|
+  account = Account.find_by_name!(account_name)
+  within "##{dom_id(account)}" do
+    click_link link_text
+  end
+end
+
+Then /^I should see (\d+) accounts?$/ do |count|
+  page.all("#user_accounts li").size.should == count.to_i
+end

data/spec/models/signup_spec.rb

@@ -10,11 +10,10 @@ describe Signup do
 end
 
 describe Signup, "with attributes in the constructor" do
-  subject { Signup.new(:user_name => 'Joe', :account_name => 'blokes', :keyword => 'blk') }
+  subject { Signup.new(:email => 'person@example.com', :password => 'password') }
   it "assigns attributes" do
-    subject.user_name.should == 'Joe'
-    subject.account_name.should == 'blokes'
-    subject.keyword.should == 'blk'
+    subject.email.should == 'person@example.com'
+    subject.password.should == 'password'
   end
 end
 
@@ -22,8 +21,8 @@ describe Signup, "with nil to the constructor" do
   subject { Signup.new(nil) }
 
   it "assigns no attributes" do
-    subject.user_name.should be_blank
-    subject.account_name.should be_blank
+    subject.email.should be_blank
+    subject.password.should be_blank
   end
 end
 
@@ -73,45 +72,36 @@ describe Signup, "with a valid user and account" do
   it "creates an admin user" do
     subject.user.should be_admin_of(subject.account)
   end
-end
-
-describe Signup, "with a valid user but invalid account" do
-  it_should_behave_like "invalid signup"
-  subject { Factory.build(:signup, :account_name => "") }
 
-  before do
-    @result = subject.save
+  it "gives a friendly account name" do
+    subject.account.name.should == "user"
   end
 
-  it "adds error messages" do
-    subject.errors[:account_name].should_not be_empty
+  it "gives a friendly account keyword" do
+    p subject.account
+    subject.account.keyword.should =~ /^user.+/
   end
-end
-
-describe Signup, "with an invalid user but valid account" do
-  subject { Factory.build(:signup, :user_name => nil) }
-  it_should_behave_like "invalid signup"
 
-  before do
-    @result = subject.save
+  it "gives it's account a name and keyword" do
+    subject.account.name.should_not be_blank
+    subject.account.keyword.should_not be_blank
   end
 
-  it "adds error messages" do
-    subject.errors[:user_name].should_not be_empty
+  it "gives it's user a name that is the first part of it's email" do
+    subject.user.name.should == "user"
   end
 end
 
-describe Signup, "with an invalid user and nvalid account" do
-  subject { Factory.build(:signup, :user_name => nil, :account_name => nil) }
+describe Signup, "with an invalid user" do
+  subject { Factory.build(:signup, :email => nil) }
   it_should_behave_like "invalid signup"
 
   before do
     @result = subject.save
   end
 
-  it "adds error messages for both" do
-    subject.errors[:user_name].should_not be_empty
-    subject.errors[:account_name].should_not be_empty
+  it "adds error messages" do
+    subject.errors[:email].should_not be_empty
   end
 end
 
@@ -166,23 +156,6 @@ describe Signup, "valid with an existing user and incorrect password" do
   end
 end
 
-describe Signup, "invalid with an existing user and correct password" do
-  it_should_behave_like "invalid signup"
-  let(:email) { "user@example.com" }
-  let(:password) { "test" }
-  let!(:user) { Factory(:user, :email                 => email,
-                               :password              => password,
-                               :password_confirmation => password) }
-  subject { Factory.build(:signup, :account_name => '',
-                                   :email        => email,
-                                   :password     => password) }
-  before { @result = subject.save }
-
-  it "doesn't assign the user to the account" do
-    user.reload.accounts.should_not include(subject.account)
-  end
-end
-
 describe Signup, "with an account that doesn't save" do
   subject { Factory.build(:signup) }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-26 00:00:00 -04:00
+date: 2011-04-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency