lobby 0.0.1i → 0.0.2

data/Rakefile

@@ -14,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
 load 'rails/tasks/engine.rake'
 
 

data/app/controllers/lobby/confirmation_controller.rb

@@ -6,9 +6,9 @@ module Lobby
 
       if @user
         @user.confirm_signup!
-        redirect_to log_in_url, flash: { success: t( 'confirmation.registration.flash.success' ) }
+        redirect_to log_in_url, flash: { success: t( '.flash.success' ) }
       else
-        flash.now[:notice] = t( 'confirmation.registration.flash.error') if params[:token]
+        flash.now[:notice] = t( '.flash.error') if params[:token]
       end
     end
 
@@ -21,9 +21,9 @@ module Lobby
       @user = User.find_by_email(params[:email])
       if @user && @user.authenticate(params[:password])
         if @user.resend_signup_token
-          redirect_to log_in_url, flash: { success: t( 'confirmation.resend_signup_token.flash.success' ) }
+          redirect_to log_in_url, flash: { success: t( '.flash.success' ) }
         else
-          redirect_to log_in_url, flash: { danger: t( 'confirmation.resend_signup_token.flash.error' ) }
+          redirect_to log_in_url, flash: { danger: t( '.flash.error' ) }
         end
       end
     end

data/app/controllers/lobby/confirmation_controller.rb~

@@ -1,44 +1,46 @@
-class ConfirmationController < ApplicationController
+module Lobby
+  class ConfirmationController < ApplicationController
 
-  def registration
-    @user = User.where( :signup_token => params[:token] ).first unless params[:token].nil?
+    def registration
+      @user = User.where( :signup_token => params[:token] ).first unless params[:token].nil?
 
-    if @user
-      @user.confirm_signup!
-      redirect_to log_in_url, flash: { success: t( 'confirmation.registration.flash.success' ) }
-    else
-      flash.now[:notice] = t( 'confirmation.registration.flash.error') if params[:token]
+      if @user
+        @user.confirm_signup!
+        redirect_to log_in_url, flash: { success: t( '.flash.success' ) }
+      else
+        flash.now[:notice] = t( 'confirmation.registration.flash.error') if params[:token]
+      end
     end
-  end
 
-  #
-  # User has lost email with signup token. we send this email again.
-  #
+    #
+    # User has lost email with signup token. we send this email again.
+    #
 
-  def resend_signup_token
-    flash[:notice] = nil
-    @user = User.find_by_email(params[:email])
-    if @user && @user.authenticate(params[:password])
-      if @user.resend_signup_token
-        redirect_to log_in_url, flash: { success: t( 'confirmation.resend_signup_token.flash.success' ) }
-      else
-        redirect_to log_in_url, flash: { danger: t( 'confirmation.resend_signup_token.flash.error' ) }
+    def resend_signup_token
+      flash[:notice] = nil
+      @user = User.find_by_email(params[:email])
+      if @user && @user.authenticate(params[:password])
+        if @user.resend_signup_token
+          redirect_to log_in_url, flash: { success: t( 'confirmation.resend_signup_token.flash.success' ) }
+        else
+          redirect_to log_in_url, flash: { danger: t( 'confirmation.resend_signup_token.flash.error' ) }
+        end
       end
     end
-  end
 
 
-  def new_email
-    @user = User.find_by_new_email_token( params[:token] ) unless params[:token].nil?
-    if @user
-      if @user.confirm_new_email!
-        redirect_to( root_url, :notice => t( '.flash.success' ))
+    def new_email
+      @user = User.find_by_new_email_token( params[:token] ) unless params[:token].nil?
+      if @user
+        if @user.confirm_new_email!
+          redirect_to( root_url, :notice => t( '.flash.success' ))
+        else
+          flash[:notice] = t( '.flash.error' )
+        end
       else
-        flash[:notice] = t( '.flash.error' )
+        render :new_email_token
       end
-    else
-      render :new_email_token
     end
-  end
 
+  end
 end

data/app/mailers/{confirmation_mailer.rb → lobby/confirmation_mailer.rb}

@@ -7,24 +7,24 @@ module Lobby
 
     def registration( user )
       @confirmation_url = confirm_url( :registration, user.signup_token )
-      mail( :to => user.email, :subject => t( 'confirmation_mailer.registration.subject' ))
+      mail( :to => user.email, :subject => t( '.subject' ))
     end
 
     def resend_signup_token( user )
       @user = user
       @confirmation_url = confirm_url( :registration, @user.signup_token )
-      mail( :to => user.email, :subject => t( 'confirmation_mailer.resend_signup_token.subject' ))
+      mail( :to => user.email, :subject => t( '.subject' ))
     end
 
     def send_password_reset( user )
       @confirmation_url = recover_password_form_url( :token => user.password_token )
-      mail( :to => user.email, :subject => t( 'confirmation_mailer.send_password_reset.subject' ))
+      mail( :to => user.email, :subject => t( '.subject' ))
     end
 
     def new_email_request( user )
       @user = user
       @confirmation_url = new_email_url( @user.new_email_token )
