goma 0.0.1.beta → 0.0.1.gamma

data/test/rails_app/app/controllers/authentications_controller.rb

@@ -0,0 +1,15 @@
+class AuthenticationsController < ApplicationController
+  before_action
+  # GET  auth/:provider/callback
+  # POST /authentications
+  def create
+    authentication = Authentication.find_by(provider: omniauth[:provider], uid: omniauth[:uid])
+    if authentication
+      user = authentication.user
+    else
+      user = User.create_with_omniauth!(omniauth)
+    end
+    force_login(user)
+    redirect_back_or_to root_url, notice: "Successfully authenticated from #{omniauth[:provider]} account."
+  end
+end

data/test/rails_app/app/controllers/confirmations_controller.rb

@@ -0,0 +1,52 @@
+class ConfirmationsController < ApplicationController
+  # GET /confirmations/new
+  def new
+    @user= User.new
+  end
+
+
+  # POST /confirmations
+  def create
+    @user = User.find_by_identifier(params[:username_or_email])
+    @user.generate_confirmation_token
+    @user.send_activation_needed_email
+
+    redirect_to new_session_url, notice: "We are processing your request. You will receive new activation email in a few minutes."
+  end
+
+
+  # GET /confirmations/1
+  def show
+    @user, err = User.load_from_activation_token_with_error(params[:id])
+
+    if @user
+      @user.activate!
+      redirect_to new_session_url, notice: 'Your account was successfully activated.'
+    else
+      if err == :token_expired
+        flash.now[:alert] = "Your activation URL has expired, please request a new one."
+      else
+        flash.now[:alert] = "Not found any account by this URL. Please make sure you used the full URL provided."
+      end
+      render :new
+    end
+  end
+
+
+  # GET /confirmations/1/email
+  def email
+    @user, err = User.load_from_email_confirmation_token_with_error(params[:id])
+
+    if @user
+      @user.confirm_email!
+      redirect_to edit_user_url, notice: 'Your new email was successfully confirmed.'
+    else
+      if err == :token_expired
+        flash.now[:alert] = "Your email confirmation URL has expired, please change your email again."
+      else
+        flash.now[:alert] = "Email confirmation failed. Please make sure you used the full URL provided."
+      end
+      render edit_user_url(current_user)
+    end
+  end
+end

data/test/rails_app/app/controllers/passwords_controller.rb

@@ -0,0 +1,41 @@
+class PasswordsController < ApplicationController
+
+  # GET /passwords/new
+  def new
+    @user = User.new
+  end
+
+  # POST /passwords
+  def create
+    @user = User.find_by_identifier(params[:username_or_email])
+    @user.send_reset_password_instructions! if @user
+
+    flash[:notice] = "You will receive an email with instructions about how to reset your password in a few minutes."
+    redirect_to new_session_url
+  end
+
+  # GET /passwords/1/edit
+  def edit
+    @reset_password_token = params[:id]
+  end
+
+  # PATCH/PUT /passwords/1
+  def update
+    @user, err = User.load_from_reset_password_token_with_error(params[:id])
+
+    if @user
+      @user.unlock_access! if @user.lockable? && @user.access_locked?
+      @user.change_password!(params[:password], params[:password_confirmation])
+      force_login(@user)
+      redirect_back_or_to root_url, notice: 'Your password was changed successfully. You are now logged in.'
+    else
+      if err == :token_expired
+        flash.now[:alert] = "The password reset URL you visited has expired, please request a new one."
+        render :new
+      else
+        flash.now[:alert] = "You can't access this page without comming from a password reset email. If you do come from a password reset email, please make sure you used the full URL provided."
+        render :edit
+      end
+    end
+  end
+end

data/test/rails_app/app/controllers/sessions_controller.rb

@@ -1,19 +1,27 @@
 class SessionsController < ApplicationController
+
+  # GET /sessions/new
   def new
     @user = User.new
   end
 
+  # POST /sessions
   def create
-    if @user = login(params[:username_or_email], params[:password], params[:remember_me])
+     if @user = user_login(params[:username_or_email], params[:password], params[:remember_me])
       redirect_back_or_to root_url, notice: 'Login successful'
     else
-      flash.now[:alert] = "Login failed"
-      render action: 'new'
+      if goma_error(:user) == :not_activated
+        flash.now[:alert] = 'Not activated'
+      else
+        flash.now[:alert] = 'Login failed'
+      end
+      render :new
     end
   end
 
+  # DELETE /sessions
   def destroy
-    logout
-    redirect_to root_url
+    user_logout
+    redirect_to root_url, notice: "Logged out!"
   end
 end

data/test/rails_app/app/controllers/unlocks_controller.rb

