omf_web 1.2.6 → 1.2.7

data/lib/omf-web/widget/data_widget.rb

@@ -34,19 +34,28 @@ module OMF::Web::Widget
 
       if (ds = opts.delete(:data_source))
         # single source
-        data_sources = {:default => ds}
+        #data_sources = {:default => ds}
+        data_sources = [ds]
       end
       unless data_sources ||= opts.delete(:data_sources)
         raise "Missing option ':data_sources' for widget '#{name}'"
       end
-      unless data_sources.kind_of? Hash
-        data_sources = {:default => data_sources}
+      if data_sources.kind_of? Hash
+        # turn into array an set stream
+        data_sources = data_sources.map do |sname, ds_descr|
+          ds_descr[:stream] ||= sname
+        end
+      end
+      unless data_sources.kind_of? Array
+        #data_sources = {:default => data_sources}
+        raise "Unexpected ':data_sources' for widget '#{name}' - #{data_sources}"
       end
-      opts[:data_sources] = data_sources.collect do |name, ds_descr|
+      i = 0
+      opts[:data_sources] = data_sources.map do |ds_descr|
         unless ds_descr.is_a? Hash
           ds_descr = {:name => ds_descr}
         end
-        ds_descr[:alias] = "#{name}_#{self.object_id}"
+        ds_descr[:alias] = "#{name}_#{self.object_id}_#{i += 1}"
         #{:stream => ds_descr, :name => name}
         unless OMF::Web::DataSourceProxy.validate_ds_description(ds_descr)
           raise "Unknown data source requested for data widget - #{ds_descr}"

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

@@ -43,6 +43,16 @@ module OMF::Web::Widget::Text
       ::Maruku.new(content)
     end
 
+    # The markdown document may have some meta instructions at the
+    # beginning of the document which are formatted like an HTTP header
+    def self.count_header_lines(content)
+      count = 0
+      match = (content =~ /\A((\w[\w\s\_\-]+: .*\n)+)\s*\n/)
+      return 0 if match != 0
+
+      headers = $1
+      headers.split("\n").length + 1
+    end
 
     class WidgetElement < OMF::Base::LObject
 
@@ -138,7 +148,8 @@ if __FILE__ == $0
   if fname = ARGV[0]
     content = File.open(fname).read
   else
-    content = %{
+    content = %{title: Lorem2
+
 # Lorem ipsum dolor sit
 
 Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin
@@ -152,6 +163,10 @@ lorem, gravida scelerisque velit est vitae eros. Suspendisse eu
 lacinia elit.
 }
   end
+
+
   x = OMF::Web::Widget::Text::Maruku.format_content(content)
+  puts "HEADER LENGTH: #{OMF::Web::Widget::Text::Maruku.count_header_lines(content)}"
+
   puts x.to_html(suppress_section: false)
 end

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

@@ -53,7 +53,7 @@ module OMF::Web::Widget
     end
 
     def content_id
-      @content_proxy.content_id
+      @content_proxy.content_url
     end
 
     def mime_type

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

@@ -61,7 +61,7 @@ define(["graph/abstract_widget"], function (abstract_widget) {
 
 
       var vis = this.init_svg(this.w, this.h);
-      this.configure_base_layer(vis);
+      if (vis) this.configure_base_layer(vis);
 
       var self = this;
       OHUB.bind("graph.highlighted", function(evt) {
@@ -74,6 +74,7 @@ define(["graph/abstract_widget"], function (abstract_widget) {
       });
 
       //this.update(null);
+      this.init_chart();
       this.update();
     },
 
@@ -84,6 +85,11 @@ define(["graph/abstract_widget"], function (abstract_widget) {
       }
     },
 
+    // This is called once and just before update()
+    init_chart: function() {
+      // Do nothing, but allow override
+    },
+
     _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;

data/share/htdocs/graph/js/abstract_multiple_datasource_chart.js

@@ -38,17 +38,34 @@ define(["graph/abstract_chart"], function(abstract_chart) {
     process_schema: function() {
       var self = this;
       var ds_names = self.data_source_names;
+      var outstanding_schemas = ds_names.slice(0); // real copy
 
-      var schemas = self.schema = {};
-      _.each(ds_names, function(ds_name) {
-        schemas[ds_name] = self.process_single_schema(self.data_source[ds_name]);
+      // CHeck for all the schemas first and when we have them, really
+      // process the schemas
+      _.each(ds_names, function(name) {
+        self.data_source[name].on_schema(function() {
+          outstanding_schemas = _.without(outstanding_schemas, name);
+          if (_.isEmpty(outstanding_schemas.length)) {
+            self._process_schema();
+          }
+        });
       });
+    },
 
+    _process_schema: function() {
+      var self = this;
+      var ds_names = self.data_source_names;
       var om = self.opts.mapping;
       if (om == undefined) {
         throw "Missing mapping instructions in 'options'.";
       }
       self.mapping = {};
+      var schemas = self.schema = {};
+
+      _.each(ds_names, function(ds_name) {
+        schemas[ds_name] = self.process_single_schema(self.data_source[ds_name]);
+      });
+
       _.each(ds_names, function(ds_name) {
         var mapping = om[ds_name];
         if (mapping == undefined) {
@@ -56,6 +73,7 @@ define(["graph/abstract_chart"], function(abstract_chart) {
         }
         self.mapping[ds_name] = self.process_single_mapping(ds_name, mapping, self.decl_properties[ds_name]);
       });
+      self.init_mapping();
     },
 
     /*

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

@@ -1,9 +1,5 @@
 
-require.config({
-  shim: {
-    "vendor/nv_d3/js/nv.d3": ["vendor/d3/d3", "css!vendor/nv_d3/css/nv.d3"]
-  }
-});
+OML.require_dependency("vendor/nv_d3/js/nv.d3", ["vendor/d3/d3", "css!vendor/nv_d3/css/nv.d3"]);
 
 define(["graph/abstract_chart", 'vendor/nv_d3/js/nv.d3'], function (abstract_chart) {
 
@@ -37,9 +33,18 @@ define(["graph/abstract_chart", 'vendor/nv_d3/js/nv.d3'], function (abstract_cha
 
     configure_base_layer: function(vis) {
       this.base_layer = vis;
-      var chart = this.chart = this._create_model(); //nv.models.lineWithFocusChart();
-      this._configure_mapping(this.mapping, chart);
-      this._configure_options(this.opts, chart);
+      this._configure_options(this.opts, this.get_chart());
+    },
+
+    get_chart: function() {
+      if (! this.chart) {
+        this.chart = this._create_model(); //nv.models.lineWithFocusChart();
+      }
+      return this.chart;
+    },
+
+    init_mapping: function() {
+      this._configure_mapping(this.mapping, this.get_chart());
     },
 
     _configure_mapping: function(m, chart) {
@@ -116,9 +121,10 @@ define(["graph/abstract_chart", 'vendor/nv_d3/js/nv.d3'], function (abstract_cha
       var self = this;
       abstract_nv_chart.__super__.resize.call(this);
       if (this.chart) {
-        this.chart.width(self.width);
-        this.chart.height(self.height);
-        //this.chart.update();
+        // this.chart.width(self.width);
+        // this.chart.height(self.height);
+        this.chart.width(self.w);
+        this.chart.height(self.h);
       }
     },
 

data/share/htdocs/graph/js/abstract_widget.js

@@ -142,12 +142,17 @@ define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
       return ds;
     },
 
+    init_mapping: function() {},
 
     process_schema: function() {
-      this.schema = this.process_single_schema(this.data_source);
-      if (typeof(this.decl_properties) != "undefined") {
-        this.mapping = this.process_single_mapping(null, this.opts.mapping, this.decl_properties);
-      }
+      var self = this;
+      this.data_source.on_schema(function() {
+        self.schema = self.process_single_schema(self.data_source);
+        if (typeof(self.decl_properties) != "undefined") {
+          self.mapping = self.process_single_mapping(null, self.opts.mapping, self.decl_properties);
+        }
+        self.init_mapping();
+      });
     },
 
     process_single_schema: function(data_source) {
@@ -155,8 +160,12 @@ define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
       var o = this.opts;
       var schema = {};
       _.map(data_source.schema, function(s, i) {
-          s['index'] = i;
-          schema[s.name] = s;
+        // TODO: Remove, this is quick hack to addres a bug in Job Service
+        if (_.isArray(s)) { s = {name: s[0], type: s[1]}; }
+        // End of hack
+
+        s['index'] = i;
+        schema[s.name] = s;
       });
       return schema;
     },
@@ -295,19 +304,40 @@ define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
              return v;
            };
          case 'color':
-           var color_fname = descr.color;
-           if (color_fname == undefined) {
-             throw "Missing color function for '" + mname + "'.";
+           var color_fdecl = descr.color;
+           if (color_fdecl == undefined) {
+             throw "Missing color mapping declaration for '" + mname + "'.";
            }
-           var color_fp = self.decl_color_func[color_fname];
-           if (color_fp == undefined) {
-             throw "Unknown color function '" + color_fname + "'.";
+           var color_f = null;
+           if (typeof color_fdecl == 'string') {
+             var color_fp = self.decl_color_func[color_fdecl];
+             if (color_fp == undefined) {
+               throw "Unknown color function '" + color_fname + "'.";
+             }
+             color_f = color_fp();
+           } else if (color_fdecl instanceof Object) {
+             if (color_fdecl instanceof Array) {
+               var l = color_fdecl.length;
+               color_f = function(v) {
+                 if (v < 0) v = 0;
+                 if (v >= l) v = l - 1;
+                 return color_fdecl[v];
+               };
+             } else {
+               // hash table, mapping some name to color
+               return function(d) {
+                 var key = d[index];
+                 var c = color_fdecl[key] || 'black';
+                 return c;
+               };
+             }
+           } else {
+             throw "Unknown color function type '" + color_fdecl + "'.";
            }
-           var color_f = color_fp();
            var scale = descr.scale;
            var min_value = descr.min;
            return function(d) {
-             var v = d[index];
+             var v = parseInt(d[index]);
              if (scale != undefined) v = v * scale;
              if (min_value != undefined && v < min_value) v = min_value;
              var color = color_f(v);

data/share/htdocs/graph/js/line_chart3.js

@@ -1,11 +1,7 @@
 
-require.config({
-  shim: {
-    "vendor/nv_d3/js/nv.d3": ["vendor/d3/d3", "css!vendor/nv_d3/css/nv.d3"],
-    "vendor/nv_d3/js/models/line": ["vendor/nv_d3/js/nv.d3"],
-    "vendor/nv_d3/js/models/lineChart": ["vendor/nv_d3/js/models/line"],
-  }
-});
+OML.require_dependency("vendor/nv_d3/js/nv.d3", ["vendor/d3/d3", "css!vendor/nv_d3/css/nv.d3"]);
+OML.require_dependency("vendor/nv_d3/js/models/line", ["vendor/nv_d3/js/nv.d3"]);
+OML.require_dependency("vendor/nv_d3/js/models/lineChart", ["vendor/nv_d3/js/models/line"]);
 
 define(["graph/abstract_nv_chart",
           "graph/abstract_chart", "graph/axis",
@@ -52,7 +48,7 @@ define(["graph/abstract_nv_chart",
         // ;
 
       this.opts.transition_duration = 0; // force no smooth transition
-      this._configure_xy_axis(opts, chart)
+      this._configure_xy_axis(opts, chart);
     },
 
     _datum: function(data, chart) {
@@ -67,7 +63,7 @@ define(["graph/abstract_nv_chart",
       } else {
         data = [data];
       };
-      chart.showLegend(data.length > 1);
+      chart.showLegend(group_by != null);
 
       return data.map(function(rows, i) {
         var name = m.group_by != null ? m.group_by(rows[0]) : 'unknown';

data/share/htdocs/graph/js/map2.js

@@ -1,26 +1,28 @@
 
 
 //L.provide('OML.map', ["d3", "http://maps.googleapis.com/maps/api/js?sensor=true"], function () {
-L.provide('OML.googleLoader', ["http://www.google.com/jsapi"], function () {  
-  google.load("maps", "3", {"callback" : onMapLoaded, "other_params":"sensor=true"});
-});
-
-function onMapLoaded() {
-  
-  L.provide('OML.map2', ["graph/js/abstract_chart", "#OML.abstract_chart"], function () {  
-    
-    OML.map2 = OML.abstract_chart.extend({
+// define(["http://www.google.com/jsapi"], function () {
+  // google.load("maps", "3", {"callback" : onMapLoaded, "other_params":"sensor=true"});
+// });
+
+
+  define(["graph/abstract_chart", "http://www.google.com/jsapi"], function (abstract_chart) {
+
+  //L.provide('OML.map2', ["graph/js/abstract_chart", "#OML.abstract_chart"], function () {
+
+    var map2 = abstract_chart.extend({
       //this.opts = opts;
-      
+
       decl_properties: [
-        ['lat', 'float', {}], 
-        ['lng', 'float', {}], 
-        ['radius', 'int', 10], 
-        ['fill_color', 'color', 'blue'], 
-        ['stroke_width', 'int', 1], 
-        ['stroke_color', 'color', 'black'], 
+        ['latitude', 'key', {property: 'latitude'}],
+        ['longitude', 'key', {property: 'longitude'}],
+        //['radius', 'key', {property: 'radius', type: 'int', default: 10}],
+        ['radius', 'int', 10],
+        ['fill_color', 'color', 'blue'],
+        ['stroke_width', 'int', 1],
+        ['stroke_color', 'color', 'black'],
       ],
-      
+
       defaults: function() {
         return this.deep_defaults({
           margin: {
@@ -29,10 +31,13 @@ function onMapLoaded() {
             right: 20,
             bottom: 0
           },
-        }, OML.map2.__super__.defaults.call(this));      
-      },    
-      
-      
+          events: {
+            // click: event_name
+          }
+        }, map2.__super__.defaults.call(this));
+      },
+
+
       init_svg: function(w, h) {
       //this.init = function(opts) {
         var self = this;
@@ -40,9 +45,9 @@ function onMapLoaded() {
         var base_el = opts.base_el || '#map';
         d3.select(base_el)
           .style('position', 'relative')
-          .style("height", "100%") 
+          .style("height", "100%")
           .style("width", "100%")
-          .style("height", h) 
+          .style("height", h)
           .style("width", w)
           ;
 
@@ -54,74 +59,90 @@ function onMapLoaded() {
         var center = opts.map.center || [151.197189, -33.895508];
         var zoom = opts.map.zoom;
         if (zoom == undefined) zoom = 17;
-        var map = this.map = new google.maps.Map(node, {
-          zoom: zoom,
-          center: new google.maps.LatLng(center[1], center[0]),
-          mapTypeId: google.maps.MapTypeId.ROADMAP
-        });
         // force width and height AFTER creating the map, otherwise height is zero.
         var ca = this.widget_area;
         d3.select('#' + map_el)
-                          .style("height", ca.h + "px") 
+                          .style("height", ca.h + "px")
                           .style("width", ca.w + "px")
                           .style("position", "relative")
                           // .style("position", "absolute")
-                          .style("top", ca.ty + "px")          
+                          .style("top", ca.ty + "px")
                           .style("left", ca.x + "px")
-                          //.style('z-index', '10')        
+                          //.style('z-index', '10')
                           ;
 
         this.offset = {left: 0, top: 0};
-        
-        google.maps.event.addListener(map, 'bounds_changed', function() {
-          self._resize();
-          self.redraw();
-        });        
-        google.maps.event.addListener(map, 'zoom_changed', function() {
-          // some things aren't set yet when 'bounds_changed' is called after a zoom'
-          setTimeout(function() {
-            self._resize();
+
+        var map = null;
+        google.load("maps", "3", {
+          "other_params":"sensor=true",
+          "callback" : function() {
+            map = self.map = new google.maps.Map(node, {
+              zoom: zoom,
+              center: new google.maps.LatLng(center[1], center[0]),
+              mapTypeId: google.maps.MapTypeId.ROADMAP
+            });
+
+            google.maps.event.addListener(map, 'bounds_changed', function() {
+              self._resize();
+              self.redraw();
+            });
+            google.maps.event.addListener(map, 'zoom_changed', function() {
+              // some things aren't set yet when 'bounds_changed' is called after a zoom'
+              setTimeout(function() {
+                self._resize();
+                self.redraw();
+              }, 100);
+            });
+
+            self._configure_base_layer();
             self.redraw();
-          }, 100);
-        });       
+          }
+        });
+        return null;
       },
-      
+
+      // _google_init: function() {
+//
+      // },
+
       _resize: function() {
         var self = this;
-        
+
         if (self.svg_layer) {
           var map_el = self.map_el;
           var map = $('#' + map_el);
-          var div = $('#' + map_el + '_div');            
+          var div = $('#' + map_el + '_div');
           var svg = $('#' + map_el + '_svg');
           var map_offset = map.offset();
           var div_offset = div.offset();
-          
+
           svg.width($('#' + map_el).width());
-          svg.height($('#' + map_el).height());                        
+          svg.height($('#' + map_el).height());
 
           //console.log(map_offset.left - div_offset.left);
           // Reposition the SVG layer to cover the entire map area - requires readjustment later (this.offset)
           self.svg_layer
-            .style("top", (self.offset.top = map_offset.top - div_offset.top) + "px")       
+            .style("top", (self.offset.top = map_offset.top - div_offset.top) + "px")
             .style("left", (self.offset.left = map_offset.left - div_offset.left) + "px")
-            ;             
-        }   
+            ;
+        }
       },
-  
+
       redraw: function() {
         //console.log("redraw");
         if (this.draw_layer) this._draw(null);
         //this.overlay.map_changed();
       },
-      
+
       _draw: function(overlay) {
-        var projection = this.overlay.getProjection();          
+        var self = this;
+        var projection = this.overlay.getProjection();
         var m = this.mapping;
         var offset = this.offset;
         var x_f = function(d) {
-          var lat = m.lat(d.value);
-          var lng = m.lng(d.value);
+          var lat = m.latitude(d.value);
+          var lng = m.longitude(d.value);
           var point = new google.maps.LatLng(lat, lng);
           var xy = d.xy = projection.fromLatLngToDivPixel(point);
           return xy.x - offset.left;
@@ -131,60 +152,82 @@ function onMapLoaded() {
         };
         var m_f = function(d, m) {
           return (typeof m === "function") ? m(d.value) : m;
-        }
-        
+        };
+
         var data = d3.entries(this.data_source.rows());
         this.draw_layer.selectAll('.marker')
           .data(data)
-            .attr("cx", x_f) 
+            .attr("cx", x_f)
             .attr("cy", y_f)
-            .attr("r", function(d) {return m_f(d, m.radius)})
-            .style("fill", function(d) {return m_f(d, m.fill_color)})
-            .style("stroke", function(d) {return m_f(d, m.stroke_color)})
-            .style("stroke-width", function(d) {return m_f(d, m.stroke_width)})
+            .attr("r", function(d) {return m_f(d, m.radius);})
+            .style("fill", function(d) {return m_f(d, m.fill_color);})
+            .style("stroke", function(d) {return m_f(d, m.stroke_color);})
+            .style("stroke-width", function(d) {return m_f(d, m.stroke_width);})
           .enter().append('svg:circle')
             .attr("class", "marker")
-            .attr("cx", x_f) 
+            .attr("cx", x_f)
             .attr("cy", y_f)
-            .attr("r", function(d) {return m_f(d, m.radius)})
-            .style("fill", function(d) {return m_f(d, m.fill_color)})
-            .style("stroke", function(d) {return m_f(d, m.stroke_color)})
-            .style("stroke-width", function(d) {return m_f(d, m.stroke_width)})
+            .attr("r", function(d) {return m_f(d, m.radius);})
+            .style("fill", function(d) {return m_f(d, m.fill_color);})
+            .style("stroke", function(d) {return m_f(d, m.stroke_color);})
+            .style("stroke-width", function(d) {return m_f(d, m.stroke_width);})
+            .call(self._configure_events, self.opts.events, self)
+            .style("cursor", 'pointer')
+            // .on('click', function(d) {
+              // var x = self;
+              // var i = 0;
+            // })
+            // .on('mouseover', function(d) {
+              // var x = self;
+              // var i = 0;
+            // })
           ;
       },
 
-      configure_base_layer: function(vis) {
+      _configure_events: function(el, events, self) {
+        _.each(events, function(v, event) {
+          el.on(event, function(d) {
+            var ev_name = v;
+            OHUB.trigger(ev_name, {el: self, datum: d.value, schema: self.schema});
+          });
+        });
+      },
+
+      // Should only call this after Google map is initialised
+      _configure_base_layer: function(vis) {
         var overlay = this.overlay = new google.maps.OverlayView();
         var self = this;
-        
+
         // Add the container when the overlay is added to the map.
         overlay.onAdd = function() {
-          var overlay_layer = this.getPanes().overlayLayer;
+          var overlay_layer = this.getPanes().overlayMouseTarget;
           d3.select(overlay_layer).attr('id', 'fooooo');
           self.div_layer = d3.select(overlay_layer).append("div")
               .attr('id', self.map_el + '_div')
               //.attr('class', this.base_css_class);
-              ;          
+              ;
           self.svg_layer = self.div_layer.append("svg:svg")
               .attr('id', self.map_el + '_svg')
               .style("position", "absolute")
-              .style('z-index', '10')                  
+              .style('z-index', '10')
               ;
           self.draw_layer = self.svg_layer.append("svg:g")
               ;
           self._resize();
-          
+
           overlay.draw = function() {
-            //console.log("overlay draw"); 
-            self._draw(this) 
+            //console.log("overlay draw");
+            self._draw(this);
           };
-        };      
+        };
         overlay.setMap(this.map);
       }
-    })
+
+    });
+
+    return map2;
   });
 
-}
 
 /*
   Local Variables:
@@ -192,4 +235,4 @@ function onMapLoaded() {
   tab-width: 2
   indent-tabs-mode: nil
   End:
-*/
+*/