rbbt-rest 1.4.13 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f6369a018efc715d4d43812781989fc9c81e0be
-  data.tar.gz: fd448c6fb71b1b145a2eb03291e2a55b9266677e
+  metadata.gz: 373227cb24541cc0b77e52a7228c1e8b4f7dafc8
+  data.tar.gz: f4fcde8a61a88c37f99e4e3ab64cc2b413eba217
 SHA512:
-  metadata.gz: 805eaf6fbefae98774f067f47ab2da03fe14f041772017cc602151ccce5b64368954fb627210a4b4645f74b446e2fc0cc3ced93ffe43319980a8ada0d3c7bb5b
-  data.tar.gz: fadc91b35639e826b830b68cbef1a40f793ba2291256361869bdaf65464f1a995524703dd6ac6d70e6f888bc4a3735b8646453c0cbd55b906eee9ac785a36958
+  metadata.gz: f1f78d6a708dee3e21eea2cfe7825d951babf1bb6f226322a33fd1ad36245787344e205bd45c2b5730bb0d471f33c579c834052b12e32e05f585440b6dcc4f42
+  data.tar.gz: 1fb872b28cffc3bf7b656fbde9318fb201193bdcf811390327524d277cd15ad8dc3826befde3bea35d76f5372375a501bcf92f52ec0d3240cac804b5b1e0b696

data/Rakefile

@@ -15,7 +15,7 @@ begin
     gem.add_dependency('rake')
     gem.add_dependency('sinatra')
     gem.add_dependency('modular-scale')
-    gem.add_dependency('zurb-foundation')
+    #gem.add_dependency('zurb-foundation')
     gem.add_dependency('compass')
     gem.add_dependency('json')
     gem.add_dependency('haml')

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

@@ -31,7 +31,7 @@ module RbbtRESTHelpers
     @layout = false if @layout.nil? and     @ajax
     @layout = true  if @layout.nil? and not @ajax
     @layout = false if @layout == "false"
-    @layout = true if @layout == "true"
+    @layout = true  if @layout == "true"
 
     @format = consume_parameter(:_format)
     @format = :html if @format.nil?

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

@@ -56,14 +56,14 @@ module RbbtRESTHelpers
     template_file = template_file.find if template_file.respond_to? :find
     if layout_file
       Tilt::HamlTemplate.new(layout_file, :filename => layout_file, :ugly => production?).render(self, locals) do
+        Log.debug{ "Rendering #{template_file} with layout" }
         cache(cache, locals.merge(:_template_file => template_file, :user => user).merge(cache_options)) do
-          Log.debug{ "Rendering #{template_file} with layout" }
           Tilt::HamlTemplate.new(template_file, :filename => template_file, :ugly => production?).render(self, locals)
         end
       end
     else
+      Log.debug{ "Rendering #{template_file} without layout" }
       cache(cache, locals.merge(:_template_file => template_file, :user => user).merge(cache_options)) do
-        Log.debug{ "Rendering #{template_file} without layout" }
         Tilt::HamlTemplate.new(template_file, :filename => template_file, :ugly => production?).render(self, locals)
       end
     end
@@ -196,12 +196,16 @@ module RbbtRESTHelpers
     end
   end
 
-  def reveal(text, id = nil, &block)
+  def reveal(text, id = nil, options = nil, &block)
     id ||= "rbbt_reveal_" << (rand * 10000).to_i.to_s
 
     content_html = capture_haml(&block)
 
-    str = html_tag('a', text.to_s, :href => "#", "data-reveal-id" => 'modal1', 'attr-reveal_id' => id, 'class' => 'rbbt_reveal_trigger') << 
+    options = {} if options.nil?
+    options = {:href => "#", "data-reveal-id" => 'modal1', 'attr-reveal_id' => id}.merge(options)
+    options[:class] ||= ''
+    options[:class] << ' rbbt_reveal_trigger'
+    str = html_tag('a', text.to_s, options) << 
           "\n" <<
           html_tag('div', "\n" << content_html << "\n", :id => id, 'class' => 'rbbt_reveal_content') << 
           "\n"

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

@@ -100,6 +100,7 @@ Ratio
 Size
 size
 Matches
+Quality
                 EOF
                ).split("\n")
 

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

@@ -37,11 +37,15 @@ module Sinatra
       end
 
       app.get '/login' do
-        "<form class='login' method='POST' action='/login'>" +
-          "<label for='login_name'>Name: </label>" +
-          "<input id='login_name' type='text' name='user'>" +
-          "<label for='login_pass'>Pass: </label>" +
-          "<input id 'login_pass' type='password' name='pass'>" +
+        "<form class='login ui form' method='POST' action='/login'>" +
+          "<div class='ui field'>" +
+          "<label for='login_name' class='ui label'>Name: </label>" +
+          "<input id='login_name' class='ui input' type='text' name='user'>" +
+          "</div>" +
+          "<div class='ui field'>" +
+          "<label for='login_pass' class='ui label'>Pass: </label>" +
+          "<input id='login_pass' class='ui input' type='password' name='pass'>" +
+          "</div>" +
           "<input type='submit'>" +
         "</form>"
       end

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

@@ -63,7 +63,7 @@ module EntityRESTHelpers
     locals[:description] = description
     locals = locals.merge(form_options)
 
-    html_tag :div, partial_render('partials/form', locals), {:class => 'action_parameters'}.merge(action_options)
+    html_tag :div, partial_render('partials/form', locals), {:class => 'action_parameters ui raised segment'}.merge(action_options)
   end
 
   def page_type(path = nil)

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

@@ -49,9 +49,7 @@ module Entity
       link_params = include_entity_params ? entity_link_params : {}
 
       %w(class style title).each do |at|
-        attributes[at.to_sym] = options.delete(at.to_sym) || 
-          options.delete(at.to_s) || 
-          nil
+        attributes[at.to_sym] = options.delete(at.to_sym) || options.delete(at.to_s) || nil
       end
 
       attributes[:class] = attributes[:class].split(" ") if String === attributes[:class]
@@ -122,6 +120,7 @@ module Entity
       #return self.tap{|a| a.extend AnnotatedArray}.collect{|e| e.link(text, options) } if Array === self
       return self.collect{|e| e.link(text, options) } if Array === self
       return self.split(";").collect{|e| self.annotate(e).link(text, options) } * ", " if self.include? ";"
+      return nil if self.empty?
 
       klasses = self.klasses
       klasses <<  'entity'
@@ -183,7 +182,8 @@ module Entity
 
       attributes, link_params = process_link_options(options)
 
-      attributes[:class] = klasses
+      attributes[:class] ||= ''
+      attributes[:class] << klasses
       attributes[:href] = Entity::REST.entity_list_url(id, entity_type.to_s)
 
       attributes[:title] = id
@@ -205,7 +205,8 @@ module Entity
 
       attributes, link_params = process_link_options({:title => [action, id] * ": " }.merge(options), false)
 
-      attributes[:class] = klasses
+      attributes[:class] ||= ''
+      attributes[:class] << klasses
       attributes[:href] = Entity::REST.entity_list_action_url(id, entity_type.to_s, action, link_params)
 
       attributes[:title] = id if attributes[:title].nil?

data/lib/rbbt/rest/main.rb

@@ -142,7 +142,7 @@ module Sinatra
           cache_control :public, :max_age => 360000 if production?
 
           cache("css: #{File.basename(file)}", :_template_file => file, :_send_file => true, :cache_type => production? ? :synchronous : :none) do
-            Log.debug{ "Rendering stylesheets" }
+            Log.debug{ "Rendering stylesheet: #{ file }" }
             render_sass(file)
           end
         end

data/share/views/compass/menu.sass

@@ -40,3 +40,4 @@
 
 #content, #modal
   +large_menus
+

data/share/views/layout/top_menu.haml

@@ -18,27 +18,3 @@
   .find.hide(hide-title="Find")
     = partial_render('layout/top_menu/finder')
 
-//:sass
-//  .dl_menu
-//    dt
-//      display: inline-block
-//      float: left
-//    
-//  body
-//    margin-top: 0 !important
-//  #top_bar
-//    .reload
-//      float: right
-//
-//#top_bar.ui.fixed.main.menu.dl_menu
-//  .title.item= $title
-//
-//  %dl.favourites.left.menu.ui.blue
-//    %dt.item(data-tab='entities') Entities
-//    %dd.en
-//    %dt.item(data-tab='lists') Lists
-//    %dl
-//  
-//  .reload.item
-//    %i.spinner.icon
-//

data/share/views/public/js/_ajax_replace.js

@@ -24,6 +24,8 @@ $.ajax = function(url, options){
     url = options['url'];
   }
 
+  url = add_parameter(url, '_layout', 'false')
+  options['url'] = url
   options["crossDomain"] = true
 
   add_ajax(url);
