trestle-auth 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e01368d321502dbe498b5bdf59088390bd6086aeef291013f0baaa0416ef4c2
-  data.tar.gz: 9eaec32a25dc19056911f58982dcec072f426ca5835e30fe6501064c7374c68b
+  metadata.gz: 8ef9ad52449a79a688c9ee2a6e7b86c35179b4c0bad12390f69cb31cf25704ff
+  data.tar.gz: 30f3172c89781a4baa176f1dffa233efbb1060a7cf5171aa93339b7aa27d1d3f
 SHA512:
-  metadata.gz: 0df58e37c7544874b4e4c72367933e2cec9729cb7aa68effcb6d35cd92abde4e53f73e3ad4abee0598fa3fcfe1fcaa0f6593af3ff75b5f7e6e2ddbe2b48b4b5b
-  data.tar.gz: fb7e23d61644b5e88bd9a92ade6c0e16e52fbf8d71d76c2ef45445ef219550cd3443ffea6a9d116b49fe801fa3bdeaaa43b7d83fb0fea809277e4faa0cc0e203
+  metadata.gz: c51b04bb59d56bf4e65f268944fb1b1f0e92001ad83115f630a24381bc70f7474491456126bfffad1372612150d75481dd98bb46cbc2e200116efb4cc1983c89
+  data.tar.gz: f5dfe2f6cf6298d8b8ff39be723498951d40a77f53671e4845a85c23c7bfddc09f27ff21fdf06e583f33e8254d9f9c3e37faa33b873e2af732e91be0df776b06

data/app/controllers/trestle/auth/sessions_controller.rb

@@ -10,7 +10,7 @@ class Trestle::Auth::SessionsController < Trestle::ApplicationController
     if user = Trestle.config.auth.authenticate(params)
       login!(user)
       remember_me! if params[:remember_me] == "1"
-      redirect_to previous_location || Trestle.config.path
+      redirect_to previous_location || instance_exec(&Trestle.config.auth.redirect_on_login)
     else
       flash[:error] = t("admin.auth.error", default: "Incorrect login details.")
       redirect_to action: :new
@@ -19,6 +19,6 @@ class Trestle::Auth::SessionsController < Trestle::ApplicationController
 
   def destroy
     logout!
-    redirect_to login_url
+    redirect_to instance_exec(&Trestle.config.auth.redirect_on_logout)
   end
 end

data/app/helpers/trestle/auth/user_helper.rb

@@ -1,13 +1,9 @@
 module Trestle::Auth::UserHelper
   def format_user_name(user)
-    if user.respond_to?(:first_name) && user.respond_to?(:last_name)
-      safe_join([user.first_name, content_tag(:strong, user.last_name)], " ")
-    else
-      display(user)
-    end
+    instance_exec(user, &Trestle.config.auth.format_user_name)
   end
 
   def avatar_for(user)
-    avatar { instance_exec(user, &Trestle.config.auth.avatar) } if Trestle.config.auth.avatar
+    instance_exec(user, &Trestle.config.auth.avatar) if Trestle.config.auth.avatar
   end
 end

data/app/views/trestle/auth/_userbox.html.erb

@@ -10,7 +10,7 @@
 
   <ul class="dropdown-menu dropdown-menu-right">
     <% if Trestle.config.auth.user_admin && user_admin = Trestle.lookup(Trestle.config.auth.user_admin) -%>
-      <li><%= link_to t("admin.auth.my_account", default: "My Account"), user_admin.path(:show, id: current_user), class: "dropdown-item" %></li>
+      <li><%= admin_link_to t("admin.auth.my_account", default: "My Account"), current_user, admin: user_admin, class: "dropdown-item" %></li>
     <% end -%>
     <li><%= link_to t("admin.auth.logout", default: "Log out"), trestle.logout_path, class: "dropdown-item" %></li>
   </ul>

data/lib/generators/trestle/auth/install/install_generator.rb

@@ -6,6 +6,12 @@ module Trestle
 
         argument :model, type: :string, default: "Administrator"
 
