attache 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 228685a6b1038b73b233cf5165570252f271f447
-  data.tar.gz: df3611d3b73a8c2120b9fda08fab214bfaa55ecb
+  metadata.gz: 40d8defcee67748b1a0bffcb19211ea6a784f4a0
+  data.tar.gz: 2c4448d76d29a7115f6ebec5448ab76835ba2883
 SHA512:
-  metadata.gz: d8556bbf47617561a3bafd4bacb72ae3445e52357ee1acd5e5fd92473f4d1fbfe9336a86a3c6af30df01392a207a3be05881d88290c3cbf95dff3335dc515899
-  data.tar.gz: 71ec695990a228854eb3ba24fdcb5462f70b106670fa370d08d89584e04ae7e4ab8f9d5788cbf800f6d312a0fc6093bd8e82a86af27b8e8f605907de28199ee8
+  metadata.gz: 025d0526f38962154e8a5e4ff88973778e6ca97722d0a81310b8a8e869634d886cbcc262408a7db7fccc4ad4e5f92853f7bb69d5e5abad07ba3a0c262c2da339
+  data.tar.gz: 932a2b35ad81e8a554c94bd43fa414964d0a72d6263eefdcadb6e5f71a75b8d2f78f39757228878e59654287de7e4be74b659265d721931a63b1d389649c8895

data/README.md

@@ -143,11 +143,7 @@ Users will upload files directly into the `attache` server from their browser, b
 > ```
 > PUT /upload?file=image123.jpg
 > ```
-> file content is the http request body as raw binary (preferred) or encoded as base64 uri like this:
-> ```
-> PUT /upload?file=image123.jpg
-> data:image/jpeg;base64,/9j/4QBiR....
-> ```
+> file content is the http request body
 
 The main app front end will receive a unique `path` for each uploaded file - the only information to store in the main app database.
 

data/lib/attache/download.rb

@@ -5,6 +5,7 @@ class Attache::Download < Attache::Base
 
   def initialize(app)
     @app = app
+    @mutexes = {}
   end
 
   def _call(env, config)
@@ -23,52 +24,20 @@ class Attache::Download < Attache::Base
           return [302, headers, []]
         end
 
-        file = begin
-          cachekey = File.join(request_hostname(env), relpath)
-          Attache.cache.fetch(cachekey) do
-            name_with_vhost_pairs = vhosts.inject({}) { |sum,(k,v)| (v ? sum.merge(k => v) : sum) }
-            get_first_result_present_async(name_with_vhost_pairs.collect {|name, vhost|
-              lambda { Thread.handle_interrupt(BasicObject => :on_blocking) {
-                begin
-                  Attache.logger.info "[POOL] looking for #{name} #{relpath}..."
-                  vhost.storage_get(relpath: relpath).tap do |v|
-                    Attache.logger.info "[POOL] found #{name} #{relpath} = #{v.inspect}"
-                  end
-                rescue Exception
-                  Attache.logger.error $!
-                  Attache.logger.error $@
-                  Attache.logger.info "[POOL] not found #{name} #{relpath}"
-                  nil
-                end
-              } }
-            })
+        thumbnail = case geometry
+          when 'original', *vhosts.keys
+            get_original_file(relpath, vhosts, env)
+          else
+            get_thumbnail_file(geometry, basename, relpath, vhosts, env)
           end
-        rescue Exception # Errno::ECONNREFUSED, OpenURI::HTTPError, Excon::Errors, Fog::Errors::Error
-          Attache.logger.error "ERROR REFERER #{env['HTTP_REFERER'].inspect}"
-          nil
-        end
 
-        unless file && file.try(:size).to_i > 0
-          return [404, config.download_headers, []]
-        end
-
-        thumbnail = case geometry
-        when 'original', *vhosts.keys
-          file
-        else
-          extension = basename.split(/\W+/).last
-          make_thumbnail_for(file.tap(&:close), geometry, extension, basename)
-        end
+        return [404, config.download_headers, []] if thumbnail.try(:size).to_i == 0
 
         headers = {
           'Content-Type' => content_type_of(thumbnail.path),
         }.merge(config.download_headers)
 
-        [200, headers, rack_response_body_for(thumbnail)].tap do
-          unless file == thumbnail # cleanup
-            File.unlink(thumbnail.path) rescue Errno::ENOENT
-          end
-        end
+        [200, headers, rack_response_body_for(thumbnail)]
       end
     else
       @app.call(env)
@@ -86,11 +55,55 @@ class Attache::Download < Attache::Base
       yield dirname, geometry, basename, relpath
     end
 
-    def make_thumbnail_for(file, geometry, extension, basename)
-      Attache.logger.info "[POOL] new job"
-      RESIZE_JOB_POOL.with do |job|
-        job.perform(file, geometry, extension, basename)
+    def synchronize(key, &block)
+      mutex = @mutexes[key] ||= Mutex.new
+      mutex.synchronize(&block)
+    ensure
+      @mutexes.delete(key)
+    end
+
+    def get_thumbnail_file(geometry, basename, relpath, vhosts, env)
+      cachekey = File.join(request_hostname(env), relpath, geometry)
+      synchronize(cachekey) do
+        tempfile = nil
+        Attache.cache.fetch(cachekey) do
+          Attache.logger.info "[POOL] new job"
+          tempfile = RESIZE_JOB_POOL.with do |job|
+            job.perform(geometry, basename, relpath, vhosts, env) do
+              # opens up possibility that job implementation
+              # does not require we download original file prior
+              get_original_file(relpath, vhosts, env)
+            end
+          end
+        end.tap { File.unlink(tempfile.path) if tempfile.try(:path) }
+      end
+    end
+
+    def get_original_file(relpath, vhosts, env)
+      cachekey = File.join(request_hostname(env), relpath)
+      synchronize(cachekey) do
+        Attache.cache.fetch(cachekey) do
+          name_with_vhost_pairs = vhosts.inject({}) { |sum,(k,v)| (v ? sum.merge(k => v) : sum) }
+          get_first_result_present_async(name_with_vhost_pairs.collect {|name, vhost|
+            lambda { Thread.handle_interrupt(BasicObject => :on_blocking) {
+              begin
+                Attache.logger.info "[POOL] looking for #{name} #{relpath}..."
+                vhost.storage_get(relpath: relpath).tap do |v|
+                  Attache.logger.info "[POOL] found #{name} #{relpath} = #{v.inspect}"
+                end
+              rescue Exception
+                Attache.logger.error $!
+                Attache.logger.error $@
+                Attache.logger.info "[POOL] not found #{name} #{relpath}"
+                nil
+              end
+            } }
+          })
+        end
       end
+    rescue Exception # Errno::ECONNREFUSED, OpenURI::HTTPError, Excon::Errors, Fog::Errors::Error
+      Attache.logger.error "ERROR REFERER #{env['HTTP_REFERER'].inspect}"
+      nil
     end
 
     # Ref https://gist.github.com/sferik/39831f34eb87686b639c#gistcomment-1652888

data/lib/attache/resize_job.rb

@@ -1,8 +1,12 @@
 require 'digest/sha1'
+require 'stringio'
 
 class Attache::ResizeJob
-  def perform(closed_file, target_geometry_string, extension, basename)
-    t = Time.now
+  def perform(target_geometry_string, basename, relpath, vhosts, env, t = Time.now)
+    closed_file = yield
+    return StringIO.new if closed_file.try(:size).to_i == 0
+
+    extension = basename.split(/\W+/).last
     Attache.logger.info "[POOL] start"
     return make_nonimage_preview(closed_file, basename) if ['pdf', 'txt'].include?(extension.to_s.downcase)
 

data/lib/attache/version.rb

@@ -1,3 +1,3 @@
 module Attache
-  VERSION = "2.2.0"
+  VERSION = "2.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attache
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - choonkeat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-29 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack