hero_generator 0.0.1.beta4 → 0.0.1.beta5

data/lib/generators/hero/authentication/authentication_generator.rb

@@ -75,6 +75,7 @@ module Hero
       
 
       def create_routes
+        route "default_url_options :host => 'localhost:3000'"
         route "resources #{user_plural_name.to_sym.inspect}"
         route "resources #{session_plural_name.to_sym.inspect}"
         route "get 'log_out' => '#{session_plural_name.to_sym.inspect}#destroy', :as => 'log_out'"

data/lib/generators/hero/authentication/templates/controllers/confirmation_controller.rb

@@ -8,12 +8,12 @@ class ConfirmationController < ApplicationController
       redirect_to log_in_path, :notice => t( 'fe.confirmation.registration.flash.success' )
     end
     
-    flash[:error] = t( 'fe.confirmation.registration.flash.error')  if params[:token]
+    flash[:notice] = t( 'fe.confirmation.registration.flash.error')  if params[:token]
   end
   
   def resend_signup_token
-    @user = User.authenticate( params[:email], params[:password] )
-    if @user
+    @user = User.find_by_email(params[:email])
+    if @user && @user.authenticate(params[:password])
       if @user.resend_signup_token
         flash[:notice] = t( 'fe.confirmation.resend_signup_token.flash.success' )
       else

data/lib/generators/hero/authentication/templates/controllers/sessions_controller.rb

@@ -3,8 +3,8 @@ class SessionsController < ApplicationController
   end
   
   def create
-    @user = User.authenticate(params[:email], params[:password])
-    if @user
+    @user = User.find_by_email params[:email]
+    if @user && @user.authenticate(params[:password])
       if @user.confirmed?
         session[:user_id] = @user.id
         redirect_to root_url, :notice => t( 'fe.session.create.flash.success' )

data/lib/generators/hero/authentication/templates/controllers/settings_controller.rb

@@ -9,8 +9,8 @@ class SettingsController < ApplicationController
     @user = current_user
     
     flash.now[:notice] = t( 'fe.settings.change_user_email.flash_error' )
-    
-    if User.authenticate( current_user.email, params[:user][:password] )    
+
+    if @user.authenticate( params[:user][:password] )
       current_user.set_new_email = true
       current_user.new_email = params[:user][:new_email]
       current_user.new_email_confirmation = params[:user][:new_email_confirmation]          

data/lib/generators/hero/authentication/templates/mailers/confirmation_mailer.rb

@@ -6,7 +6,7 @@ class ConfirmationMailer < ActionMailer::Base
 
   def registration( user )
     @user = user
-    @confirmation_url = confirm_url( user.signup_token )
+    @confirmation_url = confirm_url( :registration, @user.signup_token )
     mail( :to => user.email, :subject => t( 'confirmation_mailer.registration.subject' ))
   end
 

data/lib/generators/hero/authentication/templates/migrations/create_users.rb

@@ -2,8 +2,7 @@ class CreateUsers < ActiveRecord::Migration
   def change
     create_table :users do |t|
       t.string :email
-      t.string :password_hash
-      t.string :password_salt
+      t.string :password_digest
       t.string :signup_token
       t.string :password_token
       t.string :new_email

data/lib/generators/hero/authentication/templates/models/user.rb

@@ -1,8 +1,9 @@
 class User < ActiveRecord::Base
+  has_secure_password
+  
   attr_accessible :email, :password, :password_confirmation, :new_email_confirmation, :set_new_email
   
-  attr_accessor :password, :password_confirmation, :update_password, :new_email_confirmation, :set_new_email
-  before_save :encrypt_password
+  attr_accessor :update_password, :new_email_confirmation, :set_new_email
      
   validates_format_of :email, :with => /^([\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+\.)*[\w\!\#$\%\&\'\*\+\-\/\=\?\^\`{\|\}\~]+@((((([a-z0-9]{1}[a-z0-9\-]{0,62}[a-z0-9]{1})|[a-z])\.)+[a-z]{2,6})|(\d{1,3}\.){3}\d{1,3}(\:\d{1,5})?)$/i
   validates_presence_of :email
@@ -84,21 +85,6 @@ class User < ActiveRecord::Base
     update_password || new_record?
   end    
   
-  def self.authenticate(email, password)
-    user = find_by_email(email)
-    if user && user.password_hash == BCrypt::Engine.hash_secret(password, user.password_salt) 
-      user
-    else
-      nil
-    end    
-  end
-  
-  def encrypt_password
-    if password.present?
-      self.password_salt = BCrypt::Engine.generate_salt
-      self.password_hash = BCrypt::Engine.hash_secret(password, password_salt) 
-    end
-  end
   
   
   def send_password_reset  

data/lib/generators/hero/authentication/templates/tests/spec/factories.rb

@@ -10,7 +10,7 @@ Factory.define :user do |u|
   
   u.email { Factory.next(:email) }
   u.password 'secret'
-  #u.password_confirmation 'secret'
+  u.password_confirmation 'secret'
 end
 
 

data/lib/generators/hero/authentication/templates/tests/spec/models/user_spec.rb

@@ -51,24 +51,13 @@ describe User do
     @other_user.should be_valid
   end
   
-  it 'saves same passwords with different salts' do
-    same_password = 'secret'
-    @user.password = same_password
-    @user.save
-    
-    @other_user = Factory.build( :user, :password => same_password ) 
-    @other_user.save
-        
-    @user.password_hash.should_not == @other_user.password_hash
-    @user.password_salt.should_not == @other_user.password_salt    
-  end
+
   
   it 'should authenticate valid user' do
     @user.save
-    @user.should == User.authenticate( @user.email, @user.password )
-    
-    User.authenticate( '', @user.password ).should == nil
-    User.authenticate( @user.email, '' ).should == nil
+
+    @user.authenticate( @user.password ).should be @user
+    @user.authenticate( '' ).should be false
   end
   
   it 'should be confirmable' do

data/lib/generators/hero/authentication/templates/tests/spec/routing/confirmation_mailer_spec.rb

@@ -20,7 +20,7 @@ describe ConfirmationMailer do
     it "send user confirmation url" do
       mail.subject.should eq( I18n.t( 'confirmation_mailer.registration.subject' ))
       mail.to.should eq([user.email])
-      mail.body.encoded.should match(confirm_url(user.signup_token))
+      mail.body.encoded.should match(confirm_url( :registration, user.signup_token ))
     end
   end
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hero_generator
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta4
+  version: 0.0.1.beta5
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000Z
+date: 2012-02-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &69373650 !ruby/object:Gem::Requirement
+  requirement: &82459840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *69373650
+  version_requirements: *82459840
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &69372530 !ruby/object:Gem::Requirement
+  requirement: &82459580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.1.2
   type: :development
   prerelease: false
-  version_requirements: *69372530
+  version_requirements: *82459580
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &69371460 !ruby/object:Gem::Requirement
+  requirement: &82459310 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *69371460
+  version_requirements: *82459310
 description: Write a gem description
 email:
 - guido@boyke.de