echo_uploads 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89d8ff5528868bf46e63aba75b9ea6f1d6f7d861
-  data.tar.gz: 117384aef09f78edd0dd32ac3e1e22bdca305a42
+  metadata.gz: 81819f2de3a42bf1503f4cc4014134dbe8646e74
+  data.tar.gz: 2d8ed15098b73f1a06934743ee9c88aad08d75eb
 SHA512:
-  metadata.gz: 29f4d670433fc68eb23c8e14c23a11167215952191f6a21d750c54b8cf6543555215866cf24ded923778d02bb94f8c1882dc6d21d96cf20e082df49df741c501
-  data.tar.gz: 07642f719beb308e0fa74f9b8722b1f4e79e8d3c9965e82c447b62535a607502d7f5064732b25ab9e56e1d1ca1112acf7da43243e945a1730400c0235c3826e2
+  metadata.gz: 81c71087ae0363e7ad7d5cde6483fbfdcf127f65c7bc7e4fbea61a1c9d3fa001de9a2ad7f2dc53b55692b5ae25b37617ca3ec733945d7e688d675ec8d4b3bda4
+  data.tar.gz: 770e016b4defa22d3fafa82e91a367cfee94a31050c0901cc85d45cf105e1fee29130d5bd6eb792a96e82d6eb3cf9456ab078829295a8b6b7d25541acc9aa691

data/lib/echo_uploads/file.rb

@@ -64,7 +64,7 @@ module EchoUploads
       end
       
       # Configure and save the metadata object.
-      self.key = options[:key].call file # Normall, this is .default_key_proc.
+      self.key = options[:key].call file # Normally, this is .default_key_proc.
       self.owner_attr = attr
       self.original_extension = ::File.extname(file.original_filename)
       self.original_basename = ::File.basename(file.original_filename, original_extension)

data/lib/echo_uploads/model.rb

@@ -213,7 +213,7 @@ module EchoUploads
         end
         
         # Define the has_tmp_x? method. Returns true if the record "remembers"
-        # a a temporary metadata record. (Typically because validation errors caused
+        # a temporary metadata record. (Typically because validation errors caused
         # the form to be redisplayed.)
         define_method("has_tmp_#{attr}?") do
           send("#{attr}_tmp_metadata").present?
@@ -225,6 +225,10 @@ module EchoUploads
           echo_uploads_map_metadata(attr, options, &:read)
         end
         
+        define_method("write_#{attr}") do |&block|
+          echo_uploads_write_prm_file(attr, options, &block)
+        end
+        
         define_method("#{attr}_size") do
           echo_uploads_map_metadata(attr, options, &:size)
         end

data/lib/echo_uploads/prm_file_writing.rb

@@ -2,6 +2,17 @@ module EchoUploads
   module PrmFileWriting
     extend ActiveSupport::Concern
     
+    def echo_uploads_write_prm_file(attr, options)
+      meta = send("#{attr}_metadata")
+      writable_file = EchoUploads::WritableFile.new meta, options
+      if block_given?
+        yield writable_file
+        writable_file.close
+      else
+        writable_file
+      end
+    end
+    
     module ClassMethods
       def echo_uploads_configure_prm_file_writing(attr, options)
         define_model_callbacks :echo_uploads_write_prm

data/lib/echo_uploads/version.rb

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

data/lib/echo_uploads/writable_file.rb

@@ -0,0 +1,39 @@
+module EchoUploads
+  # Used by `EchoUploads::PrmFileWriting#echo_uploads_write_prm_file`.
+  class WritableFile
+    def close
+      # Using ActionDispatch::Http::UploadedFile is ugly. We use it because
+      # EchoUploads::File#persist! expects that. In version 1 of this gem, we should
+      # refactor. Everything should be more modular in general.
+      uploaded_file = ActionDispatch::Http::UploadedFile.new(
+        tempfile: @tempfile,
+        filename: @metadata.original_filename
+      )
+      ActiveRecord::Base.transaction do
+        # Duping the EchoUploads::File and destroy the prior one. This ensure that the
+        # old data is cleaned out if necessary.
+        new_metadata = @metadata.dup
+        @metadata.destroy
+        new_metadata.file = uploaded_file
+        new_metadata.persist! new_metadata.owner_attr, @options
+        @tempfile.close!
+      end
+    end
+    
+    # Takes an EchoUploads::File.
+    def initialize(metadata, options)
+      tmp_name = SecureRandom.hex 10
+      @tempfile = Tempfile.new 'echo_uploads', Rails.root.join('tmp')
+      @metadata = metadata
+      @options = options
+    end
+    
+    def method_missing(meth, *args)
+      if @tempfile.respond_to? meth
+        @tempfile.send meth, *args
+      else
+        super meth, *args
+      end
+    end
+  end
+end

data/lib/echo_uploads.rb

@@ -10,6 +10,7 @@ require 'echo_uploads/model'
 require 'echo_uploads/file'
 require 'echo_uploads/mapper'
 require 'echo_uploads/mapped_file'
+require 'echo_uploads/writable_file'
 require 'echo_uploads/abstract_store'
 require 'echo_uploads/filesystem_store'
 require 'echo_uploads/s3_store'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: echo_uploads
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Jarrett Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types
@@ -60,6 +60,7 @@ files:
 - lib/echo_uploads/tmp_file_writing.rb
 - lib/echo_uploads/validation.rb
 - lib/echo_uploads/version.rb
+- lib/echo_uploads/writable_file.rb
 homepage: https://github.com/jarrett/echo_uploads
 licenses:
 - MIT