saucy 0.5.5 → 0.6.0

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+0.6.0
+
+Upgrading to, and making an explicit dependency on Clearance ~> 0.11.0. You can
+get an overview of the important changes to clearance here:
+
+    https://github.com/thoughtbot/clearance/wiki/upgrading-clearance
+
 0.5.5
 
 Fixes for account and project keywords containing special characters, generated by signup

data/Gemfile

@@ -5,7 +5,7 @@ gem "rake"
 gem "rspec-rails", :require => false
 gem "rails", ">= 3.0.3"
 gem "thin"
-gem "clearance", :git => "git://github.com/thoughtbot/clearance.git", :require => false
+gem "clearance", "~> 0.11.0"
 gem "shoulda", :require => false
 gem "bourne", :require => false
 gem "sqlite3", :require => false

data/Gemfile.lock

@@ -1,10 +1,3 @@
-GIT
-  remote: git://github.com/thoughtbot/clearance.git
-  revision: 7fb410051e0e7cce758883c98ec7b13824265cd0
-  specs:
-    clearance (0.9.1)
-      rails (~> 3.0.0)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -57,6 +50,9 @@ GEM
     celerity (0.8.8)
     childprocess (0.1.7)
       ffi (~> 0.6.3)
+    clearance (0.11.1)
+      diesel (~> 0.1.4)
+      rails (~> 3.0.0)
     configuration (1.2.0)
     cucumber (0.9.4)
       builder (~> 2.1.2)
@@ -69,6 +65,8 @@ GEM
     culerity (0.2.15)
     daemons (1.1.0)
     database_cleaner (0.6.0)
+    diesel (0.1.4)
+      railties (~> 3.0.3)
     diff-lcs (1.1.2)
     dynamic_form (1.1.3)
     erubis (2.6.6)
@@ -170,7 +168,7 @@ DEPENDENCIES
   bourne
   braintree
   capybara
-  clearance!
+  clearance (~> 0.11.0)
   cucumber
   cucumber-rails
   database_cleaner

data/app/controllers/accounts_controller.rb

@@ -1,5 +1,5 @@
 class AccountsController < ApplicationController
-  before_filter :authenticate, :only => [:index, :edit, :update]
+  before_filter :authorize, :only => [:index, :edit, :update]
   before_filter :authorize_admin, :except => [:new, :create, :index]
   before_filter :ensure_active_account, :only => [:edit, :update]
   layout Saucy::Layouts.to_proc

data/app/controllers/invitations_controller.rb

@@ -1,7 +1,7 @@
 class InvitationsController < ApplicationController
   before_filter :authorize_admin, :except => [:show, :update]
   before_filter :ensure_account_within_users_limit, :only => [:new, :create]
-  skip_before_filter :authenticate, :only => [:show, :update]
+  skip_before_filter :authorize, :only => [:show, :update]
   layout Saucy::Layouts.to_proc
 
   def new

data/app/controllers/profiles_controller.rb

@@ -1,7 +1,7 @@
 class ProfilesController < ApplicationController
   layout Saucy::Layouts.to_proc
 
-  before_filter :authenticate
+  before_filter :authorize
 
   def edit
     @user = current_user

data/app/models/invitation.rb

@@ -8,8 +8,7 @@ class Invitation < ActiveRecord::Base
   before_create :generate_code
   after_create :deliver_invitation
 
-  attr_accessor :new_user_name, :new_user_password,
-    :new_user_password_confirmation, :authenticating_user_password, :existing_user
+  attr_accessor :new_user_name, :new_user_password, :authenticating_user_password, :existing_user
   attr_writer :new_user_email, :authenticating_user_email
   attr_protected :account_id, :used
   attr_reader :user
@@ -79,7 +78,6 @@ class Invitation < ActiveRecord::Base
     User.new(
       :email                 => new_user_email,
       :password              => new_user_password,
-      :password_confirmation => new_user_password_confirmation,
       :name                  => new_user_name
     )
   end

data/app/models/signup.rb

@@ -111,7 +111,6 @@ class Signup
 
   def populate_additional_user_fields
     user.name = short_name
-    user.password_confirmation = password
   end
 
   def delegate_attributes_for(model_name)

data/app/views/invitations/show.html.erb

@@ -8,7 +8,6 @@
     <%= form.input :new_user_email, :label => 'Email' %>
     <%= form.input :new_user_name, :label => 'Name' %>
     <%= form.input :new_user_password, :label => 'Password' %>
-    <%= form.input :new_user_password_confirmation, :label => 'Confirm password' %>
   <% end -%>
 
   <h5 class="legend">I am an existing user</h5>

data/app/views/profiles/_inputs.html.erb

@@ -1,6 +1,5 @@
 <%= form.inputs do %>
   <%= form.input :email %>
   <%= form.input :password %>
-  <%= form.input :password_confirmation, :label => "Confirm password", :required => true %>
 <% end %>
 

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

@@ -27,7 +27,6 @@
 
     <%= form.inputs do %>
       <%= form.input :password, :label => "New password", :required => true %>
-      <%= form.input :password_confirmation, :label => "Confirm password", :required => true %>
     <% end %>
 
     <%= form.buttons do %>

data/features/step_definitions/clearance_steps.rb

@@ -2,8 +2,8 @@ When /^I bootstrap the application for clearance$/ do
   steps %{
     When I remove the file "public/index.html"
     And I successfully run "rails generate cucumber:install"
-    And I successfully run "rails generate clearance"
-    And I successfully run "rails generate clearance_features"
+    And I successfully run "rails generate clearance:install"
+    And I successfully run "rails generate clearance:features"
     And I configure ActionMailer to use "www.example.com" as a host
     And I add flash messages to the layout
     And I add session links to the layout

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

@@ -21,7 +21,7 @@ DESC
       end
 
       def remove_conflicting_files
-        remove_file "features/sign_up.feature"
+        remove_file "features/clearance/visitor_signs_up.feature"
         remove_file "spec/factories/clearance.rb"
         remove_file "test/factories/clearance.rb"
       end

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

@@ -10,7 +10,6 @@ Factory.define :user do |user|
   user.name                  { "test user" }
   user.email                 { Factory.next :email }
   user.password              { "password" }
-  user.password_confirmation { "password" }
 end
 
 Factory.define :account do |f|

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

@@ -23,7 +23,6 @@ Feature: Managing users
     And I fill in the following new user:
       | Name             | Billy  |
       | Password         | secret |
-      | Confirm password | secret |
     And I press "Accept Invitation"
     Then I should be signed in
     And "invitee@example.com" should be a member of the "See me" project
@@ -34,8 +33,8 @@ Feature: Managing users
 
   Scenario: Invite existing user who is not signed in
     Given the following user exists:
-      | email               | password | password confirmation |
-      | invitee@example.com | secret   | secret                |
+      | email               | password |
+      | invitee@example.com | secret   |
     When I follow "Invite user"
     And I fill in "Email" with "invitee@example.com"
     And I press "Invite User"
@@ -50,8 +49,8 @@ Feature: Managing users
 
   Scenario: Invite existing user who is signed in
     Given the following user exists:
-      | email               | password | password confirmation |
-      | invitee@example.com | secret   | secret                |
+      | email               | password |
+      | invitee@example.com | secret   |
     When I follow "Invite user"
     And I fill in "Email" with "invitee@example.com"
     And I press "Invite User"
@@ -72,8 +71,8 @@ Feature: Managing users
 
   Scenario: Invite admin users
     Given the following user exists:
-      | email               | password | password confirmation |
-      | invitee@example.com | secret   | secret                |
+      | email               | password |
+      | invitee@example.com | secret   |
     When I follow "Invite user"
     And I fill in "Email" with "invitee@example.com"
     And I check "Grant administrator privileges"

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

@@ -20,7 +20,7 @@ end
 
 When /^I sign in as "([^"\/]*)"$/ do |email|
   user = User.find_by_email!(email)
-  user.update_attributes!(:password => 'test', :password_confirmation => 'test')
+  user.update_attributes!(:password => 'test')
   When %{I sign in as "#{email}/test"}
 end
 

data/lib/saucy/projects_controller.rb

@@ -3,7 +3,7 @@ module Saucy
     extend ActiveSupport::Concern
 
     included do
-      before_filter :authenticate
+      before_filter :authorize
       before_filter :authorize_member,      :only   => :show
       before_filter :authorize_admin,       :except => [:show]
       before_filter :ensure_active_account, :only   => [:show, :destroy, :index]

data/lib/saucy/user.rb

@@ -3,7 +3,7 @@ module Saucy
     extend ActiveSupport::Concern
 
     included do
