rbbt-rest 1.8.96 → 1.8.97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '0429c45627c2177b14bb51e6a648f162394873db'
-  data.tar.gz: c96ed9340c6998578a371cdcf899a39bf1ae9434
+  metadata.gz: e6c9bc522c1da20b8383d2096839c3114832bba3
+  data.tar.gz: 6974f5eba8ffe5e5e9572326bfe8a2b6b2bad1e5
 SHA512:
-  metadata.gz: 93ecbc69ba55b7607a092fa84ec846dff70970cda74580e52c7538737df3be15478229cdb2b527cee4dbbced7afda99246c5c0e66ad39a788b0a57b6e1147447
-  data.tar.gz: 8a1c4ecc6ba94b28348f7f0f784bca9d702415baf36b6aad0580a387e6e986a6788c94345caee5e1d9c4dafaa13f5d533fdf3c6fc0a70df632ffd65be5fc9d6e
+  metadata.gz: a48924091212132a9a75f042937100eb432b9c43b49c5e2329af69154dd0b403cacdd7c06454a596e3a1aba4ca6cb8abbed489201c9c5f04eafd7669d08bffc0
+  data.tar.gz: effb02baf732cfe5ed9b3ffad5977d675cf0a37bbb86915e9cb2c39399c5ecbc861f45d7b4bcfafb9eedb5eb81ab5589555e2cfa060be181dc9d6dff84559fb1

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

@@ -197,7 +197,6 @@ module RbbtRESTHelpers
           EOF
           send_file png_file, :type => 'image/png', :filename => fragment_file + ".heatmap.png"
         else
-          content_type "text/html"
 
           require 'mimemagic'
           mime = nil
@@ -217,7 +216,25 @@ module RbbtRESTHelpers
             end
           end
 
-          content_type mime if mime
+          if mime.nil?
+            txt = Open.read(fragment_file)
+            if txt =~ /<([^> ]+)[^>]*>.*<\/\1>/sm
+              mime = "text/html"
+            else
+              begin
+                JSON.parse(txt)
+                mime = "application/json"
+              rescue
+              end
+            end
+          end
+
+          if mime
+            content_type mime 
+          else
+            content_type "text/plain"
+          end
+
           send_file fragment_file
         end
       elsif Open.exists?(fragment_file + '.error') 

data/share/views/entity_partials/action_controller.haml

@@ -23,7 +23,7 @@
       .ui.buttons.action_menu
         - last_resource = nil
         - controller.actions.each do |action, text, resource, params|
-          //.ui.item.button(class="#{last_resource and last_resource != resource ? "new_resource" : ""}" attr-resource="#{resource}")
+          -#.ui.item.button(class="#{last_resource and last_resource != resource ? "new_resource" : ""}" attr-resource="#{resource}")
           - case
           - when AnnotatedArray === entity
             - id = params.delete :id if Hash === params

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

@@ -46,6 +46,10 @@ rbbt.ajax = function(params){
     params.config = config
   }
 
+  if (params.json == false){
+    params.deserialize = function(body){ return body }
+  }
+
   // circunvent m.request parametrizeUrl
 
   params.url.replace(/:[a-z]\w+/gi, function(token){
@@ -53,8 +57,17 @@ rbbt.ajax = function(params){
     params.data[token.slice(1)] = token
   })
 
+
   req = m.request(params)
 
+  if (undefined !== params.success || undefined !== params.error){
+    req = req.then(params.success, params.error);
+  }
+    
+  if (undefined !== params.complete){
+    req = req.then(params.complete);
+  }
+
   return req
 }
 

metadata

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