ruote-kit 2.2.0.3 → 2.3.0.2

data/lib/ruote-kit/resources/participants.rb

@@ -43,7 +43,7 @@ class RuoteKit::Application
     respond_to do |format|
 
       format.html do
-        redirect '/_ruote/participants'
+        redirect url('/_ruote/participants')
       end
       format.json do
         @participants = RuoteKit.engine.participant_list

data/lib/ruote-kit/resources/processes.rb

@@ -24,8 +24,36 @@ class RuoteKit::Application
 
     @process = RuoteKit.engine.process(params[:wfid])
 
+    return http_error(404) if @process.nil? or @process.expressions.empty?
+
+    @pins =
+      @process.leaves.collect { |fexp|
+        pin =
+          if fexp.error
+            [ 'error', 'er' ]
+          elsif fexp.class == Ruote::Exp::ParticipantExpression
+            [ 'workitem', 'wi' ]
+          else
+            [ 'other', '-' ]
+          end
+        [ fexp.fei.expid, *pin ]
+      }
+
+    respond_with :process
+  end
+
+  put '/_ruote/processes/:wfid' do
+
+    @process = RuoteKit.engine.process(params[:wfid])
+
     return http_error(404) unless @process
 
+    if fetch_put_info['state'] == 'paused'
+      RuoteKit.engine.pause(params[:wfid])
+    else
+      RuoteKit.engine.resume(params[:wfid])
+    end
+
     respond_with :process
   end
 
@@ -38,7 +66,11 @@ class RuoteKit::Application
       @wfid = RuoteKit.engine.launch(
         @info.definition, @info.fields || {}, @info.variables || {})
 
-    rescue Exception => e
+    rescue => e
+      #p e
+      #p e.ruby
+      #puts e.ruby.backtrace
+      #puts e.backtrace
       return http_error(400, e)
     end
 
@@ -59,22 +91,47 @@ class RuoteKit::Application
     end
 
     respond_to do |format|
-      format.html { redirect '/_ruote/processes' }
+      format.html { redirect url('/_ruote/processes') }
       format.json { json :status, :ok }
     end
   end
 
   protected
 
+  class LaunchInfo
+
+    attr_accessor :definition, :fields, :variables
+
+    def initialize(h={})
+
+      @definition = h['definition'].strip
+      @fields = h['fields']
+      @variables = h['variables']
+
+      if @definition.match(/^define /) && @definition.match(/\bend$/)
+        @definition = 'Ruote.' + @definition
+      end
+    end
+  end
+
+  def fetch_put_info
+
+    if request.content_type.match(/^application\/json(;.+)?$/)
+      Rufus::Json.decode(request.body.read)
+    else
+      params
+    end
+  end
+
   def fetch_launch_info
 
     if request.content_type == 'application/json' then
 
-      OpenStruct.new(Rufus::Json.decode(request.body.read))
+      LaunchInfo.new(Rufus::Json.decode(request.body.read))
 
     else
 
-      info = OpenStruct.new('definition' => params[:definition])
+      info = LaunchInfo.new('definition' => params[:definition])
 
       fields = params[:fields] || ''
       fields = '{}' if fields.empty?

data/lib/ruote-kit/resources/workitems.rb

@@ -35,7 +35,6 @@ class RuoteKit::Application
 
     if @workitem
       etag @workitem.to_h['_rev']
-
       respond_with :workitem
     else
       respond_with :workitems
@@ -62,15 +61,16 @@ class RuoteKit::Application
     end
 
     if options[:proceed]
-      RuoteKit.engine.storage_participant.reply(@workitem)
+      RuoteKit.engine.storage_participant.proceed(@workitem)
     end
 
     respond_to do |format|
 
       format.html do
         redirect(options[:proceed] ?
-          "/_ruote/workitems/#{@workitem.fei.wfid}" :
-          "/_ruote/workitems/#{@workitem.fei.sid}")
+          url("/_ruote/workitems/#{@workitem.fei.wfid}") :
+          url("/_ruote/workitems/#{@workitem.fei.sid}")
+        )
       end
       format.json do
         json :workitem

data/lib/ruote-kit/version.rb

@@ -8,6 +8,6 @@
 
 module RuoteKit
 
-  VERSION = '2.2.0'
+  VERSION = '2.3.0.2'
 end
 

data/lib/ruote-kit/views/_pagination.html.haml

@@ -17,7 +17,7 @@
     = @count
     = res
 
-    - las = ((@count / lim.to_f).ceil - 1) * lim
+    - las = lim < 1 ? @count : ((@count / lim.to_f).ceil - 1) * lim
     - pre = [ 0, @skip - lim ].max
     - nex = [ @skip + lim, las ].min
 
@@ -35,4 +35,4 @@
 
     - if resources = instance_variable_get("@#{res}")
       = "#{resources.size} #{res}"