@@ -0,0 +1,32 @@
+class UnlocksController < ApplicationController
+
+  # GET /unlocks/1
+  def show
+    @user, err = User.load_from_unlock_token_with_error(params[:id])
+    if @user
+      flash[:notice] = "Your account has been unlocked successfully. Please continue to login."
+      redirect_to new_session_url
+    else
+      if err == :token_expired
+        flash.now[:alert] = "The unlock URL you visited has expired, please request a new one."
+      else
+        flash.now[:alert] = "Not found any account by this URL."
+      end
+      render :new
+    end
+  end
+
+  # GET /unlocks/new
+  def new
+    @user = User.new
+  end
+
+  # POST /unlocks
+  def create
+    @user = User.find_by_identifier(params[:username_or_email])
+    @user.send_unlock_instructions!
+
+    flash[:notice] = 'Instructions have been sent to your email.'
+    redirect_to new_session_url
+  end
+end

data/test/rails_app/app/controllers/users_controller.rb

@@ -1,41 +1,58 @@
 class UsersController < ApplicationController
+  before_action :set_user, only: [:show, :edit, :update, :destroy]
+
+  # GET /users
   def index
+    @users = User.all
   end
 
+  # GET /users/1
   def show
   end
 
+  # GET /users/new
   def new
+    @user = User.new
+  end
+
+  # GET /users/1/edit
+  def edit
   end
 
+  # POST /users
   def create
     @user = User.new(user_params)
+
     if @user.save
-      flash[:notice] = 'Successfully created'
-      redirect_to root_url
+      redirect_to new_session_url, notice: "You have signed up successfully. However, we could not sign you in because your account is not yet activated. You will receive an email with instructions about how to activate your account in a few minutes."
     else
       render :new
     end
   end
 
-  def activate
-    @user = User.load_from_activation_token(params[:id])
-    @user.activate!
-    flash[:notice] = 'Successfully activated.'
-    redirect_to root_url
-  end
-
-  def edit
-  end
-
+  # PATCH/PUT /users/1
   def update
+    if @user.update(user_params)
+      redirect_to @user, notice: 'User was successfully updated.'
+    else
+      render :edit
+    end
   end
 
+  # DELETE /users/1
   def destroy
+    @user.destroy
+    redirect_to users_url, notice: 'User was successfully destroyed.'
   end
 
   private
-  def user_params
-    params.require(:user).permit(:username, :email, :password, :password_confirmation)
-  end
+    # Use callbacks to share common setup or constraints between actions.
+    def set_user
+      @user = User.find(params[:id])
+    end
+
+    # Only allow a trusted parameter "white list" through.
+    def user_params
+      params.require(:user).permit(:username, :email, :password, :password_confirmation)
+    end
 end

data/test/rails_app/app/helpers/authentications_helper.rb

@@ -0,0 +1,2 @@
+module AuthenticationsHelper
+end

data/test/rails_app/app/helpers/confirmations_helper.rb

@@ -0,0 +1,2 @@
+module ConfirmationsHelper
+end

data/test/rails_app/app/helpers/passwords_helper.rb

@@ -0,0 +1,2 @@
+module PasswordsHelper
+end

data/test/rails_app/app/helpers/unlocks_helper.rb

@@ -0,0 +1,2 @@
+module UnlocksHelper
+end

data/test/rails_app/app/mailers/user_mailer.rb

@@ -1,5 +1,5 @@
 class UserMailer < ActionMailer::Base
-  default from: "from@example.com"
+  default from: "please-change-me-at-config-initializers-goma@example.com"
 
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
@@ -7,47 +7,60 @@ class UserMailer < ActionMailer::Base
   #   en.user_mailer.activation_needed_email.subject
   #
   def activation_needed_email(user)
-    @greeting = "Hi"
-
-    mail to: "to@example.org"
+    @user = user
+    mail to: @user.email,
+         subject: "Activation instructions"
   end
-
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
   #
   #   en.user_mailer.activation_success_email.subject
   #
   def activation_success_email(user)
-    @greeting = "Hi"
-
-    mail to: "to@example.org"
+    @user = user
+    mail to: @user.email,
+         subject: "Your account is now activated."
   end
-
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
   #
   #   en.user_mailer.email_confirmation_needed_email.subject
   #
   def email_confirmation_needed_email(user)
-    @greeting = "Hi"
-
-    mail to: "to@example.org"
+    @user = user
+    mail to: @user.email,
+         subject: "Email confirmation instructions"
   end
-
   # Subject can be set in your I18n file at config/locales/en.yml
   # with the following lookup:
   #
   #   en.user_mailer.email_confirmation_success_email.subject
   #
   def email_confirmation_success_email(user)
