attache 1.1.4 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 637b0e3db30b5d851946c433e8df383d38708d39
-  data.tar.gz: 9103c50678a077092a9c43a10bab435e425e86ac
+  metadata.gz: fc90b16475272e6baac6425b906f8fffca6f1249
+  data.tar.gz: 58122828ad77382848273daf0913e3c6de9782d4
 SHA512:
-  metadata.gz: ca9c7794c0dac8a080ec267d849c3d0a786fb1b60c3041b80548c37115ac2af33d57963d29f2c4634aa23647252ce5eaa9561b4a63b52b068033f82200a41eb1
-  data.tar.gz: 980b910c931c32d814d7c757fe7e74a0b1ee376a4e657c988ab531866f52e2029279b0961fe24c6b08423b43ef915d912aff9666048cbf78dd1f7894c7500d7b
+  metadata.gz: 3441af14460f63af2df895148879f0a44858ae0e931c10612916cf96fb67e838f70adf5554b03b5f05b7bf3cf33a0d9535512d9bdb36aae38078bd7c4f0dbe67
+  data.tar.gz: fd96f3fcef7f3f5668c14077cb67aad90c7e8d2c818267f0268879265ee3aa808a51d5f5c53a45d36f38962b315ccdbb887b6699c64f31803b12230ebaab1290

data/lib/attache/download.rb

@@ -1,7 +1,6 @@
 require 'connection_pool'
 
 class Attache::Download < Attache::Base
-  OUTPUT_EXTENSIONS = %w[png jpg jpeg gif]
   RESIZE_JOB_POOL = ConnectionPool.new(JSON.parse(ENV.fetch('RESIZE_POOL') { '{ "size": 2, "timeout": 60 }' }).symbolize_keys) { Attache::ResizeJob.new }
 
   def initialize(app)
@@ -31,10 +30,13 @@ class Attache::Download < Attache::Base
             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
@@ -55,8 +57,7 @@ class Attache::Download < Attache::Base
           file
         else
           extension = basename.split(/\W+/).last
-          extension = OUTPUT_EXTENSIONS.first unless OUTPUT_EXTENSIONS.index(extension.to_s.downcase)
-          make_thumbnail_for(file.tap(&:close), geometry, extension)
+          make_thumbnail_for(file.tap(&:close), geometry, extension, basename)
         end
 
         headers = {
@@ -85,10 +86,10 @@ class Attache::Download < Attache::Base
       yield dirname, geometry, basename, relpath
     end
 
-    def make_thumbnail_for(file, geometry, extension)
+    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)
+        job.perform(file, geometry, extension, basename)
       end
     end
 
@@ -97,11 +98,14 @@ class Attache::Download < Attache::Base
     def get_first_result_present_async(lambdas)
       return if lambdas.empty? # queue.pop will never happen
       queue = Queue.new
-      threads = lambdas.collect { |code| Thread.new { queue << code.call } }
-      until result = queue.pop do
+      threads = lambdas.shuffle.collect { |code| Thread.new { queue << [Thread.current, code.call] } }
+      until (item = queue.pop).last do
+        thread, _ = item
+        thread.join # we could be popping `queue` before thread exited
         break unless threads.any?(&:alive?) || queue.size > 0
       end
       threads.each(&:kill)
+      _, result = item
       result
     end
 end

data/lib/attache/resize_job.rb

@@ -1,20 +1,52 @@
 require 'digest/sha1'
 
 class Attache::ResizeJob
-  def perform(closed_file, target_geometry_string, extension)
+  def perform(closed_file, target_geometry_string, extension, basename)
     t = Time.now
     Attache.logger.info "[POOL] start"
+    return make_nonimage_preview(closed_file, basename) if ['pdf', 'txt'].include?(extension.to_s.downcase)
+
     thumbnail = thumbnail_for(closed_file: closed_file, target_geometry_string: target_geometry_string, extension: extension)
-    thumbnail.instance_variable_set('@basename', thumbnail.instance_variable_get('@basename').gsub(/[^\w\.]/, '_'))
-    thumbnail.make.tap do
-      Attache.logger.info "[POOL] done in #{Time.now - t}s"
-    end
+    thumbnail.instance_variable_set('@basename', make_safe_filename(thumbnail.instance_variable_get('@basename')))
+    thumbnail.make
   rescue Paperclip::Errors::NotIdentifiedByImageMagickError
-    closed_file
+    make_nonimage_preview(closed_file, basename)
+  ensure
+    Attache.logger.info "[POOL] done in #{Time.now - t}s"
   end
 
   private
 
+    BOLD_FONT_FILE = ENV.fetch('FONT_FILE', File.join(Attache.publicdir, "vendor/roboto/Roboto-Medium.ttf"))
+    THIN_FONT_FILE = ENV.fetch('FONT_FILE', File.join(Attache.publicdir, "vendor/roboto/Roboto-Light.ttf"))
+    BORDER_SIZE = ENV.fetch('BORDER_SIZE', "3")
+    FG_COLOR = ENV.fetch('FG_COLOR', "#ffffff")
+    BG_COLOR = ENV.fetch('BG_COLOR', "#dddddd")
+    EXT_COLOR = ENV.fetch('EXT_COLOR', "#333333")
+    TXT_SIZE = ENV.fetch('TXT_SIZE', "12")
+    PREVIEW_SIZE = ENV.fetch('PREVIEW_SIZE', '96x')
+
+    def make_nonimage_preview(closed_file, basename)
+      t = Time.now
+      Attache.logger.info "[POOL] start nonimage preview"
+      output_file = Tempfile.new(["preview", ".png"]).tap(&:close)
+      cmd = case basename
+      when /\.pdf$/i
+        "convert -size #{PREVIEW_SIZE.inspect} #{closed_file.path.inspect}[0] -thumbnail #{PREVIEW_SIZE.inspect} -font #{BOLD_FONT_FILE.inspect}"
+      else
+        "convert -size #{PREVIEW_SIZE.inspect} \\( -gravity center -font #{BOLD_FONT_FILE.inspect} -fill #{EXT_COLOR.inspect} label:'#{make_safe_filename(basename).split(/\W+/).last}' \\)"
+      end + " -bordercolor #{FG_COLOR.inspect} -border #{BORDER_SIZE} -background #{BG_COLOR.inspect} -gravity center -font #{THIN_FONT_FILE.inspect} -pointsize 12 -set caption #{basename.inspect} -polaroid 0 #{output_file.path.inspect}"
+      Attache.logger.info cmd
+      system cmd
+      File.new(output_file.path)
+    ensure
+      Attache.logger.info "[POOL] done nonimage preview in #{Time.now - t}s"
+    end
+
+    def make_safe_filename(str)
+      str.to_s.gsub(/[^\w\.]/, '_')
+    end
+
     def thumbnail_for(closed_file:, target_geometry_string:, extension:, max: 2048)
       thumbnail = Paperclip::Thumbnail.new(closed_file, geometry: target_geometry_string, format: extension)
       current_geometry = current_geometry_for(thumbnail)

data/lib/attache/version.rb

@@ -1,3 +1,3 @@
 module Attache
-  VERSION = "1.1.4"
+  VERSION = "2.1.0"
 end

data/lib/attache/vhost.rb

@@ -46,7 +46,9 @@ class Attache::VHost
   def storage_url(args)
     remote_api.new({
       key: File.join(*remotedir, args[:relpath]),
-    }).url(Time.now + 60)
+    }).url(Time.now + 600).tap do |url|
+      Attache.logger.info "storage_url: #{url}"
+    end
   end
 
   def storage_get(args)

data/public/vendor/roboto/Apache License.txt

@@ -0,0 +1,203 @@
+Font data copyright Google 2012
+
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attache
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 2.1.0
 platform: ruby
 authors:
 - choonkeat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -264,6 +264,9 @@ files:
 - lib/attache/version.rb
 - lib/attache/vhost.rb
 - public/index.html
+- public/vendor/roboto/Apache License.txt
+- public/vendor/roboto/Roboto-Light.ttf
+- public/vendor/roboto/Roboto-Medium.ttf
 homepage: https://github.com/choonkeat/attache
 licenses:
 - MIT