omf_web 0.9.6 → 0.9.7

data/example/bridge/config.ru

@@ -0,0 +1,101 @@
+
+require 'rackamole'
+require 'omf_common/lobject'
+
+use ::Rack::ShowExceptions
+#use ::Rack::Lint
+#use Rack::Mole, :app_name => "Bridge"
+
+OMF::Web::Runner.instance.life_cycle(:pre_rackup)
+options = OMF::Web::Runner.instance.options
+                               
+require 'omf-web/rack/session_authenticator'                               
+use OMF::Web::Rack::SessionAuthenticator, #:expire_after => 10, 
+          :login_url => '/tab/login',
+          :no_session => ['^/resource/', '^/login', '^/logout']
+
+class Authenticator < OMF::Common::LObject
+  def self.signon(email, pw, remember)
+    OMF::Web::Rack::SessionAuthenticator.authenticate  
+    OMF::Web::Rack::SessionAuthenticator[:name] = email
+    info "Authenticated '#{email}' (#{Thread.current["sessionID"]})"
+  end
+end
+
+map "/resource" do
+  require 'omf-web/rack/multi_file'
+  run OMF::Web::Rack::MultiFile.new(options[:static_dirs])
+end
+
+map '/_ws' do
+  begin
+    require 'omf-web/rack/websocket_handler'
+    run OMF::Web::Rack::WebsocketHandler.new #:backend => { :debug => true }
+  rescue Exception => ex
+    OMF::Common::Loggable.logger('web').error "#{ex}"
+  end
+end
+
+map '/_update' do
+  require 'omf-web/rack/update_handler'
+  run OMF::Web::Rack::UpdateHandler.new
+end
+
+map '/_content' do
+  require 'omf-web/rack/content_handler'
+  run OMF::Web::Rack::ContentHandler.new
+end
+
+map "/tab" do
+  require 'omf-web/rack/tab_mapper'
+  run OMF::Web::Rack::TabMapper.new(options)
+end
+
+map "/widget" do
+  require 'omf-web/rack/widget_mapper'
+  run OMF::Web::Rack::WidgetMapper.new(options)
+end
+
+map '/login' do
+  handler = Proc.new do |env| 
+    req = ::Rack::Request.new(env)
+    #puts ">>> post?: #{req.post?} - #{req.params.inspect}"
+    if req.post?
+      email = req.params["email"]
+      pw = req.params["password"]
+      remember = req.params["remember"] == "on"
+      Authenticator.signon(email, pw, remember)
+    end
+    [301, {'Location' => '/tab', "Content-Type" => ""}, ['Next window!']]
+  end
+  run handler
+end
+
+map '/logout' do
+  handler = Proc.new do |env| 
+    OMF::Web::Rack::SessionAuthenticator.logout
+    [301, {'Location' => '/tab', "Content-Type" => ""}, ['Next window!']]
+  end
+  run handler
+end
+
+map "/" do
+  handler = Proc.new do |env| 
+    req = ::Rack::Request.new(env)
+    case req.path_info
+    when '/'
+      [301, {'Location' => '/tab', "Content-Type" => ""}, ['Next window!']]
+    when '/favicon.ico'
+      [301, {'Location' => '/resource/image/favicon.ico', "Content-Type" => ""}, ['Next window!']]
+    else
+      OMF::Common::Loggable.logger('rack').warn "Can't handle request '#{req.path_info}'"
+      [401, {"Content-Type" => ""}, "Sorry!"]
+    end 
+  end
+  run handler
+end
+
+OMF::Web::Runner.instance.life_cycle(:post_rackup)
+
+
+

data/example/bridge/configure/configure_widget.rb

@@ -0,0 +1,32 @@
+require 'omf-web/widget/abstract_widget'
+
+
+  # Implements a widget to configure the state of the system
+  #
+  class ConfigureWidget < AbstractWidget
+
+    attr_reader :name, :opts #:base_id
+
+
+    # opts
+    #
+    def initialize(opts = {})
+    end
+    
+    # This is the DOM id which should be used by the renderer for this widget. 
+    # We need to keep this here as various renderes at various levels may need
+    # to get a reference to it to allow for such functionalities as 
+    # hiding, stacking, ...
+    # def dom_id
+      # "w#{object_id.abs}"
+    # end
+
+    def content()
+      OMF::Web::Theme.require 'data_renderer'
+      OMF::Web::Theme::DataRenderer.new(self, @opts)
+    end
+
+
+
+
+  end # class

data/example/bridge/data_sources/sensor-sqlite.rb

@@ -1,8 +1,26 @@
 require 'omf_web'
 require 'omf_common/lobject'
-require 'omf-oml/table'
-require 'omf-oml/sql_source'
+require 'omf_oml/table'
+require 'omf_oml/sql_source'
 
+class LazySlicableTable < OMF::Common::LObject
+
+  attr_reader :name
+#  attr_accessor :max_size
+  attr_reader :schema
+#  attr_reader :offset
+
+  def initialize(name, schema, &block)
+    @name = name
+    @schema = schema
+    @block = block
+  end
+  
+  def create_sliced_table(col_name, col_value, table_opts = {})
+    @block.call(col_name, col_value, table_opts)
+  end
+
+end
 
 class BridgeSensor < OMF::Common::LObject
   attr_reader :table
@@ -14,8 +32,12 @@ class BridgeSensor < OMF::Common::LObject
   # oml_sender_id INTEGER, oml_seq INTEGER, oml_ts_client REAL, oml_ts_server REAL, "eventID" TEXT, "sensorID" TEXT, "time" REAL, "x" REAL, "y" REAL, "z" REAL, "v1" REAL, "v2" REAL
   def process_acceleration(stream)
     #puts stream.class
-    @table = stream.to_table(:sensors, :include_oml_internals => true)
-    OMF::Web.register_datasource @table    
+    @table = stream.to_table(:sensors_raw, :include_oml_internals => true)
+    
+    #OMF::Web.register_datasource @table    
+    OMF::Web.register_datasource(LazySlicableTable.new(:sensors, @table.schema) do |col_name, col_value, table_opts|
+      @table.create_sliced_table(col_name, col_value, table_opts)
+    end)
   end
 
   def process_health(stream)
@@ -32,7 +54,7 @@ class BridgeSensor < OMF::Common::LObject
     #ep = OMF::OML::OmlSqlSource.new(@db_name, :offset => -500, :check_interval => 1.0)
     ep = OMF::OML::OmlSqlSource.new(@db_name, :check_interval => 3.0)
     ep.on_new_stream() do |stream|
-      #puts stream.inspect
+      #puts "NEW STREAM: #{stream.inspect}"
       case stream.stream_name
       when 'SydneyHarbourBridge_acceleration'
         process_acceleration(stream)
@@ -60,7 +82,7 @@ class BridgeSensor < OMF::Common::LObject
         loop do
           #2012-07-21-17:03:25|node49|0.600000023841858
           ev_id = Time.now.iso8601
-          [['node47', 0, '2012-07-21-00:48:46'], ['node48', 0.2, ev_id], ['node49', 0.6, ev_id]].each do |r|
+          [['node47', 0, '2012-07-21-17:04:22'], ['node48', 0.2, ev_id], ['node49', 0.6, ev_id]].each do |r|
             joint_id, health, ev_id = r
             table.add_row [0, seq_no, 0.0, 0.0, ev_id, joint_id, health]
           end

data/example/bridge/htdocs/{js/graph → graph/js}/bridge.js

@@ -1,5 +1,5 @@
 