+        def check_trestle_installed
+          unless ::File.exist?("config/initializers/trestle.rb")
+            raise Thor::Error, "The file config/initializers/trestle.rb does not appear to exist. Please run `trestle:install` first."
+          end
+        end
+
         def insert_configuration
           inject_into_file "config/initializers/trestle.rb", before: /^end/ do
             <<-RUBY.strip_heredoc.indent(2)
@@ -48,7 +54,17 @@ module Trestle
               # Defaults to the Gravatar based on the user's email address.
               #
               # config.auth.avatar = ->(user) {
-              #   image_tag(user.avatar_url, alt: user.name)
+              #   avatar(fallback: user.initials) do
+              #     image_tag(user.avatar_url, alt: user.name) if user.avatar_url?
+              #   end
+              # }
+
+              # Customize the rendering of the current user's name in the main header.
+              # Defaults to the user's #first_name and #last_name (last name in bold),
+              # with a fallback to `display(user)` if those methods aren't defined.
+              #
+              # config.auth.format_user_name = ->(user) {
+              #   content_tag(:strong, user.full_name)
               # }
 
               # Customize the method for determining the user's locale.
@@ -65,6 +81,22 @@ module Trestle
               #   user.time_zone if user.respond_to?(:time_zone)
               # }
 
+              # Specify the redirect location after a successful login.
+              # Defaults to the main Trestle admin path.
+              #
+              # config.auth.redirect_on_login = -> {
+              #   if admin = Trestle.lookup(Trestle.config.auth.user_admin)
+              #     admin.instance_path(current_user)
+              #   else
+              #     Trestle.config.path
+              #   end
+              # }
+
+              # Specify the redirect location after logging out.
+              # Defaults to the trestle-auth new login path.
+              #
+              # config.auth.redirect_on_logout = -> { "/" }
+
               # Enable or disable remember me functionality. Defaults to true.
               #
               # config.auth.remember.enabled = false

data/lib/trestle/auth/configuration.rb

@@ -27,16 +27,27 @@ module Trestle
       }
 
       option :avatar, ->(user) {
-        gravatar(user.email)
+        avatar { gravatar(user.email) }
+      }, evaluate: false
+
+      option :format_user_name, ->(user) {
+        if user.respond_to?(:first_name) && user.respond_to?(:last_name)
+          safe_join([user.first_name, content_tag(:strong, user.last_name)], " ")
+        else
+          display(user)
+        end
       }, evaluate: false
 
       option :locale, ->(user) {
         user.locale if user.respond_to?(:locale)
-      }
+      }, evaluate: false
 
       option :time_zone, ->(user) {
         user.time_zone if user.respond_to?(:time_zone)
-      }
+      }, evaluate: false
+
+      option :redirect_on_login, -> { Trestle.config.path }, evaluate: false
+      option :redirect_on_logout, -> { login_url }, evaluate: false
 
       option :remember, Rememberable.new
     end

data/lib/trestle/auth/controller_methods.rb

@@ -8,8 +8,8 @@ module Trestle
 
         before_action :require_authenticated_user
 
-        around_action :set_locale, if: :logged_in?
-        around_action :set_time_zone, if: :logged_in?
+        around_action :set_locale, if: :logged_in? if Trestle.config.auth.locale
+        around_action :set_time_zone, if: :logged_in? if Trestle.config.auth.time_zone
       end
 
     protected
@@ -71,11 +71,11 @@ module Trestle
       end
 
       def set_locale
-        I18n.with_locale(Trestle.config.auth.locale(current_user) || I18n.default_locale) { yield }
+        I18n.with_locale(Trestle.config.auth.locale.call(current_user) || I18n.default_locale) { yield }
       end
 
       def set_time_zone
-        Time.use_zone(Trestle.config.auth.time_zone(current_user) || Rails.application.config.time_zone) { yield }
+        Time.use_zone(Trestle.config.auth.time_zone.call(current_user) || Rails.application.config.time_zone) { yield }
       end
     end
   end

data/lib/trestle/auth/version.rb

@@ -1,5 +1,5 @@
 module Trestle
   module Auth
-    VERSION = "0.2.4"
+    VERSION = "0.2.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trestle-auth
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Sam Pohlenz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-23 00:00:00.000000000 Z
+date: 2018-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trestle