activestorage 6.1.5 → 7.0.3

data/lib/active_storage/service.rb

@@ -35,8 +35,8 @@ module ActiveStorage
   # can configure the service to use like this:
   #
   #   ActiveStorage::Blob.service = ActiveStorage::Service.configure(
-  #     :Disk,
-  #     root: Pathname("/foo/bar/storage")
+  #     :local,
+  #     { local: {service: "Disk",  root: Pathname("/tmp/foo/storage") } }
   #   )
   class Service
     extend ActiveSupport::Autoload
@@ -57,7 +57,7 @@ module ActiveStorage
       # Passes the configurator and all of the service's config as keyword args.
       #
       # See MirrorService for an example.
-      def build(configurator:, name:, service: nil, **service_config) #:nodoc:
+      def build(configurator:, name:, service: nil, **service_config) # :nodoc:
         new(**service_config).tap do |service_instance|
           service_instance.name = name
         end
@@ -90,6 +90,11 @@ module ActiveStorage
       ActiveStorage::Downloader.new(self).open(*args, **options, &block)
     end
 
+    # Concatenate multiple files into a single "composed" file.
+    def compose(source_keys, destination_key, filename: nil, content_type: nil, disposition: nil, custom_metadata: {})
+      raise NotImplementedError
+    end
+
     # Delete the file at the +key+.
     def delete(key)
       raise NotImplementedError
@@ -128,12 +133,12 @@ module ActiveStorage
     # The URL will be valid for the amount of seconds specified in +expires_in+.
     # You must also provide the +content_type+, +content_length+, and +checksum+ of the file
     # that will be uploaded. All these attributes will be validated by the service upon upload.
-    def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:)
+    def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:, custom_metadata: {})
       raise NotImplementedError
     end
 
     # Returns a Hash of headers for +url_for_direct_upload+ requests.
-    def headers_for_direct_upload(key, filename:, content_type:, content_length:, checksum:)
+    def headers_for_direct_upload(key, filename:, content_type:, content_length:, checksum:, custom_metadata: {})
       {}
     end
 
@@ -150,6 +155,9 @@ module ActiveStorage
         raise NotImplementedError
       end
 
+      def custom_metadata_headers(metadata)
+        raise NotImplementedError
+      end
 
       def instrument(operation, payload = {}, &block)
         ActiveSupport::Notifications.instrument(

data/lib/active_storage/transformers/image_processing_transformer.rb

@@ -15,297 +15,6 @@ module ActiveStorage
       private
         class UnsupportedImageProcessingMethod < StandardError; end
         class UnsupportedImageProcessingArgument < StandardError; end
-        SUPPORTED_IMAGE_PROCESSING_METHODS = [
-          "adaptive_blur",
-          "adaptive_resize",
-          "adaptive_sharpen",
-          "adjoin",
-          "affine",
-          "alpha",
-          "annotate",
-          "antialias",
-          "append",
-          "apply",
-          "attenuate",
-          "authenticate",
-          "auto_gamma",
-          "auto_level",
-          "auto_orient",
-          "auto_threshold",
-          "backdrop",
-          "background",
-          "bench",
-          "bias",
-          "bilateral_blur",
-          "black_point_compensation",
-          "black_threshold",
-          "blend",
-          "blue_primary",
-          "blue_shift",
-          "blur",
-          "border",
-          "bordercolor",
-          "borderwidth",
-          "brightness_contrast",
-          "cache",
-          "canny",
-          "caption",
-          "channel",
-          "channel_fx",
-          "charcoal",
-          "chop",
-          "clahe",
-          "clamp",
-          "clip",
-          "clip_path",
-          "clone",
-          "clut",
-          "coalesce",
-          "colorize",
-          "colormap",
-          "color_matrix",
-          "colors",
-          "colorspace",
-          "colourspace",
-          "color_threshold",
-          "combine",
-          "combine_options",
-          "comment",
-          "compare",
-          "complex",
-          "compose",
-          "composite",
-          "compress",
-          "connected_components",
-          "contrast",
-          "contrast_stretch",
-          "convert",
-          "convolve",
-          "copy",
-          "crop",
-          "cycle",
-          "deconstruct",
-          "define",
-          "delay",
-          "delete",
-          "density",
-          "depth",
-          "descend",
-          "deskew",
-          "despeckle",
-          "direction",
-          "displace",
-          "dispose",
-          "dissimilarity_threshold",
-          "dissolve",
-          "distort",
-          "dither",
-          "draw",
-          "duplicate",
-          "edge",
-          "emboss",
-          "encoding",
-          "endian",
-          "enhance",
-          "equalize",
-          "evaluate",
-          "evaluate_sequence",
-          "extent",
-          "extract",
-          "family",
-          "features",
-          "fft",
-          "fill",
-          "filter",
-          "flatten",
-          "flip",
-          "floodfill",
-          "flop",
-          "font",
-          "foreground",
-          "format",
-          "frame",
-          "function",
-          "fuzz",
-          "fx",
-          "gamma",
-          "gaussian_blur",
-          "geometry",
-          "gravity",
-          "grayscale",
-          "green_primary",
-          "hald_clut",
-          "highlight_color",
-          "hough_lines",
-          "iconGeometry",
-          "iconic",
-          "identify",
-          "ift",
-          "illuminant",
-          "immutable",
-          "implode",
-          "insert",
-          "intensity",
-          "intent",
-          "interlace",
-          "interline_spacing",
-          "interpolate",
-          "interpolative_resize",
-          "interword_spacing",
-          "kerning",
-          "kmeans",
-          "kuwahara",
-          "label",
-          "lat",
-          "layers",
-          "level",
-          "level_colors",
-          "limit",
-          "limits",
-          "linear_stretch",
-          "linewidth",
-          "liquid_rescale",
-          "list",
-          "loader",
-          "log",
-          "loop",
-          "lowlight_color",
-          "magnify",
-          "map",
-          "mattecolor",
-          "median",
-          "mean_shift",
-          "metric",
-          "mode",
-          "modulate",
-          "moments",
-          "monitor",
-          "monochrome",
-          "morph",
-          "morphology",
-          "mosaic",
-          "motion_blur",
-          "name",
-          "negate",
-          "noise",
-          "normalize",
-          "opaque",
-          "ordered_dither",
-          "orient",
-          "page",
-          "paint",
-          "pause",
-          "perceptible",
-          "ping",
-          "pointsize",
-          "polaroid",
-          "poly",
-          "posterize",
-          "precision",
-          "preview",
-          "process",
-          "quality",
-          "quantize",
-          "quiet",
-          "radial_blur",
-          "raise",
-          "random_threshold",
-          "range_threshold",
-          "red_primary",
-          "regard_warnings",
-          "region",
-          "remote",
-          "render",
-          "repage",
-          "resample",
-          "resize",
-          "resize_to_fill",
-          "resize_to_fit",
-          "resize_to_limit",
-          "resize_and_pad",
-          "respect_parentheses",
-          "reverse",
-          "roll",
-          "rotate",
-          "sample",
-          "sampling_factor",
-          "saver",
-          "scale",
-          "scene",
-          "screen",
-          "seed",
-          "segment",
-          "selective_blur",
-          "separate",
-          "sepia_tone",
-          "shade",
-          "shadow",
-          "shared_memory",
-          "sharpen",
-          "shave",
-          "shear",
-          "sigmoidal_contrast",
-          "silent",
-          "similarity_threshold",
-          "size",
-          "sketch",
-          "smush",
-          "snaps",
-          "solarize",
-          "sort_pixels",
-          "sparse_color",
-          "splice",
-          "spread",
-          "statistic",
-          "stegano",
-          "stereo",
-          "storage_type",
-          "stretch",
-          "strip",
-          "stroke",
-          "strokewidth",
-          "style",
-          "subimage_search",
-          "swap",
-          "swirl",
-          "synchronize",
-          "taint",
-          "text_font",
-          "threshold",
-          "thumbnail",
-          "tile_offset",
-          "tint",
-          "title",
-          "transform",
-          "transparent",
-          "transparent_color",
-          "transpose",
-          "transverse",
-          "treedepth",
-          "trim",
-          "type",
-          "undercolor",
-          "unique_colors",
-          "units",
-          "unsharp",
-          "update",
-          "valid_image",
-          "view",
-          "vignette",
-          "virtual_pixel",
-          "visual",
-          "watermark",
-          "wave",
-          "wavelet_denoise",
-          "weight",
-          "white_balance",
-          "white_point",
-          "white_threshold",
-          "window",
-          "window_group"
-        ].concat(ActiveStorage.supported_image_processing_methods)
-
-        UNSUPPORTED_IMAGE_PROCESSING_ARGUMENTS = ActiveStorage.unsupported_image_processing_arguments
 
         def process(file, format:)
           processor.
@@ -329,7 +38,7 @@ module ActiveStorage
             if name.to_s == "combine_options"
               raise ArgumentError, <<~ERROR.squish
                 Active Storage's ImageProcessing transformer doesn't support :combine_options,
-                as it always generates a single ImageMagick command.
+                as it always generates a single command.
               ERROR
             end
 
@@ -342,7 +51,7 @@ module ActiveStorage
         def validate_transformation(name, argument)
           method_name = name.to_s.tr("-", "_")
 
-          unless SUPPORTED_IMAGE_PROCESSING_METHODS.any? { |method| method_name == method }
+          unless ActiveStorage.supported_image_processing_methods.any? { |method| method_name == method }
             raise UnsupportedImageProcessingMethod, <<~ERROR.squish
               One or more of the provided transformation methods is not supported.
             ERROR
@@ -360,7 +69,11 @@ module ActiveStorage
         end
 
         def validate_arg_string(argument)
-          if UNSUPPORTED_IMAGE_PROCESSING_ARGUMENTS.any? { |bad_arg| argument.to_s.downcase.include?(bad_arg) }; raise UnsupportedImageProcessingArgument end
+          unsupported_arguments = ActiveStorage.unsupported_image_processing_arguments.any? do |bad_arg|
+            argument.to_s.downcase.include?(bad_arg)
+          end
+
+          raise UnsupportedImageProcessingArgument if unsupported_arguments
         end
 
         def validate_arg_array(argument)

data/lib/active_storage/transformers/transformer.rb

@@ -31,7 +31,7 @@ module ActiveStorage
       private
         # Returns an open Tempfile containing a transformed image in the given +format+.
         # All subclasses implement this method.
-        def process(file, format:) #:doc:
+        def process(file, format:) # :doc:
           raise NotImplementedError
         end
     end

data/lib/active_storage/version.rb

@@ -3,7 +3,7 @@
 require_relative "gem_version"
 
 module ActiveStorage
-  # Returns the version of the currently loaded ActiveStorage as a <tt>Gem::Version</tt>
+  # Returns the currently loaded version of Active Storage as a <tt>Gem::Version</tt>.
   def self.version
     gem_version
   end