From aaed265c910d2a27d147cd613b1cfbcfb6694aa9 Mon Sep 17 00:00:00 2001
From: Ryan Bates <ryan@railscasts.com>
Date: Mon, 16 Nov 2009 19:24:04 -0800
Subject: [PATCH] turning into a funtioning Rails plugin

---
 init.rb                            |  1 +
 lib/cancan.rb                      | 11 +++++------
 lib/cancan/controller_additions.rb |  8 +++++---
 3 files changed, 11 insertions(+), 9 deletions(-)
 create mode 100644 init.rb

diff --git a/init.rb b/init.rb
new file mode 100644
index 0000000..db9a953
--- /dev/null
+++ b/init.rb
@@ -0,0 +1 @@
+require 'cancan'
diff --git a/lib/cancan.rb b/lib/cancan.rb
index 6e80747..227e421 100644
--- a/lib/cancan.rb
+++ b/lib/cancan.rb
@@ -1,8 +1,7 @@
-$:.unshift(File.dirname(__FILE__))
-require 'cancan/instance_exec'
-require 'cancan/ability'
-require 'cancan/controller_additions'
-
 module CanCan
   class AccessDenied < StandardError; end
-end
\ No newline at end of file
+end
+
+require File.dirname(__FILE__) + '/cancan/instance_exec'
+require File.dirname(__FILE__) + '/cancan/ability'
+require File.dirname(__FILE__) + '/cancan/controller_additions'
diff --git a/lib/cancan/controller_additions.rb b/lib/cancan/controller_additions.rb
index 92949a1..2dea04c 100644
--- a/lib/cancan/controller_additions.rb
+++ b/lib/cancan/controller_additions.rb
@@ -35,6 +35,8 @@ module CanCan
   end
 end
 
-class ActionController::Base
-  include CanCan::ControllerAdditions
-end
+if defined? ActionController
+  ActionController::Base.class_eval do
+    include CanCan::ControllerAdditions
+  end
+end
\ No newline at end of file