authenticate 0.3.1 → 0.3.2

data/lib/authenticate/version.rb

@@ -1,3 +1,3 @@
 module Authenticate
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'.freeze
 end

data/lib/generators/authenticate/controllers/controllers_generator.rb

@@ -6,7 +6,7 @@ require 'rails/generators/base'
 module Authenticate
   module Generators
     class ControllersGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../../../..", __FILE__)
+      source_root File.expand_path('../../../../..', __FILE__)
 
       def create_controllers
         directory 'app/controllers'
@@ -15,7 +15,6 @@ module Authenticate
       def create_mailers
         directory 'app/mailers'
       end
-
     end
   end
 end

data/lib/generators/authenticate/helpers.rb

@@ -21,7 +21,7 @@ module Authenticate
       end
 
       def namespaced?
-        !!namespace
+        !namespace.nil?
       end
 
       def model_name
@@ -56,7 +56,6 @@ module Authenticate
         @class_path.map!(&:underscore)
         @file_name = @class_path.pop
       end
-
     end
   end
 end

data/lib/generators/authenticate/install/install_generator.rb

@@ -9,8 +9,10 @@ module Authenticate
       include Authenticate::Generators::Helpers
 
       source_root File.expand_path('../templates', __FILE__)
-
-      class_option :model, optional: true, type: :string, banner: 'model',
+      class_option :model,
+                   optional: true,
+                   type: :string,
+                   banner: 'model',
                    desc: "Specify the model class name if you will use anything other than 'User'"
 
       def initialize(*)
@@ -19,7 +21,7 @@ module Authenticate
       end
 
       def verify
-        if options[:model] && !File.exists?(model_path)
+        if options[:model] && !File.exist?(model_path)
           puts "Exiting: the model class you specified, #{options[:model]}, is not found."
           exit 1
         end
@@ -49,9 +51,9 @@ module Authenticate
 
       def inject_into_application_controller
         inject_into_class(
-            'app/controllers/application_controller.rb',
-            ApplicationController,
-            "  include Authenticate::Controller\n\n"
+          'app/controllers/application_controller.rb',
+          ApplicationController,
+          "  include Authenticate::Controller\n\n"
         )
       end
 
@@ -59,20 +61,19 @@ module Authenticate
         copy_file 'authenticate.rb', 'config/initializers/authenticate.rb'
         if options[:model]
           inject_into_file(
-              'config/initializers/authenticate.rb',
-              "  config.user_model = '#{options[:model]}' \n",
-              after: "Authenticate.configure do |config|\n",
+            'config/initializers/authenticate.rb',
+            "  config.user_model = '#{options[:model]}' \n",
+            after: "Authenticate.configure do |config|\n"
           )
         end
       end
 
-
       private
 
       def create_new_users_migration
         config = {
-            new_columns: new_columns,
-            new_indexes: new_indexes
+          new_columns: new_columns,
+          new_indexes: new_indexes
         }
         copy_migration 'create_users.rb', config
       end
@@ -80,8 +81,8 @@ module Authenticate
       def create_add_columns_migration
         if migration_needed?
           config = {
-              new_columns: new_columns,
-              new_indexes: new_indexes
+            new_columns: new_columns,
+            new_indexes: new_indexes
           }
           copy_migration('add_authenticate_to_users.rb', config)
         end
@@ -90,9 +91,9 @@ module Authenticate
       def copy_migration(migration_name, config = {})
         unless migration_exists?(migration_name)
           migration_template(
-              "db/migrate/#{migration_name}",
-              "db/migrate/#{migration_name}",
-              config
+            "db/migrate/#{migration_name}",
+            "db/migrate/#{migration_name}",
+            config
           )
         end
       end
@@ -103,23 +104,23 @@ module Authenticate
 
       def new_columns
         @new_columns ||= {
-            email: 't.string :email',
-            encrypted_password: 't.string :encrypted_password, limit: 128',
-            session_token: 't.string :session_token, limit: 128',
-
-            # trackable, lifetimed
-            current_sign_in_at: 't.datetime :current_sign_in_at',
-            current_sign_in_ip: 't.string :current_sign_in_ip, limit: 128',
-            last_sign_in_at: 't.datetime :last_sign_in_at',
-            last_sign_in_ip: 't.string :last_sign_in_ip, limit: 128',
-            sign_in_count: 't.integer :sign_in_count'
+          email: 't.string :email',
+          encrypted_password: 't.string :encrypted_password, limit: 128',
+          session_token: 't.string :session_token, limit: 128',
+
+          # trackable, lifetimed
+          current_sign_in_at: 't.datetime :current_sign_in_at',
+          current_sign_in_ip: 't.string :current_sign_in_ip, limit: 128',
+          last_sign_in_at: 't.datetime :last_sign_in_at',
+          last_sign_in_ip: 't.string :last_sign_in_ip, limit: 128',
+          sign_in_count: 't.integer :sign_in_count'
         }.reject { |column| existing_users_columns.include?(column.to_s) }
       end
 
       def new_indexes
         @new_indexes ||= {
-            index_users_on_email: "add_index :#{table_name}, :email",
-            index_users_on_session_token: "add_index :#{table_name}, :session_token"
+          index_users_on_email: "add_index :#{table_name}, :email",
+          index_users_on_session_token: "add_index :#{table_name}, :session_token"
         }.reject { |index| existing_users_indexes.include?(index.to_s) }
       end
 
@@ -128,7 +129,7 @@ module Authenticate
       end
 
       def existing_migrations
-        @existing_migrations ||= Dir.glob("db/migrate/*.rb").map do |file|
+        @existing_migrations ||= Dir.glob('db/migrate/*.rb').map do |file|
           migration_name_without_timestamp(file)
         end
       end
@@ -155,8 +156,6 @@ module Authenticate
       def self.next_migration_number(dir)
         ActiveRecord::Generators::Base.next_migration_number(dir)
       end
-
-
     end
   end
 end

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

@@ -1,5 +1,4 @@
 Authenticate.configure do |config|
-
   # config.user_model = 'User'
 
   # config.cookie_name = 'authenticate_session_token'

data/lib/generators/authenticate/routes/routes_generator.rb

@@ -16,7 +16,7 @@ module Authenticate
         inject_into_file(
           'config/initializers/authenticate.rb',
           "  config.routes = false \n",
-          after: "Authenticate.configure do |config|\n",
+          after: "Authenticate.configure do |config|\n"
         )
       end
 
@@ -30,7 +30,6 @@ module Authenticate
       def routes_file_path
         File.expand_path(find_in_source_paths('routes.rb'))
       end
-
     end
   end
 end

data/lib/generators/authenticate/views/USAGE

@@ -1,6 +1,6 @@
 Description:
-    Override the default authenticate views. This generator will copy all of the
-    base authenticate views into your project.
+    Override the default authenticate views and locale file. This generator will copy all of the
+    base authenticate views and locale file into your project.
 
 Examples:
     rails generate authenticate:views
@@ -11,3 +11,4 @@ Examples:
     View: app/views/passwords/new.html.erb
     View: app/views/sessions/new.html.erb
     View: app/views/users/new.html.erb
+    Locale: config/locales/en.yml

data/lib/generators/authenticate/views/views_generator.rb

@@ -6,7 +6,7 @@ require 'rails/generators/base'
 module Authenticate
   module Generators
     class ViewsGenerator < Rails::Generators::Base
-      source_root File.expand_path("../../../../..", __FILE__)
+      source_root File.expand_path('../../../../..', __FILE__)
 
       def create_views
         directory 'app/views'
@@ -15,7 +15,6 @@ module Authenticate
       def create_locales
         directory 'config/locales'
       end
-
     end
   end
 end

data/spec/controllers/passwords_controller_spec.rb

@@ -31,7 +31,7 @@ describe Authenticate::PasswordsController, type: :controller do
       bad_email = 'bunk_email_address@non_existent_domain.com'
       it 'does not send an email' do
         ActionMailer::Base.deliveries.clear
-        post :create, password: { email: bad_email}
+        post :create, password: { email: bad_email }
         expect(ActionMailer::Base.deliveries).to be_empty
       end
       it 'always responds with redirect to avoid leaking user information' do
@@ -64,7 +64,7 @@ describe Authenticate::PasswordsController, type: :controller do
         user = create(:user, :with_password_reset_token_and_timestamp, password_reset_sent_at: 2.years.ago)
         get :edit, id: user.id, token: user.password_reset_token
         expect(response).to be_redirect
-        expect(flash[:notice]).to match /password change request has expired/
+        expect(flash[:notice]).to match(/password change request has expired/)
       end
     end
     context 'with a blank password_reset_token' do
@@ -104,16 +104,14 @@ describe Authenticate::PasswordsController, type: :controller do
         expect(response).to render_template(:edit)
       end
     end
-
   end
 
   def update_params(user, options = {})
     new_password = options.fetch(:new_password)
     {
-        id: user,
-        token: user.password_reset_token,
-        password_reset: { password: new_password }
+      id: user,
+      token: user.password_reset_token,
+      password_reset: { password: new_password }
     }
   end
-
 end

data/spec/controllers/secured_controller_spec.rb

@@ -6,18 +6,19 @@ RSpec::Matchers.define :deny_access do
   match do |controller|
     redirects_to_sign_in?(controller) && sets_flash?(controller)
   end
-  def redirects_to_sign_in? controller
+
+  def redirects_to_sign_in?(controller)
     expect(controller).to redirect_to(controller.sign_in_url)
   end
-  def sets_flash? controller
-    controller.flash[:notice].match /sign in to continue/
+
+  def sets_flash?(controller)
+    controller.flash[:notice].match(/sign in to continue/)
   end
 end
 
-
+# A dummy 'secured' controller to test
 class SecuredAppsController < ActionController::Base
   include Authenticate::Controller
-
   before_action :require_authentication, only: :show
 
   def new
@@ -29,7 +30,6 @@ class SecuredAppsController < ActionController::Base
   end
 end
 
-
 describe SecuredAppsController, type: :controller do
   before do
     Rails.application.routes.draw do

data/spec/controllers/sessions_controller_spec.rb

@@ -37,7 +37,7 @@ describe Authenticate::SessionsController, type: :controller do
     context 'with good password' do
       before do
         @user = create(:user)
-        post :create, session:{ email: @user.email, password: @user.password }
+        post :create, session: { email: @user.email, password: @user.password }
       end
       it { is_expected.to respond_with 302 }
 
@@ -63,6 +63,7 @@ describe Authenticate::SessionsController, type: :controller do
 
       it { is_expected.to redirect_to sign_in_url }
     end
+
     context 'with a session cookie' do
       before do
         @user = create(:user, session_token: 'old-session-token')
@@ -82,5 +83,4 @@ describe Authenticate::SessionsController, type: :controller do
       end
     end
   end
-
 end

data/spec/controllers/users_controller_spec.rb

@@ -26,6 +26,7 @@ describe Authenticate::UsersController, type: :controller do
       end
     end
   end
+
   describe 'post to #create' do
     context 'not signed in' do
       context 'with valid attributes' do
@@ -33,7 +34,7 @@ describe Authenticate::UsersController, type: :controller do
         subject { post :create, user: user_attributes }
 
         it 'creates user' do
-          expect{ subject }.to change{ User.count }.by(1)
+          expect { subject }.to change { User.count }.by(1)
         end
 
         it 'assigned user' do
@@ -55,7 +56,7 @@ describe Authenticate::UsersController, type: :controller do
         subject { post :create, user: user_attributes }
 
         it 'creates user' do
