From 562e3716a3ca8ad4705d7e2788fd4bdfc1e24a64 Mon Sep 17 00:00:00 2001
From: Bert Goethals <bert@bertg.be>
Date: Sat, 12 Nov 2011 14:55:18 +0100
Subject: [PATCH] Using a Glue class to include DelayedPaperclip into
 ActiveRecord.

---
 lib/delayed_paperclip.rb         | 6 ++++--
 lib/delayed_paperclip/railtie.rb | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/delayed_paperclip.rb b/lib/delayed_paperclip.rb
index 3d74ae2..7c2a1f1 100644
--- a/lib/delayed_paperclip.rb
+++ b/lib/delayed_paperclip.rb
@@ -33,8 +33,10 @@ def process_job(instance_klass, instance_id, attachment_name)
 
   end
 
-  def self.included(base)
-    base.extend(ClassMethods)
+  module Glue
+    def self.included base #:nodoc:
+      base.extend(ClassMethods)
+    end
   end
 
   module ClassMethods
diff --git a/lib/delayed_paperclip/railtie.rb b/lib/delayed_paperclip/railtie.rb
index 33404d2..0a17600 100644
--- a/lib/delayed_paperclip/railtie.rb
+++ b/lib/delayed_paperclip/railtie.rb
@@ -14,7 +14,7 @@ class Railtie < Rails::Railtie
 
   class Railtie
     def self.insert
-      ActiveRecord::Base.send(:include, DelayedPaperclip)
+      ActiveRecord::Base.send(:include, DelayedPaperclip::Glue)
       Paperclip::Attachment.send :include, DelayedPaperclip::Attachment
     end
   end