Refactoring logic around evaluating entity
Refactoring logic around evaluating entity

For some reason this was breaking specs once rebased (no shame, it
happens!) Reworking the logic a bit, I did spot one possible bug so
changed the code slightly by adding a SNO (&) and forced a return value
from the extracted method. Specs are now running clean.

voormedia/rails-erd,voormedia/rails-erd