-          expect{ subject }.to change{ User.count }.by(1)
+          expect { subject }.to change { User.count }.by(1)
         end
 
         it 'assigned user' do
@@ -68,8 +69,8 @@ describe Authenticate::UsersController, type: :controller do
           expect(response).to redirect_to '/url_in_the_session'
         end
       end
-
     end
+
     context 'signed in' do
       it 'redirects to redirect_url' do
         sign_in
@@ -78,5 +79,4 @@ describe Authenticate::UsersController, type: :controller do
       end
     end
   end
-
 end

data/spec/features/brute_force_spec.rb

@@ -36,10 +36,8 @@ feature 'visitor has consecutive bad logins' do
       expect_user_to_be_signed_in
     end
   end
-
 end
 
-
 def expect_locked_account
   expect(page).to have_content 'Your account is locked'
 end

data/spec/features/max_session_lifetime_spec.rb

@@ -26,5 +26,4 @@ feature 'visitor has consecutive bad logins' do
       expect_user_to_be_signed_out
     end
   end
-
 end

data/spec/features/password_reset_spec.rb

@@ -36,8 +36,7 @@ feature 'visitor requests password reset' do
   end
 end
 
-
-def request_password_reset_for email
+def request_password_reset_for(email)
   visit new_password_path
   fill_in 'password_email', with: email
   click_button 'Reset password'
@@ -47,20 +46,18 @@ def expect_password_change_request_success_message
   expect(page).to have_content I18n.t('passwords.create.description')
 end
 
-def expect_user_to_have_password_reset_attributes user
+def expect_user_to_have_password_reset_attributes(user)
   user.reload
   expect(user.password_reset_token).not_to be_blank
   expect(user.password_reset_sent_at).not_to be_blank
 end
 
-def expect_password_reset_email_for user
-  recipient = user.email
-  token = user.password_reset_token
+def expect_password_reset_email_for(user)
   expect(ActionMailer::Base.deliveries).not_to be_empty
   ActionMailer::Base.deliveries.any? do |email|
-    email.to == [recipient] &&
-        email.html_part.body =~ /#{token}/ &&
-        email.text_part.body =~ /#{token}/
+    email.to == [user.email] &&
+      email.html_part.body =~ /#{user.password_reset_token}/ &&
+      email.text_part.body =~ /#{user.password_reset_token}/
   end
 end
 
@@ -68,15 +65,11 @@ def expect_mailer_to_have_no_deliveries
   expect(ActionMailer::Base.deliveries).to be_empty
 end
 
-
-
-
-
 feature 'visitor sets new password' do
   scenario 'requests password change' do
     user = given_user_with_password_reset_token
     visit_password_update_page_for user
-    request_password_change_for user
+    request_password_change
     expect_password_is_changed_for user
     expect_redirect_to_root
   end
@@ -88,7 +81,6 @@ feature 'visitor sets new password' do
   end
 end
 
-
 def given_user_with_fake_password_reset_token
   user = create :user
   user.password_reset_token = 'big_fake_token'
@@ -99,16 +91,16 @@ def given_user_with_password_reset_token
   create :user, :with_password_reset_token_and_timestamp
 end
 
-def visit_password_update_page_for user
+def visit_password_update_page_for(user)
   visit edit_users_password_path(user.id, token: user.password_reset_token)
 end
 
-def request_password_change_for user
+def request_password_change
   fill_in 'password_reset_password', with: 'new_dumb_password'
   click_button 'Save this password'
 end
 
-def expect_password_is_changed_for user
+def expect_password_is_changed_for(user)
   old_encrypted_password = user.encrypted_password
   expect(user.reload.encrypted_password).to_not eq old_encrypted_password
 end
@@ -120,4 +112,3 @@ end
 def expect_failure_flash
   expect(page).to have_content 'Please double check the URL or try submitting the form again.'
 end
-