rbbt-rest 1.8.30 → 1.8.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9230db28ce95fa06fb96cfb4d58005af043b677f
-  data.tar.gz: a8967b87caa817f847d60cb9c915ae5186e0d1f4
+  metadata.gz: 789edcb774536a07b918951440c7150312a58313
+  data.tar.gz: 5c39a7b0157d6e5c825125bbad3c578039925cb1
 SHA512:
-  metadata.gz: f6d4e3a0229529c575968285f014b2da0d1da953d91acc036731a5b5069196a88613042e5907471205d9bf1afbaf3a60fe86678416a44a0865ecc5bd0c1e3081
-  data.tar.gz: 786a8ff78bee2660dd16106cf87b4e0bad7c9a619accf9824e0cc4d0c193ace5717f6ef41802f75f2839fe6ffb8aedf73333033c0d197a7d3b5728a09803600d
+  metadata.gz: 87c1c2465deb8abf238270933df0b25f30225e497d64b2a693c2f7e42a4eb3ae20e894ef1dc6caf79a16847d1f6dd51dd04d51c43d3481dc9f2803f589802b4b
+  data.tar.gz: 17ec51cb37b07363bd5a76d79c45ec22cebe6ab5e1115b983f9ae35a9d83029abbf696e2136a6b453f6bd2cb5378746b8b5c6e14438e7a804d16a3634e125c0a

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

@@ -135,18 +135,23 @@ module RbbtRESTHelpers
         else
           send_file fragment_file
         end
-      else
-        if File.exists?(fragment_file + '.error') 
-          klass, _sep, message = Open.read(fragment_file + '.error').partition(": ")
-          backtrace = Open.read(fragment_file + '.backtrace').split("\n")
-          exception =  Kernel.const_get(klass).new message || "no message"
-          exception.set_backtrace backtrace
-          raise exception
-          #halt 500, html_tag(:span, File.read(fragment_file + '.error'), :class => "message") + 
-          #  html_tag(:ul, File.read(fragment_file + '.backtrace').split("\n").collect{|l| html_tag(:li, l)} * "\n", :class => "backtrace") 
-        else
+      elsif Open.exists?(fragment_file + '.error') 
+        klass, _sep, message = Open.read(fragment_file + '.error').partition(": ")
+        backtrace = Open.read(fragment_file + '.backtrace').split("\n")
+        exception =  Kernel.const_get(klass).new message || "no message"
+        exception.set_backtrace backtrace
+        raise exception
+        #halt 500, html_tag(:span, File.read(fragment_file + '.error'), :class => "message") + 
+        #  html_tag(:ul, File.read(fragment_file + '.backtrace').split("\n").collect{|l| html_tag(:li, l)} * "\n", :class => "backtrace") 
+      elsif Open.exists?(fragment_file + '.pid') 
+        pid = Open.read(fragment_file + '.pid')
+        if Misc.pid_exists?(pid.to_i)
           halt 202, "Fragment not completed"
+        else
+          halt 500, "Fragment aborted"
         end
+      else
+        halt 500, "Fragment not completed and no pid file"
       end
     end
 

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

@@ -122,6 +122,7 @@ module RbbtRESTHelpers
           end
           Kernel.exit! 0
         }
+        Open.write(fragment_file + '.pid', pid.to_s)
 
         url = request.fullpath
         url = remove_GET_param(url, "_update")

data/lib/rbbt/rest/workflow.rb

@@ -192,7 +192,7 @@ module Sinatra
 
         job = workflow.load_id(File.join(task, job))
 
-        raise RbbtException.new "Job not found" unless job.done? or job.started?
+        raise RbbtException.new "Job not found: #{job.path}" unless job.started?
 
         begin
           check_step job unless job.done?

data/share/views/public/js/helpers/helpers.js

@@ -23,12 +23,23 @@ function add_parameters(url, parameters){
 }
 
 function add_parameter(url, parameter, value){
- var url = remove_parameter(url, parameter)
+ var url = remove_section_hash(url)
+ url = remove_parameter(url, parameter)
  url = add_parameters(url, parameter + "=" + value)
  return url;
 }
 
