From 0bb765289e04a8bb9b201e332dbdc303de5c4bab Mon Sep 17 00:00:00 2001
From: Jared Beck <jared@jaredbeck.com>
Date: Sat, 9 Apr 2016 00:08:51 -0400
Subject: [PATCH] Fix unnecessary lexical scoping

The registration of these two modules does not need to occur,
lexically, within the PaperTrail module.

The only lexical contents of a module should be methods, constants,
and statements which require that specific lexical scope.
---
 .rubocop.yml                                   | 5 +++++
 lib/paper_trail/frameworks/rails/controller.rb | 6 ++++--
 lib/paper_trail/frameworks/sinatra.rb          | 6 ++++--
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index 62c5c639..dda74879 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -55,6 +55,11 @@ Style/DoubleNegation:
 Style/GuardClause:
   MinBodyLength: 3
 
+# Use postfix (modifier) conditionals for one-liners, unless doing so would
+# exceed 60 characters.
+Style/IfUnlessModifier:
+  MaxLineLength: 60
+
 # The Ruby Style Guide says:
 #
 # > Use \ instead of + or << to concatenate two string literals at line end.
diff --git a/lib/paper_trail/frameworks/rails/controller.rb b/lib/paper_trail/frameworks/rails/controller.rb
index a1a295b3..049006dc 100644
--- a/lib/paper_trail/frameworks/rails/controller.rb
+++ b/lib/paper_trail/frameworks/rails/controller.rb
@@ -102,8 +102,10 @@ module PaperTrail
       end
     end
   end
+end
 
-  if defined?(::ActionController)
-    ::ActiveSupport.on_load(:action_controller) { include PaperTrail::Rails::Controller }
+if defined?(::ActionController)
+  ::ActiveSupport.on_load(:action_controller) do
+    include ::PaperTrail::Rails::Controller
   end
 end
diff --git a/lib/paper_trail/frameworks/sinatra.rb b/lib/paper_trail/frameworks/sinatra.rb
index b1ead623..10115054 100644
--- a/lib/paper_trail/frameworks/sinatra.rb
+++ b/lib/paper_trail/frameworks/sinatra.rb
@@ -32,6 +32,8 @@ module PaperTrail
       ::PaperTrail.whodunnit = user_for_paper_trail if ::PaperTrail.enabled?
     end
   end
-
-  ::Sinatra.register PaperTrail::Sinatra if defined?(::Sinatra)
+end
+
+if defined?(::Sinatra)
+  ::Sinatra.register(::PaperTrail::Sinatra)
 end