rbbt-rest 1.7.14 → 1.7.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce8c4aa907a83faab847c02de0a07aa2a762c8d2
-  data.tar.gz: f59aa870c35fe2616b67c2d8cc8ed7e2e77aa136
+  metadata.gz: d7bb233c1577c8a190d0bcdacd86f8014620de6f
+  data.tar.gz: 6989d8b3be1b51a817022fa35ee2f8124ff5dc87
 SHA512:
-  metadata.gz: 5c4e572157f16516c0c2545e35a5a0848cbc52e9dca8daa543f3ba598dcb05bdc351249ff0fe034ab9aee8fe13ef45fe11d5efa5fa795be3ae1dcdef0def3e31
-  data.tar.gz: 06dee8abc4d12ca0a63807d18843f43177c2c97dc71c3a7f8dfde44ab4cbac5a90e5e0cb5a7b4058078771b5c6587872083a47712e843ef356c2c06f4f205642
+  metadata.gz: 9963a51751edb4971bd7c87309010299f7f1f449c4e5a29bec3cf59e402919816ed648dd84fae44d779e204924c2e8eeea01c3f33f472c7f507e746417909a96
+  data.tar.gz: 6e0a31491b8046ca5e2dc34b799772a88c9547592c66627fe1c076bc30a66aeffb654d77b3ccc941ef13fcf02809e020189f447cbd167760288ee7d8d2240eb1

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

@@ -222,7 +222,14 @@ module RbbtRESTHelpers
   end
 
   def remove_GET_param(url, param)
-    url.gsub(/&?#{param}=[^&]+/,'').sub(/\?$/, '')
+    if Array === param
+      param.each do |p|
+        url = remove_GET_param(url, p)
+      end
+      url
+    else
+      url.gsub(/&?#{param}=[^&]+/,'').sub(/\?$/, '')
+    end
   end
 
   def add_GET_param(url, param, value)

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

@@ -174,27 +174,37 @@ module RbbtRESTHelpers
     text ||= filename
 
     filename = Misc.sanitize_filename(filename)
-    f = settings.file_dir[filename].find
+
+    if @step
+      url = add_GET_param(remove_GET_param(@fullpath, ["_update", "_"]), "_fragment", "html_resources/#{ filename }")
+      f = @step.file(:html_resources)[filename].find
+    else
+      url = "/files/#{ filename }"
+      f = settings.file_dir[filename].find
+    end
+
     FileUtils.mkdir_p(File.dirname(f))
+
     yield(f)
 
+
     type ||= :link
     case type
     when :image
-      "<img src='/files/#{ filename }' alt='#{text}' class='file_resource'/>"
+      "<img src='#{url}' alt='#{text}' class='file_resource'/>"
     when :link
-      "<a href='/files/#{ filename }' class='file_resource'>#{ text }</a>"
+      "<a href='#{url}' class='file_resource'>#{ text }</a>"
     when :linked_image
-      "<a href='/files/#{ filename }' class='file_resource' target='_blank'><img src='/files/#{ filename }' class='file_resource'/></a>"
+      "<a href='#{url}' class='file_resource' target='_blank'><img src='#{url}' class='file_resource'/></a>"
     when :zoomable_image
       id = options[:id] || Misc.digest(filename)
       width, height= [600, 600]
-      "<div class='zoomable_image'><img id='#{id}' style='width:#{width}px; height:#{height}px' rel='/files/#{ filename }' src='/files/#{ filename }' class='file_resource'/></div>"
+      "<div class='zoomable_image'><img id='#{id}' style='width:#{width}px; height:#{height}px' rel='#{url}' src='#{url}' class='file_resource'/></div>"
     when :mapped_image
       mapid = options[:mapid] || options[:id] + '_map'
       width, height= [300, 300]
       mapfile = f.sub(/\.[^.]+$/, '.html')
-      "<div class='mapped_image'>#{Open.read(mapfile)}<img class='has_map' usemap='##{mapid}' rel='/files/#{ filename }' src='/files/#{ filename }' class='file_resource'/></div>"
+      "<div class='mapped_image'>#{Open.read(mapfile)}<img class='has_map' usemap='##{mapid}' rel='#{url}' src='#{url}' class='file_resource'/></div>"
     else
       raise "Type not understood: #{ type }"
     end

data/lib/rbbt/rest/knowledge_base.rb

@@ -7,11 +7,14 @@ require 'rbbt/rest/knowledge_base/query'
 require 'rbbt/rest/knowledge_base/helpers'
 require 'rbbt/rest/knowledge_base/locate'
 require 'rbbt/rest/knowledge_base/render'
+require "sinatra/multi_route"
 
 module Sinatra
   module RbbtRESTKnowledgeBase
     def self.registered(base)
       base.module_eval do
+        register Sinatra::MultiRoute
+
         include RbbtRESTHelpers
         include KnowledgeBaseRESTHelpers
 

data/lib/rbbt/rest/main.rb

@@ -221,7 +221,7 @@ module Sinatra
           file = locate_file(Path.setup('public')[filename])
           send_file file.find
         end
-        
+
         require 'rbbt/rest/monitor'
         register Sinatra::RbbtRESTMonitor
       end

data/share/views/partials/table.haml

@@ -50,9 +50,9 @@
           - field = header ? header[i] : nil
           - val = table_value(value, field, :list_id => list_id, :unnamed => unnamed, :entity_options => entity_options, :span => span)
           - case val.to_s
-          - when 'true'
+          - when 'true', 'Yes', 'yes'
             %td.true= val.to_s
-          - when 'false'
+          - when 'false', 'No', 'no'
             %td.false= val.to_s
           - else
             %td= Float === val ? "%.5g" % val : val.to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.7.14
+  version: 1.7.15
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-21 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake