Merge pull request #232 from CyborgMaster/models-in-subdirectories

Don't crash on inherited models in subdirectories.
ctran · Mar 4, 2015 · 6464fc0 · 6464fc0
2 parents 46dc084 + dd28720
commit 6464fc0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/annotate/annotate_models.rb b/lib/annotate/annotate_models.rb
@@ -386,7 +386,8 @@ def get_model_class(file)
         get_loaded_model(model_path) or raise LoadError.new("cannot load a model from #{file}")
       rescue LoadError
         # this is for non-rails projects, which don't get Rails auto-require magic
-        if Kernel.require(file)
+        file_path = File.expand_path(file)
+        if File.file?(file_path) && Kernel.require(file_path)
           retry
         elsif model_path.match(/\//)
           model_path = model_path.split('/')[1..-1].join('/').to_s