goma 0.0.1.beta → 0.0.1.gamma

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af5f7ed8eefed280b495dd5d0a152daebdfac80c
-  data.tar.gz: 703c1616889b139b5b76bff799e12a3c6b8f8027
+  metadata.gz: a89f50e2d41994b88fc95fbc6c981684f8a71043
+  data.tar.gz: 0d9c4bb7dd2dfd2836b903d62fd5689d7bee43ed
 SHA512:
-  metadata.gz: 998571ea655a6c735e0142a0cfea9fed899747c85ffc2f7bae397e31a890049cff8055aeda0971c89fdbc75117f7461cda02cc99350e71c816c3efdea0985fc3
-  data.tar.gz: 43e0954377398b50fa0309f4563fcae81fb72da6afb345f3ef5aa3ed778f8937684323d4444dd44e6ec2ac09a997dcc957d4b82f0ddaef5af967d8032612c9e6
+  metadata.gz: e1e4c13eb562fc355eb35effae5a44eca9f4f0e29d50ed69de2687689893609ef14ccc234d42eb9290b59f87091d1a596f9453405dcdaa701191fb864e5ba20d
+  data.tar.gz: 141f626b7c5a22e697bab9b7c63a4c335872e8b024be56c8e68a09e58ba9f44c464df38af417afb87d171a58c87ee1d1d30eee306ba4d788b87f82125abb840a

data/Gemfile

@@ -15,4 +15,5 @@ gemspec
 
 group :development, :test do
   gem 'omniauth'
+  gem 'omniauth-twitter'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    goma (0.0.1.beta)
+    goma (0.0.1.gamma)
       rails (~> 4.0)
       warden
 
@@ -58,9 +58,16 @@ GEM
     mocha (1.0.0)
       metaclass (~> 0.0.1)
     multi_json (1.9.3)
+    oauth (0.4.7)
     omniauth (1.2.1)
       hashie (>= 1.2, < 3)
       rack (~> 1.0)
+    omniauth-oauth (1.0.1)
+      oauth
+      omniauth (~> 1.0)
+    omniauth-twitter (1.0.1)
+      multi_json (~> 1.3)
+      omniauth-oauth (~> 1.0)
     polyglot (0.3.4)
     rack (1.5.2)
     rack-test (0.6.2)
@@ -114,6 +121,7 @@ DEPENDENCIES
   minitest-ansi
   mocha
   omniauth
+  omniauth-twitter
   shoulda-context
   single_test
   sqlite3

data/README.md

@@ -60,7 +60,7 @@ rails generate goma:scaffold NAME
 
 Replace NAME by the class name used for the applications users, it's frequently `user` but could also be anything you want. This will create a model with a migration, controllers, views, and mailers (that are configured based on the initializer file which is created by `rails generate goma:install`).
 
-Please note that this scaffold generator is just a "better than nothing' thing. It does not include tests and there must be bugs. But if you see the code which is generated by this scaffold, you can see how to use this gem roughly. If you find bugs, please create an issue or send a pull request.
+Please note that this scaffold generator is just a "better than nothing" thing. It does not include tests and there must be bugs. But if you see the code which is generated by this scaffold, you can see how to use this gem roughly. If you find bugs, please create an issue or send a pull request.
 
 
 You can also use the following generators.
@@ -89,26 +89,29 @@ rails generate goma:model MODEL
 
 ```
   # in routes
-  current_user # If you have an :admin scope, you can use current_admin
-  user_logged_in? # you can specify scope
+  current_user        # If you have an :admin scope, you can use current_admin
+  logged_in?          #
+  user_logged_in?     # you can specify scope
 
   # in controllers
-  require_login # this is a before filter (default scope)
-  require_user_login # ditto. You can specify a scope.
-  login(identifier, password, remember_me=false) # You can use multiple identifiers in a field, such as username or email.
-  force_login(user) # Login without credentials (same as auto_login in Sorcery gem)
-  logout(scope=Goma.config.default_scope) # Logout. you can specify a scope.
-  user_logout # ditto
-  logged_in? # Available in view
-  user_logged_in? # ditto. You can specify a scope.
-  current_user # Available in view. If you have an :admin scope, you can use current_admin
+  require_login       # this is a before filter (default scope)
+  require_user_login  # ditto. You can specify a scope.
+  login(identifier, password, remember_me=false)
+                      # You can use multiple identifiers in a field, such as username or email.
+  force_login(user)   # Login without credentials (same as auto_login in Sorcery gem)
+  logout(scope=Goma.config.default_scope)
+                      # Logout. you can specify a scope.
+  user_logout         # ditto
+  logged_in?          # Available in view
+  user_logged_in?     # ditto. You can specify a scope.
+  current_user        # Available in view. If you have an :admin scope, you can use current_admin
 
   # Password authenticatable
-  find_by_identifier # You can find user by authentication key
+  find_by_identifier  # You can find user by authentication key
 
   # Rememberable
-  remember_me! # Goma call this automatically so that, usually, You don't have to call this manually.
-  forget_me!   # ditto
+  remember_me!        # Goma call this automatically so that, usually, You don't have to call this manually.
+  forget_me!          # ditto
 
   # Confirmable
   User.load_from_activation_token(token)

data/goma.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- test/*`.split("\n")
   s.require_paths = ['lib']
   s.post_install_message =<<-MESSAGE