- 
+

data/lib/ruote-kit/views/_tree_editor.html.haml

@@ -1,10 +1,13 @@
 
 #overlay
 #editor
-  %canvas#efluo
+  #fluo
   #fluo_editor
-  %a.ruote_button.ruote_go_button{ :title => 'close and use that definition', :href => '', :onclick => 'hideEditor(true); return false;' }
-  %a.ruote_button.ruote_cross_button{ :title => 'close', :href => '', :onclick => 'hideEditor(false); return false;' }
+  .editor_buttons
+    %button.use{ :value => 'Ruby' } use (Ruby)
+    %button.use{ :value => 'Json' } use (JSON)
+    %button.use{ :value => 'Radial' } use (Radial)
+    %button.discard{ :title => 'close' } discard
 
 :javascript
 
@@ -13,40 +16,70 @@
   $('#overlay').hide();
   $('#editor').hide();
 
-  function initEditor () {
+  $('button.use').each(function(i, e) {
+    $(e).attr('title', 'close and use this definition as ' + e.value);
+  });
+
+  $('button.use').on('click', function(ev) {
+    RkEditor.hide(ev.target.value);
+    return false;
+  });
+  $('button.discard').on('click', function() {
+    RkEditor.hide(false);
+    return false;
+  });
+
+  // disable "save as Ruby" for now
+  //
+  var $ruby = $('button.use[value="Ruby"]');
+  $ruby.attr(
+    'disabled',
+    'disabled');
+  $ruby.attr(
+    'title',
+    $ruby.attr('title') +
+    ' (disabled for now, Radial and JSON are sufficient)');
+
+  var RkEditor = (function() {
+
+    var self = this;
+
+    this.init = function() {
+
+      var tree = window.tree || #{sample_process_tree};
+      var def = $('#tree').val();
+      if (def.match(/\s*\[/)) tree = JSON.parse(def);
+
+      RuoteFluoEditor.render('#fluo_editor', tree);
+      RuoteFluo.render('#fluo', tree);
+
+      $('#fluo_editor')[0].onChange = function(tree) {
+        RuoteFluo.render('#fluo', tree);
+      }
+      $('#fluo_editor')[0].onOver = function(expid) {
+        RuoteFluo.highlight('#fluo', expid);
+      }
+    }
 
-    var tree = tree || #{sample_process_tree};
-    var def = $('#tree')[0].value;
-    if (def.match(/\s*\[/)) tree = JSON.parse(def);
+    this.show = function() {
 
-    FluoEditor.renderFlow('fluo_editor', tree);
-    Fluo.renderFlow('efluo', tree);
-    Fluo.crop('efluo');
+      $('#overlay').css('height', '' + $(document).height() + 'px');
 
-    $('#fluo_editor')[0].onChange = function (tree) {
-      Fluo.renderFlow('efluo', tree);
-      Fluo.crop('efluo');
-    }
-    $('#fluo_editor')[0].onOver = function (expid) {
-      Fluo.highlight('efluo', expid);
+      $('#overlay').slideDown(function() {
+        $('#editor').show();
+        RkEditor.init()
+      });
     }
-  }
-
-  function showEditor () {
 
-    initEditor();
+    this.hide = function(use) {
 
-    document.getElementById('overlay').style.height =
-      '' + window.outerHeight + 'px';
+      $('#editor').hide();
+      $('#overlay').hide();
 
-    $('#overlay').slideDown(function () { $('#editor').show(); });
-  }
-
-  function hideEditor (use) {
+      if (use) $('#tree').val(RuoteFluoEditor['as' + use]('#fluo_editor'));
+    }
 
-    $('#editor').hide();
-    $('#overlay').hide();
+    return this;
 
-    if (use) $('#tree')[0].value = FluoEditor.asJson('fluo_editor');
-  }
+  }).apply({});
 

data/lib/ruote-kit/views/error.html.haml

@@ -1,15 +1,25 @@
 
 - # under the MIT license, see LICENSE.txt
 
+- @_uses_fluo = true
+
 %h1 error #{@error.fei.sid}
 
+#fluo
+
 %table.details
 
   %tr
     %td
       id
     %td
-      = @error.fei.sid
+      &= @error.fei.sid
+
+  %tr
+    %td
+      at
+    %td
+      &= @error.at
 
   %tr
     %td
@@ -27,8 +37,19 @@
     %td
       trace
     %td
-      %pre.trace{ :onclick => 'Rk.toggleNext(this);' } #{h(@error.trace[0, 80] + '...')}
-      %pre.trace{ :onclick => 'Rk.toggleNext(this);', :style => 'display: none;' } #{h(@error.trace)}
+      %pre.trace #{h(@error.trace[0, 80] + '...')}
+      %pre.trace{ :style => 'display: none;' } #{h(@error.trace)}
+
+  %tr
+    %td
+      details
+    %td
+      - if @error.details.nil?
+        %pre.details nil
+      - else
+        - details = Ruote.pps(@error.details)
+        %pre.details #{h(details[0, 80] + '...')}
+        %pre.details{ :style => 'display: none;' } #{h(details)}
 
   %tr
     %td.no_border{ :colspan => 2 }
@@ -40,8 +61,8 @@
     %td
       GET
       = alink(:expressions, @error.fei.sid)
-      %span.explanation
-        you can re-apply the expression (and hopefully nuke the error) from there
+      -#%span.explanation
+      -#  you can re-apply the expression (and hopefully nuke the error) from there
   %tr
     %td
       process
@@ -50,7 +71,7 @@
       = alink(:processes, @error.wfid)
   %tr
     %td
-      errors of this process
+      process errors
     %td
       GET
       = alink(:errors, @error.wfid)
@@ -62,8 +83,28 @@
     %td
     %td
       %form{ :method => 'POST' }
-        %input{ :type => 'hidden', :name => '_method', :value => 'delete' }
+        %input{ :type => 'hidden', :name => '_method', :value => 'DELETE' }
         %input{ :type => 'submit', :value => "DELETE /_ruote/errors/#{@error.fei.sid}", :title => 'replay at this error' }
-        %span.explanation
-          replay at this error
+        -#%span.explanation
+        -#  replay at this error
+
+:javascript
+
+  $(document).ready(function() {
+
+    $('pre.trace').on('click', Rk.toggleNext);
+    $('pre.details').on('click', Rk.toggleNext);
+
+    Rk.fitFluo();
+
+    var proc_rep = #{process_tree(@process)};
+    var pins = #{Rufus::Json.encode(@pins)};
+
+    RuoteFluo.render('#fluo', proc_rep, { fit: 'down' });
+    Rk.onClickZoom('#fluo');
+
+    pins.forEach(function(pin) {
+      RuoteFluo.pin('#fluo', pin[0], pin[1], pin[2])
+    });
+  });
 

data/lib/ruote-kit/views/errors.html.haml

@@ -6,7 +6,7 @@
 = haml :_pagination, :layout => false
 
 %table.list
- 
+
   %thead
     %td
       error

data/lib/ruote-kit/views/expression.html.haml

@@ -7,11 +7,12 @@
   expression
   = @expression.fei.sid
 
-%canvas#fluo
+#exp_fluo
 
 %form{ :method => 'POST', :enctype => 'multipart/form-data', :accept_charset => 'UTF-8' }
 
   %input#_method{ :type => 'hidden', :name => '_method', :value => 'DELETE' }
+  %input#state{ :type => 'hidden', :name => 'state', :value => '' }
   %input{ :type => 'hidden', :name => '_snowman', :value => '☃' }
 
   %table.details
@@ -33,9 +34,14 @@
         &= @expression.tree.first
     %tr
       %td
-        expression class
+        class
       %td
         &= @expression.class.to_s
+    %tr
+      %td
+        state
+      %td
+        &= @expression.state
     - if @expression.original_tree != @expression.tree
       %tr
         %td
@@ -44,9 +50,9 @@
           - ruby = Ruote::Reader.to_ruby(@expression.original_tree)
           - rubyline = ruby.split("\n").first
           - json = Rufus::Json.pretty_encode(@expression.original_tree)
-          %pre.pdef{ :onclick => 'Rk.toggleNext(this);' } #{rubyline}
-          %pre.pdef{ :onclick => 'Rk.toggleNext(this);', :style => 'display: none;' } #{ruby}
-          %pre.pdef{ :onclick => 'Rk.toggleNext(this);', :style => 'display: none;' } #{json}
+          %pre.pdef #{rubyline}
+          %pre.pdef{ :style => 'display: none;' } #{ruby}
+          %pre.pdef{ :style => 'display: none;' } #{json}
     %tr
       %td
         tree
@@ -54,9 +60,9 @@
         - ruby = Ruote::Reader.to_ruby(@expression.tree)
         - rubyline = ruby.split("\n").first
         - json = Rufus::Json.pretty_encode(@expression.tree)
-        %pre.pdef{ :onclick => 'Rk.toggleNext(this);' } #{rubyline}
-        %pre.pdef{ :onclick => 'Rk.toggleNext(this);', :style => 'display: none;' } #{ruby}
-        %pre.pdef{ :onclick => 'Rk.toggleNext(this);', :style => 'display: none;' } #{json}
+        %pre.pdef #{rubyline}
+        %pre.pdef{ :style => 'display: none;' } #{ruby}
+        %pre.pdef{ :style => 'display: none;' } #{json}
 
     - if sched = @process.schedules.find { |s| s['owner'] == @expression.fei }
       %tr
@@ -97,23 +103,35 @@
 
     %tr
       %td
-        cancel
+        - if @expression.state == 'paused'
+          %input{ :type => 'submit', :value => 'resume' }
+        - else
+          %input{ :type => 'submit', :value => 'pause' }
+          %input{ :type => 'checkbox', :name => 'breakpoint' }
+          breakpoint
+      %td
+        %span.description PUT /_ruote/expressions/#{@expression.fei.sid}
+
+    %tr
+      %td.no_border{ :colspan => 2 }
+         
+
+    %tr
+      %td
+        %input{ :type => 'submit', :value => 'cancel' }
       %td
-        %input{ :type => 'submit', :value => 'cancel', :onclick => 'return confirm("really ?");' }
         %span.description DELETE /_ruote/expressions/#{@expression.fei.sid}
     %tr
       %td
-        kill
+        %input{ :type => 'submit', :value => 'kill' }
       %td
-        -#%input{ :type => 'hidden', :name => '_kill', :value => '1' }
-        %input{ :type => 'submit', :value => 'kill', :onclick => 'return confirm("really ?");' }
         %span.description DELETE /_ruote/expressions/#{@expression.fei.sid}?_kill=1
 
     %tr
       %td.no_border{ :colspan => 2 }
          
 
-    %tr{ :style => 'cursor: pointer;', :onclick => 'showReApply(this);' }
+    %tr#show_re_apply{ :style => 'cursor: pointer;' }
       %td{ :colspan => 2 }
         re-apply
     %tr.re_apply
@@ -126,7 +144,7 @@
     %tr.re_apply
       %td
         tree
-        %a.ruote_button.ruote_go_button{ :title => 'open process definition editor', :href => '', :onclick => 'showEditor(); return false;' }
+        %a.ruote_button.ruote_go_button{ :title => 'open process definition editor', :href => '' }
       %td.no_padding
         - tree = @expression.tree
         - tree = Rufus::Json.pretty_encode(tree)
@@ -135,35 +153,67 @@
     %tr.re_apply
       %td
       %td
-        -#%input{ :type => 'hidden', :name => '_method', :value => 'put' }
-        %input{ :type => 'submit', :value => 're-apply', :onclick => 'return confirmReApply();' }
+        %input{ :type => 'submit', :value => 're-apply' }
         %span.description PUT /_ruote/expressions/#{@expression.fei.sid}
 
 
 :javascript
 
-  var proc_rep = #{process_tree(@process)};
-  Fluo.renderFlow('fluo', proc_rep);
-  Fluo.crop('fluo');
-  Fluo.highlight('fluo', '#{@expression.fei.expid}');
-  Fluo.resizeForMaxWidth('fluo', $('body').width() / 2.1);
+  $(document).ready(function() {
+
+    $('pre.pdef').on('click', Rk.toggleNext);
+
+    Rk.fitFluo($('#exp_fluo'), $('table.details'));
+
+    var proc_rep = #{process_tree(@process)};
+    RuoteFluo.render('#exp_fluo', proc_rep, { fit: 'down' });
+    RuoteFluo.highlight('#exp_fluo', '#{@expression.fei.expid}');
+
+    Rk.onClickZoom('#exp_fluo');
+
+    $('.re_apply').hide();
+
+    $('#show_re_apply').on('click', function(ev) {
+      $(ev.target).hide();
+      $('.re_apply').show();
+    });
+
+    $('a.ruote_go_button').on('click', function(ev) {
+      RkEditor.show();
+      return false;
+    });
+
+    function confirmPut(message) {
+
+      var r = confirm(message);
 
-  $('.re_apply').hide();
+      if (r) {
+        $('#_method')[0].value = 'PUT';
+        if (message.match(/pause/)) {
+          $('#state')[0].value = 'paused';
+        } else if (message.match(/resume/)) {
+          $('#state')[0].value = 'resuming';
+        } else {
+          $('#state').detach();
+        }
+      }
 
-  function showReApply (elt) {
-    $(elt).hide();
-    $('.re_apply').show();
-  }
+      return r;
+    }
 
-  function confirmReApply () {
+    $('input[type="submit"]').on('click', function(ev) {
 
-    var r = confirm('really ?');
-    if (r) $('#_method')[0].value = 'PUT';
+      var val = ev.target.value;
+      var msg = "really " + val + " expression?";
 
-    return r;
-  }
+      if (val === 'cancel' || val === 'kill') {
+        return confirm(msg);
+      }
+      return confirmPut(msg);
+    });
+  });
 
-  var tree = #{Rufus::Json.encode(@expression.tree)};
+  window.tree = #{Rufus::Json.encode(@expression.tree)};
 
 = haml :_tree_editor, :layout => false