+function remove_section_hash(url){
+ if (url.match("#")){
+   return url.replace(/#.*/,'')
+ }else{
+   return url
+ }
+}
+
 function remove_parameter(url, parameter){
+ var url = remove_section_hash(url)
+
  if (url.match("&" + parameter + "=")){
   return url.replace("&" + parameter + "=", '&REMOVE=').replace(/REMOVE=[^&]+/, '').replace(/\?&/, '?').replace(/&&/, '&').replace(/[?&]$/, '');
  }else{

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.8.30
+  version: 1.8.31
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-01 00:00:00.000000000 Z
+date: 2016-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -202,75 +202,6 @@ files:
 - share/views/compass/card_templates.sass
 - share/views/compass/layout.sass
 - share/views/compass/misc.sass
-- share/views/compass/old/base/backgrounds.sass
-- share/views/compass/old/base/blocks.sass
-- share/views/compass/old/base/color.sass
-- share/views/compass/old/base/colors.sass
-- share/views/compass/old/base/font-scale.sass
-- share/views/compass/old/base/fonts.sass
-- share/views/compass/old/base/hide.sass
-- share/views/compass/old/base/icon_content.scss
-- share/views/compass/old/base/icons.sass
-- share/views/compass/old/base/material.sass
-- share/views/compass/old/base/misc.sass
-- share/views/compass/old/base/screen_sizes.sass
-- share/views/compass/old/base/text.sass
-- share/views/compass/old/base/util.sass
-- share/views/compass/old/base/variables.sass
-- share/views/compass/old/base/variables/color.sass
-- share/views/compass/old/blocks.sass
-- share/views/compass/old/cards.sass
-- share/views/compass/old/color.sass
-- share/views/compass/old/color/blocks.sass
-- share/views/compass/old/color/buttons.sass
-- share/views/compass/old/color/elements.sass
-- share/views/compass/old/color/font.sass
-- share/views/compass/old/color/top_bar.sass
-- share/views/compass/old/elements.sass
-- share/views/compass/old/elements/buttons.sass
-- share/views/compass/old/elements/forms.sass
-- share/views/compass/old/elements/lists.sass
-- share/views/compass/old/elements/materials.sass
-- share/views/compass/old/elements/movement.sass
-- share/views/compass/old/elements/positions.sass
-- share/views/compass/old/elements/table.sass
-- share/views/compass/old/elements/tool.sass
-- share/views/compass/old/grid.sass
-- share/views/compass/old/init.sass
-- share/views/compass/old/layout.sass
-- share/views/compass/old/layout/body.sass
-- share/views/compass/old/layout/footer.sass
-- share/views/compass/old/layout/result.sass
-- share/views/compass/old/layout/reveal.sass
-- share/views/compass/old/layout/top_bar.sass
-- share/views/compass/old/layout/top_menu.sass
-- share/views/compass/old/menu.sass
-- share/views/compass/old/menu/accordion_menu.sass
-- share/views/compass/old/menu/actionable.sass
-- share/views/compass/old/menu/dropdown_menu.sass
-- share/views/compass/old/menu/hide.sass
-- share/views/compass/old/menu/menu.sass
-- share/views/compass/old/menu/tab_menu.sass
-- share/views/compass/old/menu/top_bar.sass
-- share/views/compass/old/menu/vertical_menu.sass
-- share/views/compass/old/mixins/_all.sass
-- share/views/compass/old/mixins/_blocks.sass
-- share/views/compass/old/mixins/_compass.sass
-- share/views/compass/old/mixins/_deps.sass
-- share/views/compass/old/mixins/_hide.sass
-- share/views/compass/old/mixins/_keyframes.scss
-- share/views/compass/old/mixins/_semantic-ui.sass
-- share/views/compass/old/new.sass
-- share/views/compass/old/offcanvas.sass
-- share/views/compass/old/position/basic.sass
-- share/views/compass/old/responsive.sass
-- share/views/compass/old/semantic-ui.css
-- share/views/compass/old/semantic-ui/semantic-ui.css
-- share/views/compass/old/space/button.sass
-- share/views/compass/old/table.sass
-- share/views/compass/old/text.sass
-- share/views/compass/old/variables/colors.sass
-- share/views/compass/old/variables/sizes.sass
 - share/views/compass/screen_sizes.sass
 - share/views/compass/tab_menu.sass
 - share/views/entity/Default.haml

data/share/views/compass/old/base/backgrounds.sass

@@ -1,41 +0,0 @@
-%background-white
-  background: white
-  a:not([href="#"])
-    color: $color-link
-
-%background-main
-  background: $color-background-main
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-subtle
-  background: $color-background-subtle
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-glassy
-  background: $color-background-glassy
-
-%background-hover
-  background: $color-background-hover
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-active
-  background: $color-background-active
-  &, a:not([href="#"])
-    color: white
-  
-%background-error
-  background: $color-background-error
-  color: $color-accent
-  & > a
-    color: $color-accent
-  
-=subtle_background
-  @extend %background-subtle
-
-=white_background
-  @extend %background-white
-
-

data/share/views/compass/old/base/blocks.sass

@@ -1,92 +0,0 @@
-@import "susy"
-@import "base/misc"
-@import "base/screen_sizes"
-@import "base/colors"
-@import "base/material"
-@import "base/hide"
-
-=raisable($depth: 1)
-  &.show, &.active
-    +material($depth)
-
-=border( $size: 1px, $padding: 0.25 ) 
-  +rhythm-borders($size,$padding)
-  border-color: $subtle-border
-  &:hover
-    border-color: darken($subtle-border, 20)
-
-=block
-  text-overflow: ellipsis
-  @media #{$only-small}
-    width: 100% 
-
-=padded_block($padsize: 1 of 50, $verticalpad: 1)
-  padding: 16px
-
-=medium_size
-  @media #{$only-small}
-    width: 100% !important
-  @media #{$not-very-large}
-    width: span(1 of 2)
-  @media #{$only-very-large}
-    width: span(1 of 3)
-
-=full_block
-  +block
-  width: 100%
-  overflow: show
-  text-overflow: show
-
-=large_block
-  +block
-  @media #{$only-very-large}
-    +gallery(1 of 2)
-
-=medium_block
-  +block
-  @media #{$not-small}
-    +gallery(1 of 2)
-  @media #{$only-large}
-    +gallery(1 of 3)
-  &.masonry
-    @media #{$only-very-large}
-      +gallery(1 of 4)
-
-=small_block
-  +block
-  @media #{$not-small}
-    +gallery(1 of 2)
-  @media #{$only-very-large}
-    +gallery(1 of 4)
-  &.masonry
-    +gallery(1 of 2)
-    @media #{$only-large}
-      +gallery(4 of 12)
-    @media #{$only-very-large}
-      +gallery(1 of 5)
-
-=ease_margin
-  @include transition-property(margin)
-  @include transition-duration(3s)
-  @include transition-timing-function(ease-in)
-=ease_width
-  @include transition-property(width)
-  @include transition-duration(3s)
-  @include transition-timing-function(ease-in)
-=ease_height
-  @include transition-property(border)
-  @include transition-property(max-height)
-  @include transition-duration(1s)
-  @include transition-timing-function(ease-in)
-=ease_color
-  @include transition-property(color)
-  @include transition-duration(3s)
-  @include transition-timing-function(ease-in)
-
-=ease
-  @include transition-property(top)
-  @include transition-duration(0.6s)
-  @include transition-timing-function(ease-in)
-  
-=boxed
-  +padded_block

data/share/views/compass/old/base/color.sass

@@ -1,66 +0,0 @@
-@import "base/variables/color"
-
-=subtle_color
-  color: $subtle_color
-
-=gold
-  color: gold
-
-=error
-  color: red
-
-$background-transparent: 0.15
-
-$color-background-main: $color-one
-$color-background-alt: $color-one
-
-$color-background-subtle: tint($color-background-alt, 40)
-$color-background-glassy: transparentize($color-background-subtle, 0.18)
-
-$color-background-button: #c9c9c9
-$color-background-active: shade($color-background-button, 40)
-$color-background-hover: shade($color-background-button, 20)
-$color-background-inactive: transparentize($color-background-button, 0.80)
-$color-background-error: $color-accent
-
-%background-white
-  background: white
-  a:not([href="#"])
-    color: $color-link
-
-%background-main
-  background: $color-background-main
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-subtle
-  background: $color-background-subtle
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-glassy
-  background: $color-background-glassy
-
-%background-hover
-  background: $color-background-hover
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-active
-  background: $color-background-active
-  &, a:not([href="#"])
-    color: white
-  
-%background-error
-  background: $color-background-error
-  color: $color-accent
-  & > a
-    color: $color-accent
-  
-=subtle_background
-  @extend %background-subtle
-
-=white_background
-  @extend %background-white
-
-

data/share/views/compass/old/base/colors.sass

@@ -1,66 +0,0 @@
-@import "base/variables/color"
-
-=subtle_color
-  color: $subtle_color
-
-=gold
-  color: gold
-
-=error
-  color: red
-
-$background-transparent: 0.15
-
-$color-background-main: $color-one
-$color-background-alt: $color-one
-
-$color-background-subtle: tint($color-background-alt, 40)
-$color-background-glassy: transparentize($color-background-subtle, 0.18)
-
-$color-background-button: tint($color-background-subtle, 20)
-$color-background-active: shade($color-background-button, 40)
-$color-background-hover: shade($color-background-button, 20)
-$color-background-inactive: transparentize($color-background-button, 0.80)
-$color-background-error: $color-accent
-
-%background-white
-  background: white
-  a:not([href="#"])
-    color: $color-link
-
-%background-main
-  background: $color-background-main
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-subtle
-  background: $color-background-subtle
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-glassy
-  background: $color-background-glassy
-
-%background-hover
-  background: $color-background-hover
-  a:not([href="#"])
-    color: $color-link-alt
-
-%background-active
-  background: $color-background-active
-  &, a:not([href="#"])
-    color: white
-  
-%background-error
-  background: $color-background-error
-  color: $color-accent
-  & > a
-    color: $color-accent
-  
-=subtle_background
-  @extend %background-subtle
-
-=white_background
-  @extend %background-white
-
-