ruote-kit 2.1.8.1 → 2.1.8.2

data/lib/ruote-kit.rb

@@ -4,7 +4,7 @@ require 'ruote/part/storage_participant'
 
 module RuoteKit
 
-  VERSION = '2.1.8'
+  VERSION = '2.1.8.2'
 
   autoload :Configuration, "ruote-kit/configuration"
   autoload :Application,   "ruote-kit/application"

data/lib/ruote-kit/public/_ruote/javascripts/fluo-dial.js

@@ -3,7 +3,7 @@
  *  OpenWFEru - open source ruby workflow and bpm engine
  *  (c) 2008 John Mettraux
  *
- *  OpenWFEru is freely distributable under the terms 
+ *  OpenWFEru is freely distributable under the terms
  *  of a BSD-style license.
  *  For details, see the OpenWFEru web site: http://openwferu.rubyforge.org
  *
@@ -83,7 +83,7 @@ var FluoDial = function() {
   }
 
   function newDialog (title, width, height) {
-  
+
     var sheet = newRectangle
       ("dial_sheet", "dial_sheet", width, height);
     var dialog = newRectangle
@@ -127,8 +127,8 @@ var FluoDial = function() {
 
     var hmenu = new Element("div", { "class": "dial_menu" });
     var hclose = new Element
-      ("a", 
-       { "href": "#", 
+      ("a",
+       { "href": "#",
          "title": "close this dialog",
          "onclick": "$('dial_dialog').close(); return false;" });
     hclose.innerHTML = "close";

data/lib/ruote-kit/public/_ruote/javascripts/{fluo-can.js → ruote-fluo.js}

@@ -1,11 +1,9 @@
-
 /*
  *  Ruote - open source ruby workflow engine
- *  (c) 2005-2009 jmettraux@gmail.com
+ *  (c) 2005-2010 jmettraux@gmail.com
  *
- *  OpenWFEru is freely distributable under the terms
- *  of a BSD-style license.
- *  For details, see the OpenWFEru web site: http://openwferu.rubyforge.org
+ *  Ruote is freely distributable under the terms of the MIT license.
+ *  For details, see the ruote web site: http://ruote.rubyforge.org
  *
  *  Made in Japan
  *
@@ -23,12 +21,13 @@
 //  return s;
 //}
 
-var FluoCon = {
+var FluoConstants = {
 
-  RGB_WHITE: 'rgb(255, 255, 255)',
-  RGB_HIGHLIGHT: 'rgb(220, 220, 220)',
+  WHITE: 'rgb(255, 255, 255)',
+  HIGHLIGHT: 'rgb(220, 220, 220)',
   LINE_HEIGHT: 20,
-  MIN_ACTIVITY_WIDTH: 110
+  MIN_ACTIVITY_WIDTH: 110,
+  FONT: '12px Helvetica Neue'
 }
 
 var FluoCanvas = function() {
@@ -124,7 +123,7 @@ var FluoCanvas = function() {
       c.lineTo(0, 0);
       if (i == 0) {
         c.save();
-        c.fillStyle = FluoCon.RGB_WHITE;
+        c.fillStyle = FluoConstants.WHITE;
         c.fill();
         c.restore();
       }
@@ -138,7 +137,7 @@ var FluoCanvas = function() {
     c.save();
     c.beginPath();
     c.lineWidth = 1.4;
-    c.fillStyle = FluoCon.RGB_WHITE;
+    c.fillStyle = FluoConstants.WHITE;
     c.arc(0, 0, height / 2 - 1, 0, Math.PI * 2, true);
     c.arc(0, 0, height / 2 - 2.3, 0, Math.PI * 2, true);
     c.stroke();
@@ -149,7 +148,7 @@ var FluoCanvas = function() {
     c.save();
     c.beginPath();
     c.lineWidth = 0.5;
-    c.fillStyle = FluoCon.RGB_WHITE;
+    c.fillStyle = FluoConstants.WHITE;
     c.arc(0, 0, height / 2, 0, Math.PI * 2, true);
     c.arc(0, 0, height / 2 - 2.3, 0, Math.PI * 2, true);
     c.stroke();
@@ -295,7 +294,7 @@ var FluoCanvas = function() {
   };
 }();
 
-var FluoCan = function() {
+var Fluo = function () {
 
   //
   // MISC METHODS
@@ -304,7 +303,7 @@ var FluoCan = function() {
     var children = getChildren(c, exp);
     var max = 0;
     for (var i = 0; i < children.length; i++) {
-      var val = FluoCan[funcname](c, children[i]);
+      var val = Fluo[funcname](c, children[i]);
       if (val > max) max = val;
     }
     return max;
@@ -314,7 +313,7 @@ var FluoCan = function() {
     var children = getChildren(c, exp);
     var sum = 0;
     for (var i = 0; i < children.length; i++) {
-      sum += FluoCan[funcname](c, children[i]);
+      sum += Fluo[funcname](c, children[i]);
     }
     return sum;
   }
@@ -323,7 +322,7 @@ var FluoCan = function() {
     var max = 0;
     if (title) max = c.measure(title);
     for (var attname in exp[1]) {
-      var text = '' + attname + ': ' + fluoToJson(exp[1][attname], false);
+      var text = '' + attname + ': ' + JSON.stringify(exp[1][attname]);
       var l = c.measure(text);
       //if (attname.match(/^on[-\_](error|cancel)$/)) l += 30;
       if (l > max) max = l;
@@ -331,17 +330,6 @@ var FluoCan = function() {
     return max;
   }
 
-  function childText (exp) {
-    //var exp2 = exp[2];
-    //if (exp2.length == 1 && ((typeof exp2[0]) == 'string')) return exp2[0];
-    //return null;
-    for (var k in exp[1]) {
-      var v = exp[1][k];
-      if (v == null) return k;
-    }
-    return null;
-  }
-
   // returns the list of attribute names (sorted)
   //
   function attributeNames (exp) {
@@ -358,8 +346,10 @@ var FluoCan = function() {
   }
 
   function carriageReturn (c) {
-    if (c.canvas.horizontal == true) c.translate(-FluoCon.LINE_HEIGHT, 0);
-    else c.translate(0, FluoCon.LINE_HEIGHT);
+    if (c.canvas.horizontal == true) {
+      c.translate(-FluoConstants.LINE_HEIGHT, 0);
+    }
+    else c.translate(0, FluoConstants.LINE_HEIGHT);
   }
 
   function drawAttributes (c, exp, expname, namePlus, width, height) {
@@ -369,20 +359,12 @@ var FluoCan = function() {
       carriageReturn(c);
     }
 
-    //var ct = strchild && childText(exp);
-    var ct = childText(exp);
-    if (namePlus && ct) {
-      FluoCanvas.drawText(c, ct, width, height);
-      carriageReturn(c);
-    }
-
     var attname;
     var attnames = attributeNames(exp, expname);
 
     while (attname = attnames.shift()) {
 
-      var v = exp[1][attname];
-      if (v != null) v = fluoToJson(v, false);
+      var v = JSON.stringify(exp[1][attname]);
 
       if (attname.match(/^on[-\_]error$/)) {
         FluoCanvas.drawText(c, v, width, height, 'drawError');
@@ -394,12 +376,9 @@ var FluoCan = function() {
       }
       else {
         var t = attname;
-        //alert(fluoToJson([ t, ct, namePlus ]));
-        if (t != ct) {
-          if (v != null) t = t + ': ' + v;
-          FluoCanvas.drawText(c, t, width, height);
-          carriageReturn(c);
-        }
+        if (v != 'null') t = t + ': ' + v;
+        FluoCanvas.drawText(c, t, width, height);
+        carriageReturn(c);
       }
     }
   }
@@ -448,8 +427,8 @@ var FluoCan = function() {
 
   var GenericHandler = newHandler();
   GenericHandler.adjust = function (exp) {
-    var ct = childText(exp);
-    if (ct) exp[0] = exp[0] + ' ' + ct;
+    //var ct = childText(exp);
+    //if (ct) exp[0] = exp[0] + ' ' + ct;
   }
   GenericHandler.render = function (c, exp) {
     var width = this.getWidth(c, exp);
@@ -460,17 +439,16 @@ var FluoCan = function() {
     c.restore();
   };
   GenericHandler.getRealHeight = function (c, exp) {
-    return 7 + (1 + attributeCount(exp)) * FluoCon.LINE_HEIGHT;
+    return 7 + (1 + attributeCount(exp)) * FluoConstants.LINE_HEIGHT;
   };
   GenericHandler.getRealWidth = function (c, exp) {
-    //return 10 + attributeMaxWidth(c, exp, exp[0]);
-    return Math.max(10 + attributeMaxWidth(c, exp, exp[0]), FluoCon.MIN_ACTIVITY_WIDTH);
+    return Math.max(10 + attributeMaxWidth(c, exp, exp[0]), FluoConstants.MIN_ACTIVITY_WIDTH);
   };
 
   var AttributeOnlyHandler = newHandler();
   AttributeOnlyHandler.adjust = function (exp) {
-    var ct = childText(exp);
-    if (ct) exp[0] = exp[0] + ' ' + ct;
+    //var ct = childText(exp);
+    //if (ct) exp[0] = exp[0] + ' ' + ct;
   }
   AttributeOnlyHandler.render = function (c, exp) {
     var width = this.getWidth(c, exp);
@@ -480,7 +458,7 @@ var FluoCan = function() {
     c.restore();
   };
   AttributeOnlyHandler.getRealHeight = function (c, exp) {
-    return 7 + attributeCount(exp) * FluoCon.LINE_HEIGHT;
+    return 7 + attributeCount(exp) * FluoConstants.LINE_HEIGHT;
   };
   AttributeOnlyHandler.getRealWidth = function (c, exp) {
     return attributeMaxWidth(c, exp, exp[0]);
@@ -500,7 +478,7 @@ var FluoCan = function() {
     FluoCanvas.drawCrossInABox(c, height);
   };
   SubprocessHandler.getRealHeight = function (c, exp) {
-    return 12 + 7 + (1 + attributeCount(exp)) * FluoCon.LINE_HEIGHT;
+    return 12 + 7 + (1 + attributeCount(exp)) * FluoConstants.LINE_HEIGHT;
   };
 
 
@@ -511,14 +489,16 @@ var FluoCan = function() {
     var width = this.getWidth(c, exp);
     var height = this.getHeight(c, exp);
     var attWidth = attributeMaxWidth(c, exp, exp[0]) + 7;
-    var attHeight = attributeCount(exp) * FluoCon.LINE_HEIGHT;
+    var attHeight = attributeCount(exp) * FluoConstants.LINE_HEIGHT;
     var children = getChildren(c, exp);
     if (c.canvas.horizontal == true) {
       var w = attWidth;
       attWidth = attHeight;
       attHeight = w;
     }
-    FluoCanvas.drawRoundedRect(c, width, height, 8);
+    if ((c.canvas.noOuterBorder != true) || (exp.expid != "0")) {
+      FluoCanvas.drawRoundedRect(c, width, height, 8);
+    }
     c.save();
     c.translate(-width/2 + attWidth/2 + 5 , 7);
     if (c.canvas.horizontal == true) c.translate(attHeight/2, 0);
@@ -529,8 +509,7 @@ var FluoCan = function() {
     for (var i = 0; i < children.length; i++) {
       var child = children[i];
       renderExp(c, child);
-      //c.translate(0, 7 + FluoCan.getHeight(c, child));
-      c.translate(0, FluoCan.getHeight(c, child));
+      c.translate(0, Fluo.getHeight(c, child));
       if (this.drawArrow && i < children.length -1) FluoCanvas.drawArrow(c, 10);
       c.translate(0, 10);
     }
@@ -581,7 +560,7 @@ var FluoCan = function() {
   };
   TextHandler.getText = function (exp) {
     var t = exp[0];
-    var ct = childText(exp); if (ct) t += (' ' + ct);
+    //var ct = childText(exp); if (ct) t += (' ' + ct);
     for (var attname in exp[1]) {
       var v = exp[1][attname];
       t += (' ' + attname + ': "' + v + '"');
@@ -589,7 +568,7 @@ var FluoCan = function() {
     return t;
   };
   TextHandler.getRealHeight = function (c, exp) {
-    return FluoCon.LINE_HEIGHT;
+    return FluoConstants.LINE_HEIGHT;
   };
   TextHandler.getRealWidth = function (c, exp) {
     return c.measure(this.getText(exp));
@@ -614,7 +593,7 @@ var FluoCan = function() {
     c.restore();
   };
   SymbolHandler.getRealHeight = function (c, exp) {
-    return attributeCount(exp) * FluoCon.LINE_HEIGHT + SymbolHandler.SYMBOL_HEIGHT;
+    return attributeCount(exp) * FluoConstants.LINE_HEIGHT + SymbolHandler.SYMBOL_HEIGHT;
   };
   SymbolHandler.getRealWidth = function (c, exp) {
     return attributeMaxWidth(c, exp, exp[0]);
@@ -627,7 +606,7 @@ var FluoCan = function() {
 
   var VerticalHandler = newHandler();
   VerticalHandler.adjust = function (exp) {
-    if (attributeCount(exp) > 0) exp[2].unshift([ '_atts_', exp[1], [] ]);
+    //if (attributeCount(exp) > 0) exp[2].unshift([ '_atts_', exp[1], [] ]);
   }
   VerticalHandler.render = function (c, exp) {
     c.save();
@@ -635,7 +614,7 @@ var FluoCan = function() {
     for (var i = 0; i < children.length; i++) {
       var child = children[i];
       renderExp(c, child);
-      c.translate(0, FluoCan.getHeight(c, child));
+      c.translate(0, Fluo.getHeight(c, child));
       if (i < children.length - 1) {
         FluoCanvas.drawArrow(c, 14);
         c.translate(0, 14);
@@ -670,7 +649,7 @@ var FluoCan = function() {
   };
   HorizontalHandler.getHeaderHeight = function (c, exp) {
     if (c.canvas.horizontal == true) return 23 + attributeMaxWidth(c, exp);
-    return 23 + attributeCount(exp) * FluoCon.LINE_HEIGHT;
+    return 23 + attributeCount(exp) * FluoConstants.LINE_HEIGHT;
   };
   HorizontalHandler.getChildrenHeight = function (c, exp) {
     return childrenMax(c, exp, 'getHeight');
@@ -690,7 +669,7 @@ var FluoCan = function() {
     var offset = -totalWidth/2;
     var dist = new Array(children.length);
     for (var i = 0; i < children.length; i++) {
-      var cWidth = FluoCan.getWidth(c, children[i]);
+      var cWidth = Fluo.getWidth(c, children[i]);
       dist[i] = offset + cWidth / 2;
       offset += (cWidth + 3);
     }
@@ -712,27 +691,27 @@ var FluoCan = function() {
     this.renderHeaderLabel(c, exp);
   };
   HorizontalHandler.renderHeaderSymbol = function (c) {
-    FluoCanvas.drawDiamond(c, FluoCon.LINE_HEIGHT);
+    FluoCanvas.drawDiamond(c, FluoConstants.LINE_HEIGHT);
   };
   HorizontalHandler.renderHeaderLabel = function (c, exp) {
     var width = attributeMaxWidth(c, exp);
-    var height = attributeCount(exp) * FluoCon.LINE_HEIGHT;
+    var height = attributeCount(exp) * FluoConstants.LINE_HEIGHT;
     if (c.canvas.horizontal == true) {
       var w = width;
       width = height;
       height = w;
     }
     c.save();
-    c.translate(0, FluoCon.LINE_HEIGHT);
+    c.translate(0, FluoConstants.LINE_HEIGHT);
     c.save();
-    c.fillStyle = FluoCon.RGB_WHITE;
+    c.fillStyle = FluoConstants.WHITE;
     c.fillRect(-width/2, 0, width, height);
     c.restore();
     drawAttributes(c, exp, false, false, width, height);
     c.restore();
   };
   HorizontalHandler.renderChild = function (c, exp, childrenHeight) {
-    var cheight = FluoCan.getHeight(c, exp);
+    var cheight = Fluo.getHeight(c, exp);
     renderExp(c, exp);
     c.beginPath();
     c.moveTo(0, cheight); c.lineTo(0, childrenHeight);
@@ -765,12 +744,21 @@ var FluoCan = function() {
     FluoCanvas.drawParaDiamond(c, 20);
   };
 
+  function hasNoCondition (attributes) {
+    if (attributes['test']) return false;
+    if (attributes['not']) return false;
+    for (k in attributes) {
+      if (attributes[k] == null) return false;
+    }
+    return true;
+  }
+
   var IfHandler = newHandler(HorizontalHandler);
   IfHandler.adjust = function (exp) {
     //
     // all the crazy legwork to adapt to the 'if' expression
     //
-    if ( ! (exp[1]['test'] || exp[1]['not'])) {
+    if (hasNoCondition(exp[1])) {
       // ok, steal first exp
       var cond = exp[2].shift();
       if (cond) {
@@ -822,7 +810,7 @@ var FluoCan = function() {
     'jump': TextHandler,
       // 'commands'
 
-    '_atts_': AttributeOnlyHandler,
+    //'_atts_': AttributeOnlyHandler,
     '_': GhostHandler
   };
 
@@ -876,15 +864,14 @@ var FluoCan = function() {
       context.rotate(-Math.PI/2);
     }
 
-    context.mozTextStyle = "12px Helvetica Neue";
-    context.font = "12px Helvetica Neue";
+    context.mozTextStyle = FluoConstants.FONT;
+    context.font = FluoConstants.FONT;
 
     var fs = context.fillStyle;
-    context.fillStyle = FluoCon.RGB_WHITE;
+    context.fillStyle = FluoConstants.WHITE;
     context.fillRect(0, 0, context.canvas.width, context.canvas.height);
     context.fillStyle = fs;
 
-    //context.translate(context.canvas.width/2, 0);
     var w = getWidth(context, flow);
     context.translate(w/2 + 1, 1); // aligning left
 
@@ -892,17 +879,13 @@ var FluoCan = function() {
 
     context.restore();
 
-    //flow.width = getWidth(context, flow);
-    //flow.height = getHeight(context, flow);
     getWidth(context, flow);
     getHeight(context, flow);
   }
 
   function highlight (c, highlight) {
     canvas = resolveCanvas(c);
-    //clear(canvas);
-    //renderFlow(canvas, canvas.flow, canvas.workitems, highlight);
-    renderFlow(canvas, canvas.flow, {'highlight': highlight});
+    renderFlow(canvas, canvas.flow, { 'highlight': highlight });
   }
 
   function drawWorkitem (c, exp) {
@@ -913,7 +896,7 @@ var FluoCan = function() {
       c.translate(5, -14);
     }
     else {
-      c.translate(20, -7);
+      c.translate(49, 2);
     }
     c.fillStyle = '#F4D850';
     c.moveTo(0, 0);
@@ -948,9 +931,9 @@ var FluoCan = function() {
       var h = getHeight(c, exp);
       var t = 7;
       c.save();
-      c.fillStyle = FluoCon.RGB_HIGHLIGHT;
+      c.fillStyle = FluoConstants.HIGHLIGHT;
       c.fillRect(-w/2, 0, w, h);
-      c.fillStyle = FluoCon.RGB_WHITE;
+      c.fillStyle = FluoConstants.WHITE;
       c.fillRect(-w/2 + t, 0 + t , w - 2 * t, h - 2 * t);
       c.restore();
     }
@@ -1002,20 +985,13 @@ var FluoCan = function() {
     nc.hideMinor = canvas.hideMinor;
     nc.horizontal = canvas.horizontal;
     nc.workitems = canvas.workitems;
+    nc.noOuterBorder = canvas.noOuterBorder;
 
-    //renderFlow(nc, canvas.flow, canvas.workitems, canvas.highlight);
     renderFlow(nc, canvas.flow);
     canvas.parentNode.replaceChild(nc, canvas);
   }
 
   function neutralizeContext (c) {
-    //if (window.navigator.userAgent.match(/Firefox/)) return;
-    //c.mozDrawText = function (t) {
-    //  // do nothing
-    //};
-    //c.mozMeasureText = function (t) {
-    //  return t.length * 5;
-    //};
     if (window.navigator.userAgent.match(/Firefox/)) {
       c.write = function (t) {
         this.mozDrawText(t);

data/lib/ruote-kit/version.rb

@@ -6,6 +6,6 @@
 
 module RuoteKit
 
-  VERSION = '2.1.8.1'
+  VERSION = '2.1.8.2'
 end
 

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

@@ -33,6 +33,6 @@
 
 :javascript
   var proc_rep = #{process_tree( @process )};
-  FluoCan.renderFlow( 'fluo', proc_rep );
-  FluoCan.crop('fluo');
-  FluoCan.highlight('fluo', '#{@expression.fei.expid}');
+  Fluo.renderFlow( 'fluo', proc_rep );
+  Fluo.crop('fluo');
+  Fluo.highlight('fluo', '#{@expression.fei.expid}');

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

@@ -26,5 +26,5 @@
 
 :javascript
   var proc_rep = #{process_tree( @process )};
-  FluoCan.renderFlow( 'fluo', proc_rep );
-  FluoCan.crop('fluo');
+  Fluo.renderFlow( 'fluo', proc_rep );
+  Fluo.crop('fluo');

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

@@ -8,10 +8,8 @@
     %link{ :type => "text/css", :href => "/_ruote/stylesheets/rk.css", :rel => "stylesheet" }
     %script{ :type => "text/javascript", :src => "/_ruote/javascripts/SimplyButtons.js" }
     - if @_uses_fluo
-      %script{ :type => "text/javascript", :src => "/_ruote/javascripts/fluo-can.js" }
+      %script{ :type => "text/javascript", :src => "/_ruote/javascripts/ruote-fluo.js" }
       %script{ :type => "text/javascript", :src => "/_ruote/javascripts/fluo-dial.js" }
-      %script{ :type => "text/javascript", :src => "/_ruote/javascripts/fluo-json.js" }
-      %script{ :type => "text/javascript", :src => "/_ruote/javascripts/fluo-tred.js" }
 
     :javascript
       window.onload = function() { SimplyButtons.init(); }

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

@@ -51,5 +51,5 @@
 
 :javascript
   var proc_rep = #{process_tree( @process )};
-  FluoCan.renderFlow( 'fluo', proc_rep );
-  FluoCan.crop('fluo');
+  Fluo.renderFlow( 'fluo', proc_rep );
+  Fluo.crop('fluo');

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

@@ -35,5 +35,5 @@
 
 :javascript
   var proc_rep = #{process_tree( @workitem )};
-  FluoCan.renderFlow( 'fluo', proc_rep, { 'workitems' : ['#{@workitem.fei.expid}'] } );
-  FluoCan.crop('fluo');
+  Fluo.renderFlow( 'fluo', proc_rep, { 'workitems' : ['#{@workitem.fei.expid}'] } );
+  Fluo.crop('fluo');

data/ruote-kit.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruote-kit}
-  s.version = "2.1.8.1"
+  s.version = "2.1.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["kenneth.kalmer@gmail.com"]
@@ -37,10 +37,8 @@ Gem::Specification.new do |s|
      "lib/ruote-kit/public/_ruote/images/bg_button_left_submit.gif",
      "lib/ruote-kit/public/_ruote/images/bg_button_right.gif",
      "lib/ruote-kit/public/_ruote/javascripts/SimplyButtons.js",
-     "lib/ruote-kit/public/_ruote/javascripts/fluo-can.js",
      "lib/ruote-kit/public/_ruote/javascripts/fluo-dial.js",
-     "lib/ruote-kit/public/_ruote/javascripts/fluo-json.js",
-     "lib/ruote-kit/public/_ruote/javascripts/fluo-tred.js",
+     "lib/ruote-kit/public/_ruote/javascripts/ruote-fluo.js",
      "lib/ruote-kit/public/_ruote/stylesheets/SimplyButtons.css",
      "lib/ruote-kit/public/_ruote/stylesheets/base.css",
      "lib/ruote-kit/public/_ruote/stylesheets/rk.css",

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 2
   - 1
   - 8
-  - 1
-  version: 2.1.8.1
+  - 2
+  version: 2.1.8.2
 platform: ruby
 authors: 
 - kenneth.kalmer@gmail.com
@@ -166,10 +166,8 @@ files:
 - lib/ruote-kit/public/_ruote/images/bg_button_left_submit.gif
 - lib/ruote-kit/public/_ruote/images/bg_button_right.gif
 - lib/ruote-kit/public/_ruote/javascripts/SimplyButtons.js
-- lib/ruote-kit/public/_ruote/javascripts/fluo-can.js
 - lib/ruote-kit/public/_ruote/javascripts/fluo-dial.js
-- lib/ruote-kit/public/_ruote/javascripts/fluo-json.js
-- lib/ruote-kit/public/_ruote/javascripts/fluo-tred.js
+- lib/ruote-kit/public/_ruote/javascripts/ruote-fluo.js
 - lib/ruote-kit/public/_ruote/stylesheets/SimplyButtons.css
 - lib/ruote-kit/public/_ruote/stylesheets/base.css
 - lib/ruote-kit/public/_ruote/stylesheets/rk.css

data/lib/ruote-kit/public/_ruote/javascripts/fluo-json.js

@@ -1,183 +0,0 @@
-// Copyright (C) 2008 Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/**
- * @param {string} json per RFC 4627
- * @return {Object|Array}
- * @author Mike Samuel <mikesamuel@gmail.com>
- */
-//var jsonParse = (function () {
-var fluoFromJson = (function () {
-  var number
-      = '(?:-?\\b(?:0|[1-9][0-9]*)(?:\\.[0-9]+)?(?:[eE][+-]?[0-9]+)?\\b)';
-  var oneChar = '(?:[^\\0-\\x08\\x0a-\\x1f\"\\\\]'
-      + '|\\\\(?:[\"/\\\\bfnrt]|u[0-9A-Fa-f]{4}))';
-  var string = '(?:\"' + oneChar + '*\")';
-
-  // Will match a value in a well-formed JSON file.
-  // If the input is not well-formed, may match strangely, but not in an unsafe
-  // way.
-  // Since this only matches value tokens, it does not match whitespace, colons,
-  // or commas.
-  var jsonToken = new RegExp(
-      '(?:false|true|null|[\\{\\}\\[\\]]'
-      + '|' + number
-      + '|' + string
-      + ')', 'g');
-
-  // Matches escape sequences in a string literal
-  var escapeSequence = new RegExp('\\\\(?:([^u])|u(.{4}))', 'g');
-
-  // Decodes escape sequences in object literals
-  var escapes = {
-    '"': '"',
-    '/': '/',
-    '\\': '\\',
-    'b': '\b',
-    'f': '\f',
-    'n': '\n',
-    'r': '\r',
-    't': '\t'
-  };
-  function unescapeOne(_, ch, hex) {
-    return ch ? escapes[ch] : String.fromCharCode(parseInt(hex, 16));
-  }
-
-  // A non-falsy value that coerces to the empty string when used as a key.
-  var EMPTY_STRING = new String('');
-  var SLASH = '\\';
-
-  // Constructor to use based on an open token.
-  var firstTokenCtors = { '{': Object, '[': Array };
-
-  return function (json) {
-    // Split into tokens
-    var toks = json.match(jsonToken);
-    // Construct the object to return
-    var result;
-    var tok = toks[0];
-    if ('{' === tok) {
-      result = {};
-    } else if ('[' === tok) {
-      result = [];
-    } else {
-      throw new Error(tok);
-    }
-
-    // If undefined, the key in an object key/value record to use for the next
-    // value parsed.
-    var key;
-    // Loop over remaining tokens maintaining a stack of uncompleted objects and
-    // arrays.
-    var stack = [result];
-    for (var i = 1, n = toks.length; i < n; ++i) {
-      tok = toks[i];
-
-      var cont;
-      switch (tok.charCodeAt(0)) {
-        default:  // sign or digit
-          cont = stack[0];
-          cont[key || cont.length] = +(tok);
-          key = void 0;
-          break;
-        case 0x22:  // '"'
-          tok = tok.substring(1, tok.length - 1);
-          if (tok.indexOf(SLASH) !== -1) {
-            tok = tok.replace(escapeSequence, unescapeOne);
-          }
-          cont = stack[0];
-          if (!key) {
-            if (cont instanceof Array) {
-              key = cont.length;
-            } else {
-              key = tok || EMPTY_STRING;  // Use as key for next value seen.
-              break;
-            }
-          }
-          cont[key] = tok;
-          key = void 0;
-          break;
-        case 0x5b:  // '['
-          cont = stack[0];
-          stack.unshift(cont[key || cont.length] = []);
-          key = void 0;
-          break;
-        case 0x5d:  // ']'
-          stack.shift();
-          break;
-        case 0x66:  // 'f'
-          cont = stack[0];
-          cont[key || cont.length] = false;
-          key = void 0;
-          break;
-        case 0x6e:  // 'n'
-          cont = stack[0];
-          cont[key || cont.length] = null;
-          key = void 0;
-          break;
-        case 0x74:  // 't'
-          cont = stack[0];
-          cont[key || cont.length] = true;
-          key = void 0;
-          break;
-        case 0x7b:  // '{'
-          cont = stack[0];
-          stack.unshift(cont[key || cont.length] = {});
-          key = void 0;
-          break;
-        case 0x7d:  // '}'
-          stack.shift();
-          break;
-      }
-    }
-    // Fail if we've got an uncompleted object.
-    if (stack.length) { throw new Error(); }
-    return result;
-  };
-})();
-
-
-//
-// the following code is ruote-fluo code, under the BSD license.
-//
-function fluoToJson (o, quotes) {
-  if (quotes != false) quotes = true;
-  if (o == null) return 'null';
-  var t = (typeof o);
-  if (t == 'undefined') return 'null' // really ?
-  if (t == 'number') return o;
-  if (t == 'string') {
-    //return quotes ? '"' + o + '"' : o;
-    if ( ! quotes) return o;
-    return '"' +
-      o
-        .replace(/"/g, '\\"')
-        .replace(/\r/g, '')
-        .replace(/\n/g, '\\n') + 
-      '"';
-      // this global replace works with safari (webkit) and ffox
-  }
-  if (o.constructor.toString().indexOf(' Array()') == 8) {
-    var a = [];
-    for (var i = 0; i < o.length; i++) a.push(fluoToJson(o[i]));
-    return '[' + a.join(', ') + ']';
-  }
-  if (t == 'object') {
-    var a = [];
-    for (var key in o) a.push(fluoToJson(key) + ': ' + fluoToJson(o[key]));
-    return '{' + a.join(', ') + '}';
-  }
-  return o.toString();
-}
-

data/lib/ruote-kit/public/_ruote/javascripts/fluo-tred.js

@@ -1,515 +0,0 @@
-
-/*
- *  Ruote - open source ruby workflow engine
- *  (c) 2005-2009 John Mettraux
- *
- *  Ruote is freely distributable under the terms 
- *  of a BSD-style license.
- *  For details, see the OpenWFEru web site: http://openwferu.rubyforge.org
- *
- *  This piece of hack was created during the RubyKaigi2008,
- *  between Tsukuba and Akihabara.
- */
-
-//var flow = [ 'process-definition', { 'name': 'toto', 'revision': '1.0' }, [
-//    [ 'sequence', {}, [
-//      [ 'participant', { 'ref': 'alpha' }, [] ],
-//      [ 'bravo', {}, [] ]
-//    ]]
-//  ]
-//]
-
-try {
-  HTMLElement.prototype.firstChildOfClass = function (className) {
-    for (var i=0; i < this.childNodes.length; i++) {
-      var c = this.childNodes[i];
-      if (c.className == className) return c;
-    }
-    return null;
-  }
-} catch (e) {
-  // probably testing via Rhino
-}
-
-String.prototype.tstrip = function () {
-  var s = this;
-  while (s.charAt(0) == ' ') s = s.substring(1);
-  while (s.charAt(s.length - 1) == ' ') s = s.substring(0, s.length - 1);
-  return s;
-}
-String.prototype.qstrip = function () {
-  var s = this;
-  if (s.match(/".*"/)) s = s.substring(1, s.length - 1);
-  return s;
-}
-String.prototype.tqstrip = function () {
-  return this.tstrip().qstrip();
-}
-
-var FluoTred = function () {
-
-  //
-  // it's easy to override this var to let FluoTred point to another root
-  //
-  //     FluoTred.imageRoot = 'http://my.image.server.exmaple.com/img'
-  //
-  var imageRoot = '/images';
-  
-  var ExpressionHead = function () {
-
-    function createButton (imgsrc, tooltip, callback) {
-
-      var i = document.createElement("img");
-      i.callback = callback;
-      i.className = "tred_button";
-      i.setAttribute('src', imgsrc);
-      i.setAttribute('title', tooltip);
-      i.setAttribute("onclick", "this.callback()");
-      return i;
-    }
-
-    function addHeadButtons (expdiv) {
-
-      var outOpacity = 0.0;
-
-      var buttons = document.createElement('span');
-      buttons.style.opacity = outOpacity;
-
-      var root = findTredRoot(expdiv);
-
-      expdiv.onmouseover = function () { 
-        buttons.style.opacity = 1.0; 
-        //var root = findTredRoot(expdiv);
-        if (root.onOver) root.onOver(computeExpId(expdiv.parentNode));
-      };
-      expdiv.onmouseout = function () { 
-        buttons.style.opacity = outOpacity; 
-        //var root = findTredRoot(expdiv);
-        if (root.onOver) root.onOver(null);
-      };
-
-      buttons.appendChild(createButton(
-        FluoTred.imageRoot+'/btn-add.gif',
-        'add a child expression',
-        function () {
-          FluoTred.addExpression(expdiv.parentNode, [ '---', {}, [] ]);
-        }));
-
-      if (expdiv.parentNode.parentNode != root) {
-
-        buttons.appendChild(createButton(
-          FluoTred.imageRoot+'/btn-cut.gif',
-          'cut expression',
-          function () {
-            FluoTred.removeExpression(expdiv.parentNode);
-          }));
-        buttons.appendChild(createButton(
-          FluoTred.imageRoot+'/btn-moveup.gif',
-          'move expression up',
-          function () {
-            FluoTred.moveExpression(expdiv.parentNode, -1);
-            buttons.style.opacity = outOpacity;
-          }));
-        buttons.appendChild(createButton(
-          FluoTred.imageRoot+'/btn-movedown.gif',
-          'move expression down',
-          function () {
-            FluoTred.moveExpression(expdiv.parentNode, +1);
-            buttons.style.opacity = outOpacity;
-          }));
-        buttons.appendChild(createButton(
-          FluoTred.imageRoot+'/btn-paste.gif',
-          'paste expression here',
-          function () {
-            var clip = document._tred_clipboard;
-            if (clip) FluoTred.insertExpression(expdiv.parentNode, clip);
-          }));
-      }
-
-      expdiv.appendChild(buttons);
-    }
-
-    var headPattern = /^(\S*)( [.]*[^:]*)?( .*)?$/;
-    var keyPattern = /([^ :]+|".*") *:/;
-
-    function quoteKeys (s) {
-      var ss = '';
-      while (s) {
-        var m = s.match(keyPattern);
-        if ( ! m) {
-          ss += s;
-          break;
-        }
-        ss += s.substring(0, m.index - 1);
-        var m1 = m[1].tstrip();
-        if (m1.match(/^".*"$/)) ss += m1;
-        else ss += ('"' + m1 + '"');
-        ss += ':';
-        s = s.substring(m.index + m[0].length);
-      }
-      return ss;
-    }
-
-    function renderAttributes (h) {
-      s = '';
-      for (var k in h) {
-        s += ('' + k + ': ' + fluoToJson(h[k]) + ', ');
-      }
-      if (s.length > 1) s = s.substring(0, s.length - 2);
-      return s;
-    }
-
-    return {
-
-      render: function (node, exp) {
-
-        var expname = exp[0];
-
-        var text = '';
-        if ((typeof exp[2][0]) == 'string') text = exp[2].shift();
-
-        //var atts = fluoToJson(exp[1]);
-        //atts = atts.substring(1, atts.length - 1);
-        var atts = renderAttributes(exp[1]);
-
-        var d = document.createElement('div');
-        d.setAttribute('class', 'tred_exp');
-        node.appendChild(d);
-
-        var sen = document.createElement('span');
-        sen.setAttribute('class', 'tred_exp_span tred_expression_name');
-        sen.appendChild(document.createTextNode(expname));
-        d.appendChild(sen);
-
-        var ses = document.createElement('span');
-        ses.setAttribute('class', 'tred_exp_span tred_expression_string');
-        var t = text;
-        if (t != '') t = ' ' + t;
-        ses.appendChild(document.createTextNode(t));
-        d.appendChild(ses);
-
-        var sea = document.createElement('span');
-        sea.setAttribute('class', 'tred_exp_span tred_expression_atts');
-        sea.appendChild(document.createTextNode(' ' + atts));
-        d.appendChild(sea);
-
-        addHeadButtons(d);
-
-        var onblur = function () {
-
-          var p = d.parentNode;
-          var d2 = ExpressionHead.render(p, ExpressionHead.parse(this.value));
-          p.replaceChild(d2, d);
-
-          triggerChange(p); // trigger onChange()...
-        };
-
-        var onkeyup = function (evt) {
-
-          var e = evt || window.event;
-          var c = e.charCode || e.keyCode;
-          if (c == 13) this.blur();
-
-          return false;
-        }
-
-        var onclick = function () {
-          d.removeChild(sen);
-          d.removeChild(ses);
-          var input = document.createElement('input');
-          input.setAttribute('type', 'text');
-          input.value = expname + ' ' + atts;
-          if (text != '') input.value = expname + ' ' + text + ' ' + atts;
-          d.replaceChild(input, sea);
-          input.onblur = onblur;
-          input.onkeyup = onkeyup;
-          input.focus();
-        };
-
-        sen.onclick = onclick;
-        ses.onclick = onclick;
-        sea.onclick = onclick;
-
-        return d;
-      },
-
-      parseAttributes: function (s) {
-        return fluoFromJson("{" + quoteKeys(s) + "}");
-      },
-
-      parse: function (s) {
-
-        var m = s.match(headPattern);
-
-        if (m == null) return [ '---', {}, [] ];
-
-        var expname = m[1];
-
-        var children = [];
-        if (m[2]) {
-          var t = m[2].tstrip();
-          if (t.match(/".*"/)) t = t.substring(1, t.length - 1);
-          if (t != '') children.push(t);
-        }
-
-        atts = ExpressionHead.parseAttributes(m[3]);
-
-        return [ expname, atts, children ];
-      },
-
-      toExp: function (node) {
-
-        node = node.firstChild;
-
-        var name = node.childNodes[0].firstChild.nodeValue;
-        var text = node.childNodes[1].firstChild.nodeValue;
-        var atts = node.childNodes[2].firstChild.nodeValue;
-
-        atts = ExpressionHead.parseAttributes(atts);
-
-        var children = [];
-        if (text != '') children.push(text.tstrip()); 
-          // child is just a string...
-
-        return [ name, atts, children ];
-      }
-    };
-  }();
-
-  function asJson (node) {
-
-    if ((typeof node) == 'string') 
-      node = document.getElementById(node);
-
-    return fluoToJson(toTree(node));
-  }
-
-  function renderEnding (node, exp) {
-
-    var ending = document.createElement('div');
-    ending.className = 'tred_text';
-    if (exp[2].length > 0) ending.appendChild(document.createTextNode('end'));
-    node.appendChild(ending);
-  }
-
-  function renderExpressionString (node, s) {
-
-    var opening = document.createElement('div');
-
-    var sname = document.createElement('span');
-    sname.appendChild(document.createTextNode(s));
-    sname.setAttribute('onclick', 'EditableSpan.toInput(this);');
-    sname.className = 'tred_expression_string';
-    opening.appendChild(sname);
-
-    node.appendChild(opening);
-  }
-
-  function addExpression (parentExpNode, exp) {
-
-    var end = parentExpNode.lastChild;
-    var node = renderExpression(parentExpNode, exp);
-    parentExpNode.replaceChild(node, end);
-    parentExpNode.appendChild(end);
-
-    if (end.childNodes.length == 0)
-      end.appendChild(document.createTextNode('end'));
-
-    triggerChange(parentExpNode);
-  }
-
-  function removeExpression (expNode) {
-
-    var p = expNode.parentNode;
-    p.removeChild(expNode);
-
-    if (p.childNodes.length == 2)
-      p.lastChild.removeChild(p.lastChild.firstChild);
-
-    document._tred_clipboard = toTree(expNode);
-
-    triggerChange(p);
-  }
-
-  function renderExpression (parentNode, exp, isRootExp) {
-
-    //
-    // draw expression
-
-    var node = document.createElement('div');
-    node.className = 'tred_expression';
-
-    if ( ! isRootExp)
-      node.setAttribute('style', 'margin-left: 14px;');
-
-    parentNode.appendChild(node);
-
-    if ( ! (exp instanceof Array)) {
-      renderExpressionString(node, exp.toString());
-      return;
-    }
-
-    ExpressionHead.render(node, exp);
-
-    //
-    // draw children
-
-    for (var i=0; i < exp[2].length; i++) renderExpression(node, exp[2][i]);
-
-    //
-    // over
-
-    renderEnding(node, exp);
-
-    return node;
-  }
-
-  function renderFlow (parentNode, flow) {
-
-    parentNode.className = 'tred_root';
-
-    renderExpression(parentNode, flow, true);
-
-    parentNode.stack = []; // the undo stack
-    parentNode.currentTree = flow;
-  }
-
-  function moveExpression (elt, delta) {
-
-    var p = elt.parentNode;
-
-    if (delta == -1) { // move up
-      if (elt.previousSibling.className != 'tred_expression') return;
-      p.insertBefore(elt, elt.previousSibling);
-    }
-    else { // move down
-      if (elt.nextSibling.className != 'tred_expression') return;
-      p.insertBefore(elt, elt.nextSibling.nextSibling);
-    }
-
-    FluoTred.triggerChange(p);
-  }
-
-  function insertExpression (before, exp) {
-
-    var newNode = renderExpression(before.parentNode, exp);
-
-    before.parentNode.insertBefore(newNode, before);
-
-    FluoTred.triggerChange(before.parentNode);
-  }
-
-  function triggerChange (elt) {
-
-    var tredRoot = findTredRoot(elt);
-    var tree = toTree(tredRoot);
-
-    stack(tredRoot, tree);
-
-    //FluoTred.onChange(tree); 
-    if (tredRoot.onChange) tredRoot.onChange(tree);
-  }
-
-  function stack(root, tree) {
-    root.stack.push(root.currentTree);
-    root.currentTree = tree;
-  }
-
-  function undo (root) {
-
-    if ((typeof root) == 'string') root = document.getElementById(root);
-    if (root.stack.length < 1) return;
-
-    while (root.firstChild != null) root.removeChild(root.firstChild);
-
-    var tree = root.stack.pop();
-
-    root.currentTree = tree;
-    renderExpression(root, tree, true);
-
-    if (root.onChange) root.onChange(tree);
-  }
-
-  function findTredRoot (node) {
-
-      if (node.className == 'tred_root') return node;
-      return findTredRoot(node.parentNode);
-  }
-
-  function computeExpId (node, from, expid) {
-
-    if (from == null) {
-      from = findTredRoot(node);
-      expid = '';
-    }
-    if (from == node) return expid.substring(1, expid.length);
-
-    var divs = from.childNodes;
-    var childid = -1;
-
-    for (var i=0; i<divs.length; i++) {
-      var e = divs[i];
-      if (e.nodeType != 1) continue;
-      if (e.className != 'tred_expression') continue;
-      childid += 1;
-      var ei = computeExpId(node, e, expid + '.' + childid);
-      if (ei != null) return ei;
-    }
-
-    return null;
-  }
-
-  function toTree (node) {
-
-    node.focus();
-      //
-      // making sure all the input boxes get blurred...
-
-    if (node.className != 'tred_expression') {
-      node = node.firstChildOfClass('tred_expression');
-    }
-
-    //
-    // expression itself
-
-    var exp = ExpressionHead.toExp(node);
-
-    //
-    // children
-
-    var divs = node.childNodes;
-
-    var children = exp[2];
-
-    for (var i=0; i<divs.length; i++) {
-      var e = divs[i];
-      if (e.nodeType != 1) continue;
-      if (e.className != 'tred_expression') continue;
-      children.push(toTree(e));
-    }
-
-    //
-    // done
-
-    return exp;
-  }
-
-  //
-  // public methods
-  //
-  return {
-
-    ExpressionHead: ExpressionHead, // for testing purposes
-
-    renderFlow: renderFlow,
-    addExpression: addExpression,
-    removeExpression: removeExpression,
-    moveExpression: moveExpression,
-    insertExpression: insertExpression,
-    triggerChange: triggerChange,
-    undo: undo,
-    asJson: asJson,
-    imageRoot: imageRoot
-  };
-}();
-