rbbt-rest 1.2.23 → 1.2.24

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NmE0NzYyMmFiODhkNDE4Y2ExZDM4NThhMzk2MjU3YzkzMTM5MjJiMA==
+    NjViNDIyYjJhNjdkYmE3MTllNjJkN2I4YTRjZTI4NWNlYmQ0NDY4YQ==
   data.tar.gz: !binary |-
-    OGNmN2Y5ODk5ZjEwMTRmZDUzZTNiMjViMDY2NzBjMDRlNTIzYTRhYQ==
+    NGMxNjc1NjI2ODdlNzhlNDM1NTQyY2E4NTgxMzdlZjQ4NTc1NTcxMg==
 SHA512:
   metadata.gz: !binary |-
-    M2IwODM0OTBkZDcyZWEzNDUwOTdjYzA1ZTUwYjVmOTc3MmUwYjU5YWYyZjAw
-    Njg5NWJmYWE1OGQwMzQxZDRiNzRlN2YzYTQ3MDYxNzVjY2UzZmU3NmE4NGUw
-    ODQ4NWVmMDJlYmE2M2EyMTI2NDZlZGI0YTA2NDUxNmYzMDIzYmQ=
+    YjIzZmVhZmU0ZTEzYTU3ZmI4ZDI0YzA0M2Q2ZDZmNTY3NjEzYmM2NmZhYzVh
+    ZmFlZWI3ZWEzNDFiYzc5NTQzNTljZjM3Njg0ODRmNjk3ODU4MmVmMDliNDFh
+    M2U0OGM1M2UxZDVlYTE3ZDEwMjQzYTljY2U4N2Q5ZTQxZDZjY2Q=
   data.tar.gz: !binary |-
-    YzE0ODdjYTdlMTg0MmE5YjVjYzE0NTIzYzI1MTA2MmQ2MmRhODUyMTQ3YmY3
-    ZWFjYmYxMzFjZDIyYTYxOWIyNzE0ZDA4ZmZjYzY4MDk4NThkOWE1MzVhMjdi
-    Nzg0MzMzMzM1ZWRiOGVlZmZmNDY2ZTg3NTE2Mjg5OTk4NTYxOTU=
+    YTQwM2U5NzAwZDY4MDBmYzlkYWVjOTRlYmJhYTgwNzhiZmRmZDJjM2IxYjRl
+    MTAwZWIyZTZjY2M2ZDRjZmMwZmM4M2Y5ODljMWE2NmMwN2I4Y2FmM2YzMzAx
+    ZDI2M2JmYThiMmY1YjlmYjEwMDcwNmIwY2Y3MDBiZDEzMTA1ZDQ=

data/lib/rbbt/rest/file_server.rb

@@ -1,11 +1,14 @@
 require 'rbbt'
 require 'sinatra/base'
+require 'sinatra/streaming'
+                                       
 
 module Sinatra
   module RbbtRESTFileServer
     
     def self.registered(base)
       base.module_eval do
+        helpers Sinatra::Streaming
 
         get '/resource/:resource/get_directory' do
           directory, resource, create = params.values_at :directory, :resource, :create
@@ -27,24 +30,28 @@ 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 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}' .") 
+          headers['Content-Encoding'] = 'gzip'
+          chunk_size = 1024
+          stream do |out|
+            tar = Misc.tarize(path.find)
+
+            out.errback do
+              Log.error{"Error streaming #{ path }"}
+              begin tar.close unless tar.closed?; rescue; end
+              out.close unless out.closed?
+            end
+
+            begin
+              while chunk = tar.read(1024)
+                out << chunk
+              end
+            ensure
+              Log.debug("Finished streaming #{path}. Closing")
+              begin tar.close unless tar.closed?; rescue; end
+              out.close unless out.closed?
             end
-            headers['Content-Encoding'] = 'gzip'
-            send_file file, :filename => directory.gsub('/','_') + '.tar.gz', :type => "application/x-gzip"
+
+            out
           end
         end
 

data/share/views/public/js/rbbt/modal.js

@@ -72,6 +72,7 @@ $.widget("rbbt.modal", {
 
    replace_object(modal.find('.content'), url, true, function(){
     var url = tool._shown_url()
+    var url = remove_parameter(url, '_')
 
     modal.addClass('url')
     modal.find('.link-reveal-modal').attr('href', url)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.2.23
+  version: 1.2.24
 platform: ruby
 authors:
 - Miguel Vazquez