better_record 0.15.2 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38d1f355a28bcc6fa75e43137e4f6d2096c78b85de3420733cf201826424e22d
-  data.tar.gz: d5da519726817d407cc67a027041dc0c258daf715f6c8675de934cda2c3b626b
+  metadata.gz: 669acb9b867dcb30b92fbe9d4d147f97c60862aedebd1a9a5f9319577f262b17
+  data.tar.gz: fea7a77007c6279d2c0ad4b9845f22579b9ff608e54e49f306d36da4d68198f4
 SHA512:
-  metadata.gz: 2cdb3aeac811064a91c3450942a5e5f0776e539aba2300a14c2ec7f2883caaf985d745e44a0dfaa5761ed794a0ba37322e2583c5d014435c5e5364852799c223
-  data.tar.gz: 7e965a6f43b3fb45b47ab026d682bf00294ec8b417077183189d85c39f965d247eb6a83d90e6d3a0e59c2194e4aa938a1c1d7a748262962a64fef211be494892
+  metadata.gz: 283448eb2be733d810ffdb8bfcfcdb1ec0471983729da9529e4fe836711cf50ed065a7180eed2f49360218d55541288aef7c02975b7871b37286699d739d407b
+  data.tar.gz: 2c8c02a86f16fa393a0168dadf80438892c26a2c224511eba68a1bb573d82bc968817136d0ccea31d87b8db47dd39ad7ac70f31362da15f2e896800bbeedd2a0

data/app/jobs/active_storage/purge_job.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+# Provides asynchronous purging of ActiveStorage::Blob records via ActiveStorage::Blob#purge_later.
+class ActiveStorage::PurgeJob < ActiveStorage::BaseJob
+  discard_on ActiveRecord::RecordNotFound
+
+  def perform(blob)
+    begin
+      blob&.purge
+    rescue
+    end
+  end
+end

data/app/models/better_record/attachment_validation.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module BetterRecord
+  class AttachmentValidation < ApplicationRecord
+    # == Constants ============================================================
+
+    # == Attributes ===========================================================
+
+    # == Extensions ===========================================================
+
+    # == Relationships ========================================================
+    belongs_to :attachment,
+      class_name: 'ActiveStorage::Attachment',
+      inverse_of: :validations
+      
+    ActiveStorage::Attachment.has_many :validations,
+      class_name: 'BetterRecord::AttachmentValidation',
+      foreign_key: :attachment_id,
+      inverse_of: :attachment,
+      dependent: :destroy
+    # == Validations ==========================================================
+
+    # == Scopes ===============================================================
+
+    # == Callbacks ============================================================
+
+    # == Boolean Class Methods ================================================
+
+    # == Class Methods ========================================================
+
+    # == Boolean Methods ======================================================
+
+    # == Instance Methods =====================================================
+
+  end
+end

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

@@ -16,12 +16,13 @@ module BetterRecord
           min_image_size: nil,
           max_image_size: 500.kilobytes,
           shrink_large_image: false,
+          shrink_wait_time: 1.minute,
           **opts
         )
           # == Constants ============================================================
 
           # == Attributes ===========================================================
-          attribute :"new_#{avatar_name}?", :boolean
+          attribute :"shrinking_#{avatar_name}", :boolean, default: false
 
           # == Extensions ===========================================================
 
@@ -30,25 +31,49 @@ module BetterRecord
           has_one_attached avatar_name
 
           # == Validations ==========================================================
-          validate avatar_name, image_validator
+          validate avatar_name, :"check_#{image_validator}"
 
           # == Scopes ===============================================================
 
           # == Callbacks ============================================================
-          after_save :"cache_current_#{avatar_name}", if: :"new_#{avatar_name}?"
+          after_commit :"check_#{image_validator}", if: :"#{avatar_name}_attached?", on: %i[ create update ]
 
           # == Boolean Class Methods ================================================
 
           # == Class Methods ========================================================
 
           # == Boolean Methods ======================================================
+          define_method :"#{avatar_name}_attached?" do
+            __send__(avatar_name).attached?
+          end
+
+          define_method :"#{avatar_name}_validation_ran?" do |rld=false|
+            !!__send__(:"#{avatar_name}_validation_record", !!rld)&.ran
+          end
 
           # == Instance Methods =====================================================
-          define_method :"attach_#{avatar_name}" do |file, **options|
-            __send__(avatar_name).attach(file, **options)
+          define_method :"attach_#{avatar_name}" do |*args, **options|
+            __send__(avatar_name).attach(*args, **options)
             __send__ image_validator
           end
 
+          define_method :"create_#{avatar_name}_validation" do |ran=false|
+            begin
+              AttachmentValidation.create!(name: image_validator, attachment_id: __send__(avatar_name).id, ran: ran)
+            rescue
+              __send__(:"#{avatar_name}_validation_record").update(ran: true) if $!.is_a?(PG::UniqueViolation) && ran && !__send__(:"#{avatar_name}_validation_record").ran
+            end
+            __send__(:"#{avatar_name}_validation_record")
+          end
+
+          define_method :"#{avatar_name}_validation_record" do |rld=false|
+            (!rld && instance_variable_get(:"@#{avatar_name}_record")) ||
+            instance_variable_set(
+              :"@#{avatar_name}_record",
+              AttachmentValidation.find_by(attachment_id: __send__(avatar_name).id, name: image_validator)
+            )
+          end
+
           define_method :valid_image_format do
             unless __send__(avatar_name).blob.content_type.start_with? 'image/'
               errors.add(avatar_name, 'is not an image file')
@@ -60,14 +85,19 @@ 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?
-                @copy_later = true
-                ResizeBlobImageJob.perform_later(
+                puts "\nSHRINKING\n"
+                self.__send__ :"shrinking_#{avatar_name}=", true
+                (
+                  shrink_wait_time ?
+                  ResizeBlobImageJob.set(wait: shrink_wait_time) :
+                  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
                 )
+                true
               else
                 errors.add(avatar_name, "is too large, maximum #{ActiveSupport::NumberHelper.number_to_human_size(max_image_size)}")
                 return false
@@ -81,27 +111,33 @@ module BetterRecord
 
           define_method :valid_image do
             return true unless __send__(avatar_name).attached?
+            __send__(:"create_#{avatar_name}_validation", true)
 
             if valid_image_format && valid_image_size
-              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
+              self.__send__(:"shrinking_#{avatar_name}") ||
+              reloaded_record.__send__(:"cache_current_#{avatar_name}")
             else
-              r = self.find_by(id: self.id).__send__(avatar_name)
-              r.purge if r.attached?
+              r = reloaded_record.__send__(avatar_name)
+              begin
+                r.purge_later if r.attached?
+              rescue Exception
+              end
               __send__(:"load_last_#{avatar_name}") if __send__(:"last_#{avatar_name}").attached?
               false
             end
           end
 
+          define_method :"check_#{image_validator}" do |*args|
+            return true unless __send__(avatar_name).attached?
+            __send__(image_validator) unless __send__(:"#{avatar_name}_validation_ran?", true)
+          end
+
           define_method :"cache_current_#{avatar_name}" do
-            __send__ :"copy_#{avatar_name}"
+            reloaded_record.__send__ :"copy_#{avatar_name}"
           end
 
           define_method :"load_last_#{avatar_name}" do
-            __send__ :"copy_#{avatar_name}", :"last_#{avatar_name}", avatar_name
+            reloaded_record.__send__ :"copy_#{avatar_name}", :"last_#{avatar_name}", avatar_name
           end
 
           define_method :"copy_#{avatar_name}" do |from = avatar_name, to = :"last_#{avatar_name}"|
@@ -109,23 +145,39 @@ module BetterRecord
             from_attachment = __send__ from
             to_attachment = __send__ to
 
-            purge(to_attachment) if to_attachment.attached?
+            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
 
-            tmp = Tempfile.new
-            tmp.binmode
-            tmp.write(from_attachment.download)
-            tmp.flush
-            tmp.rewind
+            if from_attachment.attached?
+              tmp = Tempfile.new
+              tmp.binmode
+              tmp.write(from_attachment.download)
+              tmp.flush
+              tmp.rewind
 
-            r = self.class.find_by(id: self.id)
-            from_attachment = r.__send__ from
-            to_attachment = r.__send__ to
+              r = reloaded_record
+              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
+              to_attachment.attach(io: tmp, filename: from_attachment.filename, content_type: from_attachment.content_type)
+              tmp.close
+            end
             true
           end
 
+          define_method :reloaded_record do
+            self.class.find_by(id: self.id)
+          end
+
         end
       end
 

data/db/migrate/20181228204403_create_better_record_attachment_validations.rb

@@ -0,0 +1,15 @@
+class CreateBetterRecordAttachmentValidations < ActiveRecord::Migration[5.2]
+  def change
+    create_table :better_record_attachment_validations do |t|
+      t.string     :name,       null: false
+      t.references :attachment, null: false
+      t.boolean    :ran,        null: false, default: false
+
+      t.index [ :attachment_id, :name ], name: "index_attachment_validations_uniqueness", unique: true
+
+      t.timestamps default: -> { 'NOW()' }
+    end
+
+    audit_table :better_record_attachment_validations
+  end
+end

data/lib/better_record/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.15.2
+  version: 0.16.0
 platform: ruby
 authors:
 - Sampson Crowley
@@ -234,9 +234,11 @@ files:
 - app/controllers/better_record/table_sizes_controller.rb
 - app/helpers/better_record/application_helper.rb
 - app/helpers/better_record/table_sizes_helper.rb
+- app/jobs/active_storage/purge_job.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/attachment_validation.rb
 - app/models/better_record/base.rb
 - app/models/better_record/current.rb
 - app/models/better_record/logged_action.rb
@@ -262,6 +264,7 @@ files:
 - db/migrate/20180518042050_create_better_record_db_functions.rb
 - db/migrate/20180518042060_create_better_record_custom_types.rb
 - db/migrate/20180518042070_create_better_record_table_sizes.rb
+- db/migrate/20181228204403_create_better_record_attachment_validations.rb
 - db/postgres-audit-trigger.psql
 - lib/better_record.rb
 - lib/better_record/batches.rb