attache 2.3.0 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3e6fceada01d556d51cb23682428710b64a6a4f
-  data.tar.gz: f1a1dd488a9964aaa212522fa6552776f31882af
+  metadata.gz: 2cde7af6587a7bd0d889116e932393567b21c67d
+  data.tar.gz: 89c025fc3fafb2a490aff53ae8e9596a63290a56
 SHA512:
-  metadata.gz: b71efe1bd2bb1820c32f93bd60ab6bd7ce418e804cd6738ac51d77cb78ffc9eb7e2a9d2c79ce12cb258df463033a29e9f78e253fcb7732eb20758b22e912a16d
-  data.tar.gz: b355c9cbe459befac3da3a8ec7d35f2ef2d5f10fbc3ae0c27639e2145fb4ad6f4259379ea91b803f9fdeda545a0fcc7529e47c2c3b4bd2d9907663c95a23e85d
+  metadata.gz: d6c4356d1fae80dee32d9a2957722c7ee887d7047c4f4df7cc2e44f81cd6ef934815d091d724f5efaa23f10a158a4fb8b9841098902d51a9ae1e5bb658b3ce74
+  data.tar.gz: 0fbdd6abd508fe825ec796b2e7db6b00155a8d0d3108d8b0b7c8b9355e0801dabd3ec38c77dd02928764bdc68c340bb76a90b37e9d212fd26184dc6fa6970501

data/lib/attache/base.rb

@@ -60,14 +60,19 @@ class Attache::Base
     File.join(*SecureRandom.hex.scan(/\w\w/), basename)
   end
 
-  def json_of(relpath, cachekey)
+  def json_of(relpath, cachekey, vhost)
     filepath = path_of(cachekey)
-    {
+    json = {
       path:         relpath,
       content_type: content_type_of(filepath),
       geometry:     geometry_of(filepath),
       bytes:        filesize_of(filepath),
-    }.to_json
+    }
+    if vhost && vhost.secret_key
+      content = json.sort.collect {|k,v| "#{k}=#{v}" }.join('&')
+      json['signature'] = OpenSSL::HMAC.hexdigest(OpenSSL::Digest.new('sha1'), vhost.secret_key, content)
+    end
+    json.to_json
   end
 
 end

data/lib/attache/tus/upload.rb

@@ -39,7 +39,7 @@ class Attache::Tus::Upload < Attache::Base
 
           [200,
             tus.headers_with_cors({'Content-Type' => 'text/json'}, offset: current_offset(cachekey, relpath, config)),
-            [json_of(relpath, cachekey)],
+            [json_of(relpath, cachekey, config)],
           ]
         else
           [400, tus.headers_with_cors('X-Exception' => 'Bad headers'), []]
@@ -53,7 +53,7 @@ class Attache::Tus::Upload < Attache::Base
         cachekey = File.join(request_hostname(env), relpath)
         [200,
           tus.headers_with_cors({'Content-Type' => 'text/json'}, offset: current_offset(cachekey, relpath, config)),
-          [json_of(relpath, cachekey)],
+          [json_of(relpath, cachekey, config)],
         ]
 
       when 'GET'

data/lib/attache/upload.rb

@@ -24,7 +24,7 @@ class Attache::Upload < Attache::Base
 
         config.storage_create(relpath: relpath, cachekey: cachekey) if config.storage && config.bucket
 
-        [200, config.headers_with_cors.merge('Content-Type' => 'text/json'), [json_of(relpath, cachekey)]]
+        [200, config.headers_with_cors.merge('Content-Type' => 'text/json'), [json_of(relpath, cachekey, config)]]
       when 'OPTIONS'
         [200, config.headers_with_cors, []]
       else

data/lib/attache/version.rb

@@ -1,3 +1,3 @@
 module Attache
-  VERSION = "2.3.0"
+  VERSION = "3.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: attache
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.0
 platform: ruby
 authors:
 - choonkeat
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-24 00:00:00.000000000 Z
+date: 2016-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack