Merge branch 'feature/MSP-11385/autoload' into feature/MSP-11385/rail…

…s-4.0-autoload MSP-11385
rapid7 · Sep 24, 2014 · e73333c · e73333c
2 parents 9a76b06 + 4d588e7
commit e73333c
Showing 1 changed file with 8 additions and 7 deletions.
diff --git a/lib/metasploit/model.rb b/lib/metasploit/model.rb
@@ -11,13 +11,6 @@
 # Protect attributes from mass-assignment in ActiveRecord models.
 require 'protected_attributes'
 
-#
-# Project
-#
-
-require 'metasploit/model/engine'
-require 'metasploit/model/version'
-
 autoload :DerivationValidator, 'derivation_validator'
 autoload :DynamicLengthValidator, 'dynamic_length_validator'
 autoload :IpFormatValidator, 'ip_format_validator'
@@ -57,3 +50,11 @@ module Model
     autoload :Visitation
   end
 end
+
+#
+# Project - require Metasploit::Model to be defined
+#
+
+# MUST require and not autoload as Rails::Engine loading works based subclass registration
+require 'metasploit/model/engine'
+require 'metasploit/model/version'