activestorage 6.0.0.beta3 → 6.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f4f8dc7b792435184bfba73a933d3169ed962175e6ac4538801187432878377
-  data.tar.gz: d72fe2a07e25afae1b3562ee20d95625eb7ccf7b659174c4add9d87a54bd7688
+  metadata.gz: c8580843508ea2f503d6033f26c93d245915f3bc909466345df8720cc66f5f9b
+  data.tar.gz: 25f095c896e240cba0fa842b402a28d4520b13eb53efbb9bb205d29c05a18aa8
 SHA512:
-  metadata.gz: 35588376c7e0bd863f76ef9919066f4c8c1ad1d33fc103edc70b4f0ab677d9e4b0f07847a27d13cc66cf654bf2da9307c04109e167a2d8c1b258ddc37af09e72
-  data.tar.gz: 107e06b3a5dce31df95a0e45633efbcb14a18072ffcfa15768987361477b8e806b3c37bb460ae98202b2e30e6b1f9852ca644c4491e1f763ad6dc743d870767e
+  metadata.gz: 6937e460ca8cd6ebd3e42543e5afb13bc96f7980e3026ebcd59dac443e955840e28652ffb4a8a68f022df63a33ad3d68a071a012eb9bedf2f3c99dba10c793a9
+  data.tar.gz: 0aa39714af36c775897f663ed28dde3113e28cca23ec4e579d2004d384520657ea49c6c32f67bc3a878450af6edea623a475df984782f165cfd099d9a093554c

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+## Rails 6.0.0.rc1 (April 24, 2019) ##
+
+*   Don't raise when analyzing an image whose type is unsupported by ImageMagick.
+
+    Fixes #36065.
+
+    *Guilherme Mansur*
+
+*   Permit generating variants of BMP images.
+
+    *Younes Serraj*
+
+
 ## Rails 6.0.0.beta3 (March 11, 2019) ##
 
 *   No changes.

data/README.md

@@ -4,7 +4,9 @@ Active Storage makes it simple to upload and reference files in cloud services l
 
 Files can be uploaded from the server to the cloud or directly from the client to the cloud.
 
