omf_web 1.0.0 → 1.2.0

data/example/openflow-gec15/exp_source.rb

@@ -1,22 +1,22 @@
 require 'omf_web'
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'omf_oml/network'
 require 'omf_oml/table'
 require 'omf_oml/sql_source'
 
-require 'em-postgresql-sequel'
+#require 'em-postgresql-sequel'
 
 
 include OMF::OML
 
-class ExpDB < OMF::Common::LObject
-  
-  
+class ExpDB < OMF::Base::LObject
+
+
   def initialize(db_opts)
     @db_opts = db_opts
     init_network
   end
-  
+
   def init_network
     @nw = nw = OmlNetwork.new('network')
     nw.node_schema [[:x, :float], [:y, :float]]
@@ -24,7 +24,7 @@ class ExpDB < OMF::Common::LObject
     nw.create_node :n1, :x => 0.2, :y => 0.5
     nw.create_node :n2, :x => 0.8, :y => 0.5
     nw.create_node :n3, :x => 0.8, :y => 0.2
-    
+
     nw.link_schema [[:ts, :float], [:bytes, :int], [:rate, :float], [:load, :float]]
     @links = {}
     @links[:l20] = nw.create_link(:l20, :n2, :n0, :ts => 0, :bytes => 0, :rate => 0, :load => 0)
@@ -32,21 +32,21 @@ class ExpDB < OMF::Common::LObject
     @links[:l21] = nw.create_link(:l21, :n2, :n1, :ts => 0, :bytes => 0, :rate => 0, :load => 0)
     @links[:l32] = nw.create_link(:l32, :n3, :n2, :ts => 0, :bytes => 0, :rate => 0, :load => 0)
 
-    
+
     OMF::Web.register_datasource nw.to_table(:nodes, :index => :id)
     OMF::Web.register_datasource nw.to_table(:links, :index => :id)
     @link_history = nw.to_table(:links, :max_size => 100)
     OMF::Web.register_datasource @link_history, :name => 'link_history'
   end
-  
+
   def setup_nmetric(stream)
     schema = stream.schema
     t = OMF::OML::OmlTable.new(:nmetric, schema, :max_size => 1000)
     ts_i = schema.index_for_col(:oml_ts_server)
     name_i = schema.index_for_col(:name)
-    tx_i = schema.index_for_col(:tx_bytes)    
-    rx_i = schema.index_for_col(:rx_bytes)        
-    
+    tx_i = schema.index_for_col(:tx_bytes)
+    rx_i = schema.index_for_col(:rx_bytes)
+
     def process(l, ts, bytes, max_rate)
       if (delta_t = ts - l[:ts]) > 0
         old_v = l[:bytes]
@@ -58,10 +58,10 @@ class ExpDB < OMF::Common::LObject
         l[:load] = 1.0 * rate / max_rate
       end
     end
-    
+
     stream.on_new_tuple() do |v|
       r = v.to_a(schema)
-      
+
       t.add_row(r)
       ts = r[ts_i]; name = r[name_i].to_sym; tx = r[tx_i]; rx = r[rx_i]
       #puts "VVV(#{ts}) >> #{v.row.inspect}"
@@ -78,24 +78,24 @@ class ExpDB < OMF::Common::LObject
       end
       sleep 0.5 if ts > 7300
     end
-    
+
       # nw.transaction do
-        # links.each_with_index do |l, i| 
+        # links.each_with_index do |l, i|
           # l[:ts] = ts
-          # l[:load] = rand() * frac + i * frac 
+          # l[:load] = rand() * frac + i * frac
         # end
       # end
-    
-    OMF::Web.register_datasource t 
+
+    OMF::Web.register_datasource t
   end
-  
+
   def process_nmetric(table)
     schema = table.schema
     ts_i = schema.index_for_col(:oml_ts_server)
     name_i = schema.index_for_col(:name)
