better_record 0.14.6 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b3b47c93ce607424d77c2831e43ce7c95891b5aa20694a945f0730a315dec04
-  data.tar.gz: 459521050b68f43271c3317be0f5edff448b07bf3f8cb74041c204846aadc657
+  metadata.gz: ce8484d1edf7ffd679a8c3e2b6cfedb3602a979cad7b63930505c53f7fbf2c44
+  data.tar.gz: 2b7a2ba41a6670d710ac47fc8eab490f7147d005b035abdb50dc78ba1f4478dc
 SHA512:
-  metadata.gz: cafd6735f8bfff8a9e40bae9c8d3c9bdcab3a60f92757e19e2c4bc3238fe830669cbaff5d93d4ec132660212b35b19835398e388ea5fab6662b6eb7c66254d62
-  data.tar.gz: 2835b9855fcb0c62e3d898169af895b79ec7d7c4c434f07b07c65681b7f82b1bd60a7afba19b9463bfe7ff90ed6180375d38c404584daa7215bc51947536935c
+  metadata.gz: c9c42297037f1e6f78b009631d7790502bc39c3bdff5401c8f9ee64d36c746ddbbd6274abb49b815ae236a11d8378b8fecd7a0b2062d6a705c3e820b4117452e
+  data.tar.gz: 5956669acd747dfdc77fc6feaeb9cd6e56d2b4bb51483e66da7e563bc9fb6e61b6a86b2af4f36974372b65c7e1a514dc08532f27c841c2b4b4e1db845127b573

data/app/jobs/better_record/resize_blob_image_job.rb

@@ -0,0 +1,23 @@
+module BetterRecord
+  class ResizeBlobImageJob < ApplicationJob
+    queue_as :default
+
+    def perform(**params)
+      if record = params[:model].constantize.find_by(params[:query].deep_symbolize_keys)
+        blob = record.__send__(params[:attachment]).blob
+        tmp = Tempfile.new
+        tmp.binmode
+        tmp.write(blob.service.download(blob.variant(params[:options]).processed.key))
+        tmp.flush
+        tmp.rewind
+        record.__send__(params[:attachment]).attach(
+          io: tmp,
+          filename: blob.filename,
+          content_type: blob.content_type
+        )
+        blob.purge_later
+        params[:backup_action].present? && record.__send__(params[:backup_action])
+      end
+    end
+  end
+end

data/app/models/better_record/model_concerns/has_validated_avatar.rb

@@ -16,6 +16,7 @@ module BetterRecord
           min_image_size: nil,
           max_image_size: 500.kilobytes,
           shrink_large_image: false,
+          shrink_later: false,
           **opts
         )
           # == Constants ============================================================
@@ -59,16 +60,21 @@ module BetterRecord
 
           define_method :valid_image_size do
             if max_image_size && __send__(avatar_name).blob.byte_size > max_image_size
-              if shrink_large_image
+              if shrink_large_image.present?
                 begin
                   blob = __send__(avatar_name).blob
-                  __send__(avatar_name).attach(
-                    io: open(Rails.application.routes.url_helpers.url_for(blob.variant(resize: shrink_large_image))),
-                    filename: blob.filename,
-                    content_type: blob.content_type
-                  )
-                  blob.purge
+                  @copy_later = true
+                  ResizeBlobImageJob.
+                    __send__ (shrink_later ? :perform_later : :perform_now), {
+                      model: self.class.to_s,
+                      query: {id: self.id},
+                      attachment: avatar_name,
+                      backup_action: :"cache_current_#{avatar_name}",
+                      options: shrink_large_image
+                    }
                 rescue
+                  puts $!.message
+                  puts $!.backtrace
                   return false
                 end
               else
@@ -86,7 +92,7 @@ module BetterRecord
             return unless __send__(avatar_name).attached?
 
             if valid_image_format && valid_image_size
-              __send__(:"cache_current_#{avatar_name}")
+              __send__(:"cache_current_#{avatar_name}") unless @copy_later
             else
               purge(__send__(avatar_name))
               __send__(:"load_last_#{avatar_name}") if __send__(:"last_#{avatar_name}").attached?

data/lib/better_record/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BetterRecord
-  VERSION = '0.14.6'
+  VERSION = '0.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.14.6
+  version: 0.15.0
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-27 00:00:00.000000000 Z
+date: 2018-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -235,6 +235,7 @@ files:
 - app/helpers/better_record/application_helper.rb
 - app/helpers/better_record/table_sizes_helper.rb
 - app/jobs/better_record/application_job.rb
+- app/jobs/better_record/resize_blob_image_job.rb
 - app/mailers/better_record/application_mailer.rb
 - app/models/better_record/base.rb
 - app/models/better_record/current.rb