lib/ddr/models.rb in ddr-models-3.0.0.beta.7 vs lib/ddr/models.rb in ddr-models-3.0.0.beta.8

@@ -5,11 +5,10 @@
 require 'active_fedora'
 require 'hydra/validations'
 
 module Ddr
   extend ActiveSupport::Autoload
-  extend Deprecation
 
   autoload :Actions
   autoload :Auth
   autoload :Datastreams
   autoload :Derivatives
@@ -20,33 +19,25 @@
   autoload :Metadata
   autoload :Notifications
   autoload :Utils
   autoload :Vocab
 
-  def self.const_missing(name)
-    if name == :IndexFields
-      Deprecation.warn(Ddr::Models, "`Ddr::IndexFields` is deprecated and will be removed in ddr-models 3.0." \
-                                    " Use `Ddr::Index::Fields` instead.")
-      Index::Fields
-    else
-      super
-    end
-  end
-
   module Models
     extend ActiveSupport::Autoload
 
     autoload :AdminSet
     autoload :AttachedFileProfile
     autoload :AttachedFilesProfile
+    autoload :AutoVersion
     autoload :Base
     autoload :ChecksumInvalid, 'ddr/models/error'
     autoload :Contact
     autoload :ContentModelError, 'ddr/models/error'
     autoload :DerivativeGenerationFailure, 'ddr/models/error'
     autoload :Error
     autoload :EventLoggable
+    autoload :File
     autoload :FileCharacterization
     autoload :FileManagement
     autoload :FindingAid
     autoload :FixityCheckable
     autoload :Governable
@@ -64,11 +55,17 @@
     autoload :StructDiv
     autoload :Structure
     autoload :UrlSafeId
     autoload :Validatable
     autoload :Validator
+    autoload :Versionable
     autoload :WithContentFile
     autoload :YearFacet
+
+    autoload_under "files" do
+      autoload :FitsXmlFile
+      autoload :StructuralMetadataFile
+    end
 
     autoload_under "licenses" do
       autoload :AdminPolicyLicense
       autoload :EffectiveLicense
       autoload :License