express_admin 1.7.31 → 1.7.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 842b9bb39a8cef50e485543dbe62fa800b429a9f
-  data.tar.gz: 34d241abc792f0698d075ab0c40c9d8e3ced9fa0
+  metadata.gz: 2b7203cd11047e5af24b9b0b5e18712dc795a31b
+  data.tar.gz: d38502cbb43733b0148b3d6a83853fb7ffb473c8
 SHA512:
-  metadata.gz: 927340d470ff5c607855802a79d882186923fba06189bc2a6fe30c6f06968eeebb2ba503685f21e340a24e17962c934c0cbf9321916688117cb36b9291436fba
-  data.tar.gz: 5e87335613d2676cd2f01222f82a6d3b4b0db110efb1d4514b75a80482e759ebab813ffaf1e86a1b89b4597836a04141b8e5ded1d967f7ad5a3aec4858f5ddda
+  metadata.gz: e8a44e05cf7bec13d68307f375234f18cff805bc37924525e0ccfc0849ade392cca1f06f3ad291a08f9ab50f3eb3631b90d9b6ff2c71a8827674a9e17ebb6315
+  data.tar.gz: 3e20299dc4a5a07c4b6a2d1974404a2202cf59fe66a289844cee901ea4e0acb94a74c4cceee2d7dfa27cd19d3897f68b2972bcd06f7ec90a6db456ae8d2fe7ee

data/config/initializers/initialize_current_user.rb

@@ -0,0 +1 @@
+ExpressAdmin.initialize_current_user!

data/lib/express_admin.rb

@@ -3,6 +3,11 @@ require "express_admin/engine"
 require "express_admin/routes"
 require "express_admin/commands"
 require "express_admin/commandable"
+require "express_admin/current_user"
 
 module ExpressAdmin
+  def self.initialize_current_user!
+    ActionController::Base::send(:include, ExpressAdmin::CurrentUser)
+    puts "Added ExpressAdmin::CurrentUser to ActionController::Base"
+  end
 end

data/lib/express_admin/current_user.rb

@@ -0,0 +1,25 @@
+require 'request_store'
+
+module ExpressAdmin
+  module CurrentUser
+    def self.included(base)
+      base.class_eval do
+        include InstanceMethods
+
+        before_action do
+          set_current_user
+        end
+      end
+    end
+
+    module InstanceMethods
+      def set_current_user
+        if defined? Devise
+          # This allows `current_user` (if defined) to be accessible
+          # outside a controller.
+          RequestStore[:current_user] = self.try(:current_user)
+        end
+      end
+    end
+  end
+end

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.7.31"
+  VERSION = "1.7.32"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.7.31
+  version: 1.7.32
 platform: ruby
 authors:
 - Steven Talcott Smith
@@ -480,8 +480,8 @@ files:
 - app/views/shared/express_admin/_navigation_bar.html.et
 - app/views/shared/express_admin/_navigation_bar_profile.html.et
 - app/views/shared/express_admin/_title.html.et
-- config/initializers/current_user.rb
 - config/initializers/gravatar_image_tag.rb
+- config/initializers/initialize_current_user.rb
 - config/initializers/kaminari.rb
 - config/initializers/postgresql_trigram.rb
 - config/initializers/tinymce-rails.rb
@@ -492,6 +492,7 @@ files:
 - lib/express_admin.rb
 - lib/express_admin/commandable.rb
 - lib/express_admin/commands.rb
+- lib/express_admin/current_user.rb
 - lib/express_admin/engine.rb
 - lib/express_admin/menu.rb
 - lib/express_admin/routes.rb

data/config/initializers/current_user.rb

@@ -1,7 +0,0 @@
-class ApplicationController < ActionController::Base
-  if defined? Devise
-    before_filter do
-      RequestStore[:current_user] = current_user
-    end
-  end
-end