quo_vadis 1.2.1 → 1.2.2

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 # CHANGELOG
 
 
+## 1.2.2 (20 March 2013)
+
+* Enable form validation errors in activation form.
+* Increase time limit for password reset / activation to 24hr.
+
+
 ## 1.2.1 (15 August 2012)
 
 * Ignore blank usenames when authenticating.

data/app/controllers/quo_vadis/sessions_controller.rb

@@ -85,7 +85,11 @@ class QuoVadis::SessionsController < ApplicationController
 
   # GET invitation_path /sign-in/invite/:token
   def invite
-    if (user = QuoVadis.model_class.valid_token(params[:token]).first)
+    if (@user = QuoVadis.model_class.valid_token(params[:token]).first)
+      # When we create a user who must activate their account, we give them
+      # a random username and password.  However we want to treat them as if
+      # they weren't set at all.
+      @user.username = nil
       render 'sessions/invite'
     else
       invalid_token :activation
@@ -94,17 +98,18 @@ class QuoVadis::SessionsController < ApplicationController
 
   # POST activation_path /sign-in/accept/:token
   def accept
-    if (user = QuoVadis.model_class.valid_token(params[:token]).first)
-      user.username, user.password = params[:username], params[:password]
+    if (@user = QuoVadis.model_class.valid_token(params[:token]).first)
+      @user.username, @user.password = params[:username], params[:password]
       # When we create a user who must activate their account, we give them
       # a random username and password.  However we want to treat them as if
       # they weren't set at all.
-      user.password_digest = nil if params[:password].blank?
-      if user.save
-        user.clear_token
+      @user.password_digest = nil if params[:password].blank?
+      if @user.save
+        @user.clear_token
         flash_if_present :notice, 'quo_vadis.flash.activation.accepted'
-        sign_in user
+        sign_in @user
       else
+        flash_if_present :alert, 'quo_vadis.flash.activation.invalid_credentials', :now
         render 'sessions/invite'
       end
     else

data/app/models/model_mixin.rb

@@ -22,7 +22,7 @@ module ModelMixin
       validates :username,        :presence => true, :uniqueness => true, :if => :should_authenticate?
       validates :password_digest, :presence => true, :if => :should_authenticate?
 
-      scope :valid_token, lambda { |token| where("token = ? AND token_created_at > ?", token, 3.hours.ago) }
+      scope :valid_token, lambda { |token| where("token = ? AND token_created_at > ?", token, 24.hours.ago) }
 
       instance_eval <<-END, __FILE__, __LINE__ + 1
         # Returns the user with the given <tt>username</tt> if the given password is

data/config/locales/quo_vadis.en.yml

@@ -19,3 +19,4 @@ en:
       activation:
         accepted: "Your account is active and you're now signed in."
         invalid_token: "Sorry, this link isn't valid anymore."
+        invalid_credentials: "Sorry, we couldn't accept that username and/or password."

data/lib/quo_vadis/version.rb

@@ -1,3 +1,3 @@
 module QuoVadis
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
 end

data/test/dummy/app/views/quo_vadis/notifier/change_password.text.erb

@@ -3,7 +3,7 @@ Hello <%= @username %>,
 We've received a request to change your password.  If this wasn't you,
 please ignore this email and your password will be left alone.
 
-If you do want to change your password, just click this link (valid for 3 hours):
+If you do want to change your password, just click this link (valid for 24 hours):
 <%= @url %>
 
 Thanks!

data/test/dummy/app/views/quo_vadis/notifier/invite.text.erb

@@ -1,6 +1,6 @@
 Hello <%= @user.name %>,
 
-You can activate your account by clicking this link (valid for 3 hours):
+You can activate your account by clicking this link (valid for 24 hours):
 <%= @url %>
 
 <% if instance_variable_defined? :@foo %><%= @foo %><% end %>

data/test/dummy/app/views/sessions/invite.html.erb

@@ -13,3 +13,19 @@
     <%= submit_tag 'Save my details' %>
   </p>
 <% end %>
+
+<!-- OR, to use Rails' form validation helpers:
+<%= form_for @user, url: activation_path(params[:token]), html: {method: :post} do |f| %>
+  <p>
+    <%= label_tag :password %>
+    <%= f.text_field :username, name: 'username' %>
+  </p>
+  <p>
+    <%= label_tag :password %>
+    <%= f.password_field :password, name: 'password' %>
+  </p>
+  <p>
+    <%= submit_tag 'Save my details' %>
+  </p>
+<% end %>
+-->

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quo_vadis
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-15 00:00:00.000000000 Z
+date: 2013-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153649880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153649880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &2153648320 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153648320
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2153836680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +53,15 @@ dependencies:
         version: 3.0.4
   type: :development
   prerelease: false
-  version_requirements: *2153836680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.4
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2153834960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153834960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &2153833160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +85,15 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *2153833160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &2153832240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153832240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153831680 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +117,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153831680
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple username/password authentication for Rails 3.
 email:
 - boss@airbladesoftware.com
@@ -202,7 +237,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1701755491190668826
+      hash: -1859986741885625298
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -211,10 +246,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1701755491190668826
+      hash: -1859986741885625298
 requirements: []
 rubyforge_project: quo_vadis
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple username/password authentication for Rails 3.