activestorage 5.2.6 → 6.0.0.beta1

data/lib/active_storage/service/mirror_service.rb

@@ -9,7 +9,7 @@ module ActiveStorage
   class Service::MirrorService < Service
     attr_reader :primary, :mirrors
 
-    delegate :download, :download_chunk, :exist?, :url, :path_for, to: :primary
+    delegate :download, :download_chunk, :exist?, :url, to: :primary
 
     # Stitch together from named services.
     def self.build(primary:, mirrors:, configurator:, **options) #:nodoc:

data/lib/active_storage/service/s3_service.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-gem "aws-sdk-s3", "~> 1.48"
-
 require "aws-sdk-s3"
 require "active_support/core_ext/numeric/bytes"
 
@@ -20,11 +18,9 @@ module ActiveStorage
 
     def upload(key, io, checksum: nil, **)
       instrument :upload, key: key, checksum: checksum do
-        begin
-          object_for(key).put(upload_options.merge(body: io, content_md5: checksum))
-        rescue Aws::S3::Errors::BadDigest
-          raise ActiveStorage::IntegrityError
-        end
+        object_for(key).put(upload_options.merge(body: io, content_md5: checksum))
+      rescue Aws::S3::Errors::BadDigest
+        raise ActiveStorage::IntegrityError
       end
     end
 
@@ -36,6 +32,8 @@ module ActiveStorage
       else
         instrument :download, key: key do
           object_for(key).get.body.string.force_encoding(Encoding::BINARY)
+        rescue Aws::S3::Errors::NoSuchKey
+          raise ActiveStorage::FileNotFoundError
         end
       end
     end
@@ -43,6 +41,8 @@ module ActiveStorage
     def download_chunk(key, range)
       instrument :download_chunk, key: key, range: range do
         object_for(key).get(range: "bytes=#{range.begin}-#{range.exclude_end? ? range.end - 1 : range.end}").body.read.force_encoding(Encoding::BINARY)
+      rescue Aws::S3::Errors::NoSuchKey
+        raise ActiveStorage::FileNotFoundError
       end
     end
 
@@ -81,8 +81,7 @@ module ActiveStorage
     def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:)
       instrument :url, key: key do |payload|
         generated_url = object_for(key).presigned_url :put, expires_in: expires_in.to_i,
-          content_type: content_type, content_length: content_length, content_md5: checksum,
-          whitelist_headers: ['content-length']
+          content_type: content_type, content_length: content_length, content_md5: checksum
 
         payload[:url] = generated_url
 
@@ -106,6 +105,8 @@ module ActiveStorage
         chunk_size = 5.megabytes
         offset = 0
 
+        raise ActiveStorage::FileNotFoundError unless object.exists?
+
         while offset < object.content_length
           yield object.get(range: "bytes=#{offset}-#{offset + chunk_size - 1}").body.read.force_encoding(Encoding::BINARY)
           offset += chunk_size

data/lib/active_storage/transformers/image_processing_transformer.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+require "image_processing"
+
+module ActiveStorage
+  module Transformers
+    class ImageProcessingTransformer < Transformer
+      private
+        def process(file, format:)
+          processor.
+            source(file).
+            loader(page: 0).
+            convert(format).
+            apply(operations).
+            call
+        end
+
+        def processor
+          ImageProcessing.const_get(ActiveStorage.variant_processor.to_s.camelize)
+        end
+
+        def operations
+          transformations.each_with_object([]) do |(name, argument), list|
+            if name.to_s == "combine_options"
+              ActiveSupport::Deprecation.warn <<~WARNING
+                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
+    end
+  end
+end

data/lib/active_storage/transformers/mini_magick_transformer.rb

@@ -0,0 +1,38 @@
+# 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

data/lib/active_storage/transformers/transformer.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module ActiveStorage
+  module Transformers
+    # A Transformer applies a set of transformations to an image.
+    #
+    # The following concrete subclasses are included in Active Storage:
+    #
+    # * 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
+
+      def initialize(transformations)
+        @transformations = transformations
+      end
+
+      # Applies the transformations to the source image in +file+, producing a target image in the
+      # specified +format+. Yields an open Tempfile containing the target image. Closes and unlinks
+      # the output tempfile after yielding to the given block. Returns the result of the block.
+      def transform(file, format:)
+        output = process(file, format: format)
+
+        begin
+          yield output
+        ensure
+          output.close!
+        end
+      end
+
+      private
+        # Returns an open Tempfile containing a transformed image in the given +format+.
+        # All subclasses implement this method.
+        def process(file, format:) #:doc:
+          raise NotImplementedError
+        end
+    end
+  end
+end

data/lib/tasks/activestorage.rake

@@ -12,4 +12,11 @@ namespace :active_storage do
       Rake::Task["app:active_storage:install:migrations"].invoke
     end
   end
+
+  # desc "Copy over the migrations needed to the application upgrading"
+  task update: :environment do
+    ENV["MIGRATIONS_PATH"] = "db/update_migrate"
+
+    Rake::Task["active_storage:install"].invoke
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage
 version: !ruby/object:Gem::Version
-  version: 5.2.6
+  version: 6.0.0.beta1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-05 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.6
+        version: 6.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.6
+        version: 6.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.6
+        version: 6.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.2.6
+        version: 6.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.3.1
 description: Attach cloud and local files in Rails applications.
 email: david@loudthinking.com
 executables: []
@@ -68,6 +68,7 @@ files:
 - app/controllers/active_storage/disk_controller.rb
 - app/controllers/active_storage/representations_controller.rb
 - app/controllers/concerns/active_storage/set_blob.rb
+- app/controllers/concerns/active_storage/set_current.rb
 - app/javascript/activestorage/blob_record.js
 - app/javascript/activestorage/blob_upload.js
 - app/javascript/activestorage/direct_upload.js
@@ -87,21 +88,28 @@ files:
 - app/models/active_storage/blob/representable.rb
 - app/models/active_storage/current.rb
 - app/models/active_storage/filename.rb
-- app/models/active_storage/filename/parameters.rb
 - app/models/active_storage/preview.rb
 - app/models/active_storage/variant.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
 - lib/active_storage.rb
 - lib/active_storage/analyzer.rb
 - lib/active_storage/analyzer/image_analyzer.rb
 - lib/active_storage/analyzer/null_analyzer.rb
 - lib/active_storage/analyzer/video_analyzer.rb
 - lib/active_storage/attached.rb
-- lib/active_storage/attached/macros.rb
+- lib/active_storage/attached/changes.rb
+- lib/active_storage/attached/changes/create_many.rb
+- lib/active_storage/attached/changes/create_one.rb
+- lib/active_storage/attached/changes/create_one_of_many.rb
+- lib/active_storage/attached/changes/delete_many.rb
+- lib/active_storage/attached/changes/delete_one.rb
 - lib/active_storage/attached/many.rb
+- 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
@@ -111,6 +119,7 @@ files:
 - lib/active_storage/previewer/mupdf_previewer.rb
 - lib/active_storage/previewer/poppler_pdf_previewer.rb
 - lib/active_storage/previewer/video_previewer.rb
+- lib/active_storage/reflection.rb
 - lib/active_storage/service.rb
 - lib/active_storage/service/azure_storage_service.rb
 - lib/active_storage/service/configurator.rb
@@ -118,14 +127,17 @@ files:
 - lib/active_storage/service/gcs_service.rb
 - lib/active_storage/service/mirror_service.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
 homepage: http://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v5.2.6/activestorage
-  changelog_uri: https://github.com/rails/rails/blob/v5.2.6/activestorage/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.beta1/activestorage
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.beta1/activestorage/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -134,14 +146,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.2
+      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.1.6
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Local and cloud file storage framework.

data/app/models/active_storage/filename/parameters.rb

@@ -1,36 +0,0 @@
-# frozen_string_literal: true
-
-class ActiveStorage::Filename::Parameters #:nodoc:
-  attr_reader :filename
-
-  def initialize(filename)
-    @filename = filename
-  end
-
-  def combined
-    "#{ascii}; #{utf8}"
-  end
-
-  TRADITIONAL_ESCAPED_CHAR = /[^ A-Za-z0-9!#$+.^_`|~-]/
-
-  def ascii
-    'filename="' + percent_escape(I18n.transliterate(filename.sanitized), TRADITIONAL_ESCAPED_CHAR) + '"'
-  end
-
-  RFC_5987_ESCAPED_CHAR = /[^A-Za-z0-9!#$&+.^_`|~-]/
-
-  def utf8
-    "filename*=UTF-8''" + percent_escape(filename.sanitized, RFC_5987_ESCAPED_CHAR)
-  end
-
-  def to_s
-    combined
-  end
-
-  private
-    def percent_escape(string, pattern)
-      string.gsub(pattern) do |char|
-        char.bytes.map { |byte| "%%%02X" % byte }.join
-      end
-    end
-end

data/lib/active_storage/attached/macros.rb

@@ -1,110 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveStorage
-  # Provides the class-level DSL for declaring that an Active Record model has attached blobs.
-  module Attached::Macros
-    # Specifies the relation between a single attachment and the model.
-    #
-    #   class User < ActiveRecord::Base
-    #     has_one_attached :avatar
-    #   end
-    #
-    # There is no column defined on the model side, Active Storage takes
-    # care of the mapping between your records and the attachment.
-    #
-    # To avoid N+1 queries, you can include the attached blobs in your query like so:
-    #
-    #   User.with_attached_avatar
-    #
-    # Under the covers, this relationship is implemented as a +has_one+ association to a
-    # ActiveStorage::Attachment record and a +has_one-through+ association to a
-    # ActiveStorage::Blob record. These associations are available as +avatar_attachment+
-    # and +avatar_blob+. But you shouldn't need to work with these associations directly in
-    # most circumstances.
-    #
-    # The system has been designed to having you go through the ActiveStorage::Attached::One
-    # proxy that provides the dynamic proxy to the associations and factory methods, like +attach+.
-    #
-    # If the +:dependent+ option isn't set, the attachment will be purged
-    # (i.e. destroyed) whenever the record is destroyed.
-    def has_one_attached(name, dependent: :purge_later)
-      class_eval <<-CODE, __FILE__, __LINE__ + 1
-        def #{name}
-          @active_storage_attached_#{name} ||= ActiveStorage::Attached::One.new("#{name}", self, dependent: #{dependent == :purge_later ? ":purge_later" : "false"})
-        end
-
-        def #{name}=(attachable)
-          #{name}.attach(attachable)
-        end
-      CODE
-
-      has_one :"#{name}_attachment", -> { where(name: name) }, class_name: "ActiveStorage::Attachment", as: :record, inverse_of: :record, dependent: false
-      has_one :"#{name}_blob", through: :"#{name}_attachment", class_name: "ActiveStorage::Blob", source: :blob
-
-      scope :"with_attached_#{name}", -> { includes("#{name}_attachment": :blob) }
-
-      if dependent == :purge_later
-        after_destroy_commit { public_send(name).purge_later }
-      else
-        before_destroy { public_send(name).detach }
-      end
-    end
-
-    # Specifies the relation between multiple attachments and the model.
-    #
-    #   class Gallery < ActiveRecord::Base
-    #     has_many_attached :photos
-    #   end
-    #
-    # There are no columns defined on the model side, Active Storage takes
-    # care of the mapping between your records and the attachments.
-    #
-    # To avoid N+1 queries, you can include the attached blobs in your query like so:
-    #
-    #   Gallery.where(user: Current.user).with_attached_photos
-    #
-    # Under the covers, this relationship is implemented as a +has_many+ association to a
-    # ActiveStorage::Attachment record and a +has_many-through+ association to a
-    # ActiveStorage::Blob record. These associations are available as +photos_attachments+
-    # and +photos_blobs+. But you shouldn't need to work with these associations directly in
-    # most circumstances.
-    #
-    # The system has been designed to having you go through the ActiveStorage::Attached::Many
-    # proxy that provides the dynamic proxy to the associations and factory methods, like +#attach+.
-    #
-    # If the +:dependent+ option isn't set, all the attachments will be purged
-    # (i.e. destroyed) whenever the record is destroyed.
-    def has_many_attached(name, dependent: :purge_later)
-      class_eval <<-CODE, __FILE__, __LINE__ + 1
-        def #{name}
-          @active_storage_attached_#{name} ||= ActiveStorage::Attached::Many.new("#{name}", self, dependent: #{dependent == :purge_later ? ":purge_later" : "false"})
-        end
-
-        def #{name}=(attachables)
-          #{name}.attach(attachables)
-        end
-      CODE
-
-      has_many :"#{name}_attachments", -> { where(name: name) }, as: :record, class_name: "ActiveStorage::Attachment", inverse_of: :record, dependent: false do
-        def purge
-          each(&:purge)
-          reset
-        end
-
-        def purge_later
-          each(&:purge_later)
-          reset
-        end
-      end
-      has_many :"#{name}_blobs", through: :"#{name}_attachments", class_name: "ActiveStorage::Blob", source: :blob
-
-      scope :"with_attached_#{name}", -> { includes("#{name}_attachments": :blob) }
-
-      if dependent == :purge_later
-        after_destroy_commit { public_send(name).purge_later }
-      else
-        before_destroy { public_send(name).detach }
-      end
-    end
-  end
-end