activestorage_database 1.0 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c09c92d2e2f7584a58c68836d5f6a946ec84ec0482b071fe6c1db4d3107bae9
-  data.tar.gz: fc7202ce7879b163a75fb0719c12e2de79d53deb79afca1d13c67a24edc28307
+  metadata.gz: 41730c0975c58c903b03a756fa67ebaec9ae373acdd58430346fdf98f74194f0
+  data.tar.gz: dbfc0d6d79f743e320fe244bfa6d9e5441bdd5b9435b6eb138cc7898e7b8b0c8
 SHA512:
-  metadata.gz: 171507085f3e4db49773b71c72e79e0b8e9c4160fb3085fd70546bc914597b8e9c059d9fe3568a651ef7e0a63770762ff777b4b30064d112bdd3a77cc69116eb
-  data.tar.gz: 405ada0a3112021aa408f46fda10aa610ccb7381b3feab730072ce370470dca545dd3239a88e92e3616de06830a0dfa8a4e0f3da27d07046d44dfbb527cd131e
+  metadata.gz: 6f8de2aa772e7123e38dc63718aac06de33883565ce4e077e33344eb6ee7d303ee42d6f9b880b1497fd48d974fe913be7cd71d8fda901b5469c0dfd024720859
+  data.tar.gz: 1c82f1b1c0dbb6d900a6c76762e55ed869804e909b8d85824fb515f7fd47283c64eda1dc77d45e627b1b7c7682cfd6c9e7842c6898c484b2199ac6e64dcda469

data/README.md

@@ -11,6 +11,15 @@ access to these public services.
 This project is aimed more for those type of apps, if you store TBs of files then you should probabbly look into other solutions.
 
 
+## Compatibility
+
+Rails Version | ActiveStorageBase64 Version
+--------------|-----------------------------
+7             | 2.x
+6             | 1.x
+
+
+
 # How it works
 
 Every file is stored inside the `activestorage_database_files` table as a `binary/bytea`.
@@ -62,3 +71,9 @@ After the setup you can work with ActiveStorge API as if it was any other `Activ
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Credits
+
+Active Storage Database is maintained by [WizardHealth](https://www.wizardhealth.co/?lang=en).
+
+[<img src="https://s3-us-west-1.amazonaws.com/rootstrap.com/img/rs.png" width="100"/>](http://www.rootstrap.com)

data/app/controllers/activestorage_database/files_controller.rb

@@ -28,28 +28,30 @@ class ActivestorageDatabase::FilesController < ActiveStorage::BaseController
   end
 
   private
-    def database_service
-      ActiveStorage::Blob.service
-    end
 
-    def decode_verified_key
-      ActiveStorage.verifier.verified(params[:encoded_key], purpose: :blob_key)
-    end
+  def database_service
+    ActiveStorage::Blob.service
+  end
 
-    def decode_verified_token
-      ActiveStorage.verifier.verified(params[:encoded_token], purpose: :blob_token)
-    end
+  def decode_verified_key
+    key = ActiveStorage.verifier.verified(params[:encoded_key], purpose: :blob_key)
+    key&.deep_symbolize_keys
+  end
 
-    def serve_file(key, content_type:, disposition:)
-      options = {
-          type: content_type || DEFAULT_SEND_FILE_TYPE,
-          disposition: disposition || DEFAULT_SEND_FILE_DISPOSITION
-      }
+  def decode_verified_token
+    ActiveStorage.verifier.verified(params[:encoded_token], purpose: :blob_token)
+  end
 
-      send_data database_service.download(key), options
-    end
+  def serve_file(key, content_type:, disposition:)
+    options = {
+      type: content_type || DEFAULT_SEND_FILE_TYPE,
+      disposition: disposition || DEFAULT_SEND_FILE_DISPOSITION
+    }
 
-    def acceptable_content?(token)
-      token[:content_type] == request.content_mime_type && token[:content_length] == request.content_length
-    end
+    send_data database_service.download(key), options
+  end
+
+  def acceptable_content?(token)
+    token[:content_type] == request.content_mime_type && token[:content_length] == request.content_length
+  end
 end

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.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activestorage_database
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '2.1'
 platform: ruby
 authors:
 - Dino Maric
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-18 00:00:00.000000000 Z
+date: 2024-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -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
@@ -66,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Store ActiveStorage attachments inside the database.