ruote-kit 2.2.0.3 → 2.3.0.2

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

@@ -5,31 +5,46 @@
 
 %h1 expressions for #{@process.wfid}
 
-%canvas#fluo
+#fluo
+
+%table.list.expressions
 
-%table.list{ :style => 'width: auto;', :onmouseout => "Fluo.highlight('fluo')" }
   %thead
     %td fei
     %td expid
     %td exp
     %td applied
+    %td state
 
 
   - @process.expressions.each do |expression|
-    %tr{ :onmouseover => "Fluo.highlight('fluo', '#{expression.fei.expid}')" }
+    %tr{ 'data-rk-expid' => expression.fei.expid }
       %td
-        = alink(:expressions, expression.fei.sid)
+        = alink(:expressions, expression.fei.sid, :text => [ expression.fei.wfid, expression.fei.expid ].join(' '))
       %td
         &= expression.fei.expid
       %td
         &= expression.tree.first
       %td
         = Time.parse(expression.h.put_at).localtime.strftime('%Y/%m/%d %H:%M:%S')
+      %td
+        = expression.state
 
 :javascript
 
-  var proc_rep = #{process_tree(@process)};
-  Fluo.renderFlow('fluo', proc_rep);
-  Fluo.crop('fluo');
-  Fluo.resizeForMaxWidth('fluo', $('body').width() / 2.1);
+  $(document).ready(function() {
+
+    Rk.fitFluo();
+
+    var proc_rep = #{process_tree(@process)};
+    RuoteFluo.render('fluo', proc_rep, { fit: 'down' });
+
+    $('table.list').on('mouseout', function(ev) {
+      RuoteFluo.highlight('#fluo');
+    });
+    $('tr').on('mouseover', function(ev) {
+      $tr = $(ev.target).closest('tr');
+      RuoteFluo.highlight('#fluo', $tr.attr('data-rk-expid'));
+    });
+  });
 

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

@@ -4,8 +4,15 @@
 %h1 #{@code} #{@message}
 
 - if @trace
-  %pre.trace{ :onclick => 'Rk.toggleNext(this);' } #{h(@trace.first.split("\n").first + '...')}
-  %pre.trace{ :onclick => 'Rk.toggleNext(this);', :style => 'display: none;' } #{h(@trace.join("\n"))}
+  %pre.trace #{h(@trace.first.split("\n").first + '...')}
+  %pre.trace{ :style => 'display: none;' } #{h(@trace.join("\n"))}
 
 %a{ :href => "javascript:history.go(-1)" } back
 
+:javascript
+
+  $(document).ready(function() {
+
+    $('pre.trace').on('click', Rk.toggleNext);
+  });
+

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

@@ -7,26 +7,27 @@
 
     %title ruote-kit
 
-    %link{ :type => 'image/vnd.microsoft.icon', :href => '/_ruote/images/favicon.ico', :rel => 'icon' }
+    %link{ :type => 'image/png', :href => url('/_ruote/images/favicon.png'), :rel => 'icon' }
 
-    %link{ :type => 'text/css', :href => '/_ruote/stylesheets/reset.css', :rel => 'stylesheet' }
-    %link{ :type => 'text/css', :href => '/_ruote/stylesheets/rk.css', :rel => 'stylesheet' }
+    %link{ :type => 'text/css', :href => url('/_ruote/stylesheets/reset.css'), :rel => 'stylesheet' }
+    %link{ :type => 'text/css', :href => url('/_ruote/stylesheets/rk.css'), :rel => 'stylesheet' }
 
-    %script{ :type => 'text/javascript', :src => '/_ruote/javascripts/jquery-1.4.2.min.js' }
-    %script{ :type => 'text/javascript', :src => '/_ruote/javascripts/rk.js' }
+    %script{ :type => 'text/javascript', :src => url('/_ruote/javascripts/jquery-1.9.1.min.js') }
+    %script{ :type => 'text/javascript', :src => url('/_ruote/javascripts/rk.js') }
 
     - if @_uses_fluo
