lobby 0.0.25 → 0.0.26

data/app/controllers/lobby/confirmation_controller.rb

@@ -6,7 +6,8 @@ module Lobby
 
       if @user
         @user.confirm_signup!
-        redirect_to log_in_url, flash: { success: t( '.flash.success' ) }
+        session[:user_id] = @user.id
+        redirect_to root_url, flash: { success: t( '.flash.success' ) }
       else
         flash.now[:notice] = t( '.flash.error') if params[:token]
       end

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

@@ -0,0 +1,47 @@
+module Lobby
+  class ConfirmationController < ApplicationController
+
+    def registration
+      @user = User.where( :signup_token => params[:token] ).first unless params[:token].nil?
+
+      if @user
+        @user.confirm_signup!
+        session[:user_id] = @user.id
+        redirect_to root_url, flash: { success: t( '.flash.success' ) }
+      else
+        flash.now[:notice] = t( '.flash.error') if params[:token]
+      end
+    end
+
+    #
+    # 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( '.flash.success' ) }
+        else
+          redirect_to log_in_url, flash: { danger: t( '.flash.error' ) }
+        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' ))
+        else
+          flash[:notice] = t( '.flash.error' )
+        end
+      else
+        render :new_email_token
+      end
+    end
+
+  end
+end

data/app/controllers/lobby/users_controller.rb

@@ -8,8 +8,8 @@ module Lobby
     def create
       @user = User.new(user_params)
       if @user.save
-        redirect_to log_in_url, flash: {success: t( '.success' ) }
         @user.send_registration
+        redirect_to log_in_url, flash: {success: t( '.success' ) }
       else
         render :new
       end

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

@@ -0,0 +1,23 @@
+module Lobby
+  class UsersController < ApplicationController
+
+    def new
+      @user = User.new
+    end
+
+    def create
+      @user = User.new(user_params)
+      if @user.save
+        redirect_to log_in_url, flash: {success: t( '.success' ) }
+        @user.send_registration
+      else
+        render :new
+      end
+    end
+
+    def user_params
+      params.require(:user).permit(:email, :username, :password, :password_confirmation)
+    end
+
+  end
+end

data/lib/lobby/version.rb

@@ -1,3 +1,3 @@
 module Lobby
-  VERSION = "0.0.25"
+  VERSION = "0.0.26"
 end

data/lib/lobby/version.rb~

@@ -1,3 +1,3 @@
 module Lobby
-  VERSION = "0.0.24"
+  VERSION = "0.0.25"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lobby
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.26
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-18 00:00:00.000000000 Z
+date: 2014-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -230,10 +230,12 @@ files:
 - app/mailers/lobby/confirmation_mailer.rb
 - app/assets/stylesheets/lobby/application.css
 - app/assets/javascripts/lobby/application.js
+- app/controllers/lobby/users_controller.rb~
 - app/controllers/lobby/application_controller.rb
 - app/controllers/lobby/confirmation_controller.rb
 - app/controllers/lobby/password_forgotten_controller.rb~
 - app/controllers/lobby/users_controller.rb
+- app/controllers/lobby/confirmation_controller.rb~
 - app/controllers/lobby/sessions_controller.rb
 - app/controllers/lobby/password_forgotten_controller.rb
 - app/helpers/lobby/application_helper.rb