-    tx_i = schema.index_for_col(:tx_bytes)    
-    rx_i = schema.index_for_col(:rx_bytes)        
-    
+    tx_i = schema.index_for_col(:tx_bytes)
+    rx_i = schema.index_for_col(:rx_bytes)
+
     def process(l, ts, bytes, max_rate)
       if (delta_t = ts - l[:ts]) > 0
         old_v = l[:bytes]
@@ -125,7 +125,7 @@ class ExpDB < OMF::Common::LObject
     end
     OMF::Web.register_datasource table, name: 'nmetric'
   end
-  
+
   def run
     ep = OMF::OML::OmlSqlSource.new(@db_opts, :check_interval => 3.0)
     t = ep.create_table('nmetrics_net_if', include_oml_internals: true, max_size: 1000)
@@ -136,8 +136,8 @@ class ExpDB < OMF::Common::LObject
         # setup_nmetric(stream)
       # end
     # end
-    # ep.run    
+    # ep.run
     self
   end
-  
+
 end

data/example/openflow-gec15/of_viz_server.rb

@@ -1,6 +1,6 @@
 
-require 'omf_common/lobject'
-OMF::Common::Loggable.init_log 'of-demo'
+require 'omf_base/lobject'
+OMF::Base::Loggable.init_log 'of-demo'
 
 
 require 'omf_oml/table'
@@ -10,13 +10,13 @@ $oml_database = 'postgres://norbit.npc.nicta.com.au/openflow-demo?user=oml2&pass
 
 def load_environment
   require 'omf-web/content/file_repository'
-  OMF::Web::ContentRepository.register_repo(:code, type: 'file', path: File.join(File.dirname(__FILE__), 'repository'))
-  
+  OMF::Web::ContentRepository.register_repo(:code, type: 'file', top_dir: File.join(File.dirname(__FILE__), 'repository'))
+
 
   Dir.glob("#{File.dirname(__FILE__)}/*_source.rb").each do |fn|
     load fn
   end
-  
+
   require 'yaml'
   Dir.glob("#{File.dirname(__FILE__)}/*_tab.yaml").each do |fn|
     h = YAML.load_file(fn)
@@ -26,7 +26,7 @@ def load_environment
       MObject.error "Don't know what to do with '#{fn}'"
     end
   end
-   
+
   # Start database adapter
   EM.next_tick do
     EM::run do
@@ -56,7 +56,7 @@ opts = {
       end
       p.separator ""
     end
-    
+
   }
 }
 require 'omf_web'

data/example/simple/simple.yaml

@@ -6,6 +6,7 @@
 
 server:
   name: 'Simple Demo'
+  page_title: 'Simple Demo'
   port: 4050
 
 data_sources:
@@ -13,7 +14,7 @@ data_sources:
     table: wave
     database:
       id: sample
-      url: sqlite://sample.sq3
+      url: sqlite:sample.sq3
 
 repositories:
   - id: simple

data/example/simple/simple_dynamic.yaml

@@ -15,7 +15,7 @@ data_sources:
     limit: 5 # Fetch 5 rows each time
     database:
       id: sample
-      url: sqlite://sample.sq3
+      url: sqlite:sample.sq3
 
 repositories:
   - id: simple

data/example/web_rtc/web_rtc.yaml

@@ -0,0 +1,54 @@
+
+
+
+# Simple tab showing a line chart with supporting table
+#
+
+server:
+  name: 'WebRTC Demo'
+  page_title: 'WebRTC Demo'
+  port: 4050
+
+data_sources:
+  - id: rtc_stats
+    #table: webrtc_stats
+    query: SELECT oml_ts_server as ts, val, wrid FROM webrtc_stats WHERE key='googRtt'
+    schema: [[ts, float], [val, int], [wrid, string]]
+    database:
+      id: rtc
+      url: sqlite:webrtc-exp_1381786573.sq3
+
+widgets:
+  - id: main
+    name: Main
+    top_level: true
+    priority: 900
+    type: layout/one_column
+    widgets:
+      - type: layout/stacked
+        info: This widget shows ?????.
+        widgets:
+          - name: WRID
+            type: data/line_chart3
+            data_source:
+              name: rtc_stats
+            mapping:
+              x_axis: ts
+              y_axis:
+                property: val
+                min: 0
+              group_by: wrid
+            axis:
+              x:
+                legend: Time (sec)
+              y:
+                legend: ??
+                ticks:
+                  format: ".1s"
+
+          - name: Table
+            type: data/table2
+            data_source:
+              name: rtc_stats
+
+

data/lib/omf-web/config.ru

@@ -1,5 +1,5 @@
 
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'rack/accept'
 
 use ::Rack::ShowExceptions

data/lib/omf-web/content/content_proxy.rb

@@ -1,6 +1,6 @@
 
 require 'digest/md5'
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'omf_web'
 
 module OMF::Web
@@ -9,7 +9,7 @@ module OMF::Web
   # in a web browser and the corresponding +OmlTable+ in this server.
   #
   #
-  class ContentProxy < OMF::Common::LObject
+  class ContentProxy < OMF::Base::LObject
     
     @@proxies = {}
 

data/lib/omf-web/content/file_repository.rb

@@ -1,6 +1,6 @@
 
 require 'find'
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'omf_web'
 require 'omf-web/content/content_proxy'
 require 'omf-web/content/repository'
@@ -10,55 +10,13 @@ module OMF::Web
   # This class provides an interface to a directory based repository
   # It retrieves, archives and versions content.
   #
-  class FileContentRepository < ContentRepository  
-    
-    # @@file_repositories = {}
-#     
-    # # Return the repository which is referenced to by elements in 'opts'.
-    # #
-    # #
-    # def self.[](name)
-      # unless repo = @@file_repositories[name.to_sym]
-        # raise "Unknown file repo '#{name}'"
-      # end
-      # repo
-    # end
-#       
-    # # Register an existing directory to the system. It will be 
-    # # consulted for all content url's strarting with
-    # # 'file:_top_dir_:'. If 'is_primary' is set to true, it will
-    # # become the default repo for all newly created content
-    # # in this app.
-    # #
-    # def self.register_file_repo(name, top_dir, is_primary = false)
-      # name = name.to_sym
-      # if @@file_repositories[name]
-        # warn "Ignoring repeated registration of file rep '#{name}'"
-        # return
-      # end
-      # repo = @@file_repositories[name] = FileContentRepository.new(name, top_dir)
-      # if is_primary
-        # @@primary_repository = repo
-      # end
-    # end
-    
-    
+  class FileContentRepository < ContentRepository
+
     def initialize(name, opts)
       super
       @url_prefix = "file:#{name}:"
     end
-    
-    #
-    # Create a URL for a file with 'path' in.
-    # If 'strictly_new' is true, returns nil if 'path' already exists.
-    #
-    # def create_url(path, strictly_new = true)
-      # return "git:"
-      # # TODO: Need to add code to select proper repository
-      # return GitContentRepository.create_url(path, strictly_new)
-    # end
-    
-    
+
     # Load content described by either a hash or a straightforward path
     # and return a 'ContentProxy' holding it.
     #
@@ -73,9 +31,9 @@ module OMF::Web
       descr = descr ? descr.dup : {}
       url = @url_prefix + path
       key = Digest::MD5.hexdigest(url)
-      descr[:url] = url      
+      descr[:url] = url
       descr[:url_key] = key
-      descr[:path] = path      
+      descr[:path] = path
       descr[:name] = url # Should be something human digestable
       if (descr[:strictly_new])
         Dir.chdir(@top_dir) do
@@ -85,7 +43,7 @@ module OMF::Web
       proxy = ContentProxy.create(descr, self)
       return proxy
     end
-        
+
     def write(content_descr, content, message)
       path = _get_path(content_descr)
       Dir.chdir(@top_dir) do
@@ -97,13 +55,13 @@ module OMF::Web
         f.close
       end
     end
-    
+
     # Return a URL for a path in this repo
-    # 
+    #
     def get_url_for_path(path)
       "file:#{path}"
     end
-    
+
     def _get_path(content_descr)
       if content_descr.is_a? String
         path = content_descr.to_s
@@ -129,6 +87,6 @@ module OMF::Web
       end
       return path
     end
