Fix ctran#281: "already initialized constant" warnings when models are in additional configured auto load roots

Author: 0x01f7

lib/annotate/annotate_models.rb

@@ -711,11 +711,11 @@ def get_model_class(file)
       model_path = file.gsub(/\.rb$/, '')
       model_dir.each { |dir| model_path = model_path.gsub(/^#{dir}/, '').gsub(/^\//, '') }
       begin
-        get_loaded_model(model_path) || raise(BadModelFileError.new)
+        get_loaded_model_properly(model_path, file) || raise(BadModelFileError.new)
       rescue LoadError
         # this is for non-rails projects, which don't get Rails auto-require magic
         file_path = File.expand_path(file)
-        if File.file?(file_path) && silence_warnings { Kernel.require(file_path) }
+        if File.file?(file_path) && Kernel.require(file_path)
           retry
         elsif model_path =~ /\//
           model_path = model_path.split('/')[1..-1].join('/').to_s
@@ -726,6 +726,16 @@ def get_model_class(file)
       end
     end
 
+    #
+    def get_loaded_model_properly(model_path, file)
+      klass = get_loaded_model(model_path)
+      return klass if klass
+
+      absolute_file = File.expand_path(file)
+      model_paths = $LOAD_PATH.select { |load_path| absolute_file.include?(load_path) }.map { |load_path| absolute_file.sub(load_path, '').sub(/^\//, '').sub(/\.rb$/, '') }
+      model_paths.map { |model_path| get_loaded_model(model_path) }.find { |loaded_model| !loaded_model.nil? }
+    end
+
     # Retrieve loaded model class by path to the file where it's supposed to be defined.
     def get_loaded_model(model_path)
       ActiveSupport::Inflector.constantize(ActiveSupport::Inflector.camelize(model_path))
@@ -858,15 +868,6 @@ def classified_sort(cols)
       ([id] << rest_cols << timestamps << associations).flatten.compact
     end
 
-    # Ignore warnings for the duration of the block ()
-    def silence_warnings
-      old_verbose = $VERBOSE
-      $VERBOSE = nil
-      yield
-    ensure
-      $VERBOSE = old_verbose
-    end
-
     private
 
     def with_comments?(klass, options)