-      %script{ :type => 'text/javascript', :src => '/_ruote/javascripts/ruote-fluo.js' }
-      %script{ :type => 'text/javascript', :src => '/_ruote/javascripts/ruote-fluo-editor.js' }
-      %link{ :type => 'text/css', :href => '/_ruote/stylesheets/ruote-fluo-editor.css', :rel => 'stylesheet' }
-      - #%script{ :type => "text/javascript", :src => "/_ruote/javascripts/fluo-dial.js" }
+      %script{ :type => 'text/javascript', :src => url('/_ruote/javascripts/foolbox-all.min.js') }
+      %script{ :type => 'text/javascript', :src => url('/_ruote/javascripts/ruote-fluo-all.min.js') }
+      %link{ :type => 'text/css', :href => url('/_ruote/stylesheets/ruote-fluo.css'), :rel => 'stylesheet' }
+      %link{ :type => 'text/css', :href => url('/_ruote/stylesheets/ruote-fluo-editor.css'), :rel => 'stylesheet' }
 
   %body
     #container
 
       #header
         #hlogo
-          %img{ :src => '/_ruote/images/ruote.png' }
+          %a{ :href => url('/_ruote') }
+            %img{ :src => url('/_ruote/images/ruote.png') }
         #htext
           #ruote_kit
             ruote-kit
@@ -41,7 +42,7 @@
             |
             = alink(:participants, :text => 'participants')
             ||
-            %a{ :href => '/_ruote/processes/new'} launch process
+            %a{ :href => url('/_ruote/processes/new') } launch process
         #hclear
 
       #main
@@ -54,11 +55,11 @@
 
       #footer
         %div
-          © 2009-2011 Kenneth Kalmer
+          © 2009-2013 Kenneth Kalmer
           |
           %a{ :href => 'http://www.opensourcery.co.za' } blog
           |
-          %a{ :href => 'http://github.com/tosch/ruote-kit' } source
+          %a{ :href => 'http://github.com/kennethkalmer/ruote-kit' } source
           |
           %a{ :href => 'http://ruote.rubyforge.org' } powered by ruote
 

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

@@ -7,7 +7,7 @@
   process
   = @process.wfid
 
-%canvas#fluo
+#fluo
 
 %table.details
   %tr
@@ -23,7 +23,7 @@
       - @process.position.each do |pos|
         - text = "#{pos[1]} #{pos[2]['task']}"
         - expid = pos.first.split('!').first
-        %span{ :onmouseover => "Fluo.highlight('fluo', '#{expid}');", :onmouseout => "Fluo.highlight('fluo');" }
+        %span.position{ 'data-rk-expid' => expid }
           - if @process.stored_workitems.find { |wi| wi.fei.sid == pos.first }
             = alink(:workitems, pos.first, :text => text)
           - else
@@ -55,39 +55,64 @@
     %td
       launch time
     %td
-      = Time.parse(@process.launched_time).localtime.strftime('%Y/%m/%d %H:%M:%S')
+      - if @process.launched_time
+        = Time.parse(@process.launched_time).localtime.strftime('%Y/%m/%d %H:%M:%S')
+      - else
+        ?
   %tr
     %td
       last active
     %td
-      = Time.parse(@process.last_active).localtime.strftime('%Y/%m/%d %H:%M:%S')
+      - if @process.last_active
+        = Time.parse(@process.last_active).localtime.strftime('%Y/%m/%d %H:%M:%S')
+      - else
+        ?
+  %tr
+    %td
+      root exp state
+    %td
+      = @process.root_expression_state
   %tr
     %td
       tags
     %td
-      &= @process.tags.collect { |ta| ta.first }.join(', ')
-  
+      &= (@process.tags || []).collect { |ta| ta.first }.join(', ')
+
   %tr
     %td.no_border{ :colspan => 2 }
        
-
   %tr
-    %td
-      cancel expression
     %td
       %form{ :method => 'post' }
-        %input{ :type => 'hidden', :name => '_method', :value => 'delete' }
-        %input{ :type => 'submit', :value => 'cancel', :onclick => 'return confirm("really ?");' }
-        %span.description DELETE /_ruote/processes/#{@process.wfid}
+        %input{ :type => 'hidden', :name => '_method', :value => 'PUT' }
+        - if @process.root_expression_state == 'paused'
+          %input{ :type => 'hidden', :name => 'state', :value => 'resuming' }
+          %input{ :type => 'submit', :value => 'resume' }
+        - else
+          %input{ :type => 'hidden', :name => 'state', :value => 'paused' }
+          %input{ :type => 'submit', :value => 'pause' }
+    %td
+      %span.description
+        - if @process.root_expression_state == 'paused'
+          PUT /_ruote/processes/#{@process.wfid}?state=resuming
+        - else
+          PUT /_ruote/processes/#{@process.wfid}?state=paused
+
   %tr
     %td
-      kill expression
+      %form{ :method => 'post' }
+        %input{ :type => 'hidden', :name => '_method', :value => 'DELETE' }
+        %input{ :type => 'submit', :value => 'cancel' }
+    %td
+      %span.description DELETE /_ruote/processes/#{@process.wfid}
+  %tr
     %td
       %form{ :method => 'post' }
-        %input{ :type => 'hidden', :name => '_method', :value => 'delete' }
+        %input{ :type => 'hidden', :name => '_method', :value => 'DELETE' }
         %input{ :type => 'hidden', :name => '_kill', :value => '1' }
-        %input{ :type => 'submit', :value => 'kill', :onclick => 'return confirm("really ?");' }
-        %span.description DELETE /_ruote/processes/#{@process.wfid}?_kill=1
+        %input{ :type => 'submit', :value => 'kill' }
+    %td
+      %span.description DELETE /_ruote/processes/#{@process.wfid}?_kill=1
   %tr
     %td
       expressions
@@ -115,8 +140,38 @@
 
 :javascript
 
-  var proc_rep = #{process_tree(@process)};
-  Fluo.renderFlow('fluo', proc_rep);
-  Fluo.crop('fluo');
-  Fluo.resizeForMaxWidth('fluo', $('body').width() / 2.1);
+  $(document).ready(function() {
+
+    //
+    // confirmation dialogs
+
+    $('input[type="submit"]').on('click', function(ev) {
+      return confirm("really " + ev.target.value + " process?");
+    });
+
+    //
+    // fluo
+
+    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])
+    });
+
+    // onmouseover for "positions"
+
+    $('span.position').on('mouseover', function(ev) {
+      var $span = $(ev.target).closest('span');
+      Fluo.highlight('#fluo', $span.attr('data-rk-expid'));
+    });
+    $('span.position').on('mouseout', function(ev) {
+      Fluo.highlight('#fluo');
+    });
+  });
 

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

@@ -13,6 +13,8 @@
       name
     %td
       position
+    %td
+      state
     %td
       tags
     %td
@@ -42,11 +44,15 @@
           - else
             &= text
       %td
-        &= process.tags.collect { |ta| ta.first }.join(', ')
+        = process.root_expression_state
+      %td
+        &= (process.tags || []).collect { |ta| ta.first }.join(', ')
       %td
-        = Time.parse(process.launched_time).localtime.strftime('%Y/%m/%d %H:%M:%S')
+        - if process.launched_time
+          = Time.parse(process.launched_time).localtime.strftime('%Y/%m/%d %H:%M:%S')
       %td
-        = Time.parse(process.last_active).localtime.strftime('%Y/%m/%d %H:%M:%S')
+        - if process.last_active
+          = Time.parse(process.last_active).localtime.strftime('%Y/%m/%d %H:%M:%S')
       %td.right{ :title => 'expressions' }
         = alink(:expressions, process.wfid, :text => process.expressions.size)
       %td.right{ :title => 'errors' }

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

@@ -13,7 +13,7 @@
   %div
     %label
       process definition
-      %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' }
 
     %textarea#tree{ :name => 'definition', :cols => 80, :rows => 10 } #{sample_process}
 
@@ -23,7 +23,7 @@
     %textarea{ :name => 'fields', :cols => 80, :rows => 3 }
 
   %div
-    %label.togglable{ :onclick => 'Rk.toggle(this, $("textarea.variables")[0], "(process variables)", "process variables");' }
+    %label.togglable
       (process variables)
     %textarea.variables{ :name => 'variables', :cols => 80, :rows => 3 }
 
@@ -32,5 +32,22 @@
     or
     %a{ :href => '/_ruote/processes' } cancel
 
+:javascript
+
+  $('label.togglable').on('click', function(ev) {
+
+    Rk.toggle(
+      ev.target,
+      $("textarea.variables")[0],
+      "(process variables)",
+      "process variables");
+  });
+
+  $('a.ruote_go_button').on('click', function(ev) {
+
+    RkEditor.show();
+    return false;
+  });
+
 = haml :_tree_editor, :layout => false
 

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

@@ -6,7 +6,7 @@
 = haml :_pagination, :layout => false
 
 %table.list
