<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array"/>
  <modified type="array">
    <modified>
      <diff>@@ -1,5 +1,7 @@
 == master
 
+* Change how the base module is included to prevent namespacing conflicts
+
 == 0.1.1 / 2008-06-22
 
 * Remove log files from gems</diff>
      <filename>CHANGELOG.rdoc</filename>
    </modified>
    <modified>
      <diff>@@ -3,12 +3,6 @@ require 'has_roles/authorization_helper'
 module PluginAWeek #:nodoc:
   # Adds a generic implementation for dealing with role management
   module HasRoles
-    def self.included(base) #:nodoc:
-      base.class_eval do
-        extend PluginAWeek::HasRoles::MacroMethods
-      end
-    end
-    
     module MacroMethods
       # Indicates that the model has roles. This will create the folliwng
       # association:
@@ -46,5 +40,5 @@ module PluginAWeek #:nodoc:
 end
 
 ActiveRecord::Base.class_eval do
-  include PluginAWeek::HasRoles
+  extend PluginAWeek::HasRoles::MacroMethods
 end</diff>
      <filename>lib/has_roles.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>0d2d298f24f82e509d972022441d8b135445f6f9</id>
    </parent>
  </parents>
  <author>
    <name>Aaron Pfeifer</name>
    <email>aaron.pfeifer@gmail.com</email>
  </author>
  <url>http://github.com/pluginaweek/has_roles/commit/9ecf1bdc704812c20579073766aebe1d1a2e76b3</url>
  <id>9ecf1bdc704812c20579073766aebe1d1a2e76b3</id>
  <committed-date>2008-10-04T14:50:34-07:00</committed-date>
  <authored-date>2008-10-04T14:50:34-07:00</authored-date>
  <message>Change how the base module is included to prevent namespacing conflicts</message>
  <tree>1c1b4e94e7b51ba021ac5f7ffaa69f062f757bdd</tree>
  <committer>
    <name>Aaron Pfeifer</name>
    <email>aaron.pfeifer@gmail.com</email>
  </committer>
</commit>
