active_storage_db 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 23bbb0b9bf0759169020c1da8e4a8d5028938ffdb1b13dc4a356783da06eb868
-  data.tar.gz: 1e1e1146a363bba15efe440cd82fbc4926763596746995f8696c24ca9cb9789c
+  metadata.gz: 1a465e1b93b8ab6436f800b2a0ff6e38f049fae621587924d9b2299f3fa06946
+  data.tar.gz: 78583f7c6aa00b0a8c7ab1d98f05d4d34e8ff8a1846f0ed70a0c3e16e97275c7
 SHA512:
-  metadata.gz: cc1229568804d8a6c1a0912f8ddcf59895d12374a57b460a6f29c8bce1aac7216c936b6b8c255ea41563f39b22c748e34645bac787da24886d9c02bcd367adb3
-  data.tar.gz: b85e8f1b41dfc2e01cfb566efd561a44606959cd1cb6b3a9cf718e4618b396949aad3fa87f8037ba61eda0789425bf9b4cf1031805d370c4702d2c973a5dfe5b
+  metadata.gz: 76ef220615b3e3704a99803a8bbe3af211855278d3532a97bbc9f325a5455ff393dde657180368d10bdecce8592afe99a41be7f6fe28e325d3671fa3b414087a
+  data.tar.gz: c555f306068194447e708c743abdc829f8043728585da32bbf504d689571d38a72725dbe97382665bd20fdaa95848b48ee018d45ab5d22692c1736ad9bcc59cb

data/README.md

@@ -1,16 +1,19 @@
 # Active Storage DB
 
 [![gem version](https://badge.fury.io/rb/active_storage_db.svg)](https://badge.fury.io/rb/active_storage_db)
+[![gem downloads](https://badgen.net/rubygems/dt/active_storage_db)](https://rubygems.org/gems/active_storage_db)
+[![maintainability](https://api.codeclimate.com/v1/badges/92e1e703c308744a0f66/maintainability)](https://codeclimate.com/github/blocknotes/active_storage_db/maintainability)
+
 [![linters](https://github.com/blocknotes/active_storage_db/actions/workflows/linters.yml/badge.svg)](https://github.com/blocknotes/active_storage_db/actions/workflows/linters.yml)
-[![specs Postgres](https://github.com/blocknotes/active_storage_db/actions/workflows/specs_postgres_70.yml/badge.svg)](https://github.com/blocknotes/active_storage_db/actions/workflows/specs_postgres_70.yml)
-[![Specs MySQL](https://github.com/blocknotes/active_storage_db/actions/workflows/specs_mysql_70.yml/badge.svg)](https://github.com/blocknotes/active_storage_db/actions/workflows/specs_mysql_70.yml)
+[![specs Postgres](https://github.com/blocknotes/active_storage_db/actions/workflows/specs_postgres_71.yml/badge.svg)](https://github.com/blocknotes/active_storage_db/actions/workflows/specs_postgres_71.yml)
+[![specs MySQL](https://github.com/blocknotes/active_storage_db/actions/workflows/specs_mysql_71.yml/badge.svg)](https://github.com/blocknotes/active_storage_db/actions/workflows/specs_mysql_71.yml)
 
 An Active Storage service upload/download plugin that stores files in a PostgreSQL or MySQL database.
 
 Main features:
-- supports Rails _6.0_, _6.1_ and _7.0_;
+- attachment data stored in a binary field (or blob);
 - all service methods implemented;
-- attachment data stored in a binary field (or blob).
+- supports Rails _6_ and _7_.
 
 Useful also with platforms like Heroku (due to their ephemeral file system).
 

data/app/controllers/active_storage_db/files_controller.rb

@@ -8,34 +8,41 @@ module ActiveStorageDB
       if (key = decode_verified_key)
         serve_file(key[:key], content_type: key[:content_type], disposition: key[:disposition])
       else
-        head :not_found
+        head(:not_found)
       end
     rescue ActiveStorage::FileNotFoundError
-      head :not_found
+      head(:not_found)
     end
 
     def update
       if (token = decode_verified_token)
-        if acceptable_content?(token)
-          db_service.upload(token[:key], request.body, checksum: token[:checksum])
-        else
-          head :unprocessable_entity
-        end
+        file_uploaded = upload_file(token, body: request.body)
+        head(file_uploaded ? :no_content : :unprocessable_entity)
       else
-        head :not_found
+        head(:not_found)
       end
     rescue ActiveStorage::IntegrityError
-      head :unprocessable_entity
+      head(:unprocessable_entity)
     end
 
     private
 
+    def acceptable_content?(token)
+      token[:content_type] == request.content_mime_type && token[:content_length] == request.content_length
+    end
+
     def db_service
       ActiveStorage::Blob.service
     end
 
     def decode_verified_key
-      ActiveStorage.verifier.verified(params[:encoded_key], purpose: :blob_key)
+      key = ActiveStorage.verifier.verified(params[:encoded_key], purpose: :blob_key)
+      key&.deep_symbolize_keys
+    end
+
+    def decode_verified_token
+      token = ActiveStorage.verifier.verified(params[:encoded_token], purpose: :blob_token)
+      token&.deep_symbolize_keys
     end
 
     def serve_file(key, content_type:, disposition:)
@@ -43,15 +50,14 @@ module ActiveStorageDB
         type: content_type || DEFAULT_SEND_FILE_TYPE,
         disposition: disposition || DEFAULT_SEND_FILE_DISPOSITION
       }
-      send_data db_service.download(key), options
+      send_data(db_service.download(key), options)
     end
 
-    def decode_verified_token
-      ActiveStorage.verifier.verified(params[:encoded_token], purpose: :blob_token)
-    end
+    def upload_file(token, body:)
+      return false unless acceptable_content?(token)
 
-    def acceptable_content?(token)
-      token[:content_type] == request.content_mime_type && token[:content_length] == request.content_length
+      db_service.upload(token[:key], request.body, checksum: token[:checksum])
+      true
     end
   end
 end

data/app/models/active_storage_db/application_record.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+module ActiveStorageDB
+  class ApplicationRecord < ActiveRecord::Base
+    self.abstract_class = true
+  end
+end

data/app/models/active_storage_db/file.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActiveStorageDB
-  class File < ActiveRecord::Base
+  class File < ApplicationRecord
     validates :ref,
               presence: true,
               allow_blank: false,

data/db/migrate/20200702202022_create_active_storage_db_files.rb

@@ -2,12 +2,25 @@
 
 class CreateActiveStorageDBFiles < ActiveRecord::Migration[6.0]
   def change
-    create_table :active_storage_db_files do |t|
+    create_table :active_storage_db_files, id: primary_key_type do |t|
       t.string :ref, null: false
       t.binary :data, null: false
-      t.datetime :created_at, null: false
+
+      if connection.supports_datetime_with_precision?
+        t.datetime :created_at, precision: 6, null: false
+      else
+        t.datetime :created_at, null: false
+      end
 
       t.index [:ref], unique: true
     end
   end
+
+  private
+
+  def primary_key_type
+    config = Rails.configuration.generators
+    primary_key_type = config.options[config.orm][:primary_key_type]
+    primary_key_type || :primary_key
+  end
 end

data/lib/active_storage/service/db_service.rb

@@ -36,18 +36,14 @@ module ActiveStorage
         end
       else
         instrument :download, key: key do
-          record = ::ActiveStorageDB::File.find_by(ref: key)
-          raise(ActiveStorage::FileNotFoundError) unless record
-
-          record.data
+          retrieve_file(key)
         end
       end
     end
 
     def download_chunk(key, range)
       instrument :download_chunk, key: key, range: range do
-        chunk_select = "SUBSTRING(data FROM #{range.begin + 1} FOR #{range.size}) AS chunk"
-        record = ::ActiveStorageDB::File.select(chunk_select).find_by(ref: key)
+        record = object_for(key, fields: "SUBSTRING(data FROM #{range.begin + 1} FOR #{range.size}) AS chunk")
         raise(ActiveStorage::FileNotFoundError) unless record
 
         record.chunk
@@ -63,7 +59,7 @@ module ActiveStorage
 
     def delete_prefixed(prefix)
       instrument :delete_prefixed, prefix: prefix do
-        ::ActiveStorageDB::File.where('ref LIKE ?', "#{prefix}%").destroy_all
+        ::ActiveStorageDB::File.where('ref LIKE ?', "#{ApplicationRecord.sanitize_sql_like(prefix)}%").destroy_all
       end
     end
 
@@ -127,17 +123,26 @@ module ActiveStorage
     end
 
     def ensure_integrity_of(key, checksum)
-      file = ::ActiveStorageDB::File.find_by(ref: key)
-      return if Digest::MD5.base64digest(file.data) == checksum
+      return if Digest::MD5.base64digest(object_for(key).data) == checksum
 
       delete(key)
       raise ActiveStorage::IntegrityError
     end
 
+    def retrieve_file(key)
+      file = object_for(key)
+      raise(ActiveStorage::FileNotFoundError) unless file
+
+      file.data
+    end
+
+    def object_for(key, fields: nil)
+      as_file = fields ? ::ActiveStorageDB::File.select(*fields) : ::ActiveStorageDB::File
+      as_file.find_by(ref: key)
+    end
+
     def stream(key)
-      size =
-        ::ActiveStorageDB::File.select('OCTET_LENGTH(data) AS size').find_by(ref: key)&.size ||
-        raise(ActiveStorage::FileNotFoundError)
+      size = object_for(key, fields: 'OCTET_LENGTH(data) AS size')&.size || raise(ActiveStorage::FileNotFoundError)
       (size / @chunk_size.to_f).ceil.times.each do |i|
         range = (i * @chunk_size..((i + 1) * @chunk_size) - 1)
         yield download_chunk(key, range)

data/lib/active_storage_db/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveStorageDB
-  VERSION = '1.1.0'
+  VERSION = '1.2.0'
 end

data/lib/tasks/active_storage_db_tasks.rake

@@ -20,7 +20,7 @@ namespace :asdb do
   desc 'ActiveStorageDB: list attachments ordered by blob id desc'
   task list: [:environment] do |_t, _args|
     query = ::ActiveStorage::Blob.order(id: :desc).limit(100)
-    digits = Math.log(query.maximum(:id), 10).to_i + 1
+    digits = query.ids.inject(0) { |ret, id| size = id.to_s.size; [size, ret].max }
 
     ::ActiveStorage::Tasks.print_blob_header(digits: digits)
     query.each do |blob|
@@ -52,7 +52,7 @@ namespace :asdb do
 
     blobs = ::ActiveStorage::Blob.where('filename LIKE ?', "%#{filename}%").order(id: :desc)
     if blobs.any?
-      digits = Math.log(blobs.first.id, 10).to_i + 1
+      digits = blobs.ids.inject(0) { |ret, id| size = id.to_s.size; [size, ret].max }
       ::ActiveStorage::Tasks.print_blob_header(digits: digits)
       blobs.each do |blob|
         ::ActiveStorage::Tasks.print_blob(blob, digits: digits)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_db
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-04 00:00:00.000000000 Z
+date: 2023-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage
@@ -77,6 +77,7 @@ files:
 - README.md
 - Rakefile
 - app/controllers/active_storage_db/files_controller.rb
+- app/models/active_storage_db/application_record.rb
 - app/models/active_storage_db/file.rb
 - config/initializers/inflections.rb
 - config/routes.rb
@@ -104,14 +105,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: ActiveStorage DB Service