From d4c77462810e97a2d4b67b18ed4fafe32bb9781e Mon Sep 17 00:00:00 2001
From: Samuel Cochran <sj26@sj26.com>
Date: Thu, 17 May 2012 11:57:29 +0800
Subject: [PATCH] Don't use InstanceMethods, removes deprecation warning

---
 lib/no_peeping_toms.rb | 50 ++++++++++++++++++++----------------------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/lib/no_peeping_toms.rb b/lib/no_peeping_toms.rb
index 857f554..51a7a6c 100644
--- a/lib/no_peeping_toms.rb
+++ b/lib/no_peeping_toms.rb
@@ -45,38 +45,36 @@ def observer_enabled?(observer)
     end
   end
 
-  module InstanceMethods
-    # Overrides ActiveRecord#define_callbacks so that observers are only called
-    # when enabled.
-    #
-    # This is a bit yuck being a protected method, but appears to be the cleanest
-    # way so far
-    def define_callbacks_with_enabled_check(klass)
-      observer = self
-      observer_name = observer.class.name.underscore.gsub('/', '__')
+  # Overrides ActiveRecord#define_callbacks so that observers are only called
+  # when enabled.
+  #
+  # This is a bit yuck being a protected method, but appears to be the cleanest
+  # way so far
+  def define_callbacks_with_enabled_check(klass)
+    observer = self
+    observer_name = observer.class.name.underscore.gsub('/', '__')
 
-      ActiveRecord::Callbacks::CALLBACKS.each do |callback|
-        next unless respond_to?(callback)
-        callback_meth = :"_notify_#{observer_name}_for_#{callback}"
-        unless klass.respond_to?(callback_meth)
-          klass.send(:define_method, callback_meth) do
-            observer.send(callback, self) if observer.observer_enabled?
-          end
-          klass.send(callback, callback_meth)
+    ActiveRecord::Callbacks::CALLBACKS.each do |callback|
+      next unless respond_to?(callback)
+      callback_meth = :"_notify_#{observer_name}_for_#{callback}"
+      unless klass.respond_to?(callback_meth)
+        klass.send(:define_method, callback_meth) do
+          observer.send(callback, self) if observer.observer_enabled?
         end
+        klass.send(callback, callback_meth)
       end
     end
+  end
 
-    # Enables interception of custom observer notifications, i.e.
-    #   notify_observers(:custom_notification)
-    def update(*args, &block)
-      super if observer_enabled?
-    end
+  # Enables interception of custom observer notifications, i.e.
+  #   notify_observers(:custom_notification)
+  def update(*args, &block)
+    super if observer_enabled?
+  end
 
-    # Determines whether this observer should be run
-    def observer_enabled?
-      self.class.observer_enabled?(self)
-    end
+  # Determines whether this observer should be run
+  def observer_enabled?
+    self.class.observer_enabled?(self)
   end
 end