-      mail( :to => @user.new_email, :subject => t( 'confirmation_mailer.new_email_request.subject' ))
+      mail( :to => @user.new_email, :subject => t( '.subject' ))
     end
   end
 end

data/app/mailers/lobby/confirmation_mailer.rb~

@@ -0,0 +1,30 @@
+module Lobby
+  class ConfirmationMailer < ActionMailer::Base
+
+    helper :application
+
+    default :from => APP_CONFIG['registration_mailer']['from']
+
+    def registration( user )
+      @confirmation_url = confirm_url( :registration, user.signup_token )
+      mail( :to => user.email, :subject => t( '.subject' ))
+    end
+
+    def resend_signup_token( user )
+      @user = user
+      @confirmation_url = confirm_url( :registration, @user.signup_token )
+      mail( :to => user.email, :subject => t( '.subject' ))
+    end
+
+    def send_password_reset( user )
+      @confirmation_url = recover_password_form_url( :token => user.password_token )
+      mail( :to => user.email, :subject => t( '.subject' ))
+    end
+
+    def new_email_request( user )
+      @user = user
+      @confirmation_url = new_email_url( @user.new_email_token )
+      mail( :to => @user.new_email, :subject => t( '.subject' ))
+    end
+  end
+end

data/app/models/lobby/auth_user.rb

@@ -65,7 +65,7 @@ module Lobby
     # Confirmation-Token generiert und verschickt werden.
 
     def tokenmail(request)
-      Lobby::ConfirmationMailer.send(request, self).deliver
+      ConfirmationMailer.send(request, self).deliver
     end
 
     def send_password_reset(with_mail = true)

data/app/models/lobby/auth_user.rb~

@@ -0,0 +1,100 @@
+module Lobby
+  module AuthUser
+
+    def self.included(base)
+      base.has_secure_password
+
+      base.validates :email, presence: true
+      base.validates :email, format: {with: EMAIL_REGEX, multiline: true}, if: Proc.new { |u| u.email.present? }
+      base.validates :email, uniqueness: true, :unless => :confirmed_duplicate, :on => :create, if: Proc.new { |u| u.email.present? }
+      base.validates :password, length: { minimum: 5 }, :on => :create, if: Proc.new { |u| u.password.present? }
+
+      base.extend ClassMethods
+    end
+
+
+    module ClassMethods
+      def confirmed
+        where("confirmed IS NOT NULL")
+      end
+
+      def with_email(email)
+        where(:email => email)
+      end
+
+    end
+
+
+    def confirmed_duplicate(test_mail = self.email)
+      if ((self.class.name.constantize.confirmed.with_email(test_mail).count == 0) ||
+          (self.class.name.constantize.with_email(test_mail).count == 0))
+        true
+      else
+        #self.id = self.class.name.constantize.confirmed.with_email(test_mail).first.id
+        false
+      end
+    end
+
+    def confirm_signup!
+      update_attribute(:confirmed, Time.now)
+      update_attribute(:signup_token, nil)
+      update_attribute(:active, true)
+    end
+
+    def confirm_new_email!
+      update_attribute(:email, new_email)
+      update_attribute(:new_email_token, nil)
+    end
+
+    def confirmed?
+      !self.confirmed.nil?
+    end
+
+    def active?
+      self.active == true
+    end
+
+    # Wenn der User sich registriert, dann wird ein signup_token für ihn hinterlegt.
+    # Dieser Token wird per Mail verschickt. Der User kann sich nun per Klick auf den
+    # Tokenlink verifizieren. Sollte die Mail nicht mehr erreichbar sein, so kann der User
+    # unter Angabe seiner Email einen neuen signup_Token anfordern. Der alte Token ist
+    # ab diesem Zeitpunkt ungültig.
+
+    # Nach erfolgreicher Verifizierung der Email-Adresse) wird das
+    # Feld confirmed mit einem Datum gefüllt. Ab diesem Zeitpunkt kann keine neuer
+    # Confirmation-Token generiert und verschickt werden.
+
+    def tokenmail(request)
+      Lobby::ConfirmationMailer.send(request, self).deliver
+    end
+
+    def send_password_reset(with_mail = true)
+      return unless generate_token(:password_token)
+      if with_mail
+        tokenmail(:send_password_reset)
+      end
+    end
+
+    def send_registration
+      return unless generate_token(:signup_token)
+      tokenmail(:registration)
+    end
+
+    def resend_signup_token
+      return unless (!confirmed? && generate_token(:signup_token))
+      tokenmail(:resend_signup_token)
+    end
+
+    def send_new_email_request
+      return unless (confirmed? && generate_token(:new_email_token))
+      tokenmail(:new_email_request)
+    end
+
+
+    private
+
+    def generate_token( token )
+      (defined?( token ) && update_attribute( token, SecureRandom.hex(13) ))? true : false
+    end
+  end
+end