echo_uploads 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2871758ae650fff59f9237e880bdd4170788ff9c
-  data.tar.gz: 7078fba7b15ed162a99eee3f6c78cac77c9972d5
+  metadata.gz: 89d8ff5528868bf46e63aba75b9ea6f1d6f7d861
+  data.tar.gz: 117384aef09f78edd0dd32ac3e1e22bdca305a42
 SHA512:
-  metadata.gz: f2a64cf51e0f552d6adeef3259d2dfa419d87ffc6a5927c4e884fce8f785a72cc6414ad89fce7da41bf7b7de205a4dff3377847020243fd4055fdc839763d2a6
-  data.tar.gz: c83b65cb78659d9746438edd1947c01ebac9de32aa8ffe678e707d7a24a35d1b02c7d8c66513d4ac9c7ad2131dc0cacc090b06585ea9735a904a0f2f448de7a0
+  metadata.gz: 29f4d670433fc68eb23c8e14c23a11167215952191f6a21d750c54b8cf6543555215866cf24ded923778d02bb94f8c1882dc6d21d96cf20e082df49df741c501
+  data.tar.gz: 07642f719beb308e0fa74f9b8722b1f4e79e8d3c9965e82c447b62535a607502d7f5064732b25ab9e56e1d1ca1112acf7da43243e945a1730400c0235c3826e2

data/lib/echo_uploads/prm_file_writing.rb

@@ -4,95 +4,102 @@ module EchoUploads
     
     module ClassMethods
       def echo_uploads_configure_prm_file_writing(attr, options)
+        define_model_callbacks :echo_uploads_write_prm
+        
         # Save the file and the metadata after this model saves.
         after_save do |model|
           @echo_uploads_prm_files_saved ||= {}
           if (file = send(attr)).present? and @echo_uploads_prm_files_saved[attr.to_sym] != file
-            # A file is being uploaded during this request cycle. Further, we have not
-            # already done the permanent file saving during this request cycle. (It's
-            # not uncommon for a model to be saved twice in one request. If we ran this
-            # code twice, we'd have duplicate effort at best and exceptions at worst.)
+            run_callbacks :echo_uploads_write_prm do
+              # A file is being uploaded during this request cycle. Further, we have not
+              # already done the permanent file saving during this request cycle. (It's
+              # not uncommon for a model to be saved twice in one request. If we ran this
+              # code twice, we'd have duplicate effort at best and exceptions at worst.)
             
-            @echo_uploads_prm_files_saved[attr.to_sym] = file
+              @echo_uploads_prm_files_saved[attr.to_sym] = file
             
-            if options[:multiple]
-              metas = send("#{attr}_metadatas")
-            else
-              metas = [send("#{attr}_metadata")].compact
-            end
+              if options[:multiple]
+                metas = send("#{attr}_metadatas")
+              else
+                metas = [send("#{attr}_metadata")].compact
+              end
             
-            # metas is now an array of ::EchoUploads::File instances. The array may
-            # be empty.
+              # metas is now an array of ::EchoUploads::File instances. The array may
+              # be empty.
             
-            if metas.any?
-              # Previous permanent file(s) exist. This is a new version being uploaded.
-              # Delete the old version(s).
-              metas.each(&:destroy)
-            end
+              if metas.any?
+                # Previous permanent file(s) exist. This is a new version being uploaded.
+                # Delete the old version(s).
+                metas.each(&:destroy)
+              end
             
-            # No previous permanent files exists. The metas array is currently empty or
-            # else contains deleted records. We need to rebuild that array by constructing
-            # (but not yet saving) new EchoUploads::File objects.
+              # No previous permanent files exists. The metas array is currently empty or
+              # else contains deleted records. We need to rebuild that array by constructing
+              # (but not yet saving) new EchoUploads::File objects.
             
-            if options[:multiple]
-              mapped_files = send("mapped_#{attr}") ||
-                raise('echo_uploads called with :multiple, but :map option was missing')
-              metas = mapped_files.map do |mapped_file|
-                ::EchoUploads::File.new(
-                  owner: model, temporary: false, file: mapped_file
-                )
+              if options[:multiple]
+                mapped_files = send("mapped_#{attr}") ||
+                  raise('echo_uploads called with :multiple, but :map option was missing')
+                metas = mapped_files.map do |mapped_file|
+                  ::EchoUploads::File.new(
+                    owner: model, temporary: false, file: mapped_file
+                  )
+                end
+                send("#{attr}_metadatas=", metas)
+              elsif options[:map]
+                mapped_files = send("mapped_#{attr}")
+                metas = [::EchoUploads::File.new(
+                  owner: model, temporary: false, file: mapped_files.first
+                )]
+                send("#{attr}_metadata=", metas.first)
+              else
+                metas = [::EchoUploads::File.new(
+                  owner: model, temporary: false, file: send(attr)
+                )]
+                send("#{attr}_metadata=", metas.first)
               end
