0
@@ -13,42 +13,6 @@ Symbol.class_eval do
0
   end
0
 end
0
 
0
-Module.class_eval do
0
-  # A hash that maps Class names to an array of Modules to mix in when the class is instantiated.
0
-  @@class_mixins = {}
0
-  mattr_reader :class_mixins
0
-
0
-  # Specifies that this module should be included into the given classes when they are instantiated.
0
-  #
0
-  #   module FooMethods
0
-  #     include_into "Foo", "Bar"
0
-  #   end
0
-  def include_into(*klasses)
0
-    klasses.flatten!
0
-    klasses.each do |klass|
0
-      (@@class_mixins[klass] ||= []) << self
0
-      @@class_mixins[klass].uniq!
0
-    end
0
-  end
0
-  
0
-  # add any class mixins that have been registered for this class
0
-  def auto_include!
0
-    mixins = @@class_mixins[name]
0
-    send(:include, *mixins) if mixins
0
-  end
0
-end
0
-
0
-Class.class_eval do
0
-  # Instantiates a class and adds in any class_mixins that have been registered for it.
0
-  def inherited_with_mixins(klass)
0
-    returning inherited_without_mixins(klass) do |value|
0
-      klass.auto_include!
0
-    end
0
-  end
0
-  
0
-  alias_method_chain :inherited, :mixins
0
-end
0
-
0
 # http://rails.techno-weenie.net/tip/2005/12/23/make_fixtures
0
 ActiveRecord::Base.class_eval do
0
   # person.dom_id #-> "person-5"

0
@@ -1,2 +1,38 @@
0
 # temporarily load this before all other plugins
0
-::Object::RAILS_PATH = Pathname.new(File.expand_path(RAILS_ROOT))
0
\ No newline at end of file
0
+::Object::RAILS_PATH = Pathname.new(File.expand_path(RAILS_ROOT))
0
+
0
+Module.class_eval do
0
+  # A hash that maps Class names to an array of Modules to mix in when the class is instantiated.
0
+  @@class_mixins = {}
0
+  mattr_reader :class_mixins
0
+
0
+  # Specifies that this module should be included into the given classes when they are instantiated.
0
+  #
0
+  #   module FooMethods
0
+  #     include_into "Foo", "Bar"
0
+  #   end
0
+  def include_into(*klasses)
0
+    klasses.flatten!
0
+    klasses.each do |klass|
0
+      (@@class_mixins[klass] ||= []) << name.to_s
0
+      @@class_mixins[klass].uniq!
0
+    end
0
+  end
0
+  
0
+  # add any class mixins that have been registered for this class
0
+  def auto_include!
0
+    mixins = @@class_mixins[name]
0
+    send(:include, *mixins.collect { |name| name.constantize }) if mixins
0
+  end
0
+end
0
+
0
+Class.class_eval do
0
+  # Instantiates a class and adds in any class_mixins that have been registered for it.
0
+  def inherited_with_mixins(klass)
0
+    returning inherited_without_mixins(klass) do |value|
0
+      klass.auto_include!
0
+    end
0
+  end
0
+  
0
+  alias_method_chain :inherited, :mixins
0
+end
0
\ No newline at end of file