activestorage-resumable 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eda37252cd9cae1c6209b5e2e788b82133748ae588cc3f2838be489a133f8171
-  data.tar.gz: ae610ee86f19543e8aed92b95d046ab8021d62cdd27d6b68946f702aeb739ce6
+  metadata.gz: bb92b9f960cefc981ffb50b6bfce65e16cab57098074720359925dd270d18a18
+  data.tar.gz: 7612369a85184fae18a5ebc1ebc75723952d93efd76ee6f1a8d80b4d26029322
 SHA512:
-  metadata.gz: 61c49a578d383213dd59ae28e0d06697ce25cc601e269613bcdf345fcdfa298311e3263c73e0b4747d56c055b0f65cc5658aca0abfe4ed8fc67534d2b96d1737
-  data.tar.gz: e9be9cfa3dd80cda7e05b210213ff5e93cdd275be5aea86ff26e27de85a18a5930bc88c8c86fd8c98579f5ea28e2a083694ce6d9147af99c5698fca410ccfc58
+  metadata.gz: 2888771c2c559d58de0b983673a8c24c8962aca70871725fe39296cc50478e452a23a476abb8824a170f11243efa797ef59836beda743dda700083f11aa0a32e
+  data.tar.gz: 686b52a7baf55727554f0edb96e836cae17e6c2017e2f15f0c17684e17a04798fcec7ab52fc69610e7c7c99ee884b75c7b107875a44293722b8470fe3f5af257

data/README.md

@@ -27,7 +27,15 @@ Active Storage Resumable, also includes a JavaScript library, that uploads file
 localStorage, allowing to resume an upload even after a browser restart.
 
 ### Resumable upload installation
-1. Include `activestorage-resumable.js` in your application's JavaScript bundle.
+1. Export an environment variable called UPLOAD_ORIGIN_URL with the upload origin URL, for example
+   'http://localhost:3000'. You can also create a `config/initializers/activestorage_resumable.rb` with the following:
+
+    ```ruby
+    ActiveStorage::Resumable.configure do |config|
+      config.upload_origin_url = 'https://mydomain.test:3000'
+    end
+    ```
+2. Include `activestorage-resumable.js` in your application's JavaScript bundle.
 
     Using the asset pipeline:
     ```js
@@ -37,12 +45,12 @@ localStorage, allowing to resume an upload even after a browser restart.
     ```js
     require("@fnix/activestorage-resumable").start()
     ```
-2. Annotate file inputs with the resumable upload URL.
+3. Annotate file inputs with the resumable upload URL.
 
     ```ruby
     <%= form.file_field :attachments, multiple: true, resumable_upload: true %>
     ```
-3. That's it! Uploads begin upon form submission.
+4. That's it! Uploads begin upon form submission.
 
 ### Resumable upload JavaScript events
 

data/lib/activestorage/resumable/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveStorage
   module Resumable
-    VERSION = '1.0.0'
+    VERSION = '1.0.1'
   end
 end

data/lib/activestorage_extensions/blob.rb

@@ -2,18 +2,17 @@
 
 ActiveSupport.on_load(:active_storage_blob) do
   class ActiveStorage::Blob
-    before_create do
-      self.resumable_url = service.url_for_resumable_upload(key, content_type)
-    end
-
     scope :resumable, -> { unattached.where.not(resumable_url: nil) }
     scope :active_resumable, -> { resumable.where('active_storage_blobs.created_at >= ?', 7.days.ago) }
     scope :expired_resumable, -> { resumable.where('active_storage_blobs.created_at < ?', 7.days.ago) }
 
     def self.find_or_create_before_resumable_upload!(filename:, byte_size:, checksum:, content_type: nil, metadata: nil)
-      ActiveStorage::Blob.expired_resumable.destroy_all
-      find_or_create_by! filename: filename, byte_size: byte_size, checksum: checksum, content_type: content_type,
-                         metadata: metadata
+      expired_resumable.destroy_all
+      active_resumable.find_or_create_by!(
+        filename: filename, byte_size: byte_size, checksum: checksum, content_type: content_type, metadata: metadata
+      ) do |blob|
+        blob.resumable_url = blob.service_url_for_resumable_upload
+      end
     end
 
     def uploaded_bytes
@@ -29,9 +28,8 @@ ActiveSupport.on_load(:active_storage_blob) do
       end
     end
 
-    def service_url_for_resumable_upload(expires_in: ActiveStorage.service_urls_expire_in)
-      service.url_for_resumable_upload key, expires_in: expires_in, content_type: content_type,
-                                            content_length: byte_size, checksum: checksum
+    def service_url_for_resumable_upload
+      service.url_for_resumable_upload key, content_type: content_type
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-resumable
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kadu Diógenes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2019-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage