omf_web 1.0.0 → 1.2.0

data/lib/omf-web/widget/text/maruku.rb

@@ -34,7 +34,7 @@ module OMF::Web::Widget::Text
         raise "Expected content proxy, but got '#{content_proxy.class}'"
       end
       content = content_proxy.content
-      puts ">>>> CREATING NEW MARUKU"
+      #puts ">>>> CREATING NEW MARUKU"
       ::Maruku.new(content)
     end
 

data/lib/omf-web/widget.rb

@@ -2,12 +2,12 @@
 require 'erector'
 
 module OMF::Web::Widget
-  
-    
+
+
     @@widgets = {}
-    @@descriptions = {}  
-    @@type2class = {}  
-    
+    @@descriptions = {}
+    @@type2class = {}
+
     def self.register_widget(wdescr)
       unless id = wdescr[:id]
         raise "Missing 'id' for widget '#{wdescr.inspect}'"
@@ -15,25 +15,25 @@ module OMF::Web::Widget
       id = id.to_sym
       if (@@descriptions.key? id)
         raise "Repeated try to register widget '#{id}'"
-      end  
+      end
       @@descriptions[id] = wdescr
     end
-    
+
     def self.registered_widgets()
       @@descriptions
     end
-    
+
     def self.register_widget_type(id, widget_class)
       id = id.to_sym
       if (@@type2class.key? id)
         raise "Repeated try to register widget type '#{id}'"
-      end  
+      end
       @@type2class[id] = widget_class
     end
-    
-    
+
+
     # Return the number of top level widgets. If 'restrict_to' is an
-    # array, only return those. 
+    # array, only return those.
     #
     def self.toplevel_widgets(restrict_to = nil)
       if restrict_to
@@ -49,15 +49,15 @@ module OMF::Web::Widget
         end.compact
       end
       wa.sort do |a, b|
-        (b[:priority] || 100) <=> (a[:priority] || 100) 
+        (b[:priority] || 100) <=> (a[:priority] || 100)
       end
-    end    
-    
+    end
+
     def self.create_widget(name)
       if name.is_a? Array
         # this is  short notation for a stacked widget
         #
-        wdescr = { :type => 'layout/stacked', :widgets => name} 
+        wdescr = { :type => 'layout/stacked', :widgets => name}
       elsif name.is_a? Hash
         wdescr = name
       else
@@ -85,25 +85,25 @@ module OMF::Web::Widget
         w = OMF::Web::Widget::DataWidget.new(wdescr)
       when /^layout/
         require 'omf-web/widget/layout'
-        w =  OMF::Web::Widget::Layout.create_layout_widget(type, wdescr)        
+        w =  OMF::Web::Widget::Layout.create_layout_widget(type, wdescr)
       when /^text/
         require 'omf-web/widget/text/text_widget'
-        w =  OMF::Web::Widget::TextWidget.create_text_widget(type, wdescr)        
+        w =  OMF::Web::Widget::TextWidget.create_text_widget(type, wdescr)
       when /^code/
         require 'omf-web/widget/code_widget'
-        w =  OMF::Web::Widget::CodeWidget.create_code_widget(type, wdescr)        
+        w =  OMF::Web::Widget::CodeWidget.create_code_widget(type, wdescr)
       when /^moustache/
         require 'omf-web/widget/mustache_widget'
-        w =  OMF::Web::Widget::MustacheWidget.create_mustache_widget(type, wdescr)        
+        w =  OMF::Web::Widget::MustacheWidget.create_mustache_widget(type, wdescr)
       else
         raise "Unknown widget type '#{type}' (#{wdescr.inspect})"
       end
       @@widgets[wdescr[:id]] = w
     end
-    
+
     def self._init()
       register_widget
     end
-  
+
 
 end # OMF::Web::Widget

data/lib/omf_web.rb

@@ -42,7 +42,7 @@ module OMF
       if w = y['widget']
         OMF::Web.register_widget w
       else
-        OMF::Common::LObject.error "Doesn't seem to be a widget definition. Expected 'widget' but found '#{y.keys.join(', ')}'"
+        OMF::Base::LObject.error "Doesn't seem to be a widget definition. Expected 'widget' but found '#{y.keys.join(', ')}'"
       end
     end
   

data/omf_web.gemspec

@@ -20,21 +20,24 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
 #  s.add_development_dependency "minitest", "~> 2.11.3"
-  s.add_runtime_dependency "omf_oml", "~> 1.0"
-  s.add_runtime_dependency "erector", "~> 0.8.3"
-  s.add_runtime_dependency "activesupport", "~> 3.0.0" # required by erector:table
-  s.add_runtime_dependency "rack", "~> 1.3.5"
-  s.add_runtime_dependency "thin", "~> 1.3.1"
-  s.add_runtime_dependency "coderay", "~> 1.0.6"
-  s.add_runtime_dependency "log4r", "~> 1.1.10"
-  s.add_runtime_dependency "maruku", "~> 0.6.0"
-  s.add_runtime_dependency "ritex", "~> 1.0.1"
-  s.add_runtime_dependency "json", "~> 1.7.3"
-  s.add_runtime_dependency "grit", "~> 2.5.0"
-  s.add_runtime_dependency "sqlite3", "~> 1.3.6"
-  s.add_runtime_dependency "postgres-pr", "~> 0.6.3"
-  s.add_runtime_dependency "websocket-rack", "~> 0.4.0"
-  s.add_runtime_dependency "rack-accept", "~> 0.4.5"
+  s.add_runtime_dependency "omf_oml", "~> 1"
+  s.add_runtime_dependency "omf_base"
+  s.add_runtime_dependency "erector", "~> 0.9"
+  s.add_runtime_dependency "activesupport", "~> 3.0" # required by erector:table
+  s.add_runtime_dependency "rack", "~> 1"
+  s.add_runtime_dependency "thin", "~> 1"
+  s.add_runtime_dependency "coderay", "~> 1"
+  s.add_runtime_dependency "maruku", "~> 0.6"
+  s.add_runtime_dependency "ritex", "~> 1.0"
+  s.add_runtime_dependency "json", "~> 1.7"
+  s.add_runtime_dependency "grit", "~> 2.5"
+  s.add_runtime_dependency "websocket-rack", "~> 0.4"
+  s.add_runtime_dependency "rack-accept", "~> 0.4"
+  s.add_runtime_dependency "i18n"
+
+  # Do we need the next two dependencies?
+  #s.add_runtime_dependency "sqlite3", "~> 1.3.6"
+  #s.add_runtime_dependency "postgres-pr", "~> 0.6.3"
 
   s.add_runtime_dependency "ruby-openid", "~> 2.2.3"
 

data/share/htdocs/graph/js/abstract_chart.js

@@ -1,46 +1,47 @@
 
-L.provide('OML.abstract_chart', ["graph/js/abstract_widget", "#OML.abstract_widget", "vendor/d3/d3.js"], function () {
+//L.provide('OML.abstract_chart', ["graph/js/abstract_widget", "#OML.abstract_widget", "vendor/d3/d3.js"], function () {
+
+define(["graph/abstract_widget"], function (abstract_widget) {
+
+  var abstract_chart = abstract_widget.extend({
 
-  
-  OML.abstract_chart = OML.abstract_widget.extend({
-    
     decl_color_func: {
       // scale
       "green_yellow80_red()": function() {
                                 return d3.scale.linear()
                                         .domain([0, 0.8, 1])
-                                        .range(["green", "yellow", "red"])
+                                        .range(["green", "yellow", "red"]);
                               },
       "green_red()":          function() {
                                 return d3.scale.linear()
                                         .domain([0, 1])
-                                        .range(["green", "red"])
+                                        .range(["green", "red"]);
                               },
       "red_yellow20_green()": function() {
                                 return d3.scale.linear()
                                         .domain([0, 0.2, 1])
-                                        .range(["red", "yellow", "green"])
+                                        .range(["red", "yellow", "green"]);
                               },
       "red_green()":          function() {
                                 return d3.scale.linear()
                                         .domain([0, 1])
-                                        .range(["red", "green"])
+                                        .range(["red", "green"]);
                               },
       // category
       "category10()":         function() {
-                                return d3.scale.category10()
+                                return d3.scale.category10();
                               },
       "category20()":         function() {
-                                return d3.scale.category20()
+                                return d3.scale.category20();
                               },
       "category20b()":        function() {
-                                return d3.scale.category20b()
+                                return d3.scale.category20b();
                               },
       "category20c()":        function() {
-                                return d3.scale.category20c()
+                                return d3.scale.category20c();
                               },
     },
-    
+
     defaults: function() {
       return this.deep_defaults({
         margin: {
@@ -49,19 +50,19 @@ L.provide('OML.abstract_chart', ["graph/js/abstract_widget", "#OML.abstract_widg
           right: 50,
           bottom: 40
         },
-      }, OML.abstract_chart.__super__.defaults.call(this));      
-    },    
-    
-        
+      }, abstract_chart.__super__.defaults.call(this));
+    },
+
+
     //base_css_class: 'oml-chart',
-    
+
     initialize: function(opts) {
-      OML.abstract_chart.__super__.initialize.call(this, opts);
-      
-  
+      abstract_chart.__super__.initialize.call(this, opts);
+
+
       var vis = this.init_svg(this.w, this.h);
       this.configure_base_layer(vis);
-                 
+
       var self = this;
       OHUB.bind("graph.highlighted", function(evt) {
         if (evt.source == self) return;
@@ -71,43 +72,43 @@ L.provide('OML.abstract_chart', ["graph/js/abstract_widget", "#OML.abstract_widg
         if (evt.source == self) return;
         self.on_dehighlighted(evt);
       });
-      
+
       //this.update(null);
-      this.update();         
+      this.update();
     },
-      
-    _resize_base_el: function(w, h) {  
+
+    _resize_base_el: function(w, h) {
       // Do not add margins to the base_el, but to the inside of the SVG panes
       this.w = w;
       this.h = h;
       this.base_el
         .style('height', this.h + 'px')
-        .style('width', this.w + 'px')        
+        .style('width', this.w + 'px')
         .style('margin-left', 0 + 'px')
-        .style('margin-right', 0 + 'px') 
-        .style('margin-top', 0 + 'px')        
-        .style('margin-bottom', 0 + 'px')                
+        .style('margin-right', 0 + 'px')
+        .style('margin-top', 0 + 'px')
+        .style('margin-bottom', 0 + 'px')
         ;
-      
+
       //var m = _.defaults(opts.margin || {}, this.defaults.margin);
       var m = this.opts.margin;
       var ca = this.widget_area = {
-        x: m.left, 
-        rx: w - m.left, 
-        y: m.bottom, 
-        ty: m.top, 
-        w: w - m.left - m.right, 
+        x: m.left,
+        rx: w - m.left,
+        y: m.bottom,
+        ty: m.top,
+        w: w - m.left - m.right,
         h: h - m.top - m.bottom,
         ow: w,  // outer dimensions
         oh: h
       };
-      
-    },   
-    
-    
+
+    },
+
+
     init_svg: function(w, h) {
       var opts = this.opts;
-      
+
       var vis = opts.svg = this.svg_base = this.base_el.append("svg:svg")
         // .attr("width", w)
         // .attr("height", h)
@@ -116,25 +117,25 @@ L.provide('OML.abstract_chart', ["graph/js/abstract_widget", "#OML.abstract_widg
         .attr('class', this.base_css_class);
       var offset = opts.offset;
       if (offset.x) {
-        // the next two lines do the same, but only one works 
+        // the next two lines do the same, but only one works
         // in the specific context
         vis.attr("x", offset.x);
-        vis.style("margin-left", offset.x + "px"); 
+        vis.style("margin-left", offset.x + "px");
       }
       if (offset.y) {
         vis.attr("y", offset.y);
-        vis.style("margin-top", offset.y + "px"); 
+        vis.style("margin-top", offset.y + "px");
       }
       return vis;
     },
 
-    // Split tuple array into array of tuple arrays grouped by 
+    // Split tuple array into array of tuple arrays grouped by
     // the tuple element at +index+.
     //
     group_by: function(in_data, index_f) {
       var data = [];
       var groups = {};
-      
+
       _.map(in_data, function(d) {
         var key = index_f(d);
         var a = groups[key];
@@ -147,7 +148,7 @@ L.provide('OML.abstract_chart', ["graph/js/abstract_widget", "#OML.abstract_widg
       // Sort by 'group_by' index to keep the same order and with it same color assignment.
       var data = _.sortBy(data, function(a) {
         return index_f(a[0])
-      }); 
+      });
       return data;
     },
 
@@ -156,11 +157,11 @@ L.provide('OML.abstract_chart', ["graph/js/abstract_widget", "#OML.abstract_widg
       this.ic = {
            handler: handler,
       };
-  
+
       var ig = this.base_layer.append("svg:g")
         .attr("pointer-events", "all")
         .on("mousedown", mousedown);
-  
+
       var ca = this.chart_area;
       var frame = ig.append("svg:rect")
         .attr("class", "graph-area")
@@ -171,7 +172,7 @@ L.provide('OML.abstract_chart', ["graph/js/abstract_widget", "#OML.abstract_widg
         .attr("fill", "none")
         .attr("stroke", "none")
         ;
-  
+
       function mousedown() {
         var ic = self.ic;
         if (!ic.rect) {
@@ -189,7 +190,7 @@ L.provide('OML.abstract_chart', ["graph/js/abstract_widget", "#OML.abstract_widg
         ic.move_event_consumed = false;
         d3.event.preventDefault();
       }
-  
+
       function mousedown_box() {
         var ic = self.ic;
         mousedown();
@@ -197,20 +198,20 @@ L.provide('OML.abstract_chart', ["graph/js/abstract_widget", "#OML.abstract_widg
           ic.offsetx = ic.x0[0] - ic.minx;
         }
       }
-  
+
       function mousemove(x, d, i) {
         var ic = self.ic;
         var ca = self.chart_area;
-  
+
         if (!ic.rect) return;
         if (!ic.is_dragging) return;
         ic.has_moved = true;
-  
+
         var x1 = d3.svg.mouse(ic.rect.node());
         var minx;
         if (ic.offsetx) {
           minx = Math.max(ca.x, x1[0] - ic.offsetx);
-          minx = ic.minx = Math.min(minx, ca.x + ca.w - ic.width); 
+          minx = ic.minx = Math.min(minx, ca.x + ca.w - ic.width);
         } else {
           minx = ic.minx = Math.max(ca.x, Math.min(ic.x0[0], x1[0]));
           var maxx = Math.min(ca.x + ca.w, Math.max(ic.x0[0], x1[0]));
@@ -218,7 +219,7 @@ L.provide('OML.abstract_chart', ["graph/js/abstract_widget", "#OML.abstract_widg
         }
         self.update_selection({screen_minx: minx});
       }
-  
+
       function mouseup() {
         var ic = self.ic;
         if (!ic.rect) return;
@@ -231,18 +232,18 @@ L.provide('OML.abstract_chart', ["graph/js/abstract_widget", "#OML.abstract_widg
           if (ic.handler) ic.handler(this, 0, 0);
         }
       }
-  
+
       d3.select(window)
           .on("mousemove", mousemove)
           .on("mouseup", mouseup);
     },
-  
+
     update_selection: function(selection) {
       if (!this.ic) return;
-  
+
       var ic = this.ic;
       var ca = this.chart_area;
-  
+
       var sminx = selection.screen_minx;
       if (sminx) {
         ic.rect
@@ -260,16 +261,16 @@ L.provide('OML.abstract_chart', ["graph/js/abstract_widget", "#OML.abstract_widg
         ic.handler(this, imin, imax);
       }
     },
-    
+
     /*************
      * Deal with schema and turn +mapping+ instructions into actionable functions.
      */
-    
-    
+
+
     on_highlighted: function(evt) {},
     on_dehighlighted: function(evt) {},
-    
-    
+
+
     // Return an array with the 'min' and 'max' value returned by running 'f' over 'data'
     // However, any 'min' and 'max' values in 'opts' take precedence.
     //
@@ -286,7 +287,7 @@ L.provide('OML.abstract_chart', ["graph/js/abstract_widget", "#OML.abstract_widg
       var min = o.min != undefined ? o.min : d3.min(data, function(s) {return d3.min(s, f)});
       return [min, max];
     }
-
-    
   });
-})
+
+  return abstract_chart;
+});

data/share/htdocs/graph/js/abstract_nv_chart.js

@@ -1,17 +1,17 @@
 
-L.provide('d3', ["vendor/d3/d3.js"], function() {
-  L.provide('nv_d3', ["vendor/nv_d3/js/nv.d3.js",  "vendor/nv_d3/css/nv.d3.css"]);
-})
+require.config({
+  shim: {
+    "vendor/nv_d3/js/nv.d3": ["vendor/d3/d3", "css!vendor/nv_d3/css/nv.d3"]
+  }
+});
 
-L.provide('OML.abstract_nv_chart', ["graph/js/abstract_chart", "#OML.abstract_chart", 
-                                   //"graph/js/axis", "#OML.axis", "graph/css/graph.css", 
-                                   "#nv_d3"], function () {
+define(["graph/abstract_chart", 'vendor/nv_d3/js/nv.d3'], function (abstract_chart) {
 
-  OML.abstract_nv_chart = OML.abstract_chart.extend({
+  var abstract_nv_chart = abstract_chart.extend({
     axis_defaults: {
       legend: {
         text: 'DESCRIBE ME',
-        offset: 40 
+        offset: 40
       },
       ticks: {
         // type: 'date',
@@ -25,15 +25,15 @@ L.provide('OML.abstract_nv_chart', ["graph/js/abstract_chart", "#OML.abstract_ch
       },
       margin: {
         top: 0, right: 0, bottom: 0, left: 50 // not sure what impact this really has?
-      }    
+      }
     },
-    
+
     defaults: function() {
       return this.deep_defaults({
         transition_duration: 500
-      }, OML.abstract_nv_chart.__super__.defaults.call(this));      
-    },    
-      
+      }, abstract_nv_chart.__super__.defaults.call(this));
+    },
+
 
     configure_base_layer: function(vis) {
       this.base_layer = vis;
@@ -41,24 +41,24 @@ L.provide('OML.abstract_nv_chart', ["graph/js/abstract_chart", "#OML.abstract_ch
       this._configure_mapping(this.mapping, chart);
       this._configure_options(this.opts, chart);
     },
-    
+
     _configure_mapping: function(m, chart) {
     },
-    
+
     _configure_options: function(opts, chart) {
       chart.margin(opts.margin);
     },
-    
+
     _configure_xy_axis: function(opts, chart) {
       var oaxis = opts.axis || {};
       var a_defaults = this.axis_defaults;
-      
+
       var xao = _.defaults(oaxis.x || {}, a_defaults);
       this._configure_axis('x', chart.xAxis, xao);
       var yao = _.defaults(oaxis.y || {}, a_defaults);
       this._configure_axis('y', chart.yAxis, yao);
     },
-    
+
     _configure_axis: function(name, axis, opts) {
       // LABEL
       var ol = opts.legend;
@@ -67,15 +67,15 @@ L.provide('OML.abstract_nv_chart', ["graph/js/abstract_chart", "#OML.abstract_ch
         //ol = _.defaults(ol, defaults.axis);
         axis.axisLabel(ol.text);
       }
-      
+
       // TICKS
-      var ot = opts.ticks // _.defaults(opts.ticks || {}, defaults.ticks);
+      var ot = opts.ticks; // _.defaults(opts.ticks || {}, defaults.ticks);
       // Check if we need a special formatter for the tick labels
       if (ot.type == 'date' || ot.type == 'dateTime') {
         var d_f = d3.time.format(ot.format || "%X");
         axis.tickFormat(function(d) {
           var date = new Date(1000 * d);  // TODO: Implicitly assuming that value is in seconds is most likely NOT a good idea
-          var fs = d_f(date); 
+          var fs = d_f(date);
           return fs;
         });
       } else if (ot.type == 'key') {
@@ -90,7 +90,7 @@ L.provide('OML.abstract_nv_chart', ["graph/js/abstract_chart", "#OML.abstract_ch
       if (ot.subdivide) axis.tickSubdivide(ot.subdivide);
       if (ot.size) {
         // apply doesn't seem to work here
-        if (typeof ot.size === 'number') 
+        if (typeof ot.size === 'number')
           axis.tickSize(ot.size);
         else {
           var a = ot.size;
@@ -103,37 +103,39 @@ L.provide('OML.abstract_nv_chart', ["graph/js/abstract_chart", "#OML.abstract_ch
       }
       if (ot.padding) axis.tickPadding(ot.padding);
       if (ot.count) axis.ticks(ot.count);
-      
+
       // MARGIN
-      var om = opts.margin //_.defaults(ot.margin || {}, defaults.margin);
+      var om = opts.margin; //_.defaults(ot.margin || {}, defaults.margin);
       axis.margin(om);
 
       // MISC
-      axis.showMaxMin(false)
+      axis.showMaxMin(false);
     },
 
     resize: function() {
       var self = this;
-      OML.abstract_nv_chart.__super__.resize.call(this);
+      abstract_nv_chart.__super__.resize.call(this);
       if (this.chart) {
         this.chart.width(self.width);
-        this.chart.height(self.height);        
+        this.chart.height(self.height);
         this.chart.update();
-      } 
+      }
     },
-  
+
     redraw: function(data) {
       var bl = this.base_layer//.select(".chart_layer")
                   .datum(this._datum(data, this.chart))
                   ;
       if (this.opts.transition_duration > 0) {
-        bl = bl.transition().duration(500)
+        bl = bl.transition().duration(500);
       }
       bl.call(this.chart);
     },
-    
-  })
-})
+
+  });
+
+  return abstract_nv_chart;
+});
 
 /*
   Local Variables: