activestorage 6.0.2.2 → 6.0.3.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2c422d6798079ba605d760872d4343987abe15f02bc076707758acf015c7ffab
-  data.tar.gz: 5adb73bb7d56d869da11a034582c23d798bcfa49da05ce6666941c8b13f39419
+  metadata.gz: 8d0d41b4462cca3bcbd5e81fde082a5173ca11f3a22cb3532767e87d9b637304
+  data.tar.gz: 34030e6eaacb9d2460d122a70f63c9f64e0a488dfb5e5c4b1f14087c69f0cca2
 SHA512:
-  metadata.gz: f1882e181e633c3a34713717010c35554a282548e998799d89333047335e259592d716115d724b792e5a2917c518824b17525efbe743037fb17a48b1e29770e7
-  data.tar.gz: c155404fd662f561a437337f223e4ebd3043f7b3578a1f310bc357dba2aa5343dc31707621520d8f144bd7fd71813347419707de01108972d3dba96eb5bdbd6c
+  metadata.gz: f5e9410d7f1da3c75d4226b489c81345c1ad3e9e1a63454b27ba7a10b2e000dc94fafbb22a13e5f588b790d583e3171163d878aa549257f7f154a2b5a19ba58c
+  data.tar.gz: 0ccd7ac62e8d65eb6b654027df5a0f48b5ee5963ac114f93a5688b67d0e950c70900a9240ab7255ab8c64e5d4acdeff0a1844a5bcdc9a849f473450a1e90ca1a

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Rails 6.0.3.rc1 (April 30, 2020) ##
+
+*   No changes.
+
+
+## Rails 6.0.2.2 (March 19, 2020) ##
+
+*   No changes.
+
+
 ## Rails 6.0.2.1 (December 18, 2019) ##
 
 *   No changes.

data/README.md

@@ -159,4 +159,4 @@ Bug reports for the Ruby on Rails project can be filed here:
 
 Feature requests should be discussed on the rails-core mailing list here:
 
-* https://groups.google.com/forum/?fromgroups#!forum/rubyonrails-core
+* https://discuss.rubyonrails.org/c/rubyonrails-core

data/app/assets/javascripts/activestorage.js

@@ -550,7 +550,7 @@
       this.file = file;
       this.attributes = {
         filename: file.name,
-        content_type: file.type,
+        content_type: file.type || "application/octet-stream",
         byte_size: file.size,
         checksum: checksum
       };

data/app/controllers/active_storage/direct_uploads_controller.rb

@@ -5,7 +5,7 @@
 # the blob that was created up front.
 class ActiveStorage::DirectUploadsController < ActiveStorage::BaseController
   def create
-    blob = ActiveStorage::Blob.create_before_direct_upload!(blob_args)
+    blob = ActiveStorage::Blob.create_before_direct_upload!(**blob_args)
     render json: direct_upload_json(blob)
   end
 

data/app/javascript/activestorage/blob_record.js

@@ -6,7 +6,7 @@ export class BlobRecord {
 
     this.attributes = {
       filename: file.name,
-      content_type: file.type,
+      content_type: file.type || "application/octet-stream",
       byte_size: file.size,
       checksum: checksum
     }

data/app/models/active_storage/blob/identifiable.rb

@@ -26,6 +26,6 @@ module ActiveStorage::Blob::Identifiable
     end
 
     def update_service_metadata
-      service.update_metadata key, service_metadata if service_metadata.any?
+      service.update_metadata key, **service_metadata if service_metadata.any?
     end
 end

data/app/models/active_storage/preview.rb

@@ -59,7 +59,7 @@ class ActiveStorage::Preview
   # a stable URL that redirects to the short-lived URL returned by this method.
   def service_url(**options)
     if processed?
-      variant.service_url(options)
+      variant.service_url(**options)
     else
       raise UnprocessedError
     end
@@ -71,7 +71,11 @@ class ActiveStorage::Preview
     end
 
     def process
-      previewer.preview { |attachable| image.attach(attachable) }
+      previewer.preview do |attachable|
+        ActiveRecord::Base.connected_to(role: ActiveRecord::Base.writing_role) do
+          image.attach(attachable)
+        end
+      end
     end
 
     def variant

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

@@ -58,7 +58,7 @@ module ActiveStorage
             filename: attachable.original_filename,
             content_type: attachable.content_type
         when Hash
-          ActiveStorage::Blob.build_after_unfurling(attachable)
+          ActiveStorage::Blob.build_after_unfurling(**attachable)
         when String
           ActiveStorage::Blob.find_signed(attachable)
         else

data/lib/active_storage/attached/model.rb

@@ -140,6 +140,10 @@ module ActiveStorage
       @attachment_changes ||= {}
     end
 
+    def changed_for_autosave? #:nodoc:
+      super || attachment_changes.any?
+    end
+
     def reload(*) #:nodoc:
       super.tap { @attachment_changes = nil }
     end

data/lib/active_storage/gem_version.rb

@@ -9,8 +9,8 @@ module ActiveStorage
   module VERSION
     MAJOR = 6
     MINOR = 0
-    TINY  = 2
-    PRE   = "2"
+    TINY  = 3
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/active_storage/previewer/video_previewer.rb

@@ -2,8 +2,20 @@
 
 module ActiveStorage
   class Previewer::VideoPreviewer < Previewer
-    def self.accept?(blob)
-      blob.video?
+    class << self
+      def accept?(blob)
+        blob.video? && ffmpeg_exists?
+      end
+
+      def ffmpeg_exists?
+        return @ffmpeg_exists if defined?(@ffmpeg_exists)
+
+        @ffmpeg_exists = system(ffmpeg_path, "-version", out: File::NULL, err: File::NULL)
+      end
+
+      def ffmpeg_path
+        ActiveStorage.paths[:ffmpeg] || "ffmpeg"
+      end
     end
 
     def preview
@@ -16,11 +28,7 @@ module ActiveStorage
 
     private
       def draw_relevant_frame_from(file, &block)
-        draw ffmpeg_path, "-i", file.path, "-y", "-vframes", "1", "-f", "image2", "-", &block
-      end
-
-      def ffmpeg_path
-        ActiveStorage.paths[:ffmpeg] || "ffmpeg"
+        draw self.class.ffmpeg_path, "-i", file.path, "-y", "-vframes", "1", "-f", "image2", "-", &block
       end
   end
 end

data/lib/active_storage/service.rb

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

data/lib/active_storage/service/disk_service.rb

@@ -80,8 +80,8 @@ module ActiveStorage
             disposition: content_disposition,
             content_type: content_type
           },
-          { expires_in: expires_in,
-          purpose: :blob_key }
+          expires_in: expires_in,
+          purpose: :blob_key
         )
 
         current_uri = URI.parse(current_host)
@@ -109,8 +109,8 @@ module ActiveStorage
             content_length: content_length,
             checksum: checksum
           },
-          { expires_in: expires_in,
-          purpose: :blob_token }
+          expires_in: expires_in,
+          purpose: :blob_token
         )
 
         generated_url = url_helpers.update_rails_disk_service_url(verified_token_with_expiration, host: current_host)

data/lib/active_storage/service/gcs_service.rb

@@ -135,7 +135,7 @@ module ActiveStorage
       end
 
       def client
-        @client ||= Google::Cloud::Storage.new(config.except(:bucket))
+        @client ||= Google::Cloud::Storage.new(**config.except(:bucket))
       end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage
 version: !ruby/object:Gem::Version
-  version: 6.0.2.2
+  version: 6.0.3.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.2.2
+        version: 6.0.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.2.2
+        version: 6.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.2.2
+        version: 6.0.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.2.2
+        version: 6.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.2.2
+        version: 6.0.3.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.2.2
+        version: 6.0.3.rc1
 - !ruby/object:Gem::Dependency
   name: marcel
   requirement: !ruby/object:Gem::Requirement
@@ -151,10 +151,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rails/rails/issues
-  changelog_uri: https://github.com/rails/rails/blob/v6.0.2.2/activestorage/CHANGELOG.md
-  documentation_uri: https://api.rubyonrails.org/v6.0.2.2/
-  mailing_list_uri: https://groups.google.com/forum/#!forum/rubyonrails-talk
-  source_code_uri: https://github.com/rails/rails/tree/v6.0.2.2/activestorage
+  changelog_uri: https://github.com/rails/rails/blob/v6.0.3.rc1/activestorage/CHANGELOG.md
+  documentation_uri: https://api.rubyonrails.org/v6.0.3.rc1/
+  mailing_list_uri: https://discuss.rubyonrails.org/c/rubyonrails-talk
+  source_code_uri: https://github.com/rails/rails/tree/v6.0.3.rc1/activestorage
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -166,11 +166,11 @@ 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.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Local and cloud file storage framework.