lib/ddr/derivatives.rb in ddr-models-2.11.0 vs lib/ddr/derivatives.rb in ddr-models-3.0.0.alpha.1

@@ -1,32 +1,29 @@
 module Ddr
   module Derivatives
     extend ActiveSupport::Autoload
 
-    autoload :Generator
-    autoload :PngGenerator
-    autoload :PtifGenerator
-    autoload :UpdateDerivatives
+    autoload :Derivative
+    autoload :MultiresImage
+    autoload :Thumbnail
 
-    Derivative = Struct.new(:name, :datastream, :generator, :options)
+    autoload_under 'generators' do
+      autoload :Generator
+      autoload :PngGenerator
+      autoload :PtifGenerator
+    end
 
     # Derivatives to generate.  Array of DERIVATIVE names
     mattr_accessor :update_derivatives
 
     # Eventually, we should inject the generator (probably) and the options (certainly) for each derivative
     # (e.g., from configuration)
     DERIVATIVES = {
-                    multires_image:
-                        Derivative.new( :multires_image,
-                                        Ddr::Datastreams::MULTIRES_IMAGE,
-                                        Ddr::Derivatives::PtifGenerator,
-                                        "jpeg:90,tile:256x256,pyramid"),
-                    thumbnail:
-                        Derivative.new( :thumbnail,
-                                        Ddr::Datastreams::THUMBNAIL,
-                                        Ddr::Derivatives::PngGenerator,
-                                        "-resize '100x100>'")
-                  }
+        multires_image: Ddr::Derivatives::MultiresImage.new(
+            Ddr::Derivatives::PtifGenerator.new("jpeg:90,tile:256x256,pyramid")),
+        thumbnail: Ddr::Derivatives::Thumbnail.new(
+            Ddr::Derivatives::PngGenerator.new("-resize '100x100>'"))
+    }
 
     # Yields an object with module configuration accessors
     def self.configure
       yield self
     end