Skip to content

A
annotate
Unverified Commit e4f761c6 by Junichi Sato Committed by GitHub
Options

`get_loaded_model_by_path` is supposed to be nil-safe (#883)

This commit partially reverts #801, which by declaring conditional return has turned `get_loaded_model_by_path` to a less safe method that can return nil when its the condition is not met. Apparently the very same condition has been brought to `annotate_model_file` by #774, which seems to cover the "bug" insisted in #801 as well. On the other hand #801 has brought an inconvenient behaviour as well: whenever a non-activerecord model file is found, `get_loaded_model_by_path` returns nil, which leads to raising `BadModelFileError` and ends up printing a bunch of "Unable to annotate ..." messages. Now it seems tests added by #801 are running right and I do not find a problem restoring the previous behaviour and turn it nil-safe again.
parent 3aa43ea3
Showing with 1 addition and 3 deletions
lib/annotate/annotate_models.rb
...@@ -618,9 +618,7 @@ module AnnotateModels ...@@ -618,9 +618,7 @@ module AnnotateModels
# Retrieve loaded model class by path to the file where it's supposed to be defined. # Retrieve loaded model class by path to the file where it's supposed to be defined.
def get_loaded_model_by_path(model_path) def get_loaded_model_by_path(model_path)
klass = ActiveSupport::Inflector.constantize(ActiveSupport::Inflector.camelize(model_path)) ActiveSupport::Inflector.constantize(ActiveSupport::Inflector.camelize(model_path))
klass if klass.is_a?(Class) && klass < ActiveRecord::Base
rescue StandardError, LoadError rescue StandardError, LoadError
# Revert to the old way but it is not really robust # Revert to the old way but it is not really robust
ObjectSpace.each_object(::Class) ObjectSpace.each_object(::Class)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment