better_record 0.21.3 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e7333954348a14017d9656ebb1dad398b7b2cde2f079cd1d28f9c4a996644a6
-  data.tar.gz: 6d75a37541af0305d17227205631db27b3a1908886de354baf59a695bb4b22b5
+  metadata.gz: f87fad71d3c41ee882975f1fa04439d66097c08e73e612b4566b2080dc42a3d4
+  data.tar.gz: 0a3802ec44c019360ef5e85437c941b797b02ef22e7e630da5ecd6ff21f124b0
 SHA512:
-  metadata.gz: 282f473b7382023664f51d68e5e30d62d98039a749c0ca6101a537588430d7eb7905cf1a0efd8088dcde563a2ac1308a1cea7a02708bfa3a1a7f421baa516227
-  data.tar.gz: ec97ecd9c65d53b34b1c1d78299c5e30b150ace7982b6863a569084a6aab5107005cdaad851ad9bf0961dec39cc0f90eced8fa2b755180d6e6cff12c465f2e4c
+  metadata.gz: 4f6592c9d85fcdd10c3dcf0782b0c3785d1f48a5575756cec4a177668d606785968814b1e8455ce094aa66dead9cd8c636858f8c283869d97b4d8a0c228b50ff
+  data.tar.gz: e40e619662ad6a3c6a1aa68767c110cdd0417cdfd56d05cdb06b9c1f21b2c988cea3381d958e0b3571c7d9c154bf98d5028206e714362af09aec16966e9be314

data/app/models/better_record/attachment_validation.rb

@@ -28,9 +28,11 @@ module BetterRecord
     # == Boolean Class Methods ================================================
 
     # == Class Methods ========================================================
-    # def self.boolean_columns
-    #   @@boolean_columns ||= %i[ ran ].freeze
-    # end
+    def self.delete_invalid
+      BetterRecord::AttachmentValidation.
+        where.not( id: BetterRecord::AttachmentValidation.joins(:attachment).select(:id) ).
+        delete_all
+    end
 
     # == Boolean Methods ======================================================
 

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

@@ -58,10 +58,14 @@ module BetterRecord
           end
 
           define_method :"create_#{avatar_name}_validation" do |ran=false|
+            BetterRecord::AttachmentValidation.delete_invalid
             begin
-              AttachmentValidation.create!(name: image_validator, attachment_id: __send__(avatar_name).id, ran: ran)
+              opts = { name: image_validator, attachment_id: reloaded_record&.__send__(avatar_name)&.attachment&.id, ran: ran }
+              AttachmentValidation.create!(opts) if opts[:attachment_id]
             rescue
-              __send__(:"#{avatar_name}_validation_record").update(ran: true) if $!.is_a?(PG::UniqueViolation) && ran && !__send__(:"#{avatar_name}_validation_record").ran
+              if ran && $!.is_a?(PG::UniqueViolation) && !__send__(:"#{avatar_name}_validation_record").ran
+                __send__(:"#{avatar_name}_validation_record").update(ran: true)
+              end
             end
             __send__(:"#{avatar_name}_validation_record")
           end
@@ -88,7 +92,7 @@ module BetterRecord
                 puts "\nSHRINKING\n"
                 self.__send__ :"shrinking_#{avatar_name}=", true
                 (
-                  shrink_wait_time ?
+                  shrink_wait_time  ?
                   ResizeBlobImageJob.set(wait: shrink_wait_time) :
                   ResizeBlobImageJob
                 ).perform_later(
@@ -112,75 +116,62 @@ module BetterRecord
           define_method :valid_image do
             return true unless __send__(avatar_name).attached?
             __send__(:"create_#{avatar_name}_validation", true)
+            raise "Uh Oh" unless __send__(:"#{avatar_name}_validation_ran?", true)
 
             if valid_image_format && valid_image_size
               self.__send__(:"shrinking_#{avatar_name}") ||
-              reloaded_record.__send__(:"cache_current_#{avatar_name}")
+              __send__(:"cache_current_#{avatar_name}")
+              true
             else
-              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?
+              __send__(:"load_last_#{avatar_name}")
               false
             end
           end
 
           define_method :"check_#{image_validator}" do |*args|
-            return true unless __send__(avatar_name).attached?
+            return true  if self.id.blank? || !reloaded_record&.__send__(avatar_name).attached?
             __send__(image_validator) unless __send__(:"#{avatar_name}_validation_ran?", true)
           end
 
           define_method :"cache_current_#{avatar_name}" do
-            reloaded_record.__send__ :"copy_#{avatar_name}"
+            __send__ :"copy_#{avatar_name}"
           end
 
           define_method :"load_last_#{avatar_name}" do
-            reloaded_record.__send__ :"copy_#{avatar_name}", :"last_#{avatar_name}", avatar_name
+            __send__ :"copy_#{avatar_name}", :"last_#{avatar_name}", avatar_name
+            __send__(:"create_#{avatar_name}_validation", true)
           end
 
           define_method :"copy_#{avatar_name}" do |from = avatar_name, to = :"last_#{avatar_name}"|
             puts "COPYING #{from} TO #{to}"
+            # begin
+            # rescue
+            #   puts $!.message
+            #   puts $!.backtrace
+            # end
+
             from_attachment = __send__ from
+            to_attachment   = __send__ to
 
-            delete_attachment to
 
             if from_attachment.attached?
-              tmp = Tempfile.new
-              tmp.binmode
-              tmp.write(from_attachment.download)
-              tmp.flush
-              tmp.rewind
-
-              r = reloaded_record
-              from_attachment = r.__send__ from
-              to_attachment = r.__send__ to
-
-              to_attachment.attach(
-                ActionDispatch::Http::UploadedFile.new(
-                  tempfile: tmp,
-                  filename: from_attachment.filename.to_s,
-                  type: from_attachment.content_type
-                )
-              )
-              tmp.close
+              return true if from_attachment.attachment&.blob_id == to_attachment.attachment&.blob_id
+              delete_attachment to
+              to_attachment.attach from_attachment.blob
+            else
+              delete_attachment to
             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(id: atchd.id)
-                atch&.__send__ now ? :purge : :purge_later
-              rescue Exception
-                begin
-                  ActiveStorage::Attachment.find_by(id: atchd.id).destroy
-                rescue Exception
-                end
+            begin
+              atchd = __send__ att_name
+              if atchd.attachment
+                atchd_blob = atchd.blob
+                atchd.detach
+                atchd_blob&.__send__ now ? :purge : :purge_later
               end
+            rescue Exception
             end
           end
 

data/config/initializers/active_storage/attachment.rb

@@ -0,0 +1 @@
+ActiveStorage::Attachment.belongs_to :record, polymorphic: true, touch: false

data/lib/better_record/fake_redis.rb

@@ -80,16 +80,6 @@ module BetterRecord
       val
     end
 
-    def keys(pattern = ".*")
-      data.keys.filter {|k| k.to_s =~ /^#{pattern}$/}
-    end
-
-    def del(*keys)
-      i = 0
-      keys.map {|k| data.delete(k) && (i += 1) }
-      i
-    end
-
     def method_missing
       return nil
     end

data/lib/better_record/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_record
 version: !ruby/object:Gem::Version
-  version: 0.21.3
+  version: 0.22.0
 platform: ruby
 authors:
 - Sampson Crowley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -252,6 +252,7 @@ files:
 - config/initializers/active_record/gender_type.rb
 - config/initializers/active_record/money_integer_type.rb
 - config/initializers/active_record/three_state_type.rb
+- config/initializers/active_storage/attachment.rb
 - config/initializers/active_support/time_with_zone.rb
 - config/initializers/concerns.rb
 - config/initializers/core_ext/date.rb