activestorage 6.0.6.1 → 6.1.0.rc1

data/lib/active_storage/transformers/image_processing_transformer.rb

@@ -1,305 +1,18 @@
 # frozen_string_literal: true
 
-require "image_processing"
+begin
+  require "image_processing"
+rescue LoadError
+  raise LoadError, <<~ERROR.squish
+    Generating image variants require the image_processing gem.
+    Please add `gem 'image_processing', '~> 1.2'` to your Gemfile.
+  ERROR
+end
 
 module ActiveStorage
   module Transformers
     class ImageProcessingTransformer < Transformer
       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.
             source(file).
@@ -315,80 +28,15 @@ module ActiveStorage
 
         def operations
           transformations.each_with_object([]) do |(name, argument), list|
-            if ActiveStorage.variant_processor == :mini_magick
-              if name.to_s == "combine_options"
-                argument.each do |subtransformation_name, subtransformation_argument|
-                  validate_transformation(subtransformation_name, subtransformation_argument)
-                end
-              else
-                validate_transformation(name, argument)
-              end
-            end
-
             if name.to_s == "combine_options"
-              ActiveSupport::Deprecation.warn <<~WARNING.squish
+              raise ArgumentError, <<~ERROR.squish
                 Active Storage's ImageProcessing transformer doesn't support :combine_options,
-                as it always generates a single ImageMagick command. Passing :combine_options will
-                not be supported in Rails 6.1.
-              WARNING
-
-              list.concat argument.keep_if { |key, value| value.present? }.to_a
-            elsif argument.present?
-              list << [ name, argument ]
-            end
-          end
-        end
-
-        def validate_transformation(name, argument)
-          method_name = name.to_s.gsub("-","_")
-
-          unless 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
-          end
-
-          if argument.present?
-            if argument.is_a?(String) || argument.is_a?(Symbol)
-              validate_arg_string(argument)
-            elsif argument.is_a?(Array)
-              validate_arg_array(argument)
-            elsif argument.is_a?(Hash)
-              validate_arg_hash(argument)
-            end
-          end
-        end
-
-        def validate_arg_string(argument)
-          if UNSUPPORTED_IMAGE_PROCESSING_ARGUMENTS.any? { |bad_arg| argument.to_s.downcase.include?(bad_arg) }; raise UnsupportedImageProcessingArgument end
-        end
-
-        def validate_arg_array(argument)
-          argument.each do |arg|
-            if arg.is_a?(Integer) || arg.is_a?(Float)
-              next
-            elsif arg.is_a?(String) || arg.is_a?(Symbol)
-              validate_arg_string(arg)
-            elsif arg.is_a?(Array)
-              validate_arg_array(arg)
-            elsif arg.is_a?(Hash)
-              validate_arg_hash(arg)
+                as it always generates a single ImageMagick command.
+              ERROR
             end
-          end
-        end
-
-        def validate_arg_hash(argument)
-          argument.each do |key, value|
-            validate_arg_string(key)
 
-            if value.is_a?(Integer) || value.is_a?(Float)
-              next
-            elsif value.is_a?(String) || value.is_a?(Symbol)
-              validate_arg_string(value)
-            elsif value.is_a?(Array)
-              validate_arg_array(value)
-            elsif value.is_a?(Hash)
-              validate_arg_hash(value)
+            if argument.present?
+              list << [ name, argument ]
             end
           end
         end

data/lib/active_storage/transformers/transformer.rb

@@ -8,9 +8,6 @@ module ActiveStorage
     #
     # * ActiveStorage::Transformers::ImageProcessingTransformer:
     #   backed by ImageProcessing, a common interface for MiniMagick and ruby-vips
-    #
-    # * ActiveStorage::Transformers::MiniMagickTransformer:
-    #   backed by MiniMagick, a wrapper around the ImageMagick CLI
     class Transformer
       attr_reader :transformations
 

data/lib/active_storage.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2017-2019 David Heinemeier Hansson, Basecamp
+# Copyright (c) 2017-2020 David Heinemeier Hansson, Basecamp
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -52,24 +52,25 @@ module ActiveStorage
 
   mattr_accessor :paths, default: {}
 
-  mattr_accessor :variable_content_types,             default: []
-  mattr_accessor :binary_content_type,                default: "application/octet-stream"
-  mattr_accessor :content_types_to_serve_as_binary,   default: []
-  mattr_accessor :content_types_allowed_inline,       default: []
-  mattr_accessor :supported_image_processing_methods, default: []
-  mattr_accessor :unsupported_image_processing_arguments
+  mattr_accessor :variable_content_types,           default: []
+  mattr_accessor :web_image_content_types,          default: []
+  mattr_accessor :binary_content_type,              default: "application/octet-stream"
+  mattr_accessor :content_types_to_serve_as_binary, default: []
+  mattr_accessor :content_types_allowed_inline,     default: []
 
   mattr_accessor :service_urls_expire_in, default: 5.minutes
 
   mattr_accessor :routes_prefix, default: "/rails/active_storage"
+  mattr_accessor :draw_routes, default: true
+  mattr_accessor :resolve_model_to_route, default: :rails_storage_redirect
 
   mattr_accessor :replace_on_assign_to_many, default: false
+  mattr_accessor :track_variants, default: false
 
   module Transformers
     extend ActiveSupport::Autoload
 
     autoload :Transformer
     autoload :ImageProcessingTransformer
-    autoload :MiniMagickTransformer
   end
 end

metadata

@@ -1,71 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: activestorage
 version: !ruby/object:Gem::Version
-  version: 6.0.6.1
+  version: 6.1.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2020-11-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.1.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.3.1
+- !ruby/object:Gem::Dependency
+  name: mimemagic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
 description: Attach cloud and local files in Rails applications.
 email: david@loudthinking.com
 executables: []
@@ -77,12 +105,16 @@ files:
 - README.md
 - app/assets/javascripts/activestorage.js
 - app/controllers/active_storage/base_controller.rb
-- app/controllers/active_storage/blobs_controller.rb
+- app/controllers/active_storage/blobs/proxy_controller.rb
+- app/controllers/active_storage/blobs/redirect_controller.rb
 - app/controllers/active_storage/direct_uploads_controller.rb
 - app/controllers/active_storage/disk_controller.rb
-- app/controllers/active_storage/representations_controller.rb
+- app/controllers/active_storage/representations/proxy_controller.rb
+- app/controllers/active_storage/representations/redirect_controller.rb
+- app/controllers/concerns/active_storage/file_server.rb
 - app/controllers/concerns/active_storage/set_blob.rb
 - app/controllers/concerns/active_storage/set_current.rb
+- app/controllers/concerns/active_storage/set_headers.rb
 - app/javascript/activestorage/blob_record.js
 - app/javascript/activestorage/blob_upload.js
 - app/javascript/activestorage/direct_upload.js
@@ -94,6 +126,7 @@ files:
 - app/javascript/activestorage/ujs.js
 - app/jobs/active_storage/analyze_job.rb
 - app/jobs/active_storage/base_job.rb
+- app/jobs/active_storage/mirror_job.rb
 - app/jobs/active_storage/purge_job.rb
 - app/models/active_storage/attachment.rb
 - app/models/active_storage/blob.rb
@@ -103,11 +136,15 @@ files:
 - app/models/active_storage/current.rb
 - app/models/active_storage/filename.rb
 - app/models/active_storage/preview.rb
+- app/models/active_storage/record.rb
 - app/models/active_storage/variant.rb
+- app/models/active_storage/variant_record.rb
+- app/models/active_storage/variant_with_record.rb
 - app/models/active_storage/variation.rb
 - config/routes.rb
 - db/migrate/20170806125915_create_active_storage_tables.rb
-- db/update_migrate/20180723000244_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.rb
+- db/update_migrate/20190112182829_add_service_name_to_active_storage_blobs.rb
+- db/update_migrate/20191206030411_create_active_storage_variant_records.rb
 - lib/active_storage.rb
 - lib/active_storage/analyzer.rb
 - lib/active_storage/analyzer/image_analyzer.rb
@@ -124,7 +161,6 @@ files:
 - lib/active_storage/attached/model.rb
 - lib/active_storage/attached/one.rb
 - lib/active_storage/downloader.rb
-- lib/active_storage/downloading.rb
 - lib/active_storage/engine.rb
 - lib/active_storage/errors.rb
 - lib/active_storage/gem_version.rb
@@ -140,9 +176,9 @@ files:
 - lib/active_storage/service/disk_service.rb
 - lib/active_storage/service/gcs_service.rb
 - lib/active_storage/service/mirror_service.rb
+- lib/active_storage/service/registry.rb
 - lib/active_storage/service/s3_service.rb
 - lib/active_storage/transformers/image_processing_transformer.rb
-- lib/active_storage/transformers/mini_magick_transformer.rb
 - lib/active_storage/transformers/transformer.rb
 - lib/active_storage/version.rb
 - lib/tasks/activestorage.rake
@@ -151,12 +187,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.6.1/activestorage/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.0.6.1/
+  changelog_uri: https://github.com/rails/rails/blob/v6.1.0.rc1/activestorage/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.0.rc1/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.6.1/activestorage
-  rubygems_mfa_required: 'true'
-post_install_message:
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.0.rc1/activestorage
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -167,12 +202,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.4.3
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Local and cloud file storage framework.
 test_files: []

data/db/update_migrate/20180723000244_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.rb

@@ -1,9 +0,0 @@
-class AddForeignKeyConstraintToActiveStorageAttachmentsForBlobId < ActiveRecord::Migration[6.0]
-  def up
-    return if foreign_key_exists?(:active_storage_attachments, column: :blob_id)
-
-    if table_exists?(:active_storage_blobs)
-      add_foreign_key :active_storage_attachments, :active_storage_blobs, column: :blob_id
-    end
-  end
-end