-      attr_accessible :name, :project_ids, :email, :password_confirmation, :password
+      attr_accessible :name, :project_ids, :email, :password
       has_many :memberships
       has_many :accounts, :through => :memberships
       has_many :permissions

data/spec/models/invitation_spec.rb

@@ -10,8 +10,7 @@ describe Invitation do
   it { should_not allow_mass_assignment_of(:account_id) }
   it { should_not allow_mass_assignment_of(:used) }
 
-  %w(new_user_name new_user_email new_user_password
-     new_user_password_confirmation authenticating_user_password).each do |attribute|
+  %w(new_user_name new_user_email new_user_password authenticating_user_password).each do |attribute|
     it "allows assignment of #{attribute}" do
       should respond_to(attribute)
       should respond_to(:"#{attribute}=")
@@ -74,9 +73,7 @@ describe Invitation, "valid accept for a new user" do
   subject { Factory(:invitation, :account => account, :projects => projects) }
 
   let!(:result) do
-    subject.accept(:new_user_password              => password,
-                   :new_user_password_confirmation => password,
-                   :new_user_name                  => name)
+    subject.accept(:new_user_password => password, :new_user_name => name)
   end
 
   let(:user) { subject.user }
@@ -131,9 +128,7 @@ end
 
 describe Invitation, "valid accept for an existing user authenticating" do
   let(:password) { 'secret' }
-  let(:user)     { Factory(:user,
-                           :password              => password,
-                           :password_confirmation => password) }
+  let(:user)     { Factory(:user, :password => password) }
   subject        { Factory(:invitation, :email => user.email) }
   let(:account)  { subject.account }
 
@@ -242,9 +237,7 @@ describe Invitation, "valid accept for a new user" do
   subject { Factory(:invitation, :account => account, :projects => projects) }
 
   let!(:result) do
-    subject.accept(:new_user_password              => password,
-                   :new_user_password_confirmation => password,
-                   :new_user_name                  => name)
+    subject.accept(:new_user_password => password, :new_user_name => name)
   end
 
   let(:user) { subject.user }
@@ -313,9 +306,7 @@ end
 
 describe Invitation, "accepting an admin invite" do
   let(:password) { 'secret' }
-  let(:user)     { Factory(:user,
-                           :password              => password,
-                           :password_confirmation => password) }
+  let(:user)     { Factory(:user, :password => password) }
   subject        { Factory(:invitation, :email => user.email, :admin => true) }
   let(:account)  { subject.account }
 

data/spec/models/signup_spec.rb

@@ -124,9 +124,7 @@ describe Signup, "valid with an existing user and correct password" do
   it_should_behave_like "valid signup"
   let(:email) { "user@example.com" }
   let(:password) { "test" }
-  let!(:user) { Factory(:user, :email                 => email,
-                               :password              => password,
-                               :password_confirmation => password) }
+  let!(:user) { Factory(:user, :email => email, :password => password) }
   subject { Factory.build(:signup, :email => email, :password => password) }
   before { @result = subject.save }
 
@@ -160,9 +158,7 @@ describe Signup, "valid with an existing user and incorrect 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) }
+  let!(:user) { Factory(:user, :email => email, :password => password) }
   subject { Factory.build(:signup, :email => email, :password => 'wrong') }
   before { @result = subject.save }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: saucy
 version: !ruby/object:Gem::Version 
-  hash: 1
+  hash: 7
   prerelease: false
   segments: 
   - 0
-  - 5
-  - 5
-  version: 0.5.5
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - thoughtbot, inc.
@@ -18,13 +18,29 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 -04:00
+date: 2011-05-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: formtastic
+  name: clearance
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 11
+        - 0
+        version: 0.11.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: formtastic
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -35,11 +51,11 @@ dependencies:
         - 2
         version: "1.2"
   type: :runtime
-  version_requirements: *id001
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: railties
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -51,11 +67,11 @@ dependencies:
         - 3
         version: 3.0.3
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: braintree
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -67,11 +83,11 @@ dependencies:
         - 2
         version: 2.6.2
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: sham_rack
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -83,11 +99,11 @@ dependencies:
         - 3
         version: 1.3.3
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sinatra
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -99,11 +115,11 @@ dependencies:
         - 2
         version: 1.1.2
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: aruba
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -115,7 +131,7 @@ dependencies:
         - 6
         version: 0.2.6
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 description: Clearance-based Rails engine for Software as a Service (Saas) that provides account and project management
 email: support@thoughtbot.com
 executables: []