-    @greeting = "Hi"
-
-    mail to: "to@example.org"
+    @user = user
+    mail to: @user.email,
+         subject: "Your email is now changed"
+  end
+  # Subject can be set in your I18n file at config/locales/en.yml
+  # with the following lookup:
+  #
+  #   en.user_mailer.unlock_token_email.subject
+  #
+  def unlock_token_email(user)
+    @user = user
+    mail to: @user.email,
+         subject: "Unlock instructions"
+  end
+  # Subject can be set in your I18n file at config/locales/en.yml
+  # with the following lookup:
+  #
+  #   en.user_mailer.reset_password_email.subject
+  #
+  def reset_password_email(user)
+    @user = user
+    mail to: @user.email,
+         subject: "Reset password instructions"
   end
 
-  def unlock_email(user)
-    @greeting = "Hi"
 
-    mail to: "to@example.org"
-  end
 end

data/test/rails_app/app/views/confirmations/new.html.erb

@@ -0,0 +1,12 @@
+<h1>Resend activation instructions</h1>
+
+<%= form_tag(:confirmations_url, method: :post) do %>
+  <div class="field">
+    <%= label_tag :username_or_email %><br>
+    <%= text_field_tag :username_or_email
+  </div>
+  <div class="actions">
+    <%= submit_tag "Resend activation instructions" %>
+  </div>
+<% end %>
+

data/test/rails_app/app/views/passwords/edit.html.erb

@@ -0,0 +1,27 @@
+<h1>Change your password</h1>
+
+<%= form_for(@password) do |f| %>
+  <% if @password.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@password.errors.count, "error") %> prohibited this password from being saved:</h2>
+
+      <ul>
+      <% @password.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+
+  <div class="field">
+    <%= f.label :password %><br>
+    <%= f.password_field :password %>
+  </div>
+  <div class="field">
+    <%= f.label :password_confirmation %><br>
+    <%= f.password_field :password_confirmation %>
+  </div>
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/test/rails_app/app/views/passwords/new.html.erb

@@ -0,0 +1,11 @@
+<h1>Forget your password?</h1>
+
+<%= form_tag(passwords_url, method: :post) do %>
+  <div class="field">
+    <%= label_tag :username_or_email %><br>
+    <%= text_field_tag :username_or_email %>
+  </div>
+  <div class="actions">
+    <%= submit_tag "Send me reset password instructions" %>
+  </div>
+<% end %>

data/test/rails_app/app/views/sessions/new.html.erb

@@ -1,19 +1,27 @@
 <h1>Login</h1>
-<%= form_tag session_path do %>
+
+<%= form_tag(session_url, method: :post) do %>
   <div class="field">
-    <%= label_tag :username_or_email %><br />
+    <%= label_tag :username_or_email %><br>
     <%= text_field_tag :username_or_email %>
   </div>
   <div class="field">
-    <%= label_tag :password %><br />
+    <%= label_tag :password %><br>
     <%= password_field_tag :password %>
   </div>
+
   <div class="field">
-    <%= label_tag :remember_me %><br />
-    <%= check_box_tag :remember_me %>
+    <%= check_box_tag :remember_me %> <%= label_tag :remember_me %>
   </div>
+
   <div class="actions">
     <%= submit_tag "Login" %>
   </div>
 <% end %>
 
+<% if Rails.env.in? %w(development test) %>
+  <%= link_to 'Sign in with Developer', '/auth/developer' %>
+<% end %>
+<%#= link_to 'Sign in with Twitter', '/auth/twitter' %>
+<%#= link_to 'Sign in with Facebook', '/auth/facebook' %>
+

data/test/rails_app/app/views/unlocks/new.html.erb

@@ -0,0 +1,11 @@
+<h1>Resend unlock instructions</h1>
+
+<%= form_tag(unlocks_url, method: :post) do %>
+  <div class="field">
+    <%= label_tag :username_or_email %><br>
+    <%= text_field_tag :username_or_email
+  </div>
+  <div class="actions">
+    <%= submit_tag "Resend unlock instructions" %>
+  </div>
+<% end %>

data/test/rails_app/app/views/user_mailer/activation_needed_email.text.erb

@@ -1,3 +1,6 @@
-UserMailer#activation_needed_email
+Welcome, <%= @user.email %>
+============================================================
 
-<%= @greeting %>, find me in app/views/app/views/user_mailer/activation_needed_email.text.erb
+You can activate your account through the link below:
+
+<%= activate_confirmation_url(@user.raw_confirmation_token) %>

data/test/rails_app/app/views/user_mailer/activation_success_email.text.erb

@@ -1,3 +1,8 @@
-UserMailer#activation_success_email
+Congratz, <%= @user.email %>
+============================================================
 
