activestorage-delayed 0.1.2 → 0.2.0.pre.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 153ae98174a2430ab5b0ddfb3a2bb17ffc6b0d568306ba9b2ee55886d4b16581
-  data.tar.gz: a75a0db4f5a200a84a627bdf74771ee63d39260b2df769a94ecc1a93a8f75546
+  metadata.gz: 02b3779f97c4d12be774399968c3ef1b3e0c006bf4c39da9ecf5fd583bdeadf4
+  data.tar.gz: c9e4338a68b08f564d2b6e8c0c6f608d21dc70feea8688afbe22f1566b88a7ca
 SHA512:
-  metadata.gz: 76a311ff87cc7ecf0046443834e1940563d2ed69bafc50f8d5cabbd0d7643c72f1827fb8ab89a86adf60f3e20856192d3412d9cfc8704aed3e8204f8b5379a21
-  data.tar.gz: 87dc98a976a1c8cbcc0a64bbda6acd3d04e3bbd42d388640ad168627e1a89e1719a17ba07735292a715ed733000e8f11b08570a5415e9bd3ca24560f311e6342
+  metadata.gz: 88ebc7439257498bd71450e9958856102fb0a948bc1c3b3d0b26fabc43aae6094599187f3336dac6a125f8c3be320a5648f66c57cc9aa299d2ce540dcf4ec77e
+  data.tar.gz: cea2b0e318299d762121f285a270e72d11457b742537b6515fb95232de48222c52db8ea7d2af0b5281402d22b905de6fc869333de03daba393519214c88c3743

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    activestorage-delayed (0.1.2)
+    activestorage-delayed (0.2.0.pre.pre)
       activestorage
       rails
 

data/README.md

@@ -13,7 +13,7 @@ Note: This gem assumes that the app has already configured activestorage.
 ## Installation
 - Add this line to your application's Gemfile:
   ```ruby
-    gem 'activestorage-delayed', '>= 0.1.1'
+    gem 'activestorage-delayed', '>= 0.1.3'
   ```
 - And then execute: `bundle install`
 - Generate the migration: `rails g migration add_activestorage_delayed`
@@ -39,7 +39,7 @@ Note: This gem assumes that the app has already configured activestorage.
   class User < ApplicationRecord
   include ActivestorageDelayed::DelayedConcern
 
-  has_one_attached :photo, require: true, use_filename: true
+  has_one_attached :photo, required: true, use_filename: true
   delayed_attach :photo
 
   has_many_attached :certificates
@@ -48,7 +48,7 @@ end
 
 ```
 ### `delayed_attach` accepts an optional hash with the following options:
-- `require`: If set to `true`, the `photo` or the `photo_tmp` will be required before saving.
+- `required`: If set to `true`, the `photo` or the `photo_tmp` will be required before saving.
 - `use_filename`: If set to `true`, the image filename will be used as the name of uploaded file instead of the hash-key used by `activestorage`
 
 ### Examples to upload files in background 

data/lib/activestorage-delayed/delayed_concern.rb

@@ -3,10 +3,14 @@
 module ActivestorageDelayed
   module DelayedConcern
     extend ActiveSupport::Concern
-    included do
+    included do # rubocop:disable Metrics/BlockLength
       @ast_delayed_settings = {}
-      def self.delayed_attach(attr_name, required: false, use_filename: false) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
-        @ast_delayed_settings[attr_name] = { use_filename: use_filename }
+
+      # @param settings (Hash)
+      #   use_filename: (Boolean)
+      #   variant_info: (Hash) Sample: { resize_to_fit: [400, 400], convert: 'jpg' }
+      def self.delayed_attach(attr_name, required: false, **settings) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+        @ast_delayed_settings[attr_name] = settings
         tmp_attr_name = :"#{attr_name}_tmp"
         has_many_attr = :"#{attr_name}_delayed_uploads"
         attr_accessor tmp_attr_name
@@ -27,11 +31,22 @@ module ActivestorageDelayed
           delayed_data[:attr_name] = attr_name
           send(has_many_attr) << send(has_many_attr).new(delayed_data)
         end
+
+        # @param filename (String) File name
+        define_method "#{attr_name}_filename" do |filename|
+          name = File.basename(filename, '.*').parameterize
+          is_multiple = send(attr_name).class.name.include?('Many')
+          name = "#{SecureRandom.uuid}-#{name}" if is_multiple
+          "#{send(:id)}-#{name}#{File.extname(filename)}"
+        end
+
+        define_method "#{attr_name}_after_upload" do
+        end
+
+        # @param _error (Exception)
+        define_method "#{attr_name}_error_upload" do |_error|
+        end
       end
     end
-
-    # @param _attr_name (String)
-    # @param _error (Exception)
-    def ast_delayed_on_error(_attr_name, _error); end
   end
 end

data/lib/activestorage-delayed/delayed_uploader.rb

@@ -24,10 +24,11 @@ module ActivestorageDelayed
       tmp_files_data.each do |file_data|
         model.send(attr_name).attach(file_data.transform_keys(&:to_sym))
       end
+      model.send("#{attr_name}_after_upload")
       true
     rescue => e # rubocop:disable Style/RescueStandardError
       Rails.logger.error("********* #{self.class.name} -> Failed uploading files: #{e.message}. #{e.backtrace[0..20]}")
-      model.ast_delayed_on_error(attr_name, e)
+      model.send("#{attr_name}_error_upload", e)
       false
     end
 
@@ -51,11 +52,8 @@ module ActivestorageDelayed
     end
 
     def base64_to_file(file_data)
-      tempfile = Tempfile.new(file_data['filename'])
-      tempfile.binmode
-      tempfile.write Base64.decode64(file_data['io'])
-      tempfile.rewind
-      tempfile
+      io = StringIO.new(Base64.decode64(file_data['io']))
+      apply_variant(io, attr_settings[:variant_info]) { |io2| return io2 }
     end
 
     def model
@@ -64,11 +62,7 @@ module ActivestorageDelayed
 
     def filename_for(filename)
       method_name = "#{attr_name}_filename".to_sym
-      return model.send(method_name, filename) if model.respond_to?(method_name)
-
-      name = File.basename(filename, '.*').parameterize
-      name = "#{SecureRandom.uuid}-#{name}" if support_multiple?
-      "#{model.id}-#{name}#{File.extname(filename)}"
+      model.send(method_name, filename)
     end
 
     def remove_files
@@ -90,5 +84,13 @@ module ActivestorageDelayed
     def attr_settings
       model.class.instance_variable_get(:@ast_delayed_settings)[attr_name]
     end
+
+    # @param io [StringIO, File]
+    # @param variant_info [Hash, Nil] ActiveStorage variant info. Sample: { resize_to_fit: [400, 400], convert: 'jpg' }
+    def apply_variant(io, variant_info, &block)
+      return block.call(io) unless variant_info
+
+      ActiveStorage::Variation.wrap(variant_info).transform(io, &block)
+    end
   end
 end

data/lib/activestorage-delayed/models/delayed_upload.rb

@@ -10,7 +10,7 @@ module ActivestorageDelayed
     self.table_name = 'activestorage_delayed_uploads'
     attr_accessor :tmp_files
 
-    belongs_to :uploadable, polymorphic: true
+    belongs_to :uploadable, polymorphic: true, touch: true
 
     before_save :parse_tmp_files
     after_create_commit do

data/lib/activestorage-delayed/railtie.rb

@@ -4,9 +4,5 @@ require 'rails'
 module ActivestorageDelayed
   class Railtie < ::Rails::Railtie
     railtie_name :activestorage_delayed
-
-    config.after_initialize do |_app|
-      require_relative '../../initializers/upload_default_variation'
-    end
   end
 end

data/lib/activestorage-delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActivestorageDelayed
-  VERSION = '0.1.2'
+  VERSION = '0.2.0-pre'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activestorage-delayed
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0.pre.pre
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-27 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activestorage
@@ -64,7 +64,6 @@ files:
 - bin/test
 - db/test.sqlite3
 - docker-compose.yaml
-- initializers/upload_default_variation.rb
 - lib/activestorage-delayed.rb
 - lib/activestorage-delayed/delayed_concern.rb
 - lib/activestorage-delayed/delayed_uploader.rb
@@ -89,9 +88,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.1.2
 signing_key:

data/initializers/upload_default_variation.rb

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-# Ability to auto apply :default variant before uploading original image
-module ActivetoragePreprocessDefaultVariation
-  def self.prepended(base)
-    base.extend(ClassMethods)
-  end
-
-  def upload_without_unfurling(io)
-    variant = attachments.first.try(:send, :variants)
-    default_variant = variant ? variant[:default] : nil
-    if default_variant && self.class.enabled_default_variant?
-      ActiveStorage::Variation.wrap(default_variant).transform(io) do |output|
-        unfurl output, identify: identify
-        super(output)
-      end
-    else
-      super(io)
-    end
-  end
-
-  module ClassMethods
-    # To improve testing performance, we don't want to preprocess images in test environment
-    def enabled_default_variant?
-      !Rails.env.test?
-    end
-  end
-end
-
-ActiveStorage::Blob.prepend ActivetoragePreprocessDefaultVariation