rbbt-rest 1.2.28 → 1.2.29

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjcwODZiOTgzOTgzNTg2ZjBjNDBkOTYzYmUzMWVlOWM2MDFhZDY0NA==
+    M2ZiYTdmYzg0MWE3ZWIxNWI3MWE1MGZlNzQzZjcyZThiYmE1ZTE4Mw==
   data.tar.gz: !binary |-
-    YzZmZTZlNTJhODcyOWY0ZjA1ZDU2YTY0YzRiN2NlODIxZGZlMTIyNQ==
+    YjdlNzdiZGNjZjYxZTgwYTMwYmI2N2Q4YTc2NmQ5NTk3MGE5N2JiYQ==
 SHA512:
   metadata.gz: !binary |-
-    YjRhZjU5N2NlOWIzYWQzMzA3MjcxNWNjYWQ5M2E5YmRlZDE5NWY0NDU1ZjJh
-    ODczYjc3M2E0Mzg5ZmNiNWZjMTU2NGNlMWJmYmFkMDk1Y2IyYTk2ZTU4ZTVj
-    ZWY3MzMzNDQ2MzBiYWUwMTU0ZGJkMTE3ZDRkNjE5MjdmOGI1MmM=
+    MWNmMDA5NGZjNTIyNDRiODY4NDEwOGQ1MmY3MTg3MDI0YWQ5NjljZTdjZWRk
+    OTVhYzQ2ZmE5ZmM2MzI1MDRiMmVkZjliZmI0YmMzZjI2ODQzMGM0ZjM3ZDQx
+    NmMxNDM5Nzk5NmQ0YTAwYTJlMzcyMzhmMzA3MmI5YWNjYTYxMTA=
   data.tar.gz: !binary |-
-    ZDc1NDFlZTNiMTlhNTFkMjE5MWUzNmE2NGE3ZjI4YzZlNDAyNjdjMjhlZDNj
-    NTNmYjI1NWRmNGIxZDFhYWZiOGM2ZmEwMTc0Y2UxYzQ0NDU2ZWNjMTRkYTNm
-    Mjg4YzU5OWQxZjFkNmU1MjMyZmU3YzE5OTE0YTdiNWIwZjE4MjI=
+    NzgyMjgzYjMzN2ZlNzlkNDI0Yzk3OTE0YzlhYmE0NjVjYTY4ZDA4ZmIzZDU1
+    OTE4MTVlMWZhYjA3YWZjMDU5Y2ZiMDE4NGRkYjdiYzAzMTFkYjM0OGFhNTY1
+    ZTI3NDc5YWE5ZDYyOTNmYjZkNGMwZTI3ZWIwMjg1MGU4OWViN2U=

data/lib/rbbt/rest/common/cache.rb

@@ -103,7 +103,7 @@ module RbbtRESTHelpers
         step.abort if pid and Misc.pid_exists? pid
         step.pid = nil
       rescue Exception
-        Log.medium $!.message
+        Log.medium{$!.message}
       end
       step.clean 
     end
@@ -143,10 +143,10 @@ module RbbtRESTHelpers
         else
           # check for problems
           if File.exists?(step.info_file) and Time.now - File.atime(step.info_file) > 60
-            Log.debug("Checking on #{step.info_file}")
+            Log.debug{ "Checking on #{step.info_file}" }
             running = step.running?
             if FalseClass === running
-              Log.debug("Aborting zombie #{step.info_file}")
+              Log.debug{ "Aborting zombie #{step.info_file}" }
               step.abort unless step.done?
               raise RbbtRESTHelpers::Retry
             end

data/lib/rbbt/rest/common/misc.rb

@@ -9,7 +9,7 @@ module RbbtRESTHelpers
     if @step
       @step.log(status, message = nil)
     else
-      Log.info("[#{ status }] #{ message }")
+      Log.info{ "[#{ status }] #{ message }" }
     end
   end
 

data/lib/rbbt/rest/common/render.rb

@@ -40,13 +40,13 @@ module RbbtRESTHelpers
     if layout_file
       Haml::Engine.new(Open.read(layout_file), :filename => layout_file, :ugly => production?).render(self, locals) do
         cache(cache, locals.merge(:_template_file => template_file, :user => user).merge(cache_options)) do
-          Log.debug("Rendering #{template_file} with layout")
+          Log.debug{ "Rendering #{template_file} with layout" }
           Haml::Engine.new(Open.read(template_file), :filename => template_file, :ugly => production?).render(self, locals)
         end
       end
     else
       cache(cache, locals.merge(:_template_file => template_file, :user => user).merge(cache_options)) do
-        Log.debug("Rendering #{template_file} without layout")
+        Log.debug{ "Rendering #{template_file} without layout" }
         Haml::Engine.new(Open.read(template_file), :filename => template_file, :ugly => production?).render(self, locals)
       end
     end

data/lib/rbbt/rest/common/resources.rb

@@ -36,7 +36,7 @@ module RbbtRESTHelpers
       filename = File.join(settings.file_dir, "all_js-#{md5}.js")
 
       if not File.exists?(filename)
-        Log.debug("Regenerating JS Compressed file: #{ filename }")
+        Log.debug{ "Regenerating JS Compressed file: #{ filename }" }
 
         text = recorded_js_files.collect{|file| 
           begin

data/lib/rbbt/rest/common/users.rb

@@ -13,7 +13,7 @@ module Sinatra
       def authorize!
         return true if authorized?
         target_url = request.env["REQUEST_URI"]
-        Log.warn("Unauthorized access to #{target_url}")
+        Log.warn{ "Unauthorized access to #{target_url}" }
         session[:target_url] = target_url
         redirect '/login' 
       end
@@ -51,7 +51,7 @@ module Sinatra
         pass = params[:pass]
 
         if settings.users.include?(user) and settings.users[user] == pass
-          Log.warn("Successful login #{[user, pass] * ": "}")
+          Log.warn{ "Successful login #{[user, pass] * ": "}" }
           session[:authorized] = true
           session[:user] = user
           if session[:target_url]
@@ -61,7 +61,7 @@ module Sinatra
             redirect '/'
           end
         else
-          Log.warn("Failed login attempt #{[user, pass] * ": "}")
+          Log.warn{ "Failed login attempt #{[user, pass] * ": "}" }
           session[:authorized] = false
           redirect '/login'
         end

data/lib/rbbt/rest/entity/locate.rb

@@ -87,12 +87,12 @@ module EntityRESTHelpers
           true
         when File.exists?(check_file)
           begin
-            Log.debug("Checking action template: #{path}")
+            Log.debug{"Checking action template: #{path}"}
             code = File.read(check_file)
             accept = eval code
             not accept
           rescue
-            Log.debug("Error Checking action template #{path}: #{$!.message}")
+            Log.debug{"Error Checking action template #{path}: #{$!.message}"}
             true
           end
         else
@@ -223,12 +223,12 @@ module EntityRESTHelpers
           true
         when File.exists?(check_file)
           begin
-            Log.debug("Checking action template: #{path}")
+            Log.debug{ "Checking action template: #{path}" }
             code = File.read(check_file)
             accept = eval code
             not accept
           rescue
-            Log.debug("Error Checking action template #{path}: #{$!.message}")
+            Log.debug{ "Error Checking action template #{path}: #{$!.message}" }
             true
           end
         else
@@ -345,12 +345,12 @@ module EntityRESTHelpers
           true
         when File.exists?(check_file)
           begin
-            Log.debug("Checking action template: #{path}")
+            Log.debug{ "Checking action template: #{path}" }
             code = File.read(check_file)
             accept = eval code
             not accept
           rescue
-            Log.debug("Error Checking action template #{path}: #{$!.message}")
+            Log.debug{ "Error Checking action template #{path}: #{$!.message}" }
             true
           end
         else

data/lib/rbbt/rest/entity/map.rb

@@ -63,7 +63,7 @@ module Entity
       begin
         RbbtRESTHelpers.load_tsv(path).first
       rescue
-        Log.error("Error loading map #{ path }: #{$!.message}")
+        Log.error{"Error loading map #{ path }: #{$!.message}"}
         nil
       end
     end

data/lib/rbbt/rest/file_server.rb

@@ -25,10 +25,13 @@ module Sinatra
 
           raise "For security reasons the file path must not leave the resource root directory" unless Misc.path_relative_to(resource.root, path)
 
-          Log.debug("Serving resource: #{[resource, directory, path, path.find] * " | "}")
+          Log.debug{"Serving resource: #{[resource, directory, path, path.find] * " | "}"}
 
-          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?
+          if create
+            raise "Directory does not exist and cannot be created" unless path.exists?
+          else
+            raise "Directory does not exist" unless Open.exists? path.find
+          end
 
           headers['Content-Encoding'] = 'gzip'
           stream do |out|
@@ -60,7 +63,7 @@ module Sinatra
 
           raise "For security reasons the file path must not leave the resource root directory" unless Misc.path_relative_to(resource.root, path)
 
-          Log.debug("Resource: #{[resource, file, path, path.find] * " | "}")
+          Log.debug{"Resource: #{[resource, file, path, path.find] * " | "}"}
 
           raise "File does not exist and can not create it" unless path.exists?
 

data/lib/rbbt/rest/main.rb

@@ -42,7 +42,7 @@ module Sinatra
         set :allow_headers, ['URI']
 
         before do
-          Log.info("#{request.request_method} #{request.ip}: " << request.path_info << ". Params: " << Misc.fingerprint(params))
+          Log.info{ "#{request.request_method} #{request.ip}: " << request.path_info << ". Params: " << Misc.fingerprint(params) }
           process_common_parameters
 
           if profile
@@ -51,7 +51,7 @@ module Sinatra
         end
 
         after do
-          Log.info("#{request.request_method} #{request.ip}: " << request.path_info << ". Status: " << response.status.to_s)
+          Log.info{ "#{request.request_method} #{request.ip}: " << request.path_info << ". Status: " << response.status.to_s }
 
           if profile
             result = RubyProf.stop
@@ -60,7 +60,7 @@ module Sinatra
             dir = settings.file_dir
             FileUtils.mkdir_p dir unless File.exists? dir
             printer.print(:path => dir, :profile => 'profile')
-            Log.info("Profile saved at #{ dir }: #{request.env["REQUEST_URI"]}")
+            Log.info{ "Profile saved at #{ dir }: #{request.env["REQUEST_URI"]}" }
           end
           response.header["URI"] = request.env["REQUEST_URI"]
         end
@@ -93,7 +93,7 @@ module Sinatra
 
           @cache_type = production? ? :synchronous : :none
           cache('css', :_template_file => file, :_send_file => true) do
-            Log.debug("Rendering stylesheets")
+            Log.debug{ "Rendering stylesheets" }
             renderer = Sass::Engine.new(Open.read(file), :filename => file, 
                                         :style => production? ? :compressed : nil, 
                                         :debug_info => development? ? true : false)

data/lib/rbbt/rest/workflow.rb

@@ -37,7 +37,7 @@ module Sinatra
 
       add_workflow_resource(workflow) if add_resource
 
-      Log.debug("Adding #{ workflow } to REST server")
+      Log.debug{ "Adding #{ workflow } to REST server" }
 
       self.instance_eval workflow.libdir.lib['sinatra.rb'].read, workflow.libdir.lib['sinatra.rb'].find if workflow.respond_to?(:libdir) and  File.exists? workflow.libdir.lib['sinatra.rb']
 

metadata

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