fingerrails 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/fingerrails.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{fingerrails}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Manfred Stienstra", "Eloy Duran"]
-  s.date = %q{2009-10-29}
+  s.date = %q{2009-11-02}
   s.default_executable = %q{fingerrails}
   s.description = %q{A self contained version of the Fingertips Rails template}
   s.email = %q{eloy@fngtps.com}
@@ -88,4 +88,3 @@ Gem::Specification.new do |s|
   else
   end
 end
-

data/templates/app/controllers/sessions_controller.rb

@@ -13,7 +13,6 @@ class SessionsController < ApplicationController
       finish_authentication_needed! || redirect_to(root_url)
     else
       still_authentication_needed!
-      flash[:login_error] = @unauthenticated.errors.on(:base)
       render :new
     end
   end

data/templates/app/models/member/authentication.rb

@@ -20,12 +20,13 @@ class Member
     ::Digest::SHA1.hexdigest(password)
   end
   
-  # Authenticates credentials. Takes a hash with a :email and :password, returns an instance of Member.
-  # The Member has errors on base when the user isn't authenticated.
+  # Authenticates credentials. Takes a hash with a :email and :password,
+  # returns an instance of Member. The Member has errors on base when
+  # the user isn't authenticated.
   def self.authenticate(params={})
     unless member = find_by_email_and_hashed_password(params[:email], hash_password(params[:password]))
-      member = Member.new
-      member.errors.add_to_base("The username and/or email you entered is invalid. Please try again.")
+      member = Member.new(params.slice(:email, :password))
+      member.errors.add_to_base("The credentials you entered are invalid. Please try again.")
       member
     else
       member

data/templates/app/views/sessions/_form.html.erb

@@ -1,8 +1,8 @@
 <% form_for(@unauthenticated || Member.new, :url => session_path) do |f| %>
   <h2><%=h @title = 'Log in' %></h2>
   
-  <% if flash[:login_error] %>
-    <div class="errorExplanation"><%= flash[:login_error] %></div>
+  <% if @unauthenticated.errors.on(:base) %>
+    <div class="errorExplanation"><%= @unauthenticated.errors.on(:base) %></div>
   <% end %>
   
   <div class="field">

data/templates/test/functional/sessions_controller_test.rb

@@ -34,6 +34,12 @@ describe "On the", SessionsController, "a visitor" do
     assert_select 'div.errorExplanation'
   end
   
+  it "should not default the wrong password in the form after a failed login" do
+    post :create, :member => valid_credentials.merge(:password => 'wrong')
+    assert_select 'input[id="member_password"]'
+    assert_select 'input[id="member_password"][value]', false
+  end
+  
   it "should see an explanation when the email does not exist" do
     post :create, :member => valid_credentials.merge(:email => 'unknown@example.com')
     should.not.be.authenticated
@@ -41,6 +47,11 @@ describe "On the", SessionsController, "a visitor" do
     assert_select 'div.errorExplanation'
   end
   
+  it "should default the email in the form after a failed login" do
+    post :create, :member => valid_credentials.merge(:email => 'unknown@example.com')
+    assert_select 'input[id="member_email"][value="unknown@example.com"]'
+  end
+  
   it "should keep the url to return to if the password or email was wrong" do
     url = member_url(members(:adrian))
     post :create, { :member => valid_credentials.merge(:password => 'wrong') }, {}, { :after_authentication => { :redirect_to => url }}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fingerrails
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors: 
 - Manfred Stienstra
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-29 00:00:00 +01:00
+date: 2009-11-02 00:00:00 +01:00
 default_executable: fingerrails
 dependencies: []