rbbt-rest 1.2.31 → 1.2.32

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWMyY2U0NDU1YWMxYzA1ZjNiZmViMjRkMjk1OGMzMjk2NWRhNWVhNA==
+    NzEzMGEwYjRiMWZmZDBmMjVkNjFmYmQyMTBlNTVkMTNjZDJmODk1Ng==
   data.tar.gz: !binary |-
-    ZWYzMjRiNzE1ZTIyYzMwMTZjMThkMTYzYWYxMDhhNDhjMjJmMmU0Yg==
+    ZGJhN2RjODFmNjEzMzg4ODc5YTUyODM2NDhlZTFmZTJmMDE3MWU1ZQ==
 SHA512:
   metadata.gz: !binary |-
-    NTRkZmQ3MGFiMDU3NDA1OGMzNjc0Mjk4ZWMzMmJmMDI5MzEzNTBkMzVkNDM3
-    OGNkZjYzZmVkZWExZDM2YmU4YWVhODM1Mzk0M2Q0YTIyMTVkYzhkYWNkODRj
-    NTQyMzRmNDQ2MGZkYWZhZmI0NjRjZWFiN2MwYjVhZDZhOGZmNjM=
+    ODkzOGU0NGY3ZjgyODNmNWQ4OTAxM2EyY2RlODk1MWRhNzc3MGNlYjAzNGNk
+    ZjYwMWQ2MTA5ZDQ5ZGY4M2U1NzA4YjQ2MTEyNGEyYzIwNTc5MDY1MTQxZWUx
+    Y2UzNWE1OGE5ZDdkY2E2MjAyNzRlNTNhZjA3MDgwZDVhOWZhYzQ=
   data.tar.gz: !binary |-
-    N2ZjM2JhOTMyMjBjYWJjNWQ4OWY5YzM0MWY3NzQzZWNlODBkZTBmYjUyZGY3
-    YmYzY2RmYzg1NTVmNGU3NjAwMGViZWFhN2U3YzRmMzE5ZTQzZjQxNjMzODQ3
-    YzkyYjcyY2Q1OWNlMTQ3ZWQ1NGU2NzE1ZGU2NDE1OWQyMWE3ODM=
+    MjM1ZDA3OWVhMTg3OGNjNGFmZTYwN2QyMTYwNzFjMjU5ZWYzNDg1NjlkOWNk
+    NzEzNDAyOGExM2FhYWNhNTU0MGE0MWYyODY4NzEzNmM4ZGE0YTU0YWNiMDE0
+    ZmU0NTNjYTQzY2NhZWIxNTA1ZWZlNjgxZGRmNWE1YjQyODQ5MGY=

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

@@ -37,6 +37,10 @@ module RbbtRESTHelpers
 
     self.instance_variable_set("@step", step)
 
+    if @file
+      send_file step.file(@file), :filename => @file
+    end
+
     # Return fragment
 
     if @fragment
@@ -108,6 +112,13 @@ module RbbtRESTHelpers
       step.clean 
     end
 
+    clean_url = request.url
+    clean_url = remove_GET_param(clean_url, :_update)
+    clean_url = remove_GET_param(clean_url, :_)
+
+    class << step; def url; @url; end; end
+    step.instance_variable_set(:@url, clean_url)
+
     # Issue
     if not step.started?
       if cache_type == :synchronous or cache_type == :sync
@@ -117,12 +128,8 @@ module RbbtRESTHelpers
       end
     end
 
-
     if update == :reload
-      url = request.url
-      url = remove_GET_param(url, :_update)
-      url = remove_GET_param(url, :_)
-      redirect to(url)
+      redirect to(clean_url)
     end
 
     # Monitor

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

@@ -59,6 +59,7 @@ module RbbtRESTHelpers
     @_ = consume_parameter(:_)
 
     @fragment = consume_parameter(:_fragment)
+    @file     = consume_parameter(:_file)
 
     @excel_use_name     = consume_parameter(:_excel_use_name)
     @excel_sort_by      = consume_parameter(:_excel_sort_by)

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

@@ -1,5 +1,6 @@
 require 'rbbt/util/misc'
 require 'rbbt/rest/common/cache'
+require 'tilt'
 
 module RbbtRESTHelpers
   def error_for(job, layout = nil)
@@ -38,16 +39,19 @@ module RbbtRESTHelpers
     layout_file = layout_file.find if layout_file.respond_to? :find
     template_file = template_file.find if layout_file.respond_to? :find
     if layout_file
-      Haml::Engine.new(Open.read(layout_file), :filename => layout_file, :ugly => production?).render(self, locals) do
+      #Haml::Engine.new(Open.read(layout_file), :filename => layout_file, :ugly => production?).render(self, locals) do
+      Tilt::HamlTemplate.new(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" }
-          Haml::Engine.new(Open.read(template_file), :filename => template_file, :ugly => production?).render(self, locals)
+          #Haml::Engine.new(Open.read(template_file), :filename => template_file, :ugly => production?).render(self, locals)
+          Tilt::HamlTemplate.new(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" }
-        Haml::Engine.new(Open.read(template_file), :filename => template_file, :ugly => production?).render(self, locals)
+        #Haml::Engine.new(Open.read(template_file), :filename => template_file, :ugly => production?).render(self, locals)
+        Tilt::HamlTemplate.new(template_file, :filename => template_file, :ugly => production?).render(self, locals)
       end
     end
   end
@@ -82,7 +86,8 @@ module RbbtRESTHelpers
           rescue Exception
             Open.write(fragment_file + '.error', $!.message)
             Open.write(fragment_file + '.backtrace', $!.backtrace * "\n") if $!.backtrace
-            raise $!.message
+            Log.error("Error in fragment: #{ fragment_file }")
+            raise $!
           end
         }
 

data/lib/rbbt/rest/workflow.rb

@@ -32,7 +32,7 @@ module Sinatra
     end
 
     def add_workflow(workflow, add_resource = false)
-      raise "Provided workflow is not of type Workflow" unless  Workflow === workflow or WorkflowRESTClient === workflow
+      raise "Provided workflow is not of type Workflow" unless  Workflow === workflow 
       RbbtRESTWorkflow::WORKFLOWS.push workflow unless RbbtRESTWorkflow::WORKFLOWS.include? workflow
 
       add_workflow_resource(workflow) if add_resource

data/share/views/compass/entity_card.sass

@@ -43,7 +43,5 @@
         +grid-column(9, $float:right, $last_column: true)
       padding-right: 0px !important
 
-    & > .actions
-      .action_controller
-        > ul
-          +clean_list
+    & > .content > .actions
+      clear: both

data/share/views/compass/rbbt/menu.sass

@@ -147,6 +147,7 @@
 
 =rbbt_accordion($color_bg: $color_menu_bg, $color_text: $color_menu_text,  $color_item_bg: $color_menu_item_bg, $color_item_text: $color_menu_item_text, $color_content_bg: lighten($color_menu_content_bg, 55), $color_content_text: $color_menu_content_text, $z-index: $z-index_menu_content)
   +clearfix
+  clear: both 
   margin: 0
   background-color: $color_bg
   & > dt

data/share/views/error.haml

@@ -1,7 +1,7 @@
 %h5 Error processing #{File.basename(job.name)}
 - if job.messages and job.messages.any?
   %span.error_message
-    %pre= job.messages[-2]
+    %pre= CGI.escapeHTML(job.messages[-2])
 - backtrace = job.info[:backtrace]
 
 %hr

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.2.31
+  version: 1.2.32
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake