activestorage 6.0.6.1 → 6.1.7.6

data/lib/active_storage.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 #--
-# Copyright (c) 2017-2019 David Heinemeier Hansson, Basecamp
+# Copyright (c) 2017-2022 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,318 @@ 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 :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 :supported_image_processing_methods, default: [
+    "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"
+  ]
   mattr_accessor :unsupported_image_processing_arguments
 
   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
+
+  mattr_accessor :video_preview_arguments, default: "-y -vframes 1 -f image2"
 
   module Transformers
     extend ActiveSupport::Autoload
 
     autoload :Transformer
     autoload :ImageProcessingTransformer
-    autoload :MiniMagickTransformer
   end
 end

data/lib/tasks/activestorage.rake

@@ -17,6 +17,10 @@ namespace :active_storage do
   task update: :environment do
     ENV["MIGRATIONS_PATH"] = "db/update_migrate"
 
-    Rake::Task["active_storage:install"].invoke
+    if Rake::Task.task_defined?("active_storage:install")
+      Rake::Task["active_storage:install"].invoke
+    else
+      Rake::Task["app:active_storage:install"].invoke
+    end
   end
 end

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: activestorage
 version: !ruby/object:Gem::Version
-  version: 6.0.6.1
+  version: 6.1.7.6
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-17 00:00:00.000000000 Z
+date: 2023-08-22 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.7.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.6.1
+        version: 6.1.7.6
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: mini_mime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: Attach cloud and local files in Rails applications.
 email: david@loudthinking.com
 executables: []
@@ -77,12 +105,17 @@ 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/base_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 +127,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 +137,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 +162,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 +177,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,10 +188,10 @@ 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.7.6/activestorage/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.1.7.6/
   mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.6.1/activestorage
+  source_code_uri: https://github.com/rails/rails/tree/v6.1.7.6/activestorage
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -171,7 +208,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Local and cloud file storage framework.

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

data/lib/active_storage/downloading.rb

@@ -1,47 +0,0 @@
-# frozen_string_literal: true
-
-require "tmpdir"
-require "active_support/core_ext/string/filters"
-
-module ActiveStorage
-  module Downloading
-    def self.included(klass)
-      ActiveSupport::Deprecation.warn <<~MESSAGE.squish, caller_locations(2)
-        ActiveStorage::Downloading is deprecated and will be removed in Active Storage 6.1.
-        Use ActiveStorage::Blob#open instead.
-      MESSAGE
-    end
-
-    private
-      # Opens a new tempfile in #tempdir and copies blob data into it. Yields the tempfile.
-      def download_blob_to_tempfile #:doc:
-        open_tempfile_for_blob do |file|
-          download_blob_to file
-          yield file
-        end
-      end
-
-      def open_tempfile_for_blob
-        tempfile = Tempfile.open([ "ActiveStorage", blob.filename.extension_with_delimiter ], tempdir)
-
-        begin
-          yield tempfile
-        ensure
-          tempfile.close!
-        end
-      end
-
-      # Efficiently downloads blob data into the given file.
-      def download_blob_to(file) #:doc:
-        file.binmode
-        blob.download { |chunk| file.write(chunk) }
-        file.flush
-        file.rewind
-      end
-
-      # Returns the directory in which tempfiles should be opened. Defaults to +Dir.tmpdir+.
-      def tempdir #:doc:
-        Dir.tmpdir
-      end
-  end
-end

data/lib/active_storage/transformers/mini_magick_transformer.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require "mini_magick"
-
-module ActiveStorage
-  module Transformers
-    class MiniMagickTransformer < Transformer
-      private
-        def process(file, format:)
-          image = MiniMagick::Image.new(file.path, file)
-
-          transformations.each do |name, argument_or_subtransformations|
-            image.mogrify do |command|
-              if name.to_s == "combine_options"
-                argument_or_subtransformations.each do |subtransformation_name, subtransformation_argument|
-                  pass_transform_argument(command, subtransformation_name, subtransformation_argument)
-                end
-              else
-                pass_transform_argument(command, name, argument_or_subtransformations)
-              end
-            end
-          end
-
-          image.format(format) if format
-
-          image.tempfile.tap(&:open)
-        end
-
-        def pass_transform_argument(command, method, argument)
-          if argument == true
-            command.public_send(method)
-          elsif argument.present?
-            command.public_send(method, argument)
-          end
-        end
-    end
-  end
-end