@@ -158,6 +160,7 @@ function replace_object(object, href, embedd, complete){
 
 function replace_link(link){
   var href = $(link).attr('href');
+  href = add_parameter(href, '_layout','false')
 
   replace_object(link, href);
 }
@@ -220,6 +223,8 @@ function capture_embedded_form(object){
       url = url.replace(/\?.*/, '?' + params);
     }
 
+    url = add_parameter(url, '_layout', 'false')
+
     embedded.attr('target-href', url).attr('form-params', params)
 
     update_embedded(embedded);

data/share/views/public/js/app.js

@@ -15,6 +15,9 @@ function update_rbbt(){
  $('#top_menu .favourites').favourites('update_list_selects').favourites('update_map_selects')
  $('#top_bar .favourites').favourites('update_list_selects').favourites('update_map_selects')
 
+ $('.ui.accordion').accordion();
+ $('.ui.checkbox').checkbox();
+
  start_deferred()
  fit_content()
 }

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

@@ -84,7 +84,7 @@ function require_js(url, success){
   if ($.inArray(url, required_js) >= 0){
     if (typeof success == 'function'){ success.call() }
   }else{
-    var _success = function(){ if (typeof success == 'function'){ success.call() }; required_js.push(url); }
+    var _success = function(){ required_js.push(url); if (typeof success == 'function'){ success.call() }; }
     $.ajax({url: url, cache:cache, dataType:'script', async: async, success: _success} ).fail(function(jqxhr, settings, exception){ console.log('Failed to load ' + url) })
   }
  }

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

@@ -60,7 +60,7 @@ $.widget("rbbt.action_controller", {
   },
 
   _toogle_track: function(){
-    if (this.element.find('ul.controls > li.url.bookmarked').length > 0){
+    if (this.element.find('.controls > .url.bookmarked').length > 0){
       this._untrack(this._url());
     }else{
       this._track();
@@ -71,34 +71,33 @@ $.widget("rbbt.action_controller", {
     var tool = this
     var controller = tool.element;
 
-    controller.on('click', '> ul.actions  li', function(e){ tool._activate_action(this); return false});
-    controller.on('click', '> ul.controls > li.reload', function(e){ tool._reload_action(this); return false});
-    controller.on('click', '> ul.controls > li.parameters', function(e){ tool._display_parameters(this); return false});
-    controller.on('click', '> ul.controls > li.description', function(e){ tool._display_description(this); return false});
-    controller.on('click', '> ul.controls > li.pin', function(e){ tool._toggle_pin(this); return false});
-    controller.on('click', '> ul.controls > li.url', function(e){ tool._toogle_track(this); return false});
-    $('#top_menu .user ul.jobs').on('click', 'a.remove_element', function(){
+    controller.on('click', '> .actions  .button', function(e){ tool._activate_action(this); return false});
+    controller.on('click', '> .controls > .reload', function(e){ tool._reload_action(this); return false});
+    controller.on('click', '> .controls > .parameters', function(e){ tool._display_parameters(this); return false});
+    controller.on('click', '> .controls > .description', function(e){ tool._display_description(this); return false});
+    controller.on('click', '> .controls > .pin', function(e){ tool._toggle_pin(this); return false});
+    controller.on('click', '> .controls > .url', function(e){ tool._toogle_track(this); return false});
+    $('#top_menu .user .jobs').on('click', 'a.remove_element', function(){
       var link = $(this).next('a')
       tool._untrack(link.attr('href'))
     })
 
     this.options.controller = controller
-    this.options.action_controls = controller.find('> ul.controls')
-    this.options.action_list = controller.find('> ul.actions')
+    this.options.action_controls = controller.find('> .controls')
+    this.options.action_list = controller.find('> .actions')
 
     this.options.complete = function(jqXHR, textStatus){
       var action_controller = tool.options.controller
-      var action_list_item = action_controller.find('li.loading, li.active')
+      var action_list_item = action_controller.find('.actions > .loading, .actions > .active')
       var action_div = action_controller.next('.action_loader');
 
       if (jqXHR.status == 202){
         if (action_div.attr('reload-attempts') != '0'){
           action_controller.removeClass('active').addClass('loading'); 
-          action_list_item.removeClass('active').addClass('loading');
 
           var response = $(jqXHR.responseText)
           var stat = response.find('span.status').html()
-          var message = response.find('ul.step_messages li:first').html()
+          var message = response.find('.step_messages li:first').html()
 
           if (undefined === message){
             action_div.html("<span class='loading'>Loading [" + stat + "] ...</span>");
@@ -107,25 +106,25 @@ $.widget("rbbt.action_controller", {
           };
         }
       }else{ 
-        action_controller.removeClass('loading').addClass('active'); 
-        action_list_item.removeClass('loading').addClass('active');
+        action_controller.removeClass('loading').removeClass('disabled'); 
+        action_list_item.removeClass('loading').removeClass('disabled');
 
-        action_controller.find('ul.controls > li.reload').addClass('active');
+        action_controller.find('.controls > .reload').removeClass('disabled');
       }
 
       var action_div = action_controller.next('.action_loader').first();
-      action_controller.find('ul.controls > li.url').addClass('active');
+      action_controller.find('.controls > .url').removeClass('disabled');
       if (action_div.find('> .action_card > .action_parameters').length > 0){
-        action_controller.find('ul.controls > li.parameters').addClass('active');
-        action_controller.find('ul.controls > li.pin').addClass('active');
+        action_controller.find('.controls > .parameters').removeClass('disabled');
+        action_controller.find('.controls > .pin').removeClass('disabled');
       }else{
-        action_controller.find('ul.controls > li.parameters').removeClass('active');
-        action_controller.find('ul.controls > li.pin').removeClass('active');
+        action_controller.find('.controls > .parameters').addClass('disabled');
+        action_controller.find('.controls > .pin').addClass('disabled');
       }
       if (action_div.find('> .action_card > .action_description').length > 0){
-        action_controller.find('ul.controls > li.description').addClass('active');
+        action_controller.find('.controls > .description').addClass('disabled');
       }else{
-        action_controller.find('ul.controls > li.description').removeClass('active');
+        action_controller.find('.controls > .description').addClass('disabled');
       }
     }
 
@@ -135,24 +134,26 @@ $.widget("rbbt.action_controller", {
 
   _update_flag: function(){
     if ($.inArray(this._url(), this.options.bookmarked) != -1){
-      $(this.element).find('> ul.controls > li.url').addClass('bookmarked')
+      $(this.element).find('> .controls > .url').addClass('bookmarked')
       }else{
-        $(this.element).find('> ul.controls > li.url').removeClass('bookmarked')
+        $(this.element).find('> .controls > .url').removeClass('bookmarked')
       }
     },
 
     _activate_action: function(e){
       var action_list_item = $(e)
-      var action_list = action_list_item.parent('ul.actions');
+      var action_list = action_list_item.parent('.actions');
       var link = action_list_item.find('> a')
+      link = action_list_item
+
 
       this._load_action(link);
 
       var action = link.html()
       if (this.options.saved[action] !== undefined){
-        $(this.element).find('> ul.controls > li.pin').addClass('saved')
+        $(this.element).find('> .controls > .pin').addClass('saved')
         }else{
-          $(this.element).find('> ul.controls > li.pin').removeClass('saved')
+          $(this.element).find('> .controls > .pin').removeClass('saved')
         }
 
         this._update_flag()
@@ -164,22 +165,22 @@ $.widget("rbbt.action_controller", {
 
       _unpin_parameters: function(){
         var controller = $(this.element)
-        var action = controller.find('ul.actions li.active a').first().html()
+        var action = controller.find('.actions .active a').first().html()
         this.options.saved[action] = undefined
-        controller.find('> ul.controls > li.pin').removeClass('saved')
+        controller.find('> .controls > .pin').removeClass('saved')
       },
 
       _pin_parameters: function(){
         var controller = $(this.element)
-        var action = $(this.element).find('ul.actions li.active a').first().html()
+        var action = $(this.element).find('.actions .active a').first().html()
         var loader = $(this.element).next('.action_loader').first();
         this.options.saved[action] = loader.attr('form-params')
-        controller.find('> ul.controls > li.pin').addClass('saved')
+        controller.find('> .controls > .pin').addClass('saved')
         this._dump()
       },
 
       _toggle_pin: function(){
-       var action = $(this.element).find('ul.actions li.active a').first().html()
+       var action = $(this.element).find('.actions .active a').first().html()
 
        if (this.options.saved[action] != undefined){
          this._unpin_parameters();
@@ -213,7 +214,7 @@ $.widget("rbbt.action_controller", {
      _reload_action: function(e){
        if(! $(e).hasClass('active')){ return false}
        var action_list_item = $(e);
-       var action_list = action_list_item.parent('ul.controls');
+       var action_list = action_list_item.parent('.controls');
        var action_controller = action_list.parent('.action_controller');
        var action_div = action_controller.next('.action_loader').first();
 
@@ -261,11 +262,13 @@ $.widget("rbbt.action_controller", {
      },
 
      _load_action: function(link){
-       var action_list_item = link.parent('li');
-       var action_list = action_list_item.parent('ul');
+       var action_list_item = link.parent('.button');
+       action_list_item = link
+       var action_list = action_list_item.parent('.menu');
        var action_controller = action_list.parents('.action_controller').first();
        var action_div = action_controller.next('.action_loader');
        var href = link.attr('href')
+       href = add_parameter(href, '_layout', 'false')
 
        var action = link.html()
        var saved = this.options.saved[action]
@@ -277,11 +280,12 @@ $.widget("rbbt.action_controller", {
 
        if( ! action_div.hasClass('reloading') ) {
          action_div.removeClass('active');
-         action_controller.find('ul.controls > li.reload').removeClass('active');
-         action_controller.find('ul.controls > li.parameters').removeClass('active');
-         action_list.find('li').removeClass('active').removeClass('loading');
-         action_list_item.addClass('loading');
+         action_controller.find('.controls > .reload').removeClass('active');
+         action_controller.find('.controls > .parameters').removeClass('active');
+         action_list.find('.button').removeClass('active').removeClass('loading');
+         action_list_item.addClass('active');
          action_controller.addClass('loading');
+
          replace_object(action_div, href, true, this.options.complete);
 
          return false

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

@@ -26,7 +26,7 @@ function favourite_type_ul(entities){
 }
 
 function favourite_list_type_ul(type, lists){
-    var type_ul = $('<ul>').addClass('lists')
+    var type_ul = $('<ul>').addClass('lists').addClass('clean_list')
     for (var list in lists){
         var list = lists[list];
         var link = list_link(type, list)

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

@@ -28,10 +28,10 @@ body.on('click', 'a.compare_list', function(){
   var list_id = page_entity_list();
 
   var type_ul = favourite_list_type_ul(type, lists).addClass("list_comparison")
-  var buttons = $('<ul class="list_comparison_buttons">')
-  buttons.append('<li><a class="intersect_lists" href="#">Intersect</a></li>')
-  buttons.append('<li><a class="remove_list" href="#">Remove</a></li>')
-  buttons.append('<li><a class="add_list" href="#">Add</a></li>')
+  var buttons = $('<div class="list_comparison_buttons ui buttons">')
+  buttons.append('<a class="intersect_lists ui compact button" href="#">Intersect</a>')
+  buttons.append('<a class="remove_list ui compact button" href="#">Remove</a>')
+  buttons.append('<a class="add_list ui compact button" href="#">Add</a>')
   type_ul.find('li').prepend(buttons)
 
   $('#modal').modal('show', type_ul);

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

@@ -10,10 +10,10 @@ $.widget("rbbt.modal", {
 
     var title = $('<div>').addClass('title')
     if (modal_title !== undefined){ title.html(modal_title) }
-    var controls = $('<div>').addClass('controls')
-    controls.append($('<a>').addClass('toggle_favourite').append($('<i>').addClass('ui icon star right')))
-    controls.append($('<a>').addClass('link-reveal-modal').append($('<i>').addClass('ui icon arrow right')))
-    controls.append($('<a>').addClass('close-reveal-modal').append($('<i>').addClass('ui icon close right')))
+    var controls = $('<div>').addClass('controls ui buttons')
+    controls.append($('<a>').addClass('toggle_favourite ui button').append($('<i>').addClass('ui icon star right')))
+    controls.append($('<a>').addClass('link-reveal-modal ui button').append($('<i>').addClass('ui icon arrow right')))
+    controls.append($('<a>').addClass('close-reveal-modal ui button').append($('<i>').addClass('ui icon close right')))
 
     var header = $('<div>').addClass('header').append(title).append(controls)
 

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

@@ -99,7 +99,7 @@ $.widget("rbbt.table", {
 
   //{{{ Pagination
   //
-  table.on('click', 'tfoot > tr > th > ul.table_pagination > li.num > a:not(.active)', function(link){
+  table.on('click', 'tfoot > tr > th > .table_pagination > .num > a:not(.active)', function(link){
    var link = $(this)
 
    var stat = tool._status()
@@ -109,7 +109,7 @@ $.widget("rbbt.table", {
    return false
   })
 
-  table.on('click', 'tfoot > tr > th > ul.table_pagination > li.arrow > a.prev', function(link){
+  table.on('click', 'tfoot > tr > th > .table_pagination > .arrow > a.prev', function(link){
    var stat = tool._status()
 
    if (stat.num > 1){ stat.num = stat.num - 1 }
@@ -119,9 +119,9 @@ $.widget("rbbt.table", {
    return false
   })
 
-  table.on('click', 'tfoot > tr > th > ul.table_pagination > li.arrow > a.next', function(evt){
+  table.on('click', 'tfoot > tr > th > .table_pagination > .arrow > a.next', function(evt){
    var stat = tool._status();
-   var last = parseInt($(this).parents('ul.table_pagination').first().find('li.num').last().find('a').html())
+   var last = parseInt($(this).parents('.table_pagination').first().find('.num').last().find('a').html())
 
    if (stat.num < last){ stat.num = stat.num + 1 }
 
@@ -130,7 +130,7 @@ $.widget("rbbt.table", {
    return false
   })
 
-  table.on('click', 'tfoot > tr > th > ul.table_pagination > li.all', function(link){
+  table.on('click', 'tfoot > tr > th > .table_pagination > .all', function(link){
    var stat = tool._status()
 
    tool._update(stat.url, '', stat.size, stat.field, stat.filter)

data/share/views/wait.haml

@@ -9,4 +9,5 @@
 
   %ul.step_messages.clean_list
     - job.messages.reverse.each do |line|
+      - next if line.nil? or line.strip.empty?
       %li= line

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbbt-rest
 version: !ruby/object:Gem::Version
-  version: 1.4.13
+  version: 1.5.0
 platform: ruby
 authors:
 - Miguel Vazquez
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: zurb-foundation
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
@@ -173,10 +159,6 @@ extra_rdoc_files:
 files:
 - LICENSE
 - Rakefile
-- lib/rbbt/rest/client.rb
-- lib/rbbt/rest/client/adaptor.rb
-- lib/rbbt/rest/client/get.rb
-- lib/rbbt/rest/client/step.rb
 - lib/rbbt/rest/common/cache.rb
 - lib/rbbt/rest/common/forms.rb
 - lib/rbbt/rest/common/locate.rb

data/lib/rbbt/rest/client.rb

@@ -1,56 +0,0 @@
-require 'rest_client'
-require 'json'
-require 'rbbt/workflow'
-require 'rbbt/workflow/step'
-require 'rbbt/util/misc'
-
-require 'rbbt/rest/client/get'
-require 'rbbt/rest/client/adaptor'
-require 'rbbt/rest/client/step'
-
-class WorkflowRESTClient 
-  include Workflow
-
-  attr_accessor :url, :name, :exec_exports, :asynchronous_exports, :synchronous_exports
-
-  def initialize(url, name)
-    Log.debug{ "Loading remote workflow #{ name }: #{ url }" }
-    @url, @name = url, name
-    init_remote_tasks
-  end
-  
-  def to_s
-    name
-  end
-
-  def job(task, name, inputs)
-    task_info = task_info(task)
-    fixed_inputs = {}
-    input_types = task_info[:input_types]
-
-    inputs.each do |k,v| 
-      k = k.to_sym
-      if TSV === v
-        fixed_inputs[k] = v.to_s
-      else
-        case input_types[k].to_sym
-        when :tsv, :array, :file, :text
-          fixed_inputs[k] = (String === v and Open.exists?(v)) ? Open.open(v) : v
-        else
-          fixed_inputs[k] = v
-        end
-      end
-    end
-
-    RemoteStep.new(url, task, name, fixed_inputs, task_info[:result_type], task_info[:result_description], @exec_exports.include?(task))
-  end
-
-  def load_id(id)
-    task, name = id.split("/")
-    step = RemoteStep.new url, task, nil
-    step.name = name
-    step.result_type = task_info(task)[:result_type]
-    step.result_description = task_info(task)[:result_description]
-    step
-  end
-end

data/lib/rbbt/rest/client/adaptor.rb

@@ -1,66 +0,0 @@
-class WorkflowRESTClient
-
-  def workflow_description
-    WorkflowRESTClient.get_raw(File.join(url, 'description'))
-  end
-
-  def documentation
-    @documention ||= IndiferentHash.setup(WorkflowRESTClient.get_json(File.join(url, "documentation"),{}))
-  end
-
-  def task_info(task)
-    @task_info ||= {}
-    @task_info[task]
-    
-    if @task_info[task].nil?
-      task_info = WorkflowRESTClient.get_json(File.join(url, task.to_s, 'info'))
-      task_info = WorkflowRESTClient.fix_hash(task_info)
-
-      task_info[:result_type] = task_info[:result_type].to_sym
-      task_info[:export] = task_info[:export].to_sym
-      task_info[:input_types] = WorkflowRESTClient.fix_hash(task_info[:input_types], true)
-      task_info[:inputs] = task_info[:inputs].collect{|input| input.to_sym }
-
-      @task_info[task] = task_info
-    end
-    @task_info[task]
-  end
-
-  def exported_tasks
-    (@asynchronous_exports  + @synchronous_exports + @exec_exports).compact.flatten
-  end
-
-  def tasks
-    @tasks ||= Hash.new do |hash,task_name| 
-      info = task_info(task_name)
-      task = Task.setup info do |*args|
-        raise "This is a remote task" 
-      end
-      task.name = task_name.to_sym
-      hash[task_name] = task
-    end
-  end
-
-  def load_tasks
-    exported_tasks.each{|name| tasks[name]}
-    nil
-  end
-
-  def task_dependencies
-    @task_dependencies ||= Hash.new do |hash,task| 
-      hash[task] = if exported_tasks.include? task
-        WorkflowRESTClient.get_json(File.join(url, task.to_s, 'dependencies'))
-      else
-        []
-      end
-    end
-  end
-
-  def init_remote_tasks
-    task_exports = WorkflowRESTClient.get_json(url)
-    @asynchronous_exports = task_exports["asynchronous"].collect{|task| task.to_sym }
-    @synchronous_exports = task_exports["synchronous"].collect{|task| task.to_sym }
-    @exec_exports = task_exports["exec"].collect{|task| task.to_sym }
-    nil
-  end
-end

data/lib/rbbt/rest/client/get.rb

@@ -1,96 +0,0 @@
-class WorkflowRESTClient
-  def self.fix_hash(hash, fix_values = false)
-    fixed = {}
-    hash.each do |key, value|
-      fixed[key.to_sym] = case value
-                          when TrueClass
-                            value
-                          when FalseClass
-                            value
-                          when Hash 
-                            fix_hash(value)  
-                          when (fix_values and String )
-                            value.to_sym
-                          when IO
-                            value.read
-                          when TSV::Dumper
-                            value.stream
-                          when Step
-                            stream = get_stream(value)
-                            stream || value.load
-                          else
-                            value
-                          end
-    end
-    fixed
-  end
-
-  def self.capture_exception
-    begin
-      yield
-    rescue Exception => e
-      raise e unless e.respond_to? :response
-      begin
-        klass, message = e.response.to_s.split " => "
-        klass = Kernel.const_get klass
-        raise klass.new message
-      rescue
-        raise e
-      end
-      raise $!
-    end
-  end
-
-  def self.get_raw(url, params = {})
-    Log.debug{ "RestClient get_raw: #{ url } - #{Misc.fingerprint params}" }
-    params = params.merge({ :_format => 'raw' })
-    capture_exception do
-      Misc.insist(2, 0.5) do
-        RestClient.get(URI.encode(url), :params => params)
-      end
-    end
-  end
- 
-  def self.post_jobname(url, params = {})
-    Log.debug{ "RestClient post_jobname: #{ url } - #{Misc.fingerprint params}" }
-    params = params.merge({ :_format => 'jobname' })
-
-    capture_exception do
-      RestClient.post(URI.encode(url), params)
-    end
-  end
-  
-  def self.get_json(url, params = {})
-    Log.debug{ "RestClient get_json: #{ url } - #{Misc.fingerprint params }" }
-    params = params.merge({ :_format => 'json' })
-
-    res = capture_exception do
-      RestClient.get(URI.encode(url), :params => params)
-    end
-
-    begin
-      JSON.parse(res)
-    rescue
-      res
-    end
-  end
-
-  def self.post_json(url, params = {})
-    if url =~ /_cache_type=:exec/
-      JSON.parse(Open.open(url, :nocache => true))
-    else
-      params = params.merge({ :_format => 'json' })
-
-      res = capture_exception do
-        RestClient.post(URI.encode(url), params)
-      end
-
-      begin
-        JSON.parse(res)
-      rescue
-        res
-      end
-    end
-  end
-
-end

data/lib/rbbt/rest/client/step.rb

@@ -1,164 +0,0 @@
-class WorkflowRESTClient
-  class RemoteStep < Step
-
-    attr_accessor :url, :base_url, :task, :base_name, :inputs, :result_type, :result_description, :is_exec
-
-    def self.get_streams(inputs)
-      inputs.each do |k,v|
-        if Step === v
-          stream = v.get_stream
-          inputs[k] = stream || v.load
-        end
-      end
-    end
-    def initialize(base_url, task = nil, base_name = nil, inputs = nil, result_type = nil, result_description = nil, is_exec = false)
-      @base_url, @task, @base_name, @inputs, @result_type, @result_description, @is_exec = base_url, task, base_name, inputs, result_type, result_description, is_exec
-      @mutex = Mutex.new
-      RemoteStep.get_streams @inputs
-    end
-
-    def name
-      return nil if @is_exec
-      (Array === @url ? @url.first : @url).split("/").last
-    end
-
-    def task_name
-      (Array === @url ? @url.first : @url).split("/")[-2]
-    end
-
-    def info(check_lock=false)
-      @info ||= begin
-                  init_job unless url
-                  info = WorkflowRESTClient.get_json(File.join(url, 'info'))
-                  info = WorkflowRESTClient.fix_hash(info)
-                  info[:status] = info[:status].to_sym if String === info[:status]
-                  info
-                end
-    end
-    
-    def status
-      begin
-        info[:status]
-      ensure
-        @info = nil
-      end
-    end
-
-    def done?
-      @done || status.to_s == 'done'
-    end
-
-    def files
-      WorkflowRESTClient.get_json(File.join(url, 'files'))
-    end
-
-    def file(file)
-      WorkflowRESTClient.get_raw(File.join(url, 'file', file))
-    end
-
-    #{{{ MANAGEMENT
-    
-    def init_job(cache_type = :asynchronous)
-      @name ||= Persist.memory("RemoteSteps", :jobname => @name, :inputs => inputs) do
-        WorkflowRESTClient.post_jobname(File.join(base_url, task.to_s), inputs.merge(:jobname => @name||@base_name, :_cache_type => cache_type))
-      end
-      @url = File.join(base_url, task.to_s, @name)
-      nil
-    end
-
-    def load_res(res, result_type = nil)
-      result_type ||= self.result_type
-      case result_type
-      when :string
-        res
-      when :boolean
-        res == "true"
-      when :tsv
-        TSV.open(StringIO.new(res))
-      when :annotations
-        Annotated.load_tsv(TSV.open(StringIO.new(res)))
-      when :array
-        res.split("\n")
-      else
-        JSON.parse res
-      end
-    end
-
-    def get
-      params ||= {}
-      params = params.merge(:_format => [:string, :boolean, :tsv, :annotations,:array].include?(result_type.to_sym) ? :raw : :json )
-      Misc.insist 3, rand(2) + 1 do
-        begin
-          WorkflowRESTClient.get_raw(url, params)
-        rescue
-          Log.exception $!
-          raise $!
-        end
-      end
-    end
-
-    def load
-      params = {}
-      load_res get
-    end
-    
-    def exec_job
-      res = WorkflowRESTClient.capture_exception do
-        RestClient.post(URI.encode(File.join(base_url, task.to_s)), inputs.merge(:_cache_type => :exec, :_format => [:string, :boolean, :tsv, :annotations].include?(result_type) ? :raw : :json))
-      end
-      load_res res, result_type == :array ? :json : result_type
-    end
-
-    def fork
-      init_job(:asynchronous)
-    end
-
-    def running?
-      ! %w(done error aborted).include? status.to_s
-    end
-
-    def path
-      url
-    end
-
-    def run(noload = false)
-      @mutex.synchronize do
-        @result ||= begin
-                      if @is_exec
-                        exec_job 
-                      else
-                        init_job(:synchronous) 
-                        self.load
-                      end
-                    end
-      end
-      noload ? path : @result
-    end
-
-    def exec(*args)
-      exec_job
-    end
-
-    def join
-      return if self.done?
-      self.load
-      self
-    end
-
-    def recursive_clean
-      begin
-        inputs[:_update] = :recursive_clean
-      rescue Exception
-      end
-      self
-    end
-
-    def clean
-      begin
-        inputs[:_update] = :clean
-      rescue Exception
-      end
-      self
-    end
-  end
-end