-<%= @greeting %>, find me in app/views/app/views/user_mailer/activation_success_email.text.erb
+You have successfully activated your account
+
+To login to the site, just follow the link below:
+
+<%= new_session_url %>

data/test/rails_app/app/views/user_mailer/email_confirmation_needed_email.text.erb

@@ -1,3 +1,6 @@
-UserMailer#email_confirmation_needed_email
+Hello, <%= @user.email %>
+============================================================
 
-<%= @greeting %>, find me in app/views/app/views/user_mailer/email_confirmation_needed_email.text.erb
+You can confirm your account email through the link below:
+
+<%= email_confirmation_url(@user.raw_confirmation_token) %>

data/test/rails_app/app/views/user_mailer/email_confirmation_success_email.text.erb

@@ -1,3 +1,5 @@
-UserMailer#email_confirmation_success_email
+Congratz, <%= @user.email %>
+============================================================
+
+You have successfully changed your account email
 
-<%= @greeting %>, find me in app/views/app/views/user_mailer/email_confirmation_success_email.text.erb

data/test/rails_app/app/views/user_mailer/reset_password_email.text.erb

@@ -0,0 +1,10 @@
+Hello, <%= @user.email %>
+============================================================
+
+Someone has requested a link to change your password.
+You can do this through the link below.
+
+<%= edit_password_url(@user.raw_reset_password_token) %>
+
+If you didn't request this, please ignore this email.
+Your password won't change until you access the link above and create a new one.

data/test/rails_app/app/views/user_mailer/unlock_token_email.text.erb

@@ -0,0 +1,10 @@
+Hello, <%= @user.email %>
+============================================================
+
+Your account has been locked due to an excessive number of unsuccessful login attempts.
+
+Click the link below to unlock your account:
+
+
+<%= unlock_url(@user.raw_unlock_token) %>
+

data/test/rails_app/app/views/users/_form.html.erb

@@ -0,0 +1,33 @@
+<%= form_for(@user) do |f| %>
+  <% if @user.errors.any? %>
+    <div id="error_explanation">
+      <h2><%= pluralize(@user.errors.count, "error") %> prohibited this user from being saved:</h2>
+
+      <ul>
+      <% @user.errors.full_messages.each do |msg| %>
+        <li><%= msg %></li>
+      <% end %>
+      </ul>
+    </div>
+  <% end %>
+  <div class="field">
+    <%= f.label :username %><br>
+    <%= f.text_field :username %>
+  </div>
+  <div class="field">
+    <%= f.label :email %><br>
+    <%= f.text_field :email %>
+  </div>
+  <div class="field">
+    <%= f.label :password %><br>
+    <%= f.password_field :password %>
+  </div>
+  <div class="field">
+    <%= f.label :password_confirmation %><br>
+    <%= f.password_field :password_confirmation %>
+  </div>
+
+  <div class="actions">
+    <%= f.submit %>
+  </div>
+<% end %>

data/test/rails_app/app/views/users/edit.html.erb

@@ -1,2 +1,6 @@
-<h1>Users#edit</h1>
-<p>Find me in app/views/users/edit.html.erb</p>
+<h1>Editing user</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Show', @user %> |
+<%= link_to 'Back', users_path %>

data/test/rails_app/app/views/users/index.html.erb

@@ -1,2 +1,25 @@
-<h1>Users#index</h1>
-<p>Find me in app/views/users/index.html.erb</p>
+<h1>Listing users</h1>
+
+<table>
+  <thead>
+    <tr>
+      <th></th>
+      <th></th>
+      <th></th>
+    </tr>
+  </thead>
+
+  <tbody>
+    <% @users.each do |user| %>
+      <tr>
+        <td><%= link_to 'Show', user %></td>
+        <td><%= link_to 'Edit', edit_user_path(user) %></td>
+        <td><%= link_to 'Destroy', user, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<br>
+
+<%= link_to 'New User', new_user_path %>

data/test/rails_app/app/views/users/new.html.erb

@@ -1,2 +1,5 @@
-<h1>Users#new</h1>
-<p>Find me in app/views/users/new.html.erb</p>
+<h1>New user</h1>
+
+<%= render 'form' %>
+
+<%= link_to 'Back', users_path %>

data/test/rails_app/app/views/users/show.html.erb

@@ -1,2 +1,4 @@
-<h1>Users#show</h1>
-<p>Find me in app/views/users/show.html.erb</p>
+<p id="notice"><%= notice %></p>
+
+<%= link_to 'Edit', edit_user_path(@user) %> |
+<%= link_to 'Back', users_path %>

data/test/rails_app/config/environments/test.rb

@@ -33,4 +33,6 @@ RailsApp::Application.configure do
 
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
+
+  config.action_mailer.default_url_options = { host: 'localhost:3000' }
 end