- 
+
   %thead
     %td
       owner / [ target ]
@@ -26,7 +26,7 @@
       %td
         %div
           = alink(:expressions, schedule['owner'].sid)
-        - if schedule['owner'] != schedule['target']
+        - if schedule['target'] && schedule['target'] != schedule['owner']
           %div
             = alink(:expressions, schedule['target'].sid)
       %td

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

@@ -7,11 +7,11 @@
   workitem
   = @workitem.fei.sid
 
-%canvas#fluo
+#fluo
 
 %form{ :method => 'POST', :enctype => 'multipart/form-data', :accept_charset => 'UTF-8' }
 
-  %input{ :type => 'hidden', :name => '_method', :value => 'put' }
+  %input{ :type => 'hidden', :name => '_method', :value => 'PUT' }
   %input{ :type => 'hidden', :name => '_snowman', :value => '☃' }
 
   %table.details
@@ -31,6 +31,11 @@
         last modified
       %td
         = Time.parse(@workitem.h.put_at).localtime.strftime('%Y/%m/%d %H:%M:%S')
+    %tr
+      %td
+        wf name / revision
+      %td
+        = "#{@workitem.wf_name} / #{@workitem.wf_revision}"
 
     %tr
       %td.no_border{ :colspan => 2 }
@@ -85,9 +90,15 @@
 
 :javascript
 
-  var proc_rep = #{process_tree(@workitem)};
+  $(document).ready(function() {
+
+    Rk.fitFluo($('table.details'));
+
+    var proc_rep = #{process_tree(@workitem)};
+
+    RuoteFluo.render('#fluo', proc_rep, { 'fit' : 'down' });
+    RuoteFluo.pin('#fluo', '#{@workitem.fei.expid}', 'workitem');
 
-  Fluo.renderFlow('fluo', proc_rep, { 'workitems' : ['#{@workitem.fei.expid}'] });
-  Fluo.crop('fluo');
-  Fluo.resizeForMaxWidth('fluo', $('body').width() / 2.1);
+    Rk.onClickZoom('#fluo');
+  });
 

data/ruote-kit.gemspec

@@ -1,10 +1,11 @@
 # encoding: utf-8
+$:.push File.expand_path('../lib', __FILE__)
+require 'ruote-kit/version'
 
 Gem::Specification.new do |s|
 
   s.name = 'ruote-kit'
-  #s.version = File.read('lib/ruote-kit/version.rb').match(/VERSION = '([^']+)'/)[1]
-  s.version = '2.2.0.3'
+  s.version = RuoteKit::VERSION
   s.platform = Gem::Platform::RUBY
   s.authors = [ 'Kenneth Kalmer', 'Torsten Schoenebaum', 'John Mettraux' ]
   s.email = [ 'kenneth.kalmer@gmail.com' ]
@@ -13,7 +14,7 @@ Gem::Specification.new do |s|
   s.summary = 'ruote workflow engine, wrapped in a loving rack embrace'
   s.description = %q{
 ruote workflow engine, wrapped in a loving rack embrace
-}
+  }
 
   #s.files = `git ls-files`.split("\n")
   s.files = Dir[
@@ -23,16 +24,17 @@ ruote workflow engine, wrapped in a loving rack embrace
     'lib/ruote-kit/public/**/*', 'lib/ruote-kit/views/**/*'
   ] - [ 'rails-template.rb' ]
 
-  s.add_runtime_dependency 'sinatra', '1.0'
-  s.add_runtime_dependency 'sinatra-respond_to', '0.5.0'
-  s.add_runtime_dependency 'haml', '3.0.25'
+  s.add_runtime_dependency 'sinatra', '>= 1.2.0'
+  s.add_runtime_dependency 'sinatra-respond_to', '>= 0.8.0'
+
+  s.add_runtime_dependency 'haml', '>= 3.1.4'
 
   s.add_runtime_dependency 'rufus-json', '>= 0.2.5'
   #s.add_runtime_dependency('ruote', s.version) unless defined?(Bundler)
   s.add_runtime_dependency('ruote', '>= 2.2.0') unless defined?(Bundler)
     # see Gemfile
 
-  s.add_development_dependency 'rspec', '2.4.0'
+  s.add_development_dependency 'rspec', '>= 2.5.0'
   s.add_development_dependency 'rack-test', '0.5.7'
   s.add_development_dependency 'webrat', '0.7.3'