Merge pull request ctran#50 from eagleas/master

fix bug producing "Already memoized" on models
ywencn · Sep 16, 2011 · cfeec96 · cfeec96
2 parents 9ce1fd6 + 3de59e8
commit cfeec96
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/annotate/annotate_models.rb b/lib/annotate/annotate_models.rb
@@ -246,7 +246,10 @@ def get_model_files
     # Check for namespaced models in subdirectories as well as models
     # in subdirectories without namespacing.
     def get_model_class(file)
-      require File.expand_path("#{model_dir}/#{file}") # this is for non-rails projects, which don't get Rails auto-require magic
+
+      # this is for non-rails projects, which don't get Rails auto-require magic
+      require File.expand_path("#{model_dir}/#{file}") unless Module.const_defined?(:Rails)
+
       model = ActiveSupport::Inflector.camelize(file.gsub(/\.rb$/, ''))
       parts = model.split('::')
       begin