echo_uploads 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e65bbb9b899f8a3cd419761cf5166a932a57e24
-  data.tar.gz: 86788f880e33a403a1be30d2af07b9c6d3e4a290
+  metadata.gz: b33b3e17496be452917ef4e82609a8fb39348ad4
+  data.tar.gz: 24efa6d8430db50e74d7079cf927ea2216a52917
 SHA512:
-  metadata.gz: 2d08e267fced64cc44f0212d81a36e4b79a709f734cdf5f8568d2883fc1ae5cc636a8d80d5fcf4d968dd20f89329f8058ef02a6423a79b005b1c7cd014454f36
-  data.tar.gz: 9a48ac94ec4d61ece3aae321ee88fe41bc09fe6a81112204d13919d4ded551756b9af34144673f9dd68c4ed1f048683a449dfb86a71e0ba41cc347020c531cc3
+  metadata.gz: d29afadb8644e6681922d70c5ebf9799cccff6cf1cd438e5596694a1304474e30189b4dd666b81a544e9890b58b9354e6a1bec1d4669a324fc8709e6c56d14f7
+  data.tar.gz: 10f158f2e2d911ab0f54490b7d8f216b720d8316692601c68dc1e5acfc017f5b89c2cbbd1a1716838cf962a4e9e096e38aa3e292526e35358c3561dc2b89eb29

data/lib/echo_uploads/file.rb

@@ -40,9 +40,12 @@ module EchoUploads
     end
     
     # Pass in an attribute name, an ActionDispatch::UploadedFile, and an options hash.
-    def persist!(attr, file, options)
+    def persist!(attr, file, mapped_file, options)
+      # If .echo_uploads was called with the :map option, we need to use the mapped file.
+      file_to_write = mapped_file || file
+      
       # Configure and save the metadata object.
-      self.key = options[:key].call file
+      self.key = options[:key].call file_to_write
       self.owner_attr = attr
       self.original_extension = ::File.extname(file.original_filename)
       self.original_basename = ::File.basename(file.original_filename, original_extension)
@@ -51,7 +54,16 @@ module EchoUploads
       save!
     
       # Write the file to the filestore.
-      storage.write key, file
+      
+      if file_to_write.is_a?(ActionDispatch::Http::UploadedFile)
+        storage.write key, file_to_write.tempfile
+      else
+        storage.write key, file_to_write
+      end
+      if file_to_write == mapped_file
+        mapped_file.close
+        #::File.delete mapped_file.path
+      end
     
       # Prune any expired temporary files. (Unless automatic pruning was turned off in
       # the app config.)

data/lib/echo_uploads/model.rb

@@ -1,6 +1,7 @@
 require 'base64'
 require 'json'
 require 'fileutils'
+require 'securerandom'
 
 module EchoUploads    
   module Model
@@ -32,8 +33,9 @@ module EchoUploads
       parsed.each do |attr, attr_data|
         # Must verify that the metadata record is temporary. If not, an attacker could
         # pass the ID of a permanent record and change its owner.
-        meta = ::EchoUploads::File.where(key: attr_data['key'], temporary: true).find(attr_data['id'])
-        send("#{attr}_tmp_metadata=", meta)
+        if meta = ::EchoUploads::File.where(id: attr_data['id'], key: attr_data['key'], temporary: true).first
+          send("#{attr}_tmp_metadata=", meta)
+        end
       end
     end
     
@@ -53,6 +55,11 @@ module EchoUploads
       #   +1.day+.
       # - +storage+: A class that persists uploaded files to disk, to the cloud, or to
       #   wherever else you want. Defaults to +EchoUploads::FilesystemStore+.
+      # - +map+: A Proc that accepts an ActionDispatch::Htttp::UploadedFile and a path to
+      #   a temporary file. It should transform the file data (e.g. scaling an image). It
+      #   should then write the transformed data to the temporary file path. Can also
+      #   accept a symbol naming an an instance method that works the same way as the
+      #   previously described Proc.
       def echo_upload(attr, options = {})
         options = {
           expires: 1.day,
@@ -67,8 +74,26 @@ module EchoUploads
         self.echo_uploads_config ||= {}
         self.echo_uploads_config = echo_uploads_config.merge attr => {}
         
-        # Define reader and writer methods for the file attribute.
-        attr_accessor attr
+        # Define reader method for the file attribute.
+        attr_reader attr
+        
+        # Define the writer method for the file attribute.
+        define_method("#{attr}=") do |file|
+          if options[:map]
+            mapped_file_path = ::File.join Rails.root, 'tmp', SecureRandom.hex(15)
+            if options[:map].is_a? Proc
+              options[:map].call file, mapped_file_path
+            else
+              send(options[:map], file, mapped_file_path)
+            end
+            mapped_file = ::File.open mapped_file_path, 'rb'
+            send "mapped_#{attr}=", mapped_file
+          end
+          instance_variable_set "@#{attr}", file
+        end
+        
+        # Define the accessor methods for the mapped version of the file.
+        attr_accessor "mapped_#{attr}"
         
         # Define the path method. This method will raise if the given storage
         # class doesn't support the #path method.

data/lib/echo_uploads/perm_file_saving.rb

@@ -20,7 +20,7 @@ module EchoUploads
               meta = ::EchoUploads::File.new(owner: model, temporary: false)
               send("#{attr}_metadata=", meta)
             end
-            meta.persist! attr, file, options
+            meta.persist! attr, file, send("mapped_#{attr}"), options
           elsif meta = send("#{attr}_tmp_metadata") and meta.temporary
             # A file has not been uploaded during this request cycle. However, the
             # submitted form "remembered" a temporary metadata record that was previously

data/lib/echo_uploads/temp_file_saving.rb

@@ -31,7 +31,7 @@ module EchoUploads
           meta = ::EchoUploads::File.new(
             owner: nil, temporary: true, expires_at: options[:expires].from_now
           )
-          meta.persist! attr, file, options
+          meta.persist! attr, file, send("mapped_#{attr}"), options
           send("#{attr}_tmp_metadata=", meta)
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: echo_uploads
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Jarrett Colby
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mime-types