better_record 0.15.1 → 0.15.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f547a8cc802463bac755a8c63cd0a56a29820e4dff4e1fca44aaca4522113f63
-  data.tar.gz: 4c491bc39f6047d0c4abeb6b4a92df97facbdea967d634b9b1f912fd36cb6a79
+  metadata.gz: 38d1f355a28bcc6fa75e43137e4f6d2096c78b85de3420733cf201826424e22d
+  data.tar.gz: d5da519726817d407cc67a027041dc0c258daf715f6c8675de934cda2c3b626b
 SHA512:
-  metadata.gz: b47c26116fc3921a517895e13f0f2fb9d2110829fbb08c50214a79e084ce3a710f844e5a5b582faf1d0eb63a654e05c2557081224040a1a5547f94515788cad3
-  data.tar.gz: 2140d13ad729a20cd2545d0884d4ecfad9cd9c2e20a921f66314050d5a87183dabd5293feb36a1dda5ec5464cfeaf11b4bf0c218a14ed194c3c6e39242236c72
+  metadata.gz: 2cdb3aeac811064a91c3450942a5e5f0776e539aba2300a14c2ec7f2883caaf985d745e44a0dfaa5761ed794a0ba37322e2583c5d014435c5e5364852799c223
+  data.tar.gz: 7e965a6f43b3fb45b47ab026d682bf00294ec8b417077183189d85c39f965d247eb6a83d90e6d3a0e59c2194e4aa938a1c1d7a748262962a64fef211be494892

data/app/jobs/better_record/resize_blob_image_job.rb

@@ -13,20 +13,35 @@ module BetterRecord
           tmp.rewind
           record.__send__(params[:attachment]).attach(
             io: tmp,
-            filename: blob.filename,
+            filename: blob.filename.to_s.sub(/(\.[^.]*)$/, '-resized\1'),
             content_type: blob.content_type
           )
+          tmp.close
+          puts "\n\nSAVED IMAGE\n\n"
           begin
-            blob.purge_later
+            if params[:backup_action].present?
+              record.class.find_by(params[:query]).__send__(params[:backup_action].to_sym)
+            end
           rescue
+            puts "BACKUP ACTION FAILED"
+            puts $!.message
+            puts $!.backtrace
           end
-          params[:backup_action].present? && record.__send__(params[:backup_action].to_sym)
+          begin
+            puts "\n\n PURGING BLOB \n\n"
+            puts "blob exists? #{blob = ActiveStorage::Blob.find_by(id: blob.id).present?}"
+            blob.purge if blob.present?
+            puts "\n\n FINISHED PURGING BLOB \n\n"
+          rescue
+          end
+        else
+          raise ActiveRecord::RecordNotFound
         end
-        true
+        return true
       rescue
-        p $!.to_s
-        p $!.message
-        p $!.backtrace.first(25)
+        "ERROR RESIZING IMAGE"
+        puts $!.message
+        puts $!.backtrace.first(25)
         return false
       end
     end

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

@@ -16,7 +16,6 @@ module BetterRecord
           min_image_size: nil,
           max_image_size: 500.kilobytes,
           shrink_large_image: false,
-          shrink_later: false,
           **opts
         )
           # == Constants ============================================================
@@ -61,22 +60,14 @@ 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.present?
-                begin
-                  blob = __send__(avatar_name).blob
-                  @copy_later = true
-                  ResizeBlobImageJob.
-                    __send__ (shrink_later ? :perform_later : :perform_now), {
-                      model: self.class.to_s,
-                      query: {id: self.id},
-                      attachment: avatar_name.to_s,
-                      backup_action: "cache_current_#{avatar_name}",
-                      options: shrink_large_image
-                    }
-                rescue
-                  puts $!.message
-                  puts $!.backtrace
-                  return false
-                end
+                @copy_later = true
+                ResizeBlobImageJob.perform_later(
+                  model: self.class.to_s,
+                  query: {id: self.id},
+                  attachment: avatar_name.to_s,
+                  backup_action: image_validator.to_s,
+                  options: shrink_large_image
+                )
               else
                 errors.add(avatar_name, "is too large, maximum #{ActiveSupport::NumberHelper.number_to_human_size(max_image_size)}")
                 return false
@@ -89,12 +80,17 @@ module BetterRecord
           end
 
           define_method :valid_image do
-            return unless __send__(avatar_name).attached?
+            return true unless __send__(avatar_name).attached?
 
             if valid_image_format && valid_image_size
-              __send__(:"cache_current_#{avatar_name}") unless @copy_later
+              return true if @copy_later
+              puts "\n\nCOPYING AVATAR\n\n"
+              result = self.class.find_by(id: self.id).__send__(:"cache_current_#{avatar_name}")
+              puts "\n\nDONE COPYING AVATAR: #{result}\n\n"
+              result
             else
-              purge(__send__(avatar_name))
+              r = self.find_by(id: self.id).__send__(avatar_name)
+              r.purge if r.attached?
               __send__(:"load_last_#{avatar_name}") if __send__(:"last_#{avatar_name}").attached?
               false
             end
@@ -109,18 +105,23 @@ module BetterRecord
           end
 
           define_method :"copy_#{avatar_name}" do |from = avatar_name, to = :"last_#{avatar_name}"|
-            from = __send__ from
-            to = __send__ to
+            puts "COPYING #{from} TO #{to}"
+            from_attachment = __send__ from
+            to_attachment = __send__ to
 
-            purge(to) if to.attached?
+            purge(to_attachment) if to_attachment.attached?
 
             tmp = Tempfile.new
             tmp.binmode
-            tmp.write(from.download)
+            tmp.write(from_attachment.download)
             tmp.flush
             tmp.rewind
 
-            to.attach(io: tmp, filename: from.filename, content_type: from.content_type)
+            r = self.class.find_by(id: self.id)
+            from_attachment = r.__send__ from
+            to_attachment = r.__send__ to
+
+            to_attachment.attach(io: tmp, filename: from_attachment.filename, content_type: from_attachment.content_type)
             tmp.close
             true
           end

data/lib/better_record/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 0.15.2
 platform: ruby
 authors:
 - Sampson Crowley