activestorage_database 1.0 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c09c92d2e2f7584a58c68836d5f6a946ec84ec0482b071fe6c1db4d3107bae9
-  data.tar.gz: fc7202ce7879b163a75fb0719c12e2de79d53deb79afca1d13c67a24edc28307
+  metadata.gz: 7fa7b57feb6093ab0bb2d10ee4fac66829699f02ab1ef3ec49299ba6ae0ad8ca
+  data.tar.gz: f29f8e16e2c3f445bedfba0984ca7775ff04f584a4749ec92ddf7153a2c3d1d9
 SHA512:
-  metadata.gz: 171507085f3e4db49773b71c72e79e0b8e9c4160fb3085fd70546bc914597b8e9c059d9fe3568a651ef7e0a63770762ff777b4b30064d112bdd3a77cc69116eb
-  data.tar.gz: 405ada0a3112021aa408f46fda10aa610ccb7381b3feab730072ce370470dca545dd3239a88e92e3616de06830a0dfa8a4e0f3da27d07046d44dfbb527cd131e
+  metadata.gz: b163055124e6fd50d9d6546a0cb92d967541afd0d19b0d31bcff8ac0a2051cc0939bd8082b1ff2ab98b82d4abfc461e87a0d62f14642719804c0deac3b9caf6a
+  data.tar.gz: 93ba877681b403de773931c412c184f2c463e5d9595f6dc2c3af628bb47a40bb2594c7a2db4f437c7abd7647097e3316b65da2bd5f3dd1707dbff35dffe3fbc0

data/lib/active_storage/service/database_service.rb

@@ -4,7 +4,7 @@ module ActiveStorage
   class Service::DatabaseService < Service
     CHUNK_SIZE = 1.megabytes.freeze
 
-    def upload(key, io, checksum: nil, **options)
+    def upload(key, io, checksum: nil, **)
       instrument :upload, key: key, checksum: checksum do
         file = ActivestorageDatabase::File.create!(key: key, data: io.read)
         ensure_integrity_of(key, checksum) if checksum
@@ -65,19 +65,8 @@ module ActiveStorage
             expires_in: expires_in,
             purpose: :blob_key
         )
-        current_uri = URI.parse(current_host)
-        generated_url = url_helpers.service_url(
-            verified_key_with_expiration,
-            protocol: current_uri.scheme,
-            host: current_uri.host,
-            port: current_uri.port,
-            disposition: content_disposition,
-            content_type: content_type,
-            filename: filename
-        )
-        payload[:url] = generated_url
 
-        generated_url
+        url_helpers.service_url(verified_key_with_expiration, filename: filename, **url_options)
       end
     end
 
@@ -93,13 +82,10 @@ module ActiveStorage
             expires_in: expires_in,
             purpose: :blob_token
         )
-        generated_url = url_helpers.update_service_url(
-            verified_token_with_expiration,
-            host: current_host
-        )
-        payload[:url] = generated_url
 
-        generated_url
+        url_helpers.update_service_url(verified_token_with_expiration, url_options) do |generated_url|
+          payload[:url] = generated_url
+        end
       end
     end
 
@@ -108,11 +94,10 @@ module ActiveStorage
     end
 
     private
-      def current_host
-        ActiveStorage::Current.host
+      def url_options
+        ActiveStorage::Current.url_options
       end
 
-
       def ensure_integrity_of(key, checksum)
         file = ::ActivestorageDatabase::File.find_by(key: key)
         return if Digest::MD5.base64digest(file.data) == checksum

data/lib/activestorage_database/version.rb

@@ -1,3 +1,3 @@
 module ActivestorageDatabase
-  VERSION = "1.0"
+  VERSION = "2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activestorage_database
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '2.0'
 platform: ruby
 authors:
 - Dino Maric
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0
+        version: '7.0'
 description: Store ActiveStorage attachments inside the database.
 email:
 - dinom@hey.com