Change how the base module is included to prevent namespacing conflicts

twalpole · Oct 4, 2008 · 24b5b61 · 24b5b61
1 parent cfff9f2
commit 24b5b61
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
@@ -1,5 +1,7 @@
 == master
 
+* Change how the base module is included to prevent namespacing conflicts
+
 == 0.1.3 / 2008-06-29
 
 * Add +prefs+ as an alias for +preferences+

diff --git a/lib/preferences.rb b/lib/preferences.rb
@@ -21,12 +21,6 @@ module PluginAWeek #:nodoc:
   #   u.attributes = {:prefers_notifications => true}
   #   u.save!
   module Preferences
-    def self.included(base) #:nodoc:
-      base.class_eval do
-        extend PluginAWeek::Preferences::MacroMethods
-      end
-    end
-
     module MacroMethods
       # Defines a new preference for all records in the model.  By default, preferences
       # are assumed to have a boolean data type, so all values will be typecasted
@@ -286,5 +280,5 @@ def update_preferences
 end
 
 ActiveRecord::Base.class_eval do
-  include PluginAWeek::Preferences
+  extend PluginAWeek::Preferences::MacroMethods
 end