+
 \e[32mThank you for installing!
 
 You can use this gem as follows:
@@ -28,6 +29,21 @@ Edit config/initializers/goma.rb to fit your needs.
 
 \e[0mrails g goma:scaffold User\e[32m
 
+
+===========================================================================
+Some setup you must do manually if you heven't yet:
+
+- Ensure you have defined default url options in your environments files.
+  Here is an example of default_url_options appropriate for a development
+  environment in config/environments/development.rb
+
+  \e[0mconfig.action_mailer.default_url_options = { host: 'localhost:3000' }\e[32m
+
+  in production, :host should be set to the actual host of your application.
+
+===========================================================================
+
+
 That's it.
 
 This gem is in early development phase and I do not recommend you to use this for production for a while.

data/lib/generators/goma/erb/templates/confirmation/new.html.erb

@@ -2,8 +2,8 @@
 
 <%%= form_tag(:<%= name.underscore.pluralize %>_url, method: :post) do %>
   <div class="field">
-    <%%= label_tag :<%= goma_config.authentication_keys.join('_or_') %> %><br>
-    <%%= text_field_tag :identifier %>
+    <%%= label_tag :<%= goma_config.authentication_keys.to_field_name %> %><br>
+    <%%= text_field_tag :<%= goma_config.authentication_keys.to_field_name %>
   </div>
   <div class="actions">
     <%%= submit_tag "Resend activation instructions" %>

data/lib/generators/goma/erb/templates/password/new.html.erb

@@ -2,8 +2,8 @@
 
 <%%= form_tag(<%= name.underscore.pluralize %>_url, method: :post) do %>
   <div class="field">
-    <%%= label_tag :<%= goma_config.authentication_keys.join('_') %> %><br>
-    <%%= text_field_tag :identifier %>
+    <%%= label_tag :<%= goma_config.authentication_keys.to_field_name %> %><br>
+    <%%= text_field_tag :<%= goma_config.authentication_keys.to_field_name %> %>
   </div>
   <div class="actions">
     <%%= submit_tag "Send me reset password instructions" %>

data/lib/generators/goma/erb/templates/session/new.html.erb

@@ -1,9 +1,9 @@
 <h1>Login</h1>
 
-<%%= form_tag(<%= name.underscore.pluralize %>_url, method: :post) do %>
+<%%= form_tag(<%= name.underscore %>_url, method: :post) do %>
   <div class="field">
-    <%%= label_tag :<%= goma_config.authentication_keys.join('_or_') %> %><br>
-    <%%= text_field_tag :identifier %>
+    <%%= label_tag :<%= goma_config.authentication_keys.to_field_name %> %><br>
+    <%%= text_field_tag :<%= goma_config.authentication_keys.to_field_name %> %>
   </div>
   <div class="field">
     <%%= label_tag :<%= goma_config.password_attribute_name %> %><br>

data/lib/generators/goma/erb/templates/unlock/new.html.erb

@@ -2,8 +2,8 @@
 
 <%%= form_tag(<%= name.underscore.pluralize%>_url, method: :post) do %>
   <div class="field">
-    <%%= label_tag :<%= goma_config.authentication_keys.join('_') %> %><br>
-    <%%= text_field_tag :identifier %>
+    <%%= label_tag :<%= goma_config.authentication_keys.to_field_name %> %><br>
+    <%%= text_field_tag :<%= goma_config.authentication_keys.to_field_name %>
   </div>
   <div class="actions">
     <%%= submit_tag "Resend unlock instructions" %>

data/lib/generators/goma/helpers/helpers.rb

@@ -66,3 +66,8 @@ module Goma
   end
 end
 
+class Array
+  def to_field_name
+    self.to_sentence(words_connector: '_', two_words_connector: '_or_', last_word_connector: '_or_')
+  end
+end

data/lib/generators/goma/install/templates/goma.rb

@@ -1,28 +1,39 @@
 Goma.configure do |config|
   # config.default_mailer_name = 'UserMailer'
   config.mailer_sender = 'please-change-me-at-config-initializers-goma@example.com'
-  # config.authentication_keys = [ :email ]
-  # config.email_regexp = /\A[^@]+@[^@]+\z/
-  # config.case_insensitive_keys = [ :email ]
-  # config.strip_whitespace_keys = [ :email ]
   # config.clean_up_csrf_token_on_authentication = true
   config.secret_key = '<%= SecureRandom.hex(64) %>'
-  # config.encryptor = :bcrypt
-  config.stretches = Rails.env.test? ? 1 : 10
-  # config.pepper = '<%= SecureRandom.hex(64) %>'
-  # config.serialization_method = :devise
+  # config.serialization_method = :goma
   # config.scopes = [:user]
   # config.default_scope = :user
-  # config.modules = [:password_authenticatable]
+  #
+  # Select modules you need. All modules are included by default.
+  config.modules = [:password_authenticatable, :validatable, :confirmable, :rememberable, :timeoutable, :lockable, :recoverable, :trackable, :omniauthable]
+  # config.save_return_to_url = true
+  # config.not_authenticated_action = :not_authenticated
+
 
+  ####################################################
+  # Password authenticatable
+  # config.authentication_keys = [ :email ]
+  # config.case_insensitive_keys = [ :email ]
+  # config.strip_whitespace_keys = [ :email ]
+  # config.encryptor = :bcrypt
+  # config.pepper = '<%= SecureRandom.hex(64) %>'
+  config.stretches = Rails.env.test? ? 1 : 10
   # config.email_attribute_name = :email
   # config.password_attribute_name = :password
   # config.encrypted_password_attribute_name = :encrypted_password
 
+  ####################################################
+  # Validatable
+  # config.password_length = 8..128
+  # config.email_regexp = /\A[^@]+@[^@]+\z/
+
   ####################################################
   # Confirmable
   # config.activation_mailer_name = nil
-  # config.mailer_for_email_confirmation = nil
+  # config.email_confirmation_mailer_name = nil
   # config.confirmation_keys = [ :email ]
   # config.allow_unconfirmed_access_for = 0
   # config.activate_within = 3.days
@@ -44,22 +55,28 @@ Goma.configure do |config|
   # config.remember_for = 2.weeks
   # config.extend_remember_period = false
   # config.rememberable_options = {}
+  # config.remember_token_attribute_name = nil
+  # config.remember_created_at_attribute_name = :remember_created_at
 
 
   ####################################################
   # Timeoutable
   # config.timeout_in = 30.minutes
   # config.logout_all_scopes = false
+  # config.validate_session_even_in_not_login_area = true
 
   ####################################################
   # Lockable
   # config.unlock_token_mailer_name = nil
+  # config.unlock_token_email_method_name = :unlock_email
   # config.lock_strategy = :failed_attempts
   # config.unlock_keys = [ :email ]
   # config.unlock_strategies = [ :email, :time ]
   # config.maximum_attempts = 20
+  # config.failed_attempts_attribute_name = :failed_attempts
+  # config.locked_at_attribute_name = :locked_at
   # config.unlock_in = 1.hour
-  # config.last_attempt_warning = false
+  # config.last_attempt_warning = false # TODO not yet implemented
   # config.unlock_token_attribute_name = :unlock_token
   # config.unlock_token_sent_at_attribute_name = :unlock_token_sent_at
   # config.unlock_token_to_send_attribute_name = :raw_unlock_token
@@ -67,30 +84,29 @@ Goma.configure do |config|
   ####################################################
   # Recoverable
   # config.reset_password_mailer_name = nil
+  # config.reset_password_email_method_name = :reset_password_email
   # config.reset_password_keys = [ :email ]
   # config.reset_password_within = 6.hours
   # config.reset_password_token_attribute_name = :reset_password_token
   # config.reset_password_token_sent_at_attribute_name = :reset_password_token_sent_at
   # config.reset_password_token_to_send_attribute_name = :raw_reset_password_token
 
+  ####################################################
+  # Trackable
+  # config.login_count_attribute_name = :login_count
+  # config.current_login_at_attribute_name = :current_login_at
+  # config.last_login_at_attribute_name = :last_login_at
+  # config.current_login_ip_attribute_name = :current_login_ip
+  # config.last_login_ip_attribute_name = :last_login_ip
+
   ####################################################
   # Omniauthable
-  # No providers are registered by default.
-  # ex.)
-  # config.omniauth :developer if Rails.env.in? ['development', 'test']
-  # config.omniauth :twitter, 'APP_ID', 'APP_SECRET'
-  #
   # config.oauth_authentication_class_name = 'Authentication'
   # config.oauth_provider_attribute_name = :provider
   # config.oauth_uid_attribute_name = :uid
-
-
-  ####################################################
-  # Attribute names settings
-  # config.salt_attribute_name = nil
-  # config.salt_join_token = ''
 end
 
 # Scope specific configuration
 # Goma.configure_for(:user) do |config|
+  # -- scope specifig configurations goes here --
 # end

data/lib/generators/goma/mailer/erb/templates/activation_needed_email.html.erb

@@ -2,4 +2,4 @@
 
 <p>You can activate your account through the link below:</p>
 
-<p><%%= link_to 'Activate my account', activate_user_url(@<%= resource_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %>) %></p>
+<p><%%= link_to 'Activate my account', confirmation_url(@<%= resource_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %>) %></p>

data/lib/generators/goma/mailer/erb/templates/activation_needed_email.text.erb

@@ -3,4 +3,4 @@ Welcome, <%%= @<%= resource_name %>.<%= goma_config.email_attribute_name %> %>
 
 You can activate your account through the link below:
 
-<%%= activate_user_url(@<%= resource_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %>) %>
+<%%= activate_confirmation_url(@<%= resource_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %>) %>

data/lib/generators/goma/mailer/erb/templates/email_confirmation_needed_email.html.erb

@@ -2,4 +2,4 @@
 
 <p>You can confirm your account email through the link below:</p>
 
-<p><%%= link_to 'Comfirm my account email', confirm_user_url(@<%= resource_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %>) %></p>
+<p><%%= link_to 'Comfirm my account email', email_confirmation_url(@<%= resource_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %>) %></p>

data/lib/generators/goma/mailer/erb/templates/email_confirmation_needed_email.text.erb

@@ -3,4 +3,4 @@ Hello, <%%= @<%= resource_name %>.<%= goma_config.email_attribute_name %> %>
 
 You can confirm your account email through the link below:
 
-<%%= confirm_user_url(@<%= resource_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %>) %>
+<%%= email_confirmation_url(@<%= resource_name %>.<%= goma_config.confirmation_token_to_send_attribute_name %>) %>

data/lib/generators/goma/mailer/templates/mailer.rb

@@ -1,6 +1,6 @@
 <% module_namespacing do -%>
 class <%= class_name %> < ActionMailer::Base
-  default from: "from@example.com"
+  default from: "<%= goma_config.mailer_sender %>"
 
 <% goma_actions.each do |action, subject| -%>
   # Subject can be set in your I18n file at config/locales/en.yml

data/lib/generators/goma/model/active_record_generator.rb

@@ -12,6 +12,17 @@ module Goma
           merge_goma_user_attributes!
         end
 
+        def add_options_to_migration
+          if path = self.class.migration_exists?('db/migrate', migration_file_name)
+            gsub_file(path,
+                      "t.integer :#{goma_config.failed_attempts_attribute_name}",
+                      "t.integer :#{goma_config.failed_attempts_attribute_name}, default: 0, null: false")
+            gsub_file(path,
+                      "t.integer :#{goma_config.login_count_attribute_name}",
+                      "t.integer :#{goma_config.login_count_attribute_name}, default: 0, null: false")
+          end
+        end
+
       private
         def merge_goma_user_attributes!
           self.attributes = (goma_user_attributes.map do |attr|

data/lib/generators/goma/model/oauth/active_record_generator.rb

@@ -9,14 +9,23 @@ module Goma
           @generator_name = 'active_record'
           hide!
 
-          source_root File.expand_path('../../templates', __FILE__)
+          source_root File.expand_path('../templates', __FILE__)
 
           def initialize(*)
             super
             merge_goma_oauth_attributes!
           end
 
+          # This method overwrite is needed, because template source location is different. (one level deeper)
+          # I know this is terrible hack.
+          def create_migration_file
+            return unless options[:migration] && options[:parent].nil?
+            attributes.each { |a| a.attr_options.delete(:index) if a.reference? && !a.has_index? } if options[:indexes] == false
+            migration_template "../../../migration/templates/create_table_migration.rb", "db/migrate/create_#{table_name}.rb"
+          end
+
           def inject_index
+            # if path = self.class.migration_exists('db/migrate', migration_file_name)
             if behavior == :invoke
               insert_into_file("db/migrate/#{migration_number}_#{migration_file_name}.rb", goma_oauth_index, {after: /^\s{4,}end\s*\n/})
             end

data/lib/generators/goma/model/oauth/templates/model.rb

@@ -0,0 +1,5 @@
+<% module_namespacing do -%>
+class <%= class_name %> < <%= parent_class_name.classify %>
+<% "Omit belongs_to line because it seems not be used in ordinary situation" -%>
+end
+<% end -%>

data/lib/generators/goma/resource_route/resource_route_generator.rb

@@ -38,14 +38,14 @@ module Goma
       end
 
       def resource_string
-        "#{resources_or_resource} :#{file_name.pluralize}#{restriction}#{appending_string}"
+        "#{resource_definition}#{restriction}#{appending_string}"
       end
 
-      def resources_or_resource
-        if options[:controller_type] == :session
-          "resource"
+      def resource_definition
+        if options[:controller_type] == 'session'
+          "resource :#{file_name.singularize}"
         else
-          "resources"
+          "resources :#{file_name.pluralize}"
         end
       end
 
@@ -53,12 +53,10 @@ module Goma
         case options[:controller_type]
         when 'session'
           ', only: [:new, :create, :destroy]'
-        when 'confirmation'
-          ', only: [:new, :create]'
+        when 'confirmation', 'unlock'
+          ', only: [:show, :new, :create]'
         when 'password'
           ', only: [:new, :create, :edit, :update]'
-        when 'unlock'
-          ', only: [:show, :new, :create,]'
         when 'oauth'
           ', only: [:create]'
         else
@@ -67,11 +65,11 @@ module Goma
       end
 
       def appending_string
-        if options[:controller_type] == 'confirmation' && goma_config.modules.include?(:confirmable)
+        if options[:controller_type] == 'confirmation' &&
+          goma_config.modules.include?(:confirmable) && goma_config.email_confirmation_enabled
           strings = []
           strings << ' do'
-          strings << '  get :activate, on: :member'
-          strings << '  get :confirm,  on: :member' if goma_config.email_confirmation_enabled
+          strings << '  get :email,  on: :member'
           strings << 'end'
           strings.join("\n")
         elsif options[:controller_type] == 'oauth'

data/lib/generators/goma/scaffold_controller/templates/confirmation_controller.rb

@@ -12,7 +12,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
   # POST <%= route_url %>
   def create
-    @<%= resource_name %> = <%= resource_class_name %>.find_by_identifier(params[:identifier])
+    @<%= resource_name %> = <%= resource_class_name %>.find_by_identifier(params[:<%= goma_config.authentication_keys.to_field_name %>])
     @<%= resource_name %>.generate_confirmation_token
     @<%= resource_name %>.send_activation_needed_email
 
@@ -20,8 +20,8 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
 
-  # GET <%= route_url %>/1/activate
-  def activate
+  # GET <%= route_url %>/1
+  def show
     @<%= resource_name %>, err = <%= resource_class_name %>.load_from_activation_token_with_error(params[:id])
 
     if @<%= resource_name %>
@@ -38,8 +38,8 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
 
-  # GET <%= route_url %>/1/confirm
-  def confirm
+  # GET <%= route_url %>/1/email
+  def email
     @<%= resource_name %>, err = <%= resource_class_name %>.load_from_email_confirmation_token_with_error(params[:id])
 
     if @<%= resource_name %>

data/lib/generators/goma/scaffold_controller/templates/oauth_controller.rb

@@ -14,7 +14,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     else
       <%=resource_name %> = <%= resource_class_name %>.create_with_omniauth!(omniauth)
     end
-    force_<%= resource_name %>_login(<%= resource_name %>)
+    force_login(<%= resource_name %>)
     <%= specify_scope_if_needed %>redirect_back_or_to root_url, notice: "Successfully authenticated from #{omniauth[:provider]} account."
   end
 end

data/lib/generators/goma/scaffold_controller/templates/password_controller.rb

@@ -12,7 +12,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
   # POST <%= route_url %>
   def create
-    @<%= resource_name %> = <%= resource_class_name %>.find_by_identifier(params[:identifier])
+    @<%= resource_name %> = <%= resource_class_name %>.find_by_identifier(params[:<%= goma_config.authentication_keys.to_field_name %>])
     @<%= resource_name %>.send_reset_password_instructions! if @<%= resource_name %>
 
     flash[:notice] = "You will receive an email with instructions about how to reset your password in a few minutes."
@@ -31,7 +31,7 @@ class <%= controller_class_name %>Controller < ApplicationController
     if @<%= resource_name %>
       @<%= resource_name %>.unlock_access! if @<%= resource_name %>.lockable? && @<%= resource_name %>.access_locked?
       @<%= resource_name %>.change_password!(params[:<%= goma_config.password_attribute_name %>], params[:<%= goma_config.password_attribute_name %>_confirmation])
-      force_<%= resource_name %>_login(@<%= resource_name %>)
+      force_login(@<%= resource_name %>)
       <%= specify_scope_if_needed %>redirect_back_or_to root_url, notice: 'Your password was changed successfully. You are now logged in.'
     else
       if err == :token_expired

data/lib/generators/goma/scaffold_controller/templates/session_controller.rb

@@ -13,7 +13,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   # POST <%= route_url %>
   def create
 <% if goma_config.modules.include? :confirmable -%>
-     if @<%= resource_name %> = <%= resource_name %>_login(params[:identifier], params[:<%= goma_config.password_attribute_name %>]<% goma_config.modules.include?(:rememberable) ? ', params[:remember_me]' : '' %>)
+     if @<%= resource_name %> = <%= resource_name %>_login(params[:<%= goma_config.authentication_keys.to_field_name %>], params[:<%= goma_config.password_attribute_name %>]<%= goma_config.modules.include?(:rememberable) ? ', params[:remember_me]' : '' %>)
       <%= specify_scope_if_needed %>redirect_back_or_to root_url, notice: 'Login successful'
     else
       if goma_error(:<%= resource_name %>) == :not_activated
@@ -24,7 +24,7 @@ class <%= controller_class_name %>Controller < ApplicationController
       render :new
     end
 <% else -%>
-    if @<%= resource_name %> = <%= resource_name %>_login(params[:identifier], params[:<%= goma_config.password_attribute_name %>])
+    if @<%= resource_name %> = <%= resource_name %>_login(params[:<%= goma_config.authentication_keys.to_field_name %>], params[:<%= goma_config.password_attribute_name %>])
       <%= specify_scope_if_needed %>redirect_back_or_to root_url, notice: 'Login successful'
     else
       flash.now[:alert] = 'Login failed'

data/lib/generators/goma/scaffold_controller/templates/unlock_controller.rb

@@ -28,7 +28,7 @@ class <%= controller_class_name %>Controller < ApplicationController
 
   # POST <%= route_url %>
   def create
-    @<%= resource_name %> = <%= resource_class_name %>.find_by_identifier(params[:identifier])
+    @<%= resource_name %> = <%= resource_class_name %>.find_by_identifier(params[:<%= goma_config.authentication_keys.to_field_name %>])
     @<%= resource_name %>.send_unlock_instructions!
 
     flash[:notice] = 'Instructions have been sent to your email.'

data/lib/generators/goma/scaffold_controller/templates/user_controller.rb

@@ -29,7 +29,12 @@ class <%= controller_class_name %>Controller < ApplicationController
     @<%= singular_table_name %> = <%= orm_class.build(class_name, "#{singular_table_name}_params") %>
 
     if @<%= orm_instance.save %>
-      redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully created.'" %>
+<% if goma_config.modules.include?(:confirmable) && goma_config.allow_unactivated_access_for == 0 -%>
+      redirect_to <%= login_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 -%>
+      force_login(@<%= singular_table_name %>)
+      redirect_back_or_to root_url, notice: "Welcome! You have signed up successfully.<%= goma_config.modules.include?(:confirmable) ? ' You will receive an email with instructions about how to activate your account in a few minutes.' : '' %>"
+<% end -%>
     else
       render :new
     end