better_record 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e89311a82ba55ea3a011faa5ad3c85770bc88d29dd402fbd5856167a2151ab8
-  data.tar.gz: '01396e71a81cc99478664cb762c30d4d663abe3e06c76ce4a82e71e4d676d65d'
+  metadata.gz: 6f5322959bf87be1c0bb13ca7f5b72c71566023bb790006e5980bb8c0b59cd88
+  data.tar.gz: 9f58c4bae300c5451ef78fd566e90578f1fb741c9b36da9236ab4551169ee545
 SHA512:
-  metadata.gz: f527649a03436eeabdbddf11aa1d0ac1b2bf60a0db5c42831fd143c47a3f3aac9fd9f85d6f18cf2142290c03fedef48d0cd2987d826e56f32cbc1f7adfd9c72a
-  data.tar.gz: 015501e77bd844a80c679ef16b443f9e1f9f561162aaea06102c22f3c66b7f7706521c3869080ba2aa21434d3abe99a82f8377a3d7797635e0bbdef16c1de5aa
+  metadata.gz: ba2d95d83eea2ea992b2a190331259553e778ac08999b63d19c27dab614ddf08302f9f08786088ef76b4957a1b92b5ecd39ef3b5b78d258f3f790948438d843b
+  data.tar.gz: 55193234a82cfacfa2a85771b6c516bf44f8b610fec7baf8d322aaf30fcebff46aed0634611a2fa418a30d5d80ebb9c964d8f6d752e1c7654cb8b95489f1523e

data/app/jobs/better_record/resize_blob_image_job.rb

@@ -5,18 +5,29 @@ module BetterRecord
     def perform(**params)
       begin
         if record = params[:model].constantize.find_by(params[:query].deep_symbolize_keys)
-          blob = record.__send__(params[:attachment].to_sym).blob
+          name = params[:attachment].to_sym
+          blob = record.__send__(name).blob
           tmp = Tempfile.new
           tmp.binmode
-          tmp.write(blob.service.download(blob.variant(blob.filename.to_s =~ /-resized?/ ? {resize: '70%'} : params[:options]).processed.key))
+          tmp.write(blob.service.download(blob.variant(blob.filename.to_s =~ /-resized/ ? {resize: '70%'} : params[:options]).processed.key))
           tmp.flush
           tmp.rewind
-          record.__send__(params[:attachment]).reload.attach(
-            io: tmp,
+
+          blob.analyze if blob.filename.to_s =~ /-resized/
+
+          attachment = ActionDispatch::Http::UploadedFile.new(
+            tempfile: tmp,
             filename: blob.filename.to_s.sub(/(\.[^.]*)$/, '-resized\1').sub(/(-resized)+/, '-resized'),
-            content_type: blob.content_type
+            type: blob.content_type
           )
-          tmp.close
+
+          record.
+            __send__ :delete_attachment, name, true
+
+          record.
+            reload.__send__(params[:attachment]).
+            reload.attach(attachment)
+
           puts "\n\nSAVED IMAGE\n\n"
           begin
             if params[:backup_action].present?

data/app/models/better_record/base.rb

@@ -25,10 +25,11 @@ module BetterRecord
     # == Class Methods ========================================================
     def self.set_audit_methods!
       begin
-        connection.execute(%Q(SELECT 1 FROM #{BetterRecord::LoggedAction.table_name.sub('_view', '')}_#{self.table_name} LIMIT 1))
+        t_name = BetterRecord::LoggedAction.table_name.sub('_view', '')
+        connection.execute(%Q(SELECT 1 FROM #{t_name}_#{self.table_name} LIMIT 1))
 
         self.const_set(:LoggedAction, Class.new(ApplicationRecord))
-        self.const_get(:LoggedAction).table_name = "#{BetterRecord::LoggedAction.table_name}_#{self.table_name}"
+        self.const_get(:LoggedAction).table_name = "#{t_name}_#{self.table_name}"
       rescue ActiveRecord::StatementInvalid
         self.const_set(:LoggedAction, BetterRecord::LoggedAction)
       end

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

@@ -143,19 +143,8 @@ module BetterRecord
           define_method :"copy_#{avatar_name}" do |from = avatar_name, to = :"last_#{avatar_name}"|
             puts "COPYING #{from} TO #{to}"
             from_attachment = __send__ from
-            to_attachment = __send__ to
 
-            if to_attachment.attached?
-              begin
-                atch = ActiveStorage::Attachment.find_by(to_attachment.id)
-                atch&.purge_later
-              rescue Exception
-                begin
-                  ActiveStorage::Attachment.find_by(to_attachment.id).destroy
-                rescue Exception
-                end
-              end
-            end
+            delete_attachment to
 
             if from_attachment.attached?
               tmp = Tempfile.new
@@ -168,12 +157,33 @@ module BetterRecord
               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)
+              to_attachment.attach(
+                ActionDispatch::Http::UploadedFile.new(
+                  tempfile: tmp,
+                  filename: from_attachment.filename.to_s,
+                  type: from_attachment.content_type
+                )
+              )
               tmp.close
             end
             true
           end
 
+          define_method :delete_attachment do |att_name = avatar_name, now = false|
+            atchd = __send__ att_name
+            if atchd.attached?
+              begin
+                atch = ActiveStorage::Attachment.find_by(atchd.id)
+                atch&.__send__ now ? :purge : :purge_later
+              rescue Exception
+                begin
+                  ActiveStorage::Attachment.find_by(atchd.id).destroy
+                rescue Exception
+                end
+              end
+            end
+          end
+
           define_method :reloaded_record do
             self.class.find_by(id: self.id)
           end

data/lib/better_record/version.rb

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

metadata

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