omf_web 0.9.1 → 0.9.3

data/lib/omf-web/theme/abstract_page.rb

@@ -13,24 +13,8 @@ module OMF::Web::Theme
     depends_on :js, "/resource/js/require3.js"
 
     depends_on :js, "/resource/theme/abstract/abstract.js"
-    depends_on :js, "/resource/js/data_source.js"    
+    depends_on :js, "/resource/js/data_source2.js"    
 
-    # depends_on :script, %{
-      # L.baseURL = "/resource";
-      # OML = {
-        # data_sources: {},
-        # widgets: {},
-#         
-      # };
-#         
-      # var OHUB = {};
-      # _.extend(OHUB, Backbone.Events);
-#       
-      # $(window).resize(function(x) {
-        # OHUB.trigger('window.resize', {});
-      # });      
-    # }
-    
     attr_reader :opts
     
     def initialize(widget, opts)
@@ -40,6 +24,17 @@ module OMF::Web::Theme
       @opts = opts
     end
     
+    def content
+      javascript %{
+        if (typeof(LW) == "undefined") LW = {};
+        LW.session_id = OML.session_id = '#{Thread.current["sessionID"]}';
+        
+        L.provide('jquery', ['vendor/jquery/jquery.js']);
+        //L.provide('jquery.periodicalupdater', ['vendor/jquery/jquery.periodicalupdater.js']);   
+        //L.provide('jquery.ui', ['vendor/jquery-ui/js/jquery-ui.min.js']);
+      }    
+    end
+
     def render_flash
       return unless @flash
       if @flash[:notice] 
@@ -61,23 +56,44 @@ module OMF::Web::Theme
       end
     end # render_flesh
     
+    # Return an array of widgets to collect data sources from
+    #
+    def data_source_widgets
+      # puts ">>>>> #{@widget.class}"
+      # if @widget.respond_to? :data_source_widgets
+        # @widget.data_source_widgets
+      # else
+        [@widget]
+      # end
+    end
+    
     def render_data_sources
       return unless @widget
       
       require 'omf-oml/table'
       require 'set'
       
-      dsh = {}
-      @widget.collect_data_sources(Set.new).each do |ds|
-        name = ds[:name].to_s
-        dsh[name] = ds.merge(dsh[name] || {})
+      dss = Set.new
+      data_source_widgets.each do |w|
+        w.collect_data_sources(dss)
       end
+      #puts ">>>>>>>>>>> #{dss.inspect}"
+      # dsh = {}
+      # dss.each do |ds|
+        # name = ds[:name].to_s
+        # dsh[name] = ds.merge(dsh[name] || {})
+      # end
+
       #puts ">>>> #{dsh.inspect}"
-      return if dsh.empty?
+      return if dss.empty?
       
-      js = dsh.values.to_a.collect do |ds|
+      js = dss.map do |ds|
         render_data_source(ds)
       end
+      
+      # js = dsh.values.to_a.collect do |ds|
+        # render_data_source(ds)
+      # end
       # Calling 'javascript' doesn't seem to work here. No idea why, so let's do it by hand
       %{
         <script type="text/javascript">
@@ -88,11 +104,11 @@ module OMF::Web::Theme
       }
     end
     
-    def render_data_source(ds, update_interval = -1)
+    def render_data_source(ds)
       dspa = OMF::Web::DataSourceProxy.for_source(ds)
       dspa.collect do |dsp|
         dsp.reset()
-        dsp.to_javascript(update_interval)
+        dsp.to_javascript(ds)
       end.join("\n")
     end
     
@@ -105,6 +121,7 @@ module OMF::Web::Theme
     end
   
     def to_html(opts = {})
+      page_title = @title  # context may get screwed up below, so put title into scope
       b = super
       if @opts[:request].params.key?('embedded')
         b
@@ -114,7 +131,7 @@ module OMF::Web::Theme
           instruct
           html do
             head do
-              title @title || "OMF WEB"
+              title page_title || "OMF WEB"
               #<link rel="shortcut icon" href="/resource/theme/@theme/img/favicon.ico">
               #<link rel="apple-touch-icon" href="/resource/theme/@theme/img/apple-touch-icon.png">
               text! e.join("\n")

data/lib/omf-web/theme/bright/code_renderer.rb

@@ -93,7 +93,7 @@ module OMF::Web::Theme
           :media => "all", :rel => "stylesheet", :type => "text/css"
       
       javascript(%{
-        L.require('#OML.code_mirror2', 'graph/code_mirror2.js', function() {
+        L.require('#OML.code_mirror', 'graph/js/code_mirror', function() {
           OML.widgets.#{base_id} = new OML.code_mirror(#{opts.to_json});
         });
       })

data/lib/omf-web/theme/bright/page.rb

@@ -32,6 +32,7 @@ module OMF::Web::Theme
     # end
  
     def content
+      super
       div :id => 'doc3' do
         div :id => 'hd' do
           render_top_line

data/lib/omf-web/theme/bright/tabbed_renderer.rb

@@ -29,6 +29,13 @@ module OMF::Web::Theme
         end
       end     
     end
+    
+    # Return an array of widgets to collect data sources from
+    #
+    # def data_source_widgets
+      # puts "TABREN>>>>>>> #{get_selected_widget()}"
+      # [get_selected_widget()]
+    # end
 
     def render_card_nav(selected)
       cname = @opts[:component_name]

data/lib/omf-web/version.rb

@@ -0,0 +1,7 @@
+
+module OMF
+  module Web
+    VERSION = '0.9.3'
+  end
+end
+

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

@@ -25,37 +25,29 @@ module OMF::Web::Widget
         raise "Missing widget option ':viz_type' for widget '#{name}' (#{opts.inspect})"
       end
       name = opts[:name] ||= 'Unknown'
-      opts[:js_url] = "graph/#{vizType}.js"
+      opts[:js_url] = "graph/js/#{vizType}.js"
       opts[:js_class] = "OML.#{vizType}"
       opts[:base_el] = "\##{dom_id}"
-
-      # @js_class = @widget_type = opts[:js_class]
-      # @js_url = opts[:js_url]
-# 
-      # @base_id = "w#{object_id.abs}"
-      # @base_el = "\##{@base_id}"
-      # @wopts['base_el'] = @base_el
-# 
-      # @js_var_name = "oml_#{object_id.abs}"
-      
       super opts      
       
-#      @widget_type = vizType
-      
-#      @wopts = opts.dup
       if (ds = opts.delete(:data_source))
         # single source
-        @data_sources = {:default => ds}
+        data_sources = {:default => ds}
       end
-      unless @data_sources ||= opts.delete(:data_sources)
+      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}
+      unless data_sources.kind_of? Hash
+        data_sources = {:default => data_sources}
       end
-      opts[:data_sources] = @data_sources.collect do |name, ds_name|
-        {:stream => ds_name, :name => name}
+      opts[:data_sources] = data_sources.collect do |name, ds_descr|
+        unless ds_descr.is_a? Hash
+          ds_descr = {:name => ds_descr}
+        end
+        ds_descr[:alias] = "#{name}_#{self.object_id}"
+        {:stream => ds_descr, :name => name}
       end
+      #puts "DTA_WIDGTE>>> #{opts[:data_sources].inspect}"
     end
     
     # This is the DOM id which should be used by the renderer for this widget. 
@@ -78,35 +70,35 @@ module OMF::Web::Widget
     # start monitoring the table for new stuff when the web socket connects. Any
     # data added in between is not covered.
     #
-    def on_ws_open(ws)
-      raise "ARE WE STILL NEEDING THIS"
-      #puts ">>>> ON_WS_OPEN"
-      @ws = ws
-      @data_sources.each do |name, table|
-        table.on_row_added(self.object_id) do |row|
-          begin
-            # may want to queue events to group events into larger messages
-            msg = [{:stream => name, :events => [row]}]
-            ws.send_data msg.to_json
-          rescue Exception => ex
-            warn ex
-          end
-        end
-      end
-    end
-
-    def on_ws_close(ws)
-      raise "ARE WE STILL NEEDING THIS"
-      @ws = nil
-      @data_sources.each do |name, table|
-        table.on_row_added(self.object_id)
-      end
-    end
+    # def on_ws_open(ws)
+      # raise "ARE WE STILL NEEDING THIS"
+      # #puts ">>>> ON_WS_OPEN"
+      # @ws = ws
+      # @data_sources.each do |name, table|
+        # table.on_row_added(self.object_id) do |row|
+          # begin
+            # # may want to queue events to group events into larger messages
+            # msg = [{:stream => name, :events => [row]}]
+            # ws.send_data msg.to_json
+          # rescue Exception => ex
+            # warn ex
+          # end
+        # end
+      # end
+    # end
+# 
+    # def on_ws_close(ws)
+      # raise "ARE WE STILL NEEDING THIS"
+      # @ws = nil
+      # @data_sources.each do |name, table|
+        # table.on_row_added(self.object_id)
+      # end
+    # end
 
     def collect_data_sources(ds_set)
       #puts "DATA_SOURCES>>>> #{@data_sources.values.inspect}"
-      @data_sources.values.each do |ds|
-        ds_set.add(ds.is_a?(Hash) ? ds : {:name => ds})
+      @opts[:data_sources].each do |ds|
+        ds_set.add(ds[:stream])
       end
       ds_set
     end

data/lib/omf-web/widget/layout/stacked_layout.rb

@@ -31,7 +31,8 @@ module OMF::Web::Widget::Layout
       
 
     def collect_data_sources(ds_set)
-      @widgets.each {|w| w.collect_data_sources(ds_set) }
+      @active_widget.collect_data_sources(ds_set)
+      #@widgets.each {|w| w.collect_data_sources(ds_set) }
       ds_set
     end
     

data/lib/omf-web/widget/layout/tabbed_layout.rb

@@ -19,7 +19,6 @@ module OMF::Web::Widget::Layout
       OMF::Web::Theme::TabbedRenderer.new(self, @widgets, @opts)
     end
       
-
     def collect_data_sources(ds_set)
       @widgets.each {|w| w.collect_data_sources(ds_set) }
       ds_set
@@ -65,6 +64,6 @@ module OMF::Web::Widget::Layout
 
 
 
-  end # StackedWidget
+  end # class
 
 end

data/lib/{maruku → omf-web/widget/text/maruku}/output/to_html.rb

@@ -94,25 +94,26 @@ module MaRuKu; module Out; module HTML
 		Xhtml11_mathml2_svg11 + xml
 	end
 	
-				
-		Xhtml10strict  = 
-"<?xml version='1.0' encoding='utf-8'?>
-<!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN'
-'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>\n"
-		
-	Xhtml11strict_mathml2 = '<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN"
-               "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd" [
-  <!ENTITY mathml "http://www.w3.org/1998/Math/MathML">
-]>
-'
-
-Xhtml11_mathml2_svg11 = 
-'<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE html PUBLIC
-    "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN"
-    "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">
-'
+	unless defined? Xhtml10strict	
+  		Xhtml10strict  = 
+  "<?xml version='1.0' encoding='utf-8'?>
+  <!DOCTYPE html PUBLIC '-//W3C//DTD XHTML 1.0 Strict//EN'
+  'http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd'>\n"
+  		
+  	Xhtml11strict_mathml2 = '<?xml version="1.0" encoding="utf-8"?>
+  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN"
+                 "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd" [
+    <!ENTITY mathml "http://www.w3.org/1998/Math/MathML">
+  ]>
+  '
+  
+  Xhtml11_mathml2_svg11 = 
+  '<?xml version="1.0" encoding="utf-8"?>
+  <!DOCTYPE html PUBLIC
+      "-//W3C//DTD XHTML 1.1 plus MathML 2.0 plus SVG 1.1//EN"
+      "http://www.w3.org/2002/04/xhtml-math-svg/xhtml-math-svg.dtd">
+  '
+  end
 	
 	
 	def xml_newline() Text.new("\n") end
@@ -188,7 +189,9 @@ Example:
 
 =end
 
-	METAS = %w{description keywords author revised}
+  unless defined? METAS
+	  METAS = %w{description keywords author revised}
+	end
 
 	# Render to a complete HTML document (returns a REXML document tree)
 	def to_html_document_tree
@@ -387,7 +390,9 @@ It is copied as a standard HTML attribute.
 	
 	
 	
-	HTML4Attributes = {}
+	unless defined? HTML4Attributes
+	  HTML4Attributes = {}
+	end
 	
 	coreattrs = [:id, :class, :style, :title]
 	i18n = [:lang, 'xml:lang'.to_sym]

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

@@ -3,6 +3,11 @@
 
 require 'maruku'
 require 'maruku/ext/math'
+# Monkey patches to add line numbers to html output
+require 'omf-web/widget/text/maruku/input/parse_block'
+require 'omf-web/widget/text/maruku/output/to_html'
+require 'omf-web/widget/text/maruku/helpers'
+
 require 'rexml/document'
 require 'yaml'
 

data/omf_web.gemspec

@@ -5,7 +5,7 @@ require "omf-web/version"
 Gem::Specification.new do |s|
   s.name        = "omf_web"
 #  s.version     = OmfWeb::VERSION
-  s.version     = '0.9.1'
+  s.version     = OMF::Web::VERSION
   s.authors     = ["NICTA"]
   s.email       = ["omf-user@lists.nicta.com.au"]
   s.homepage    = "https://www.mytestbed.net"
@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
 
   # specify any dependencies here; for example:
 #  s.add_development_dependency "minitest", "~> 2.11.3"
+  s.add_runtime_dependency "omf-web", "~> 0.9"
   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"

data/share/htdocs/{js/graph → graph/js}/abstract_chart.js

@@ -1,5 +1,5 @@
 
-L.provide('OML.abstract_chart', ["graph/abstract_widget", "#OML.abstract_widget", "/resource/vendor/d3/d3.js"], function () {
+L.provide('OML.abstract_chart', ["graph/js/abstract_widget", "#OML.abstract_widget", "vendor/d3/d3.js"], function () {
 
   
   OML.abstract_chart = OML.abstract_widget.extend({

data/share/htdocs/{js/graph → graph/js}/abstract_nv_chart.js

@@ -1,8 +1,11 @@
-L.provide('OML.abstract_nv_chart', ["graph/abstract_chart", "#OML.abstract_chart", "graph/axis", "#OML.axis", "graph.css", 
-                                  ["/resource/vendor/d3/d3.js", 
-                                   "/resource/vendor/nv_d3/js/nv.d3.js",                                   
-                                   "/resource/vendor/nv_d3/css/nv.d3.css"
-                                  ]], function () {
+
+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"]);
+})
+
+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 () {
 
   OML.abstract_nv_chart = OML.abstract_chart.extend({
     axis_defaults: {
@@ -32,10 +35,6 @@ L.provide('OML.abstract_nv_chart', ["graph/abstract_chart", "#OML.abstract_chart
       this._configure_options(this.opts, chart);
     },
     
-    // _create_model: function() {
-      // return nv.models.lineChart();
-    // },
-    
     _configure_mapping: function(m, chart) {
     },
     
@@ -123,10 +122,6 @@ L.provide('OML.abstract_nv_chart', ["graph/abstract_chart", "#OML.abstract_chart
           .call(this.chart);
     },
     
-    // _datum: function(data, chart) {
-      // return data;
-    // },
-    
   })
 })
 

data/share/htdocs/{js/graph → graph/js}/abstract_widget.js

@@ -1,5 +1,5 @@
 
-L.provide('OML.abstract_widget', ["/resource/vendor/d3/d3.js"], function () {
+L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
 
   if (typeof(OML) == "undefined") OML = {};
 
@@ -46,11 +46,6 @@ L.provide('OML.abstract_widget', ["/resource/vendor/d3/d3.js"], function () {
       if (typeof(base_el) == "string") base_el = d3.select(base_el);
       this.base_el = base_el;
     
-      // this.init_data_source();
-      // this.process_schema();
-// 
-  
-      //o.offset = _.defaults(opts.offset || {}, this.defaults.offset);
       this.init_data_source();
       this.process_schema();
       this.resize();
@@ -68,8 +63,8 @@ L.provide('OML.abstract_widget', ["/resource/vendor/d3/d3.js"], function () {
       }
       
       var data;
-      if ((data = this.data_source.events) == null) {
-        throw "Missing events array in data source"
+      if ((data = this.data_source.rows()) == null) {
+        throw "Missing rows in data source"
       }
       if (data.length == 0) return;
       
@@ -142,11 +137,9 @@ L.provide('OML.abstract_widget', ["/resource/vendor/d3/d3.js"], function () {
     init_single_data_source: function(ds_descr) {
       var ds = OML.data_sources.lookup(ds_descr.stream);
       var self = this;
-      if (ds.is_dynamic()) {
-        ds.on_changed(function(evt) {
-          self.update();
-        });
-      }
+      OHUB.bind(ds.event_name, function() {
+        self.update();;
+      })
       return ds;
     },
     
@@ -256,12 +249,12 @@ L.provide('OML.abstract_widget', ["/resource/vendor/d3/d3.js"], function () {
          if (jcol_schema == undefined) {
            throw "Unknown stream element '" + jkey + "' in '" + jstream + "'.";
          }
-         var jindex = jcol_schema.index;
-         jstream.create_index(jindex);
+         var index_f = jstream.index_for_column(jcol_schema);
          
          return function(d) {
            var join = d[vindex];
-           var t = jstream.get_indexed_row(jindex, join); //self.get_indexed_table(jstream, jindex);
+           //var t = jstream.get_indexed_row(jindex, join); //self.get_indexed_table(jstream, jindex);
+           var t = index_f(join);
            //var r = t[join];
            return t;
          }

data/share/htdocs/{js/graph → graph/js}/axis.js

@@ -1,5 +1,5 @@
 //L.provide('OML.axis', ["graph.css", ["/resource/vendor/d3/d3.js", "/resource/vendor/d3/d3.time.js"]], function () {
-L.provide('OML.axis', ["graph.css", "/resource/vendor/d3/d3.js"], function () {  
+L.provide('OML.axis', ["graph/css/graph.css", "vendor/d3/d3.js"], function () {  
 
   OML.line_chart2_axis = function(options) {
     if (!options) options = {};

data/share/htdocs/{js/graph → graph/js}/barchart.js

@@ -1,7 +1,7 @@
 
-L.provide('OML.barchart', ["graph/abstract_chart", "#OML.abstract_chart", "graph/axis", "#OML.axis",
+L.provide('OML.barchart', ["graph/js/abstract_chart", "#OML.abstract_chart", "graph/js/axis", "#OML.axis",
 //                              ["/resource/vendor/d3/d3.js", "/resource/vendor/d3/d3.layout.js"]], 
-                              ["/resource/vendor/d3/d3.js"]], 
+                              ["vendor/d3/d3.js"]], 
   function () {
 
   OML.barchart = OML.abstract_chart.extend({

data/share/htdocs/{js/graph → graph/js}/code_mirror.js

@@ -1,8 +1,4 @@
-L.provide('OML.code_mirror', 
-    [
-      "graph/abstract_widget", "#OML.abstract_widget"
-    ], 
-    function () {
+L.provide('OML.code_mirror', ["graph/js/abstract_widget", "#OML.abstract_widget"], function () {
 
   OML.code_mirror = OML.abstract_widget.extend({
     

data/share/htdocs/{js/graph → graph/js}/discrete_bar_chart.js

@@ -3,7 +3,7 @@
                                    // "/resource/vendor/nv_d3/js/nv.d3.js",
                                    // "/resource/vendor/nv_d3/css/nv.d3.css"
                                   // ]], function () {
-L.provide('OML.discrete_bar_chart', ["graph/abstract_nv_chart", "#OML.abstract_nv_chart"], function () {
+L.provide('OML.discrete_bar_chart', ["graph/js/abstract_nv_chart", "#OML.abstract_nv_chart"], function () {
 
   OML.discrete_bar_chart = OML.abstract_nv_chart.extend({
     decl_properties: [

data/share/htdocs/{js/graph → graph/js}/histogram2.js

@@ -1,4 +1,4 @@
-L.provide('OML.histogram2', ["graph/abstract_nv_chart", "#OML.abstract_nv_chart"], function () {
+L.provide('OML.histogram2', ["graph/js/abstract_nv_chart", "#OML.abstract_nv_chart"], function () {
 
   OML.histogram2 = OML.abstract_nv_chart.extend({
     decl_properties: [

data/share/htdocs/{js/graph → graph/js}/holt_winters_chart.js

@@ -1,4 +1,4 @@
-L.provide('OML.holt_winters_chart', ["graph/line_chart2", "#OML.line_chart2"], function () {
+L.provide('OML.holt_winters_chart', ["graph/js/line_chart2", "#OML.line_chart2"], function () {
 
   OML.holt_winters_chart = OML.line_chart2.extend({
     

data/share/htdocs/{js/graph → graph/js}/line_chart3.js

@@ -5,7 +5,7 @@
                                    // "/resource/vendor/nv_d3/js/models/lineChart.js",                                   
                                    // "/resource/vendor/nv_d3/css/nv.d3.css"
                                   // ]], function () {
-L.provide('OML.line_chart3', ["graph/abstract_nv_chart", "#OML.abstract_nv_chart"], function () {
+L.provide('OML.line_chart3', ["graph/js/abstract_nv_chart", "#OML.abstract_nv_chart"], function () {
 
   OML.line_chart3 = OML.abstract_nv_chart.extend({
     decl_properties: [

data/share/htdocs/{js/graph → graph/js}/line_chart_with_focus.js

@@ -1,4 +1,4 @@
-L.provide('OML.line_chart_with_focus', ["graph/line_chart3", "#OML.line_chart3"], function () {
+L.provide('OML.line_chart_with_focus', ["graph/js/line_chart3", "#OML.line_chart3"], function () {
 
   OML.line_chart_with_focus = OML.line_chart3.extend({
     

data/share/htdocs/{js/graph → graph/js}/map2.js

@@ -7,7 +7,7 @@ L.provide('OML.googleLoader', ["http://www.google.com/jsapi"], function () {
 
 function onMapLoaded() {
   
-  L.provide('OML.map2', ["graph/abstract_chart", "#OML.abstract_chart"], function () {  
+  L.provide('OML.map2', ["graph/js/abstract_chart", "#OML.abstract_chart"], function () {  
     
     OML.map2 = OML.abstract_chart.extend({
       //this.opts = opts;

data/share/htdocs/{js/graph → graph/js}/multi_barchart.js

@@ -1,4 +1,4 @@
-L.provide('OML.multi_barchart', ["graph/abstract_nv_chart", "#OML.abstract_nv_chart"], function () {
+L.provide('OML.multi_barchart', ["graph/js/abstract_nv_chart", "#OML.abstract_nv_chart"], function () {
 
   OML.multi_barchart = OML.abstract_nv_chart.extend({
     decl_properties: [