-Image files can furthermore be transformed using on-demand variants for quality, aspect ratio, size, or any other [MiniMagick](https://github.com/minimagick/minimagick) or [Vips](http://www.rubydoc.info/gems/ruby-vips/Vips/Image) supported transformation.
+Image files can furthermore be transformed using on-demand variants for quality, aspect ratio, size, or any other [MiniMagick](https://github.com/minimagick/minimagick) or [Vips](https://www.rubydoc.info/gems/ruby-vips/Vips/Image) supported transformation.
+
+You can read more about Active Storage in the [Active Storage Overview](https://edgeguides.rubyonrails.org/active_storage_overview.html) guide.
 
 ## Compared to other storage solutions
 
@@ -149,7 +151,7 @@ Active Storage is released under the [MIT License](https://opensource.org/licens
 
 API documentation is at:
 
-* http://api.rubyonrails.org
+* https://api.rubyonrails.org
 
 Bug reports for the Ruby on Rails project can be filed here:
 

data/app/controllers/active_storage/disk_controller.rb

@@ -3,7 +3,7 @@
 # Serves files stored with the disk service in the same way that the cloud services do.
 # This means using expiring, signed URLs that are meant for immediate access, not permanent linking.
 # Always go through the BlobsController, or your own authenticated controller, rather than directly
-# to the service url.
+# to the service URL.
 class ActiveStorage::DiskController < ActiveStorage::BaseController
   skip_forgery_protection
 

data/app/models/active_storage/attachment.rb

@@ -46,3 +46,5 @@ class ActiveStorage::Attachment < ActiveRecord::Base
       record.attachment_reflections[name]&.options[:dependent]
     end
 end
+
+ActiveSupport.run_load_hooks :active_storage_attachment, ActiveStorage::Attachment

data/app/models/active_storage/blob.rb

@@ -193,17 +193,18 @@ class ActiveStorage::Blob < ActiveRecord::Base
   #
   # The tempfile's name is prefixed with +ActiveStorage-+ and the blob's ID. Its extension matches that of the blob.
   #
-  # By default, the tempfile is created in <tt>Dir.tmpdir</tt>. Pass +tempdir:+ to create it in a different directory:
+  # By default, the tempfile is created in <tt>Dir.tmpdir</tt>. Pass +tmpdir:+ to create it in a different directory:
   #
-  #   blob.open(tempdir: "/path/to/tmp") do |file|
+  #   blob.open(tmpdir: "/path/to/tmp") do |file|
   #     # ...
   #   end
   #
   # The tempfile is automatically closed and unlinked after the given block is executed.
   #
   # Raises ActiveStorage::IntegrityError if the downloaded data does not match the blob's checksum.
-  def open(tempdir: nil, &block)
-    ActiveStorage::Downloader.new(self, tempdir: tempdir).download_blob_to_tempfile(&block)
+  def open(tmpdir: nil, &block)
+    service.open key, checksum: checksum,
+      name: [ "ActiveStorage-#{id}-", filename.extension_with_delimiter ], tmpdir: tmpdir, &block
   end
 
 
@@ -272,6 +273,6 @@ class ActiveStorage::Blob < ActiveRecord::Base
         { content_type: content_type }
       end
     end
-
-    ActiveSupport.run_load_hooks(:active_storage_blob, self)
 end
+
+ActiveSupport.run_load_hooks :active_storage_blob, ActiveStorage::Blob

data/app/models/active_storage/variation.rb

@@ -40,7 +40,7 @@ class ActiveStorage::Variation
   end
 
   def initialize(transformations)
-    @transformations = transformations
+    @transformations = transformations.deep_symbolize_keys
   end
 
   # Accepts a File object, performs the +transformations+ against it, and
@@ -64,7 +64,7 @@ class ActiveStorage::Variation
         begin
           require "image_processing"
         rescue LoadError
-          ActiveSupport::Deprecation.warn <<~WARNING
+          ActiveSupport::Deprecation.warn <<~WARNING.squish
             Generating image variants will require the image_processing gem in Rails 6.1.
             Please add `gem 'image_processing', '~> 1.2'` to your Gemfile.
           WARNING

data/db/update_migrate/20180723000244_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.rb

@@ -1,6 +1,8 @@
 class AddForeignKeyConstraintToActiveStorageAttachmentsForBlobId < ActiveRecord::Migration[6.0]
   def up
-    unless foreign_key_exists?(:active_storage_attachments, column: :blob_id)
+    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

data/lib/active_storage/analyzer.rb

@@ -24,14 +24,14 @@ module ActiveStorage
     private
       # Downloads the blob to a tempfile on disk. Yields the tempfile.
       def download_blob_to_tempfile(&block) #:doc:
-        blob.open tempdir: tempdir, &block
+        blob.open tmpdir: tmpdir, &block
       end
 
       def logger #:doc:
         ActiveStorage.logger
       end
 
-      def tempdir #:doc:
+      def tmpdir #:doc:
         Dir.tmpdir
       end
   end

data/lib/active_storage/analyzer/image_analyzer.rb

@@ -25,17 +25,24 @@ module ActiveStorage
           { width: image.width, height: image.height }
         end
       end
-    rescue LoadError
-      logger.info "Skipping image analysis because the mini_magick gem isn't installed"
-      {}
     end
 
     private
       def read_image
         download_blob_to_tempfile do |file|
           require "mini_magick"
-          yield MiniMagick::Image.new(file.path)
+          image = MiniMagick::Image.new(file.path)
+
+          if image.valid?
+            yield image
+          else
+            logger.info "Skipping image analysis because ImageMagick doesn't support the file"
+            {}
+          end
         end
+      rescue LoadError
+        logger.info "Skipping image analysis because the mini_magick gem isn't installed"
+        {}
       end
 
       def rotated_image?(image)

data/lib/active_storage/attached/changes/create_one.rb

@@ -30,6 +30,7 @@ module ActiveStorage
 
     def save
       record.public_send("#{name}_attachment=", attachment)
+      record.public_send("#{name}_blob=", blob)
     end
 
     private

data/lib/active_storage/downloader.rb

@@ -2,24 +2,23 @@
 
 module ActiveStorage
   class Downloader #:nodoc:
-    def initialize(blob, tempdir: nil)
-      @blob    = blob
-      @tempdir = tempdir
+    attr_reader :service
+
+    def initialize(service)
+      @service = service
     end
 
-    def download_blob_to_tempfile
-      open_tempfile do |file|
-        download_blob_to file
-        verify_integrity_of file
+    def open(key, checksum:, name: "ActiveStorage-", tmpdir: nil)
+      open_tempfile(name, tmpdir) do |file|
+        download key, file
+        verify_integrity_of file, checksum: checksum
         yield file
       end
     end
 
     private
-      attr_reader :blob, :tempdir
-
-      def open_tempfile
-        file = Tempfile.open([ "ActiveStorage-#{blob.id}-", blob.filename.extension_with_delimiter ], tempdir)
+      def open_tempfile(name, tmpdir = nil)
+        file = Tempfile.open(name, tmpdir)
 
         begin
           yield file
@@ -28,15 +27,15 @@ module ActiveStorage
         end
       end
 
-      def download_blob_to(file)
+      def download(key, file)
         file.binmode
-        blob.download { |chunk| file.write(chunk) }
+        service.download(key) { |chunk| file.write(chunk) }
         file.flush
         file.rewind
       end
 
-      def verify_integrity_of(file)
-        unless Digest::MD5.file(file).base64digest == blob.checksum
+      def verify_integrity_of(file, checksum:)
+        unless Digest::MD5.file(file).base64digest == checksum
           raise ActiveStorage::IntegrityError
         end
       end

data/lib/active_storage/engine.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
 require "rails"
+require "action_controller/railtie"
+require "active_job/railtie"
+require "active_record/railtie"
+
 require "active_storage"
 
 require "active_storage/previewer/poppler_pdf_previewer"
@@ -29,6 +33,7 @@ module ActiveStorage
       image/jpeg
       image/pjpeg
       image/tiff
+      image/bmp
       image/vnd.adobe.photoshop
       image/vnd.microsoft.icon
     )
@@ -52,6 +57,7 @@ module ActiveStorage
       image/jpg
       image/jpeg
       image/tiff
+      image/bmp
       image/vnd.adobe.photoshop
       image/vnd.microsoft.icon
       application/pdf

data/lib/active_storage/gem_version.rb

@@ -10,7 +10,7 @@ module ActiveStorage
     MAJOR = 6
     MINOR = 0
     TINY  = 0
-    PRE   = "beta3"
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_storage/previewer.rb

@@ -26,7 +26,7 @@ module ActiveStorage
     private
       # Downloads the blob to a tempfile on disk. Yields the tempfile.
       def download_blob_to_tempfile(&block) #:doc:
-        blob.open tempdir: tempdir, &block
+        blob.open tmpdir: tmpdir, &block
       end
 
       # Executes a system command, capturing its binary output in a tempfile. Yields the tempfile.
@@ -42,7 +42,7 @@ module ActiveStorage
       #     end
       #   end
       #
-      # The output tempfile is opened in the directory returned by #tempdir.
+      # The output tempfile is opened in the directory returned by #tmpdir.
       def draw(*argv) #:doc:
         open_tempfile do |file|
           instrument :preview, key: blob.key do
@@ -54,7 +54,7 @@ module ActiveStorage
       end
 
       def open_tempfile
-        tempfile = Tempfile.open("ActiveStorage-", tempdir)
+        tempfile = Tempfile.open("ActiveStorage-", tmpdir)
 
         begin
           yield tempfile
@@ -77,7 +77,7 @@ module ActiveStorage
         ActiveStorage.logger
       end
 
-      def tempdir #:doc:
+      def tmpdir #:doc:
         Dir.tmpdir
       end
   end

data/lib/active_storage/service.rb

@@ -82,6 +82,10 @@ module ActiveStorage
       raise NotImplementedError
     end
 
+    def open(*args, &block)
+      ActiveStorage::Downloader.new(self).open(*args, &block)
+    end
+
     # Delete the file at the +key+.
     def delete(key)
       raise NotImplementedError

data/lib/active_storage/service/gcs_service.rb

@@ -131,7 +131,7 @@ module ActiveStorage
       end
 
       def bucket
-        @bucket ||= client.bucket(config.fetch(:bucket))
+        @bucket ||= client.bucket(config.fetch(:bucket), skip_lookup: true)
       end
 
       def client

data/lib/active_storage/transformers/image_processing_transformer.rb

@@ -22,7 +22,7 @@ module ActiveStorage
         def operations
           transformations.each_with_object([]) do |(name, argument), list|
             if name.to_s == "combine_options"
-              ActiveSupport::Deprecation.warn <<~WARNING
+              ActiveSupport::Deprecation.warn <<~WARNING.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.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage
 version: !ruby/object:Gem::Version
-  version: 6.0.0.beta3
+  version: 6.0.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-13 00:00:00.000000000 Z
+date: 2019-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,28 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.0.rc1
+- !ruby/object:Gem::Dependency
+  name: activejob
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.0.0.rc1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 6.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.beta3
+        version: 6.0.0.rc1
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
@@ -132,12 +146,12 @@ files:
 - lib/active_storage/transformers/transformer.rb
 - lib/active_storage/version.rb
 - lib/tasks/activestorage.rake
-homepage: http://rubyonrails.org
+homepage: https://rubyonrails.org
 licenses:
 - MIT
 metadata:
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.beta3/activestorage
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.beta3/activestorage/CHANGELOG.md
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.0.rc1/activestorage
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.0.rc1/activestorage/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths: