blobsterix 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d6c5d8753eb7b819ab4fb8f8eda41051891141c
-  data.tar.gz: fafd4b138061ae869bc6c7f6fafd7efaf86a27f4
+  metadata.gz: deb829b40753a003b15e442d2616a0b049ef3f0b
+  data.tar.gz: 6eb09a7c8506cd34215589210161378719f4bf67
 SHA512:
-  metadata.gz: bd9a45bf0dfbca62e2deccd780c5e24b919f46d4939669b2f0e5e9ac9ca7115d258a2934834cea4a608c356dea1156cf97792fc519f62a55c6657b31553cd870
-  data.tar.gz: c87a7318aef732db856b14381c95becae98181f217ddce68c1980abbfbf78f1a3f414996367eb7b46610bdcda3d5989c2d5674f8ca0e191d6b4b0e7bd3d3eb29
+  metadata.gz: 058c5d531944081803992583ff92ba56d55a6cd1b9dc88d70efe618325c49b73d49451ba3bc619d3c401c2b5a8c78e7409a72e6f42cf064b1e2498325ca263a6
+  data.tar.gz: 66aec0dbeb53da84c935cb93aa9f43a2c4dd785961c5c62e3c0a6cf5ac0b343a65139a8e3c8d81bb273ef446eb2dd366b8539e292a62c4a061506785791ff16c

data/CHANGELOG.txt

@@ -1,3 +1,6 @@
+= 0.0.12
+  * added global config option to activate X-Sendfile via config. Now it can not be activated anymore by a reverse proxy
+  * added global config option to activate or deactivate chunked streaming of files
 = 0.0.11
   * changed naming schemas of cached files and tmp files
   * fixing x-send file

data/lib/blobsterix/blob/blob_api.rb

@@ -40,7 +40,7 @@ module Blobsterix
 
         begin
           data = transformation.run(blob_access)
-          send_with_data ? data.response(true, env["HTTP_IF_NONE_MATCH"], env, env["HTTP_X_FILE"] === "yes") : data.response(false)
+          send_with_data ? data.response(true, env["HTTP_IF_NONE_MATCH"], env) : data.response(false)
         rescue Errno::ENOENT => e
           logger.error "Cache deleted: #{blob_access}"
           Blobsterix.cache_fatal_error(blob_access)

data/lib/blobsterix/helper/data_response.rb

@@ -10,13 +10,13 @@ module Blobsterix
         @env = _env
       end
 
-      def call(xfile=false, allow_chunks=true)
+      def call()
         if not meta.valid
           Http.NotFound()
-        elsif xfile and etag != meta.etag
+        elsif Blobsterix.use_x_send_file and etag != meta.etag
           [200, meta.header.merge({"X-Sendfile" => meta.path.to_s}), ""]
         elsif etag != meta.etag
-          if env != nil && meta.size > 30000 && allow_chunks
+          if env != nil && meta.size > 30000 && Blobsterix.allow_chunked_stream
             chunkresponse
           else
             [200, meta.header, (with_data ? meta.data : "")]

data/lib/blobsterix/s3/s3_api.rb

@@ -36,7 +36,7 @@ module Blobsterix
 
         if bucket?
           if meta = storage.get(bucket, file)
-            send_with_data ? meta.response(true, env["HTTP_IF_NONE_MATCH"], env, env["HTTP_X_FILE"] === "yes", false) : meta.response(false)
+            send_with_data ? meta.response(true, env["HTTP_IF_NONE_MATCH"], env) : meta.response(false)
           else
             Http.NotFound
           end

data/lib/blobsterix/storage/blob_meta_data.rb

@@ -52,8 +52,8 @@ module Blobsterix
       end
       def delete
       end
-      def response(with_data=true, _etag=nil, env = nil, xfile = false, allow_chunks=true)
-        Blobsterix::Http::DataResponse.new(self, with_data, _etag, env).call(xfile, allow_chunks)
+      def response(with_data=true, _etag=nil, env = nil)
+        Blobsterix::Http::DataResponse.new(self, with_data, _etag, env).call()
       end
     end
   end

data/lib/blobsterix/version.rb

@@ -1,3 +1,3 @@
 module Blobsterix
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 end

data/lib/blobsterix.rb

@@ -129,6 +129,22 @@ module Blobsterix
     @cache = obj
   end
 
+  def self.use_x_send_file
+    @use_x_send_file||=false
+  end
+
+  def self.use_x_send_file=(obj)
+    @use_x_send_file=obj
+  end
+
+  def self.allow_chunked_stream
+    @allow_chunked_stream||=true
+  end
+
+  def self.allow_chunked_stream=(obj)
+    @allow_chunked_stream=obj
+  end
+
   def self.decrypt_trafo=(obj)
     @decrypt_trafo=obj
   end

data/templates/app/config/environments/development.rb

@@ -5,6 +5,12 @@
 # Blobsterix.storage_dir=Blobsterix.root.join("contents")
 # Blobsterix.cache_dir=Blobsterix.root.join("cache")
 
+# # Use X-Sendfile(standard: false)
+# Blobsterix.use_x_send_file=true
+
+# # Allow chunked streaming(standard: true)
+# Blobsterix.allow_chunked_stream=true
+
 # # Set different cache or storage handler
 # Blobsterix.storage=Blobsterix::Storage::FileSystem.new(Blobsterix.storage_dir)
 # Blobsterix.cache=Blobsterix::Storage::Cache.new(cache_dir)

data/templates/app/config/environments/production.rb

@@ -5,6 +5,12 @@
 # Blobsterix.storage_dir=Blobsterix.root.join("contents")
 # Blobsterix.cache_dir=Blobsterix.root.join("cache")
 
+# # Use X-Sendfile(standard: false)
+# Blobsterix.use_x_send_file=true
+
+# # Allow chunked streaming(standard: true)
+# Blobsterix.allow_chunked_stream=true
+
 # # Set different cache or storage handler
 # Blobsterix.storage=Blobsterix::Storage::FileSystem.new(Blobsterix.storage_dir)
 # Blobsterix.cache=Blobsterix::Storage::Cache.new(cache_dir)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blobsterix
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.12
 platform: ruby
 authors:
 - Daniel Sudmann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-25 00:00:00.000000000 Z
+date: 2014-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json