0
@@ -5,3 +5,4 @@ require "#{lib_dir}/constant_cache"
0
 
0
 String.send(:include, Viget::Format)
0
 ActiveRecord::Base.send(:extend, Viget::ConstantCache::ClassMethods)
0
+ActiveRecord::Base.send(:include, Viget::ConstantCache::InstanceMethods)

0
@@ -3,17 +3,23 @@ module Viget
0
     module ClassMethods
0
       def caches_constants(additional_options = {})
0
         options = {:key => :name, :limit => 64}.merge(additional_options)
0
-        find(:all).each do |model| 
0
-          const = model.send(options[:key].to_sym).constant_name
0
-          unless const.blank?
0
-            const = const[0, options[:limit]]
0
-            if !const.blank?
0
-              raise RuntimeError, "Constant #{self.to_s}::#{const} has already been defined" if const_defined?(const)
0
-              const_set(const, model) if !const.blank?
0
-            end
0
+        find(:all).each {|model| model.set_instance_as_constant(options) }
0
+      end
0
+    end
0
+    
0
+    module InstanceMethods
0
+      
0
+      def set_instance_as_constant(options)
0
+        const = self.send(options[:key].to_sym).constant_name
0
+        unless const.blank?
0
+          const = const[0, options[:limit]]
0
+          if !const.blank?
0
+            raise RuntimeError, "Constant #{self.class.to_s}::#{const} has already been defined" if self.class.const_defined?(const)
0
+            self.class.const_set(const, self) if !const.blank?
0
           end
0
         end
0
       end
0
+      
0
     end
0
   end
0
 end
0
\ No newline at end of file