quo_vadis 1.0.5 → 1.0.6

data/.gitignore

@@ -1,6 +1,8 @@
 pkg/*
 *.gem
+Gemfile.lock
 .bundle
 test/dummy/log/*
 test/dummy/tmp/*
 rdoc/*
+NOTES

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # CHANGELOG
 
 
+## 1.0.5 (23 February 2011)
+
+* Support blocking of sign-in process.
+
 ## 1.0.4 (22 February 2011)
 
 * Work with Rails' improved CSRF protection.

data/app/controllers/controller_mixin.rb

@@ -3,6 +3,8 @@ module ControllerMixin
     base.helper_method :current_user
   end
 
+  protected
+
   def handle_unverified_request
     super
     cookies.delete :remember_me
@@ -10,14 +12,9 @@ module ControllerMixin
 
   private
 
-  # Returns true if the sign-in process is blocked to the user, false otherwise.
-  def blocked?
-    QuoVadis.blocked?(self)
-  end
-
   # Remembers the authenticated <tt>user</tt> (in this session and future sessions).
   #
-  # If you want to sign in a <tt>user</tt>, call <tt>QuoVadis::SessionsController#sign_in</tt>
+  # If you want to sign in a <tt>user</tt> you have just created, call <tt>sign_in</tt>
   # instead.
   def current_user=(user)
     remember_user_in_session user
@@ -39,6 +36,24 @@ module ControllerMixin
     end
   end
 
+  # Signs in a user, i.e. remembers them in the session, runs the sign-in hook,
+  # and redirects appropriately.
+  #
+  # This method should be called when you have just authenticated a <tt>user</tt>
+  # and you need to sign them in.  For example, if a new user has just signed up,
+  # you should call this method to sign them in.
+  def sign_in(user)
+    prevent_session_fixation
+    self.current_user = user
+    QuoVadis.signed_in_hook user, self
+    redirect_to QuoVadis.signed_in_url(user, original_url)
+  end
+
+  # Returns true if the sign-in process is blocked to the user, false otherwise.
+  def blocked?
+    QuoVadis.blocked?(self)
+  end
+
   def remember_user_in_session(user) # :nodoc:
     session[:current_user_id] = user ? user.id : nil
   end
@@ -66,4 +81,21 @@ module ControllerMixin
   def find_user_by_session # :nodoc:
     User.find(session[:current_user_id]) if session[:current_user_id]
   end
+
+  # Returns the URL if any which the user tried to visit before being forced to authenticate.
+  def original_url
+    url = session[:quo_vadis_original_url]
+    session[:quo_vadis_original_url] = nil
+    url
+  end
+
+  def prevent_session_fixation # :nodoc:
+    original_flash = flash.inject({}) { |hsh, (k,v)| hsh[k] = v; hsh }
+    original_url = session[:quo_vadis_original_url]
+
+    reset_session
+
+    original_flash.each { |k,v| flash[k] = v }
+    session[:quo_vadis_original_url] = original_url
+  end
 end

data/app/controllers/quo_vadis/sessions_controller.rb

@@ -77,30 +77,8 @@ class QuoVadis::SessionsController < ApplicationController
     end
   end
 
-  protected
-
-  # Signs in a user, i.e. remembers them in the session, runs the sign-in hook,
-  # and redirects appropriately.
-  #
-  # This method should be called when you have just authenticated <tt>user</tt>
-  # and you need to sign them in.  For example, if a new user has just signed up,
-  # you should call this method to sign them in.
-  def sign_in(user)
-    prevent_session_fixation
-    self.current_user = user
-    QuoVadis.signed_in_hook user, self
-    redirect_to QuoVadis.signed_in_url(user, original_url)
-  end
-
   private
 
-  # Returns the URL if any which the user tried to visit before being forced to authenticate.
-  def original_url
-    url = session[:quo_vadis_original_url]
-    session[:quo_vadis_original_url] = nil
-    url
-  end
-
   def invalid_token # :nodoc:
     flash[:alert] = t('quo_vadis.flash.forgotten.invalid_token') unless t('quo_vadis.flash.forgotten.invalid_token').blank?
     redirect_to forgotten_sign_in_url
@@ -110,14 +88,4 @@ class QuoVadis::SessionsController < ApplicationController
     QuoVadis.layout
   end
 
-  def prevent_session_fixation # :nodoc:
-    original_flash = flash.inject({}) { |hsh, (k,v)| hsh[k] = v; hsh }
-    original_url = session[:quo_vadis_original_url]
-
-    reset_session
-
-    original_flash.each { |k,v| flash[k] = v }
-    session[:quo_vadis_original_url] = original_url
-  end
-
 end

data/lib/quo_vadis/version.rb

@@ -1,3 +1,3 @@
 module QuoVadis
-  VERSION = '1.0.5'
+  VERSION = '1.0.6'
 end

data/test/dummy/app/controllers/users_controller.rb

@@ -0,0 +1,17 @@
+class UsersController < ActionController::Base
+
+  def new
+    @user = User.new
+  end
+
+  def create
+    @user = User.new params[:user]
+    if @user.save
+      flash[:notice] = 'You have signed up!'
+      sign_in @user  # <-- Quo Vadis sign-in hook
+    else
+      render 'new'
+    end
+  end
+
+end

data/test/dummy/app/views/users/new.html.erb

@@ -0,0 +1,14 @@
+<h1>Sign up</h1>
+
+<%= form_for @user do |f| %>
+  <%= f.label :name %>
+  <%= f.text_field :name %>
+
+  <%= f.label :username %>
+  <%= f.text_field :username %>
+
+  <%= f.label :password %>
+  <%= f.password_field :password %>
+
+  <%= f.submit 'Sign up' %>
+<% end %>

data/test/dummy/config/routes.rb

@@ -1,4 +1,5 @@
 Dummy::Application.routes.draw do
   resources :articles
+  resources :users
   root :to => 'articles#index'
 end

data/test/integration/sign_up_test.rb

@@ -0,0 +1,21 @@
+require 'test_helper'
+
+class SignUpTest < ActiveSupport::IntegrationCase
+
+  test 'sign in of a just-signed-up user' do
+    visit new_user_path
+    fill_in 'user_name',     :with => 'Robert'
+    fill_in 'user_username', :with => 'bob'
+    fill_in 'user_password', :with => 'secret'
+    click_button 'Sign up'
+
+    assert_equal root_path, current_path
+
+    within '.flash.notice' do
+      assert page.has_content?('You have signed up!')
+    end
+
+    assert page.has_content?('You are signed in as Robert')
+  end
+
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: quo_vadis
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 1
   - 0
-  - 5
-  version: 1.0.5
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Andy Stewart
@@ -15,10 +15,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-23 00:00:00 +00:00
+date: 2011-10-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  name: rails
   prerelease: false
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
@@ -30,10 +31,10 @@ dependencies:
         - 3
         - 0
         version: "3.0"
-  requirement: *id001
-  name: rails
   type: :runtime
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
+  name: bcrypt-ruby
   prerelease: false
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -46,10 +47,10 @@ dependencies:
         - 1
         - 4
         version: 2.1.4
-  requirement: *id002
-  name: bcrypt-ruby
   type: :runtime
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
+  name: rails
   prerelease: false
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -62,10 +63,10 @@ dependencies:
         - 0
         - 4
         version: 3.0.4
-  requirement: *id003
-  name: rails
   type: :development
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
+  name: sqlite3-ruby
   prerelease: false
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -76,10 +77,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
-  name: sqlite3-ruby
   type: :development
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
+  name: capybara
   prerelease: false
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -92,10 +93,10 @@ dependencies:
         - 4
         - 0
         version: 0.4.0
-  requirement: *id005
-  name: capybara
   type: :development
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
+  name: launchy
   prerelease: false
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -106,9 +107,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
-  name: launchy
   type: :development
+  requirement: *id006
 description: Simple username/password authentication for Rails 3.
 email: 
 - boss@airbladesoftware.com
@@ -122,7 +122,6 @@ files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - app/controllers/controller_mixin.rb
@@ -142,6 +141,7 @@ files:
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/articles_controller.rb
+- test/dummy/app/controllers/users_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/helpers/articles_helper.rb
 - test/dummy/app/models/article.rb
@@ -154,6 +154,7 @@ files:
 - test/dummy/app/views/sessions/edit.html.erb
 - test/dummy/app/views/sessions/forgotten.html.erb
 - test/dummy/app/views/sessions/new.html.erb
+- test/dummy/app/views/users/new.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -203,6 +204,7 @@ files:
 - test/integration/navigation_test.rb
 - test/integration/sign_in_test.rb
 - test/integration/sign_out_test.rb
+- test/integration/sign_up_test.rb
 - test/quo_vadis_test.rb
 - test/support/integration_case.rb
 - test/test_helper.rb
@@ -237,7 +239,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: quo_vadis
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Simple username/password authentication for Rails 3.
@@ -246,6 +248,7 @@ test_files:
 - test/dummy/Rakefile
 - test/dummy/app/controllers/application_controller.rb
 - test/dummy/app/controllers/articles_controller.rb
+- test/dummy/app/controllers/users_controller.rb
 - test/dummy/app/helpers/application_helper.rb
 - test/dummy/app/helpers/articles_helper.rb
 - test/dummy/app/models/article.rb
@@ -258,6 +261,7 @@ test_files:
 - test/dummy/app/views/sessions/edit.html.erb
 - test/dummy/app/views/sessions/forgotten.html.erb
 - test/dummy/app/views/sessions/new.html.erb
+- test/dummy/app/views/users/new.html.erb
 - test/dummy/config.ru
 - test/dummy/config/application.rb
 - test/dummy/config/boot.rb
@@ -307,6 +311,7 @@ test_files:
 - test/integration/navigation_test.rb
 - test/integration/sign_in_test.rb
 - test/integration/sign_out_test.rb
+- test/integration/sign_up_test.rb
 - test/quo_vadis_test.rb
 - test/support/integration_case.rb
 - test/test_helper.rb

data/Gemfile.lock

@@ -1,113 +0,0 @@
-PATH
-  remote: .
-  specs:
-    quo_vadis (1.0.5)
-      bcrypt-ruby (~> 2.1.4)
-      rails (~> 3.0)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    abstract (1.0.0)
-    actionmailer (3.0.4)
-      actionpack (= 3.0.4)
-      mail (~> 2.2.15)
-    actionpack (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-      builder (~> 2.1.2)
-      erubis (~> 2.6.6)
-      i18n (~> 0.4)
-      rack (~> 1.2.1)
-      rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.7)
-      tzinfo (~> 0.3.23)
-    activemodel (3.0.4)
-      activesupport (= 3.0.4)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activerecord (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-      arel (~> 2.0.2)
-      tzinfo (~> 0.3.23)
-    activeresource (3.0.4)
-      activemodel (= 3.0.4)
-      activesupport (= 3.0.4)
-    activesupport (3.0.4)
-    arel (2.0.8)
-    bcrypt-ruby (2.1.4)
-    builder (2.1.2)
-    capybara (0.4.1.2)
-      celerity (>= 0.7.9)
-      culerity (>= 0.2.4)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
-    celerity (0.8.8)
-    childprocess (0.1.7)
-      ffi (~> 0.6.3)
-    configuration (1.2.0)
-    culerity (0.2.15)
-    erubis (2.6.6)
-      abstract (>= 1.0.0)
-    ffi (0.6.3)
-      rake (>= 0.8.7)
-    i18n (0.5.0)
-    json_pure (1.5.1)
-    launchy (0.3.7)
-      configuration (>= 0.0.5)
-      rake (>= 0.8.1)
-    mail (2.2.15)
-      activesupport (>= 2.3.6)
-      i18n (>= 0.4.0)
-      mime-types (~> 1.16)
-      treetop (~> 1.4.8)
-    mime-types (1.16)
-    nokogiri (1.4.4)
-    polyglot (0.3.1)
-    rack (1.2.1)
-    rack-mount (0.6.13)
-      rack (>= 1.0.0)
-    rack-test (0.5.7)
-      rack (>= 1.0)
-    rails (3.0.4)
-      actionmailer (= 3.0.4)
-      actionpack (= 3.0.4)
-      activerecord (= 3.0.4)
-      activeresource (= 3.0.4)
-      activesupport (= 3.0.4)
-      bundler (~> 1.0)
-      railties (= 3.0.4)
-    railties (3.0.4)
-      actionpack (= 3.0.4)
-      activesupport (= 3.0.4)
-      rake (>= 0.8.7)
-      thor (~> 0.14.4)
-    rake (0.8.7)
-    rubyzip (0.9.4)
-    selenium-webdriver (0.1.3)
-      childprocess (~> 0.1.5)
-      ffi (~> 0.6.3)
-      json_pure
-      rubyzip
-    sqlite3-ruby (1.2.5)
-    thor (0.14.6)
-    treetop (1.4.9)
-      polyglot (>= 0.3.1)
-    tzinfo (0.3.24)
-    xpath (0.1.3)
-      nokogiri (~> 1.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  capybara (>= 0.4.0)
-  launchy
-  quo_vadis!
-  rails (>= 3.0.4)
-  sqlite3-ruby