-              send("#{attr}_metadatas=", metas)
-            elsif options[:map]
-              mapped_files = send("mapped_#{attr}")
-              metas = [::EchoUploads::File.new(
-                owner: model, temporary: false, file: mapped_files.first
-              )]
-              send("#{attr}_metadata=", metas.first)
-            else
-              metas = [::EchoUploads::File.new(
-                owner: model, temporary: false, file: send(attr)
-              )]
-              send("#{attr}_metadata=", metas.first)
-            end
             
-            # metas is still an array of the EchoUploads::File instances. If the array was
-            # initially empty (meaning no previous permanent file existed), then it has
-            # since been populated.
+              # metas is still an array of the EchoUploads::File instances. If the array was
+              # initially empty (meaning no previous permanent file existed), then it has
+              # since been populated.
             
-            metas.each do |meta|
-              meta.persist! attr, options
+              metas.each do |meta|
+                meta.persist! attr, options
+              end
             end
           elsif metas = send("#{attr}_tmp_metadata")
-            # A file has not been uploaded during this request cycle. However, the
-            # submitted form "remembered" a temporary metadata record that was previously
-            # saved.
+            run_callbacks :echo_uploads_write_prm do
+              # A file has not been uploaded during this request cycle. However, the
+              # submitted form "remembered" a temporary metadata record that was previously
+              # saved.
             
-            # Delete any existing metadata record. (It's possible we
-            # were trying to replace an old version of the file, and there were validation
-            # errors on the first attempt.)
+              # Delete any existing metadata record. (It's possible we
+              # were trying to replace an old version of the file, and there were validation
+              # errors on the first attempt.)
             
-            if options[:multiple]
-              model.send("#{attr}_metadatas").each(&:destroy)
-            elsif old = model.send("#{attr}_metadata")
-              old.destroy
-            end
+              if options[:multiple]
+                model.send("#{attr}_metadatas").each(&:destroy)
+              elsif old = model.send("#{attr}_metadata")
+                old.destroy
+              end
             
-            # We need not call persist! here, because the file is already persisted. (Nor
-            # could we call it, because persist! requires an
-            # ActionDispatch::HTTP::UploadedFile.) Mark the metadata record as permanent
-            # and set its owner.
-            metas.each do |meta|
-              meta.owner = model
-              meta.temporary = false
-              meta.expires_at = nil
-              meta.save!
-            end
+              # We need not call persist! here, because the file is already persisted. (Nor
+              # could we call it, because persist! requires an
+              # ActionDispatch::HTTP::UploadedFile.) Mark the metadata record as permanent
+              # and set its owner.
             
-            if options[:multiple]
-              send("#{attr}_metadatas=", metas)
-            else
-              send("#{attr}_metadata=", metas.first)
+              metas.each do |meta|
+                meta.owner = model
+                meta.temporary = false
+                meta.expires_at = nil
+                meta.save!
+              end
+            
+              if options[:multiple]
+                send("#{attr}_metadatas=", metas)
+              else
+                send("#{attr}_metadata=", metas.first)
+              end
             end
           end
         end

data/lib/echo_uploads/tmp_file_writing.rb

@@ -4,7 +4,7 @@ module EchoUploads
   # This module writes temporary EchoUploads::Files on failed attempts to save the main
   # ActiveRecord model. Because ActiveRecord wraps save attempts in transactions, we can't
   # use after_save callbacks. If we tried, the EchoUploads::Files would be lost upon
-  # rollback. Instead, we have to wrap #save, #create, and #update methods so that the
+  # rollback. Instead, we have to wrap the #save, #create, and #update methods so that the
   # EchoUploads::Files are saved outside the transactions.
   #
   # Here is the ancestor chain for ActiveRecord::Base, including this module,

data/lib/echo_uploads/version.rb

@@ -1,3 +1,3 @@
 module EchoUploads
-  VERSION = '0.0.18'
+  VERSION = '0.0.19'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: echo_uploads
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.19
 platform: ruby
 authors:
 - Jarrett Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-14 00:00:00.000000000 Z
+date: 2016-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types