rbbt-rest 1.2.8 → 1.2.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzkxNzcyYjE0ZmRjYTFiMGJjZDI4ZGY3N2Y0OTVjMWU1ZDdkZjc0Yg==
+    MWFhMmFjMWFjYzU4Njg2ODYyYWRkY2NkMjNmYWFiMGQ3NmZkYjBkZA==
   data.tar.gz: !binary |-
-    MzQ0ODc5Y2M2ZjFlOWUzYjViMmY5ZjZiNmJjNDAwZjA2MDgyODJjNw==
+    N2RhYmYyYmI2Njg5YTE3YTZhYzkyNDg1OWMzNzc2NzgyYzVjZmQ4NA==
 SHA512:
   metadata.gz: !binary |-
-    OTA1NWNiYzI0MWRmNWU3OTRlYWYyY2Y0M2Y2MTNlODk1MTc5ZjhkNDI3ZDRk
-    N2JkNzkzNDhjZTVlZTgyOWY5NzE2MGI5YWZmN2VhMmE5YTFjMDQxZDE5YTgx
-    YzExNmNkZDE3YjEyMWNlMzFhMmNjZGIxN2JkZDJlYWNjNTU2Nzc=
+    ZDk0MDczNTUxNGNhMTY2NzM3YjBmNDc3YjYzNGFiODZhYWI4MjdjMzVkZDQ0
+    NDIzYzA4YWJhMDAwNjU0ZWEzZGU5MTI4MmE0MWViOGNkOWJlNGMwM2JjYWRi
+    YmJlNTQ2ZGMwZjA1ODg5M2U2ZmY1MTljMGU1ZWFjMGE0NjJmMzY=
   data.tar.gz: !binary |-
-    ZWRkMWFlNDBiZGJmYmMxMmIxMDdmYmY1YWE0MDIwYjY1OTljODk3NTI3ODQ3
-    YzVmZjMxOTcwNjU5MzcwYTIyMzgyZjdlYmJmMjk1MDJkYmQ0ZjQyMDViZmJl
-    MjFkYWZiOWNjZWI1NDZmMzI2YzcwZjkyOWQ3ZGU5MDY5OTBkM2U=
+    YWExOWJmODJiMDNkZmNlNjAyOTcxZGQxYjAxYjQ4OWIzMTk1YjAzMTNiYzhi
+    NjNhZDhiMTlmNTFmYzFmYzcwMjI1ZmEzZWIyNzdmMjUxODNhMzFmNmZhYjM3
+    MDgxOTE3ODQwYWNjMWE2M2YzMDA4NjJlNzE5MTUwZjNhZGY0YmQ=

data/lib/rbbt/rest/file_server.rb

@@ -16,6 +16,8 @@ module Sinatra
 
           resource = Kernel.const_get(resource)
 
+          directory = $1 if resource.subdir and directory =~ /^#{resource.subdir}\/?(.*)/
+
           path = resource.root[directory]
 
           raise "For security reasons the file path must not leave the resource root directory" unless Misc.path_relative_to(resource.root, path)
@@ -25,15 +27,24 @@ module Sinatra
           raise "Directory does not exist" unless path.exists? or create
           raise "Directory does not exist and can not create it" unless path.exists? or path.produce.exists?
 
-          stream(:binmode => true) do |out|
-
-            io = Misc.in_dir path.find do
-              CMD.cmd("tar cfz - '.'", :pipe => true)
-            end
-
-            while not io.closed? and block = io.read(4096) 
-              out << block
+          #stream do |out|
+          #  io = nil
+          #  Misc.in_dir path.find do
+          #    io = CMD.cmd("tar cfvz - '.'", :pipe => true)
+          #  end
+          #  while not io.closed? and block = io.read(4096) 
+          #    out << block
+          #  end
+          #  io.close
+          #  out.flush
+          #end
+          
+          TmpFile.with_file :extension => 'tar.gz' do |file|
+            Misc.in_dir path.find do
+              CMD.cmd("tar cfvz '#{file}' .") 
             end
+            headers['Content-Encoding'] = 'gzip'
+            send_file file, :filename => directory.gsub('/','_') + '.tar.gz', :type => "application/x-gzip"
           end
         end
 
@@ -54,8 +65,10 @@ module Sinatra
 
           Log.debug("Resource: #{[resource, file, path, path.find] * " | "}")
 
-          raise "File does not exist" unless path.exists? or create
-          raise "File does not exist and can not create it" unless path.exists? or path.produce.exists?
+          raise "File does not exist and can not create it" unless path.exists?
+
+          directory_url = File.join("/resource", resource.to_s , 'get_directory') << '?' << "create=#{create}" << '&' << "directory=#{file}"
+          redirect to(directory_url) if path.directory?
 
           send_file path.find, :filename => path
         end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.2.9
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-06 00:00:00.000000000 Z
+date: 2013-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake