effective_logging 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a450d9893a3bdc765a9d509a3108afb28f367b8e
-  data.tar.gz: 3c283840520c3676974d2f874d1b727fff8dd117
+  metadata.gz: 45b5d90c56f4949bfb7d96bd500b4eda755c63f7
+  data.tar.gz: 29e1b90c42b855e6e4bfdb6eabff10a8d2d99431
 SHA512:
-  metadata.gz: 0efb78ee44a94a1f32f44d687707904aa5dfc41770e98777b1acf5156ce25aa18c3358b1f37312370c394e5d6560d940f1aad639fc9e09d18ef314aa06953699
-  data.tar.gz: f50fcc75ca0eb4e8138ddae57f740773e0414789883196a01b75721b4f490091da7a7f45aecf705f5d762fdb0bdfd7e913e1ebf82ef352fd085f300f7168dec5
+  metadata.gz: 56e4cb39de8b526a00bae6f6bf058bce029adc2cea72c07cb9e4ee6a3504b2bb33706e9cf83232884a07175b529600fa9b2252ef14aefa90a2d2b4befb2b154a
+  data.tar.gz: 7511adf9b0835480625ced3d1ab7e91a6df6ed3c0245d2370f62c89bef5351f4e87e8eba5070c7376ee631a3a6f9c777263b4fa635d06e91a24e1e4fa310469f

data/lib/effective_logging/engine.rb

@@ -32,11 +32,13 @@ module EffectiveLogging
       end
     end
 
-    # Register the log_page_views concern so that it can be called in ActionController or elsewhere
+    # # Register the log_page_views concern so that it can be called in ActionController or elsewhere
     initializer 'effective_logging.log_changes_action_controller' do |app|
-      ActiveSupport.on_load :action_controller do
-        ActionController::Base.include(EffectiveLogging::SetCurrentUser)
-        ActionController::Base.send(:before_action, :set_effective_logging_current_user)
+      Rails.application.config.to_prepare do
+        ActiveSupport.on_load :action_controller do
+          require 'effective_logging/set_current_user'
+          ActionController::Base.include(EffectiveLogging::SetCurrentUser::ActionController)
+        end
       end
     end
 

data/lib/effective_logging/set_current_user.rb

@@ -1,21 +1,32 @@
 module EffectiveLogging
   module SetCurrentUser
+    module ActionController
 
-    # Add me to your ApplicationController
-    # before_action :set_effective_logging_current_user
+      # Add me to your ApplicationController
+      # before_action :set_effective_logging_current_user
 
-    def set_effective_logging_current_user
-      if respond_to?(:current_user)
-        EffectiveLogging.current_user = current_user
-      else
-        raise "(effective_logging) set_effective_logging_current_user expects a current_user() method to be available"
+      def set_effective_logging_current_user
+        if respond_to?(:current_user)
+          EffectiveLogging.current_user = current_user
+        else
+          raise "(effective_logging) set_effective_logging_current_user expects a current_user() method to be available"
+        end
       end
-    end
 
-    def set_log_changes_user
-      # No longer need to call this
-    end
+      def set_log_changes_user
+        # No longer need to call this
+      end
 
+      # Sets the before action it immediately
+      def self.included(base)
+        if base.respond_to?(:before_action)
+          base.before_action :set_effective_logging_current_user
+        else
+          base.before_filter :set_effective_logging_current_user
+        end
+      end
+
+    end
   end
 end
 

data/lib/effective_logging/version.rb

@@ -1,3 +1,3 @@
 module EffectiveLogging
-  VERSION = '1.8.0'.freeze
+  VERSION = '1.8.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: effective_logging
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - Code and Effect