-              
+
   end # class
 end # module

data/lib/omf-web/content/git_repository.rb

@@ -2,7 +2,7 @@
 #require 'base64'
 require 'grit'
 require 'find'
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'omf_web'
 require 'omf-web/content/content_proxy'
 require 'omf-web/content/repository'

data/lib/omf-web/content/irods_repository.rb

@@ -1,6 +1,6 @@
 
 require 'find'
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'omf_web'
 require 'omf-web/content/content_proxy'
 require 'omf-web/content/repository'

data/lib/omf-web/content/repository.rb

@@ -2,7 +2,7 @@
 #require 'base64'
 require 'grit'
 require 'find'
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'omf_web'
 require 'omf-web/content/content_proxy'
 
@@ -11,7 +11,7 @@ module OMF::Web
   # This class provides an interface to a particular content repository.
   # It retrieves, archives and versions content.
   #
-  class ContentRepository < OMF::Common::LObject
+  class ContentRepository < OMF::Base::LObject
 
     MIME_TYPE = {
       :js => 'text/javascript',
@@ -83,7 +83,9 @@ module OMF::Web
         if (text = url_or_descr[:text])
           # a bit of a hack for small static text blocks
           # Much better for maintenance is to use a separate file
-          url = "static:-"
+          require 'omf-web/content/static_repository'
+          url = OMF::Web::StaticContentRepository.create_from_text(url_or_descr, opts)
+          #url = repo.url # "static:-"
         else
           url = url_or_descr[:url]
         end

data/lib/omf-web/content/static_repository.rb

@@ -1,25 +1,39 @@
 
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'omf_web'
 require 'omf-web/content/content_proxy'
 require 'omf-web/content/repository'
 require 'singleton'
 
 module OMF::Web
-  
+
   # This class provides an interface to a repository of static,
   # preloaded content.
   #
-  class StaticContentRepository < ContentRepository  
-      
-    
+  class StaticContentRepository < ContentRepository
+
+    # Create a static repo.
+    #   @param descr - {text: ....}
+    #   @param opts - ???
+    #   @returns url for repo
+    #
+    def self.create_from_text(descr, opts)
+      puts "STATIC>>> #{opts}"
+      unless (text = descr[:text])
+        text "Missing 'text' declaration in 'content'"
+      end
+      key = Digest::MD5.hexdigest(text)
+      ContentRepository.register_repo(key, type: :static, text: text)
+      "static:#{key}"
+    end
+
     # Load content described by either a hash or a straightforward path
     # and return a 'ContentProxy' holding it.
     #
     # @return: Content proxy
     #
     def create_content_proxy_for(content_descr)
-      debug content_descr
+      debug "CREATE CONTNT PROXY: #{content_descr}"
       if content_descr.is_a? String
         content_descr = {text: content_descr}
       end
@@ -27,7 +41,7 @@ module OMF::Web
       unless text = descr.delete(:text)
         raise "Missing ':text' declaraton for static content"
       end
-      
+
       key = Digest::MD5.hexdigest(text)
       @content[key] = text
       descr[:url] = url = "static:" + key
@@ -41,7 +55,7 @@ module OMF::Web
       debug "READ: #{content_descr}"
       @content[content_descr[:url_key]] || 'Unknown'
     end
-           
+
     def write(content_descr, content, message)
       raise "READ ONLY"
     end
@@ -54,8 +68,8 @@ module OMF::Web
       super
       @content = {}
     end
-    
-    
-              
+
+
+
   end # class
 end # module

data/lib/omf-web/data_source_proxy.rb

@@ -1,6 +1,6 @@
 
 
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'omf_oml/network'
 
 module OMF::Web
@@ -9,7 +9,7 @@ module OMF::Web
   # in a web browser and the corresponding +OmlTable+ in this server.
   #
   #
-  class DataSourceProxy < OMF::Common::LObject
+  class DataSourceProxy < OMF::Base::LObject
 
     @@datasources = {}
 
@@ -164,7 +164,7 @@ module OMF::Web
       #puts "to_java2>>>>> #{opts.inspect}"
 
       %{
-        OML.data_sources.register(#{opts.to_json});
+        ds.register(#{opts.to_json});
       }
 
     end

data/lib/omf-web/rack/content_handler.rb

@@ -1,11 +1,11 @@
 
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'omf-web/rack/rack_exceptions'
 require 'omf-web/content/content_proxy'
 
 module OMF::Web::Rack
       
-  class ContentHandler < OMF::Common::LObject
+  class ContentHandler < OMF::Base::LObject
     
     def call(env)
       req = ::Rack::Request.new(env)

data/lib/omf-web/rack/session_authenticator.rb

@@ -1,5 +1,5 @@
 
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'rack'
 require 'omf-web/session_store'
 
@@ -16,7 +16,7 @@ module OMF::Web::Rack
   # Calls to the class methods are resolved inthe context
   # of a Session using 'OMF::Web::SessionStore'
   #
-  class SessionAuthenticator < OMF::Common::LObject
+  class SessionAuthenticator < OMF::Base::LObject
 
     # Returns true if this Rack module has been instantiated
     # in the current Rack stack.
@@ -130,7 +130,7 @@ module OMF::Web::Rack
         sid = "s#{(rand * 10000000).to_i}_#{(rand * 10000000).to_i}"
       end
       Thread.current["sessionID"] = sid  # needed for Session Store
-      debug "Request for '#{path_info}' - sid: #{sid} - #{self.class.authenticated?}"
+      #debug "Request for '#{path_info}' - sid: #{sid} - #{self.class.authenticated?}"
       unless @opts[:no_session].find {|rx| rx.match(path_info) }
         # If 'login_page_url' is defined, check if this session is authenticated
         login_url = @opts[:login_page_url]

data/lib/omf-web/rack/tab_mapper.rb

@@ -1,5 +1,5 @@
 
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 #require 'erector'
 require 'rack'
 #require 'omf-web/page'
@@ -11,7 +11,7 @@ require 'omf-web/theme'
 
 
 module OMF::Web::Rack
-  class TabMapper < OMF::Common::LObject
+  class TabMapper < OMF::Base::LObject
 
 
     def initialize(opts = {})

data/lib/omf-web/rack/update_handler.rb

@@ -1,11 +1,11 @@
 
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'omf-web/session_store'
 require 'omf-web/rack/rack_exceptions'
 
 module OMF::Web::Rack
       
-  class UpdateHandler < OMF::Common::LObject
+  class UpdateHandler < OMF::Base::LObject
     
     def initialize(opts = {})
     end

data/lib/omf-web/rack/websocket_handler.rb

@@ -1,15 +1,15 @@
 
 
 require 'rack/websocket'
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'omf-web/session_store'
 require 'thread'
 
 module OMF::Web::Rack
 
   class WebsocketHandler < ::Rack::WebSocket::Application
-    include OMF::Common::Loggable
-    extend OMF::Common::Loggable
+    include OMF::Base::Loggable
+    extend OMF::Base::Loggable
 
     MESSAGE_DELAY = 0.5 # Delay in pushing action message to browser
                         # after receiving a 'on_change' from monitored data proxy

data/lib/omf-web/rack/widget_mapper.rb

@@ -1,5 +1,5 @@
 
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'rack'
 require 'omf-web/session_store'
 require 'omf-web/widget'
@@ -9,7 +9,7 @@ OMF::Web::Theme.require 'widget_page'
 
 module OMF::Web::Rack
 
-  class WidgetMapper < OMF::Common::LObject
+  class WidgetMapper < OMF::Base::LObject
 
     def initialize(opts = {})
       @opts = opts

data/lib/omf-web/session_store.rb

@@ -1,5 +1,5 @@
 
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 
 
 module OMF::Web
@@ -8,7 +8,7 @@ module OMF::Web
   #
   # TODO: Implement cleanup thread
   #
-  class SessionStore < OMF::Common::LObject
+  class SessionStore < OMF::Base::LObject
     @@sessions = {}
 
     def self.[](key, domain)