-L.provide('OML.bridge', ["graph/abstract_chart", "#OML.abstract_chart", ["/resource/vendor/d3/d3.js"]],
+L.provide('OML.bridge', ["graph/js/abstract_chart", "#OML.abstract_chart"],
 
   function () {
 
@@ -29,7 +29,7 @@ L.provide('OML.bridge', ["graph/abstract_chart", "#OML.abstract_chart", ["/resou
       
       var self = this;
       OHUB.bind("bridge.event_selected", function(evt) {
-        var joint_id = evt.event[evt.schema.jointID.index];
+        var joint_id = evt.datum[evt.schema.jointID.index];
         self.redraw_sensor_locator(joint_id);
       });
     },

data/example/bridge/htdocs/{js/graph → graph/js}/event_line_chart.js

@@ -1,7 +1,7 @@
 
-L.provide('OML.event_line_chart', ["graph/line_chart2", "#OML.line_chart2"], function () {
+L.provide('OML.event_line_chart', ["graph/js/line_chart3", "#OML.line_chart3"], function () {
 
-  OML.event_line_chart  = OML.line_chart2.extend({
+  OML.event_line_chart  = OML.line_chart3.extend({
     defaults: function() {
       return this.deep_defaults({
       }, OML.event_line_chart .__super__.defaults.call(this));      
@@ -14,8 +14,8 @@ L.provide('OML.event_line_chart', ["graph/line_chart2", "#OML.line_chart2"], fun
       
       var self = this;
       OHUB.bind("bridge.event_selected", function(evt) {
-        self.event_id = evt.event[evt.schema.eventID.index];
-        self.joint_id = evt.event[evt.schema.jointID.index];
+        self.event_id = evt.datum[evt.schema.eventID.index];
+        self.joint_id = evt.datum[evt.schema.jointID.index];
         self.update();
       });
     },
@@ -25,12 +25,13 @@ L.provide('OML.event_line_chart', ["graph/line_chart2", "#OML.line_chart2"], fun
       if (! eid) return;
       
       var data;
-      if ((data = this.data_source.events) == null) {
+      if ((data = this.data_source.rows()) == null) {
         throw "Missing events array in data source"
       }
       
+      var ei = this.schema.eventID.index;
       data = _.filter(data, function(r) {
-        return r[5] == eid;
+        return r[ei] == eid;
       })
       if (data.length == 0) return;
       this.redraw(data);

data/example/bridge/htdocs/{js/graph → graph/js}/event_table.js

@@ -1,8 +1,16 @@
 
-L.provide('OML.event_table', ["graph/table2", "#OML.table2", [
-                                '/resource/vendor/slickgrid/plugins/slick.checkboxselectcolumn.js',
-                                '/resource/css/bridge.css'
-                             ]], function () {
+// L.provide('slickgrid/checkbox', [
+                 // 'vendor/slickgrid/slick.core.js',
+                 // 'vendor/slickgrid/slick.formatters.js',
+                 // 'vendor/slickgrid/slick.editors.js',
+                 // 'vendor/slickgrid/plugins/slick.rowselectionmodel.js',
+                 // 'vendor/slickgrid/slick.grid.js',
+                 // 'vendor/slickgrid/slick.dataview.js',
+
+L.provide('OML.event_table', ["graph/js/table2", "#OML.table2", 
+                                'vendor/slickgrid/plugins/slick.checkboxselectcolumn.js',
+                                'css/bridge.css'
+                             ], function () {
 
   OML.event_table = OML.table2.extend({
     decl_properties: [
@@ -27,7 +35,7 @@ L.provide('OML.event_table', ["graph/table2", "#OML.table2", [
         var row = self.data[rindex];
         var event_id = row[self.schema.eventID.index];
         if (event_id) {
-          OHUB.trigger("bridge.event_selected", {event: row, schema: self.schema});
+          OHUB.trigger("bridge.event_selected", {datum: row, schema: self.schema});
         }
       });
     },

data/example/bridge/htdocs/template/login.html

@@ -0,0 +1,23 @@
+
+<form class="form-horizontal" action="/login" method="post">
+  <div class="control-group">
+    <label class="control-label" for="inputEmail">Email</label>
+    <div class="controls">
+      <input type="text" id="inputEmail" name="email" placeholder="Email">
+    </div>
+  </div>
+  <div class="control-group">
+    <label class="control-label" for="inputPassword">Password</label>
+    <div class="controls">
+      <input type="password" id="inputPassword" name="password" placeholder="Password">
+    </div>
+  </div>
+  <div class="control-group">
+    <div class="controls">
+      <label class="checkbox">
+        <input type="checkbox" name="remember"> Remember me
+      </label>
+      <button type="submit" class="btn">Sign in</button>
+    </div>
+  </div>
+</form>

data/example/bridge/viz_server.rb

@@ -11,9 +11,9 @@ OMF::Common::Loggable.init_log 'bridge', :searchPath => File.dirname(__FILE__)
 # If set, create fake sensor events 
 $fake_bridge_events = false
 # Path to OML database
-$oml_database = 'example/bridge/data_sources/test3.sq3'
+$oml_database = 'sqlite://example/bridge/data_sources/test3.sq3'
 
-require 'omf-oml/table'
+require 'omf_oml/table'
 
 def load_environment
 
@@ -22,10 +22,8 @@ def load_environment
   end
   
   require 'yaml'
-  Dir.glob("#{File.dirname(__FILE__)}/*.yaml").each do |fn|
-    next if fn.match /log4r.yaml/
+  Dir.glob("#{File.dirname(__FILE__)}/widgets/*.yaml").each do |fn|
     OMF::Common::LObject.debug "Load yaml file '#{fn}'"
-    
     h = YAML.load_file(fn)
     if w = h['widget']
       OMF::Web.register_widget w

data/example/bridge/widgets/configure.yaml

@@ -0,0 +1,12 @@
+
+#
+
+widget:
+  id: configure
+  name: Configure
+  top_level: true
+  priority: 300
+  type: layout/one_column
+  chrome: false  # don't show title
+  widgets:
+    - type: configure

data/example/bridge/widgets/login.yaml

@@ -0,0 +1,16 @@
+
+#
+
+widget:
+  id: login
+  top_level: true
+  priority: -1
+  type: layout/one_column
+  chrome: false  # don't show title
+  render:
+    title: false
+  widgets:
+    - type: moustache
+      template: template/login.html
+      margin:
+        top: 30

data/example/bridge/{overview.yaml → widgets/overview.yaml}

@@ -54,6 +54,13 @@ widget:
           title: Sensor Reading
           data_source:
             name: sensors
+            # Only fetch a 'slice' of the underlying data source. A slice
+            # is defined by specific value in the 'slice_column' of all rows
+            slice:
+              slice_column: eventID
+              event:
+                name: bridge.event_selected
+                key: eventID
           mapping:
             x_axis: time
             y_axis: 
@@ -75,7 +82,3 @@ widget:
             top: 10
             left: 60
             right: 20
-          
-          
-
-

data/example/demo/data_sources/animals.rb

@@ -1,6 +1,6 @@
 
 
-require 'omf-oml/table'
+require 'omf_oml/table'
 
 # A simple table holding animal population 
 #

data/example/demo/data_sources/downloads.rb

@@ -1,4 +1,4 @@
-require 'omf-oml/table'
+require 'omf_oml/table'
 
 schema = [[:t, :int], [:volume, :float]]
 table = OMF::OML::OmlTable.new 'downloads', schema

data/example/demo/data_sources/generator.rb

@@ -1,6 +1,6 @@
 
 
-require 'omf-oml/table'
+require 'omf_oml/table'
 
 # Create a table containing 'amplitude' measurements taken at a certain time for two different 
 # devices.

data/example/demo/data_sources/histogram.rb

@@ -1,5 +1,5 @@
 
-require 'omf-oml/table'
+require 'omf_oml/table'
 
 # Create a table containing 'amplitude' measurements taken at a certain time for two different 
 # devices.

data/example/demo/data_sources/mobile_network.rb

@@ -2,8 +2,8 @@
 
 
 
-require 'omf-oml/network'
-require 'omf-oml/table'
+require 'omf_oml/network'
+require 'omf_oml/table'
 
 include OMF::OML
   
@@ -19,7 +19,8 @@ nw.link_schema [[:load, :float]]
 l = nw.create_link :l01, :n0, :m1, :load => 0.8
 
 require 'omf_web'
-OMF::Web.register_datasource nw, :index => :id
+OMF::Web.register_datasource nw.to_table(:nodes, :index => :id)
+OMF::Web.register_datasource nw.to_table(:links, :index => :id)
 
 # Move mobile node
 Thread.new do

data/example/demo/data_sources/movies.rb

@@ -2,7 +2,7 @@
 # Provides a table of information about recently released movies
 #
 
-require 'omf-oml/table'
+require 'omf_oml/table'
 
 schema = OMF::OML::OmlSchema.create [
   [:id, :int], 

data/example/demo/data_sources/network.rb

@@ -1,7 +1,7 @@
 
 
-require 'omf-oml/network'
-require 'omf-oml/table'
+require 'omf_oml/network'
+require 'omf_oml/table'
 
 include OMF::OML
   
@@ -17,7 +17,8 @@ nw.create_link :l12, :n1, :n2, :load => 0.4
 nw.create_link :l21, :n2, :n1, :load => 0.9
 
 require 'omf_web'
-OMF::Web.register_datasource nw
+OMF::Web.register_datasource nw.to_table(:nodes, :index => :id)
+OMF::Web.register_datasource nw.to_table(:links, :index => :id)
 
 # opts = {
   # #:data_sources => table,

data/example/demo/data_sources/returns.rb

@@ -1,5 +1,5 @@
 
-require 'omf-oml/table'
+require 'omf_oml/table'
 
 schema = [[:id, :int], [:name, :string], [:value, :float]]
 table = OMF::OML::OmlTable.new 'financial_returns', schema 

data/example/demo/data_sources/static_network.rb

@@ -2,8 +2,8 @@
 
 
 
-require 'omf-oml/network'
-require 'omf-oml/table'
+require 'omf_oml/network'
+require 'omf_oml/table'
 
 include OMF::OML
   
@@ -23,7 +23,8 @@ links << nw.create_link(:l23, :n2, :n3, :ts => 0, :load => 0.5)
 links << nw.create_link(:l24, :n2, :n4, :ts => 0, :load => 0.75)
 
 require 'omf_web'
-OMF::Web.register_datasource nw, :index => :id
+OMF::Web.register_datasource nw.to_table(:nodes, :index => :id)
+OMF::Web.register_datasource nw.to_table(:links, :index => :id)
 
 # Create a table which serves the history of an individual link as a slice
 #

data/example/demo/data_sources/walk.rb

@@ -1,6 +1,6 @@
 
 
-require 'omf-oml/table'
+require 'omf_oml/table'
 
 # Define a map with a trace on it
 #

data/example/demo/demo_viz_server.rb

@@ -3,7 +3,7 @@ require 'omf_common/lobject'
 OMF::Common::Loggable.init_log 'demo', :searchPath => File.dirname(__FILE__)
 
 
-require 'omf-oml/table'
+require 'omf_oml/table'
 
 def load_environment
   require 'omf-web/content/file_repository'

data/example/demo/widgets/linked_graphs_tab.yaml

@@ -74,7 +74,7 @@ widget:
         slice:
           slice_column: id
           event:
-            name: graph.static_network_links.selected
+            name: graph.static_network/links.selected
             key: id
       group_by: name
       mapping:

data/example/openflow-gec15/README.md

@@ -0,0 +1,21 @@
+# Openflow Demo at GEC'15
+
+This directory contains most of the code used for our Openflow demo at GEC'15.
+
+The following will start the visualization front-end:
+
+    cd OMF_WEB_HOME
+    ruby1.9 -I lib example/openflow-gec15/of_viz_server.rb start
+    
+If you want to run it in **pure** demo mode, then add the '--local-testing' flag before the 'start' command.
+
+This will start a web server at port 3000. Point your browser there and you should see somthing like:
+
+![Screenshot of dashboard](https://raw.github.com/mytestbed/omf_web/master/example/openflow-gec15/doc/screenshot.png "Screenshot")
+
+Clicking on the 'Code' tab will show the 'OIDL' script describing the experiment, and the 'Trema' code of the Openflow controller
+used in the experiment.
+ 
+
+
+

data/example/openflow-gec15/code_tab.yaml

@@ -0,0 +1,36 @@
+
+
+
+# Simple tab showing a line chart with supporting table
+#
+
+widget:
+  id: code
+  name: Code
+  top_level: true
+  priority: 600
+  type: layout/tabbed
+  widgets: 
+    
+
+    - name: OIDL
+      type: code
+      width: 1.0
+      #height: 800
+      content:
+        url: file:code:of-exp.rb 
+        
+    - name: Trema
+      type: code
+      width: 1.0
+      #height: 800
+      content:
+        url: file:code:trema-ctl6.rb 
+        
+
+
+
+
+
+
+

data/example/openflow-gec15/dashboard_tab.yaml

@@ -0,0 +1,72 @@
+
+
+# Define a 'dashboard' consisting of two columns of widgets
+#
+
+widget:
+  id: linked_graphs
+  name: Dashboard
+  top_level: true
+  priority: 800
+  type: layout/two_columns/50_50
+  left:
+    - name: Network
+      type: data/network2
+      width: 1.0
+      height: 1.0
+      data_source: 
+        name: network
+        unique_column: id  # only use the latest link and row descriptions
+        dynamic: true
+      mapping:
+        nodes:
+          x:
+            property: x
+          y: 
+            property: y
+          radius: 20
+        links:
+          stroke_width:
+            property: rate
+            scale: 1e-4
+            min: 3
+            max: 20
+          stroke_color:
+            property: load
+            max: 1.0
+            color: green_yellow80_red()
+      margin: 
+        left: 30
+        right: 30
+      #interaction_mode: click  # click on link to create event
+
+        
+  right:
+    - name: Link Stats
+      type: data/line_chart3
+      #area: true # color the area between line and zero line
+      width: 1.0
+      height: 0.8
+      data_source:
+        name: link_history
+      mapping:
+        x_axis: ts
+        y_axis: 
+          property:  rate 
+          #max: 1
+        group_by: name
+      axis:
+        x:
+          ticks:
+            format: 's'
+            #type: time
+          legend: Time (sec)
+          transition: 0
+        y:
+          min: 0
+          legend: Rate (bps)
+          ticks:
+            format: 's'
+          transition: 0
+      margin: 
+        left: 100