lazy_blob_storage 2.0.0.pre.beta.5 → 2.0.0.pre.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45ca84928e6e354ad7966a97cf15c4d5ab6f93aa952c507f12ab405a30d12310
-  data.tar.gz: 0d4f5893ddb9acfa1631b63177f3951dc178492be3c17781ea661d141d887da9
+  metadata.gz: f59d945b4c54444be929225d268159520d5ceefd47cd74f432e82c2f8c05c26c
+  data.tar.gz: c5092d1b0f3db7974116aa3d7041a75deae86e9c94b3395bd9609ebba38bd0f3
 SHA512:
-  metadata.gz: ad52f8ca8bcb8cb31f9a683b96ac88cd2d7ef92e6176affe55ea30d2a28822de2709c59914719b03a2bcde0e015ec80854be9f61b1d99889f7bcc6d3580a93fe
-  data.tar.gz: e0da5bf09d25d351e1cda6edac680efd82b2a18e56bf514f3e82e7e6b13c61ef4eb6be3263ca7b28fb1fc9c01a6865e05828363efd520e35664f0e43ba9c4890
+  metadata.gz: a3319925424b037dd4934322b021ef020004a10db8ba768c88a5bc0461e0a88e1a7f62f8d3598f668edbfdd10c7f16c2f2f09b8ffdc357c405a3842daf93c648
+  data.tar.gz: 4536667ff095869e75fa3b9cee03c59dd78481270c2a42edd3bc0ad11a9f6634a9fb04c816ba206c309343bbdae508ada8a986249579a65aa57afbc8557cab1a

data/README.md

@@ -8,15 +8,24 @@ digest to prevent duplicate blob uploads.
 Nothing fancy. Just stores files and allows public access using the
 digest as a key. Respects HTTP Cache headers.
 
-You probably want to put a CDN/Cache/RateLimit in front of the 
-`"lazy_blobs#show"` route because somebody could DOS your website 
+You probably want to put a CDN/Cache/RateLimit in front of the
+`"lazy_blobs#show"` route because somebody could DOS your website
 if all your workers are serving files from the database.
 
-Basically this is a dumb idea, but setting up AWS buckets and permissions just 
+Basically this is a dumb idea, but setting up AWS buckets and permissions just
 to upload a dumb logo is :big_sigh_emoji:
 
 Don't use this. I mean it.
 
+## Alternative
+
+I would use activestorage_database rather than lazy_blob_storage if I were starting a new project.
+
+See:
+
+- https://rubygems.org/gems/activestorage_database
+- https://github.com/WizardComputer/activestorage_database
+
 ## Breaking Changes in 2.0.0-beta.1
 
 - Support UUID key types

data/Rakefile

@@ -1,31 +1,31 @@
 begin
-  require 'bundler/setup'
+  require "bundler/setup"
 rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+  puts "You must `gem install bundler` and `bundle install` to run rake tasks"
 end
 
-require 'rdoc/task'
+require "rdoc/task"
 
 RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'LazyBlobStorage'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.md')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_dir = "rdoc"
+  rdoc.title = "LazyBlobStorage"
+  rdoc.options << "--line-numbers"
+  rdoc.rdoc_files.include("README.md")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
 APP_RAKEFILE = File.expand_path("test/dummy/Rakefile", __dir__)
-load 'rails/tasks/engine.rake'
+load "rails/tasks/engine.rake"
 
-load 'rails/tasks/statistics.rake'
+load "rails/tasks/statistics.rake"
 
-require 'bundler/gem_tasks'
+require "bundler/gem_tasks"
 
-require 'rake/testtask'
+require "rake/testtask"
 
 Rake::TestTask.new(:test) do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
+  t.libs << "test"
+  t.pattern = "test/**/*_test.rb"
   t.verbose = false
 end
 

data/app/controllers/lazy_blobs_controller.rb

@@ -3,8 +3,8 @@ class LazyBlobsController < ActionController::Base
     @blob = LazyBlob.find_by(digest: params[:digest])
 
     if stale?(@blob, last_modified: @blob.created_at.utc, public: true)
-      headers['Content-Type'] = @blob.content_type
-      headers['Content-Length'] = @blob.content_length
+      headers["Content-Type"] = @blob.content_type
+      headers["Content-Length"] = @blob.content_length
       send_data(@blob.content, filename: @blob.filename, disposition: :inline)
     end
   end
@@ -13,9 +13,9 @@ class LazyBlobsController < ActionController::Base
     @blob = LazyBlob.from_upload(params[:file])
 
     if @blob.save
-      render json: { digest: @blob.digest }
+      render json: {digest: @blob.digest}
     else
-      render json: { errors: @blob.errors }, status: :unprocessable_entity
+      render json: {errors: @blob.errors}, status: :unprocessable_entity
     end
   end
-end
+end

data/app/models/concerns/lazy_attachable.rb

@@ -5,7 +5,7 @@ module LazyAttachable
     def initialize(name)
       define_method("handle_#{name}_upload") do
         if (send "#{name}_upload").present? && (send "#{name}_upload_size_ok?")
-          blob = LazyBlob.from_upload(send "#{name}_upload")
+          blob = LazyBlob.from_upload(send("#{name}_upload"))
 
           if (attached = (send "attached_#{name}"))
             attached.lazy_blob = blob
@@ -26,12 +26,12 @@ module LazyAttachable
 
       define_method("validate_size_of_#{name}_upload") do
         if (send "#{name}_upload").present? && !(send "#{name}_upload_size_ok?")
-          errors.add("#{name}_upload", "file too large (limit #{LazyBlobStorage._max_blob_size / 1_000} kb")
+          errors.add("#{name}_upload", LazyBlobStorage._max_blob_size_error_message)
         end
       end
 
       define_method("attached_#{name}_path") do
-        if (send "#{name}_attached?")
+        if send "#{name}_attached?"
           digest = (send "attached_#{name}").digest
           Rails.application.routes.url_helpers.lazy_blob_path(digest)
         else
@@ -40,7 +40,7 @@ module LazyAttachable
       end
 
       define_method("attached_#{name}_url") do
-        if (send "#{name}_attached?")
+        if send "#{name}_attached?"
           digest = (send "attached_#{name}").digest
           Rails.application.routes.url_helpers.lazy_blob_url(digest)
         else
@@ -81,11 +81,11 @@ module LazyAttachable
       attr_accessor "#{name}_digest"
 
       has_one "attached_#{name}".to_sym,
-              -> { where(name: name) },
-              class_name: "LazyAttachment",
-              as: :record,
-              autosave: true,
-              dependent: :destroy
+        -> { where(name: name) },
+        class_name: "LazyAttachment",
+        as: :record,
+        autosave: true,
+        dependent: :destroy
 
       scope "with_attached_#{name}".to_sym, -> {
         includes("attached_#{name}")

data/app/models/lazy_attachment.rb

@@ -1,6 +1,8 @@
 class LazyAttachment < ActiveRecord::Base
-  belongs_to :lazy_blob
+  belongs_to :lazy_blob, autosave: true
   belongs_to :record, polymorphic: true
+  has_many :lazy_variants, dependent: :destroy
+
   validates :name, presence: true
   validates :digest, presence: true
 
@@ -23,4 +25,33 @@ class LazyAttachment < ActiveRecord::Base
   def filename
     LazyBlob.select(:id, :filename).find(lazy_blob_id).filename
   end
+
+  def create_variant(name, x_size, y_size, format = "png")
+    return unless lazy_blob.content_type.start_with?("image/")
+
+    content_file = Tempfile.new("lazy_blob_content")
+    content_file.binmode
+    content_file.write(lazy_blob.content)
+    content_file.close
+
+    processed = ImageProcessing::MiniMagick
+      .source(content_file.path)
+      .resize_to_limit(x_size, y_size)
+      .convert(format)
+      .call
+
+    blob = LazyBlob.from_processed_variant(processed, name, format, lazy_blob)
+
+    variant = LazyVariant.new(
+      name: name,
+      lazy_blob: blob,
+      lazy_attachment: self
+    )
+
+    variant.save!
+  end
+
+  def variant(name)
+    lazy_variants.find_by(name: name)
+  end
 end

data/app/models/lazy_blob.rb

@@ -2,17 +2,18 @@
 
 class LazyBlob < ActiveRecord::Base
   has_many :lazy_attachments, dependent: :restrict_with_error
+  has_many :lazy_variants, dependent: :restrict_with_error
 
   validates :filename, presence: true
   validates :content_type, presence: true
   validates :content_length,
-            presence: true,
-            numericality: { greater_than: 0, less_than: LazyBlobStorage._max_blob_size }
+    presence: true,
+    numericality: {greater_than: 0, less_than: LazyBlobStorage._max_blob_size}
   validates :digest, presence: true, uniqueness: true
-  validates :content, presence: true, length: { maximum: LazyBlobStorage._max_blob_size }
+  validates :content, presence: true, length: {maximum: LazyBlobStorage._max_blob_size}
 
   def self.from_upload(uploaded_file)
-    file = File.open(uploaded_file.tempfile.path, 'rb')
+    file = File.open(uploaded_file.tempfile.path, "rb")
     data = file.read
     digest = Digest::SHA256.new.update(data).hexdigest
     blob = find_or_initialize_by(digest: digest)
@@ -29,6 +30,24 @@ class LazyBlob < ActiveRecord::Base
     file.close
   end
 
+  def self.from_processed_variant(tempfile, variant_name, variant_format, original_blob)
+    file = File.open(tempfile.path, "rb")
+    data = file.read
+    digest = Digest::SHA256.new.update(data).hexdigest
+    blob = find_or_initialize_by(digest: digest)
+
+    if blob.new_record?
+      blob.content = data
+      blob.content_length = tempfile.size
+      blob.filename = "#{original_blob.filename.split(".").first}--#{variant_name}.#{variant_format}"
+      blob.content_type = "image/#{variant_format}"
+    end
+
+    blob
+  ensure
+    file.close
+  end
+
   def data_uri
     "data:#{content_type};base64,#{Base64.encode64(content)}"
   end

data/app/models/lazy_variant.rb

@@ -0,0 +1,27 @@
+class LazyVariant < ActiveRecord::Base
+  belongs_to :lazy_blob
+  belongs_to :lazy_attachment
+  validates :name, presence: true
+  validates :name, uniqueness: {scope: :lazy_attachment_id}
+  validates :digest, presence: true
+
+  before_validation do
+    self.digest = lazy_blob.digest
+  end
+
+  def data_uri
+    lazy_blob.data_uri
+  end
+
+  def path
+    Rails.application.routes.url_helpers.lazy_blob_path(digest)
+  end
+
+  def url
+    Rails.application.routes.url_helpers.lazy_blob_url(digest)
+  end
+
+  def filename
+    LazyBlob.select(:id, :filename).find(lazy_blob_id).filename
+  end
+end

data/db/migrate/20200213161207_create_lazy_blobs.rb

@@ -1,7 +1,7 @@
 class CreateLazyBlobs < ActiveRecord::Migration[6.0]
   def change
     # Use Active Record's configured type for primary and foreign keys
-    primary_key_type, foreign_key_type = primary_and_foreign_key_types
+    primary_key_type, _foreign_key_type = primary_and_foreign_key_types
 
     create_table :lazy_blobs, id: primary_key_type do |t|
       t.string :filename
@@ -14,6 +14,7 @@ class CreateLazyBlobs < ActiveRecord::Migration[6.0]
   end
 
   private
+
   def primary_and_foreign_key_types
     config = Rails.configuration.generators
     setting = config.options[config.orm][:primary_key_type]

data/db/migrate/20230309225433_create_lazy_variants.rb

@@ -0,0 +1,11 @@
+class CreateLazyVariants < ActiveRecord::Migration[7.0]
+  def change
+    create_table :lazy_variants do |t|
+      t.references :lazy_attachment
+      t.references :lazy_blob
+      t.string :name
+      t.index :name
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20230309235549_add_digest_to_lazy_variants.rb

@@ -0,0 +1,5 @@
+class AddDigestToLazyVariants < ActiveRecord::Migration[7.0]
+  def change
+    add_column :lazy_variants, :digest, :string
+  end
+end

data/lib/lazy_blob_storage/engine.rb

@@ -1,8 +1,8 @@
 module LazyBlobStorage
   class Engine < ::Rails::Engine
-    initializer 'mixin_lazy_attachable' do
+    initializer "mixin_lazy_attachable" do
       ActiveSupport.on_load(:active_record) do
-        self.include LazyAttachable
+        include LazyAttachable
       end
     end
   end

data/lib/lazy_blob_storage/version.rb

@@ -1,3 +1,3 @@
 module LazyBlobStorage
-  VERSION = "2.0.0-beta.5"
+  VERSION = "2.0.0-beta.7"
 end

data/lib/lazy_blob_storage.rb

@@ -2,12 +2,21 @@ require "lazy_blob_storage/engine"
 
 module LazyBlobStorage
   mattr_accessor :max_blob_size
+  mattr_accessor :max_blob_size_error_message
 
   def self.default_max_blob_size
     100_000.bytes
   end
 
+  def self.default_max_blob_size_error_message
+    "file too large (limit #{_max_blob_size / 1_000} kb)"
+  end
+
   def self._max_blob_size
     max_blob_size || default_max_blob_size
   end
+
+  def self._max_blob_size_error_message
+    max_blob_size_error_message || default_max_blob_size_error_message
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lazy_blob_storage
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre.beta.5
+  version: 2.0.0.pre.beta.7
 platform: ruby
 authors:
 - Corey Smedstad
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-28 00:00:00.000000000 Z
+date: 2023-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '6'
+- !ruby/object:Gem::Dependency
+  name: ruby-lsp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: standard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description:
 email:
 - csmedstad@mreach.com
@@ -95,10 +123,13 @@ files:
 - app/models/concerns/lazy_attachable.rb
 - app/models/lazy_attachment.rb
 - app/models/lazy_blob.rb
+- app/models/lazy_variant.rb
 - config/routes.rb
 - db/migrate/20200213161207_create_lazy_blobs.rb
 - db/migrate/20200213164215_create_lazy_attachments.rb
 - db/migrate/20200213212649_add_blob_digest_to_lazy_attachments.rb
+- db/migrate/20230309225433_create_lazy_variants.rb
+- db/migrate/20230309235549_add_digest_to_lazy_variants.rb
 - lib/lazy_blob_storage.rb
 - lib/lazy_blob_storage/engine.rb
 - lib/lazy_blob_storage/version.rb
@@ -123,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Low traffic site? Small file upload needs? Don't want to setup a cloud service?