active_storage_db 0.1.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5badec24c31c5731ad428313fb458e6282e3e8006edad239581bc2fd73d3db72
-  data.tar.gz: df260e3805a1d3ca52d8a105faa1e3bee0adbcc4545f1e61eea44a24a2600abe
+  metadata.gz: 733afb3767f4174510cc6e59a72a5c6e137d17479fc6ec733a977ff81f80fbaf
+  data.tar.gz: dd7ffb266b99e6fbb2a0537b3d198a3e20200bc01dbdb43fe2407cd01161793d
 SHA512:
-  metadata.gz: 776d212df5f29c405074ff0093fb1091cbf0eca5ae8bbce5c639eb2c3fb3346d80860e980e7afe25b4dfb36e37128fe0ed8a08179cd1d573b03f86770165386e
-  data.tar.gz: 5cd28f3391c22d923b14fc270a334a97bfe209ca18c85d7218f43b79f7480187bf330a6459b32a1be6b1ab3244d494058e01e8200dd562ab36819e8e63f244ca
+  metadata.gz: 4ef2822294d193dd86b6bf865602ec14f13e5868a418e2ad3685d9eaade829b302659634c4effebf495f63c63a96252da50a170ad0b2e3cb831243602e0cfdcd
+  data.tar.gz: 8b4e73f58bfcc0f3a840812757069be9ef9859585a3a9158721ede94885d014a2b507917fdc8e5a5da7e3f17c0ef90df7146958205aa88a07243471f3b44d118

data/README.md

@@ -1,33 +1,51 @@
-# Active Storage DB [![Gem Version](https://badge.fury.io/rb/active_storage_db.svg)](https://badge.fury.io/rb/active_storage_db) [![CircleCI](https://circleci.com/gh/blocknotes/active_storage_db.svg?style=svg)](https://circleci.com/gh/blocknotes/active_storage_db)
+# Active Storage DB
+
+[![gem version](https://badge.fury.io/rb/active_storage_db.svg)](https://badge.fury.io/rb/active_storage_db)
+[![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/postgres.yml/badge.svg)](https://github.com/blocknotes/active_storage_db/actions/workflows/postgres.yml)
+[![specs MySQL](https://github.com/blocknotes/active_storage_db/actions/workflows/mysql.yml/badge.svg)](https://github.com/blocknotes/active_storage_db/actions/workflows/mysql.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;
 - all service methods implemented;
-- data is saved using a binary field (or blob);
-- RSpec tests.
+- attachment data stored in a binary field (or blob).
+
+Useful also with platforms like Heroku (due to their ephemeral file system).
 
 ## Installation
+
 - Setup Active Storage in your Rails application
-- Add this line to your Gemfile: `gem 'active_storage_db'`
-- And execute: `bundle`
-- Install gem migrations: `bin/rails active_storage_db:install:migrations`
-- And execute: `bin/rails db:migrate`
+- Add to your Gemfile `gem 'active_storage_db'` (and execute: `bundle`)
+- Install the gem migrations: `bin/rails active_storage_db:install:migrations` (and execute: `bin/rails db:migrate`)
 - Add to your `config/routes.rb`: `mount ActiveStorageDB::Engine => '/active_storage_db'`
 - Change Active Storage service in *config/environments/development.rb* to: `config.active_storage.service = :db`
 - Add to *config/storage.yml*:
+
 ```
 db:
   service: DB
 ```
 
+## Misc
+
+Some rake tasks are available:
+
+- `asdb:list`: list the stored attachments
+- `asdb:get`: download an attachment (ex. `bin/rails "asdb:get[ruby-logo.png,/tmp]"`)
+
 ## Do you like it? Star it!
+
 If you use this component just star it. A developer is more motivated to improve a project when there is some interest.
 
 Or consider offering me a coffee, it's a small thing but it is greatly appreciated: [about me](https://www.blocknot.es/about-me).
 
 ## Contributors
+
 - [Mattia Roccoberton](https://blocknot.es/): author
 - Inspired by [activestorage-database-service](https://github.com/TitovDigital/activestorage-database-service) project
 
 ## License
+
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/Rakefile

@@ -16,19 +16,23 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-APP_RAKEFILE = File.expand_path('spec/dummy/Rakefile', __dir__)
+dummy_app = ENV['RAILS_7'] ? 'dummy7' : 'dummy'
+APP_RAKEFILE = File.expand_path("spec/#{dummy_app}/Rakefile", __dir__)
 load 'rails/tasks/engine.rake'
 
 load 'rails/tasks/statistics.rake'
 
 require 'bundler/gem_tasks'
 
-require 'rake/testtask'
+begin
+  require 'rspec/core/rake_task'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'spec'
-  t.pattern = 'spec/**/*_spec.rb'
-  t.verbose = false
-end
+  RSpec::Core::RakeTask.new(:spec) do |t|
+    # t.ruby_opts = %w[-w]
+    t.rspec_opts = ['--color', '--format documentation']
+  end
 
-task default: :test
+  task default: :spec
+rescue LoadError
+  puts '! LoadError: no RSpec available'
+end

data/lib/active_storage/service/db_service.rb

@@ -83,7 +83,7 @@ module ActiveStorage
       end
     end
 
-    def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:)
+    def url_for_direct_upload(key, expires_in:, content_type:, content_length:, checksum:, custom_metadata: {})
       instrument :url, key: key do |payload|
         verified_token_with_expiration = ActiveStorage.verifier.generate(
           {
@@ -95,10 +95,7 @@ module ActiveStorage
           expires_in: expires_in,
           purpose: :blob_token
         )
-        generated_url = url_helpers.update_service_url(
-          verified_token_with_expiration,
-          host: current_host
-        )
+        generated_url = url_helpers.update_service_url(verified_token_with_expiration, host: current_host)
         payload[:url] = generated_url
 
         generated_url
@@ -112,7 +109,14 @@ module ActiveStorage
     private
 
     def current_host
-      ActiveStorage::Current.host
+      if ActiveStorage::Current.respond_to? :url_options
+        opts = ActiveStorage::Current.url_options || {}
+        url = "#{opts[:protocol]}#{opts[:host]}"
+        url += ":#{opts[:port]}" if opts[:port]
+        url || ''
+      else
+        ActiveStorage::Current.host
+      end
     end
 
     def ensure_integrity_of(key, checksum)
@@ -128,7 +132,7 @@ module ActiveStorage
         ::ActiveStorageDB::File.select('OCTET_LENGTH(data) AS size').find_by(ref: key)&.size ||
         raise(ActiveStorage::FileNotFoundError)
       (size / @chunk_size.to_f).ceil.times.each do |i|
-        range = (i * @chunk_size..(i + 1) * @chunk_size - 1)
+        range = (i * @chunk_size..((i + 1) * @chunk_size) - 1)
         yield download_chunk(key, range)
       end
     end

data/lib/active_storage_db/version.rb

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

data/lib/tasks/active_storage_db_tasks.rake

@@ -1,5 +1,31 @@
 # frozen_string_literal: true
 
-# desc 'ActiveStorageDB sync'
-# task :active_storage_db do
-# end
+namespace :asdb do
+  desc 'ActiveStorageDB: list attachments'
+  task list: [:environment] do |_t, _args|
+    ::ActiveStorage::Blob.order(:filename).pluck(:byte_size, :created_at, :filename).each do |size, dt, filename|
+      size_k = (size / 1024).to_s.rjust(7)
+      date = dt.strftime('%Y-%m-%d %H:%M')
+      puts "#{size_k}K  #{date}  #{filename}"
+    end
+  end
+
+  desc 'ActiveStorageDB: download attachment'
+  task :get, [:src, :dst] => [:environment] do |_t, args|
+    src = args[:src]&.strip
+    dst = args[:dst]&.strip
+    abort('Required arguments: source file, destination file') if src.blank? || dst.blank?
+
+    dst = "#{dst}/#{src}" if Dir.exist?(dst)
+    dir = File.dirname(dst)
+    abort("Can't write on: #{dir}") unless File.writable?(dir)
+
+    blob = ::ActiveStorage::Blob.order(created_at: :desc).find_by(filename: src)
+    abort('Source file not found') unless blob
+
+    ret = File.binwrite(dst, blob.download)
+    puts "#{ret} bytes written"
+  rescue StandardError => e
+    puts e
+  end
+end

metadata

@@ -1,71 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: active_storage_db
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Mattia Roccoberton
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-05 00:00:00.000000000 Z
+date: 2022-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '6.0'
 - !ruby/object:Gem::Dependency
-  name: capybara
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.33'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.33'
-- !ruby/object:Gem::Dependency
-  name: database_cleaner-active_record
+  name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
@@ -80,135 +66,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6.1'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.5'
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: rspec_junit_formatter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.89'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.89'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.42'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.42'
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.142'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.142'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.18'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.18'
 description: An ActiveStorage service plugin to store files in database.
 email:
-- mattiaroccoberton@nebulab.it
+- mat@blocknot.es
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -227,10 +87,13 @@ files:
 - lib/active_storage_db/engine.rb
 - lib/active_storage_db/version.rb
 - lib/tasks/active_storage_db_tasks.rake
-homepage: https://blocknot.es
+homepage: https://github.com/blocknotes/active_storage_db
 licenses:
 - MIT
-metadata: {}
+metadata:
+  homepage_uri: https://github.com/blocknotes/active_storage_db
+  source_code_uri: https://github.com/blocknotes/active_storage_db
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -239,14 +102,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: ActiveStorage DB Service