omf_web 1.0.0 → 1.2.0

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

@@ -6,14 +6,23 @@ module OMF::Web::Theme
   class AbstractPage < Erector::Widget
 
     depends_on :js,  '/resource/vendor/stacktrace/stacktrace.js'
+
+    depends_on :js,  '/resource/vendor/require/require.js'
+    depends_on :js,  '/resource/js/app.js'
+
+
     depends_on :js, '/resource/vendor/jquery/jquery.js'
-    #depends_on :js, '/resource/js/stacktrace.js'
     depends_on :js, '/resource/vendor/underscore/underscore.js'
     depends_on :js, '/resource/vendor/backbone/backbone.js'
-    depends_on :js, "/resource/js/require3.js"
 
+    # depends_on :js, "/resource/js/require3.js"
+#
     depends_on :js, "/resource/theme/abstract/abstract.js"
-    depends_on :js, "/resource/js/data_source2.js"
+    # depends_on :js, "/resource/js/data_source2.js"
+    depends_on :script, %{
+      // ABSTRACT PAGE
+      if (typeof(OML) == "undefined") OML = {};
+    }
 
     attr_reader :opts
 
@@ -29,15 +38,6 @@ module OMF::Web::Theme
     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.already_loaded('/resource/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
@@ -82,28 +82,19 @@ module OMF::Web::Theme
       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 dss.empty?
 
       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">
           // <![CDATA[
-            #{js.join("\n")}
+            require(['omf/data_source_repo'], function(ds) {
+              #{js.join("\n")}
+            });
           // ]]>
         </script>
       }

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

@@ -5,16 +5,16 @@ require 'omf-web/theme/abstract_page'
 module OMF::Web::Theme
 
   class CodeRenderer < Erector::Widget
-    
+
     #depends_on :css, "/resource/css/coderay.css"
-    
+
     # This maps the content's mime type to a different mode  supported
     # CodeMirror
     #
     MODE_MAPPER = {
       :markup => :markdown
     }
-    
+
     def initialize(widget, content, mode, opts)
       super opts
       @widget = widget
@@ -22,9 +22,9 @@ module OMF::Web::Theme
       @mode = MODE_MAPPER[mode.to_sym] || mode
       @opts = opts
     end
-        
+
     def content()
-      
+
       base_id = "cm#{self.object_id}"
       edit_id = base_id + '_e'
       mode = @mode
@@ -35,16 +35,16 @@ module OMF::Web::Theme
       opts.delete :top_level
       opts.delete :priority
       opts.merge!(
-        :base_el => "#" + base_id, 
-        :edit_el => '#' + edit_id, 
-        :content => @content.to_s, 
+        :base_el => "#" + base_id,
+        :edit_el => '#' + edit_id,
+        :content => @content.to_s,
         :mode => mode,
         :content_id => @widget.content_id,
         :save_url => @widget.update_url
       )
 
       div :id => base_id, :class => "codemirror_widget" do
-        
+
         js_toolbar = []
         div :class => "codemirror_toolbar_container widget-toolbar" do
           ol :class => "codemirror_toolbar" do
@@ -60,53 +60,47 @@ module OMF::Web::Theme
                   OML.widgets.#{base_id}.on_#{name}_pressed();
                   return false;
                 });
-              } 
+              }
             end
           end
         end
-        
+
         ['codemirror', 'util/dialog'].each do |f|
-          link :href => "/resource/vendor/codemirror/lib/#{f}.css", 
+          link :href => "/resource/vendor/codemirror/lib/#{f}.css",
             :media => "all", :rel => "stylesheet", :type => "text/css"
         end
 
         ['codemirror', 'util/dialog', 'util/searchcursor', 'util/search', 'util/loadmode'].each do |f|
           script :src => "/resource/vendor/codemirror/lib/#{f}.js"
         end
-        
+
         #script :src => "/resource/vendor/codemirror/mode/xml/xml.js"
         #script :src => "/resource/vendor/codemirror/mode/#{mode}/#{mode}.js"
 
         # Div where the text should go
         div :id => edit_id, :class => "codemirror_edit" #, :style => 'height:100%'
-         
+
         render_widget_creation(base_id, opts)
         javascript(%{
           #{js_toolbar.join("\n");}
         })
-        
-      end        
+
+      end
     end
-    
+
     def render_widget_creation(base_id, opts)
-      link :href => "/resource/theme/bright/css/codemirror.css", 
+      link :href => "/resource/theme/bright/css/codemirror.css",
           :media => "all", :rel => "stylesheet", :type => "text/css"
-      
+
       javascript(%{
-        L.require('#OML.code_mirror', 'graph/js/code_mirror', function() {
-          OML.widgets.#{base_id} = new OML.code_mirror(#{opts.to_json});
+        require(['graph/code_mirror'], function(Graph) {
+          var w = OML.widgets.#{base_id} = new Graph(#{opts.to_json});
+          var i = 0;
         });
       })
+
     end
 
-    # def content2()
-      # link :href => "/resource/css/coderay.css", 
-        # :media => "all", :rel => "stylesheet", :type => "text/css"     
-      # div :class => "oml_code CodeRay" do
-        # rawtext(@content.html :line_numbers => :inline, :tab_width => 2, :wrap => :div)
-      # end
-    # end
-    
   end
-  
+
 end

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

@@ -3,24 +3,26 @@ require 'omf-web/theme/abstract_page'
 module OMF::Web::Theme
 
   class DataRenderer < Erector::Widget
-    
+
     def initialize(widget, opts)
       super opts
       @base_id = widget.dom_id
       @js_class = opts[:js_class]
       @js_url = opts[:js_url]
+      @js_module = opts[:js_module]
       @wopts = opts.dup
-    end    
+    end
 
     def content()
       div :id => @base_id, :class => "#{@js_class.gsub('.', '_').downcase}" do
         javascript(%{
-          L.require('\##@js_class', '#@js_url', function() {
-            OML.widgets.#{@base_id} = new #{@js_class}(#{@wopts.to_json});
+          require(['#@js_module'], function(Graph) {
+            var w = OML.widgets.#{@base_id} = new Graph(#{@wopts.to_json});
+            var i = 0;
           });
         })
       end
     end
-    
+
   end
 end

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

@@ -8,7 +8,8 @@ module OMF::Web::Theme
     depends_on :css, "/resource/theme/bright/css/bright.css"
 
     depends_on :script, %{
-      OML.session_id = '#{Thread.current["sessionID"]}'
+      if (typeof(OML) == "undefined") OML = {};
+      //OML.session_id = '#{Thread.current["sessionID"]}'
       OML.show_widget = function(opts) {
         var prefix = opts.inner_class;
         var index = opts.index;

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

@@ -2,22 +2,22 @@ require 'omf-web/theme/abstract_page'
 
 module OMF::Web::Theme
   class WidgetChrome < Erector::Widget
-    
+
     def initialize(widget, inside_component, opts)
       super opts
       @widget = widget
       @inside_component = inside_component
       @opts = opts
-    end    
-    
+    end
+
     def render_card_body
       rawtext @widget.content.to_html
     end
-    
+
     def content
       render_widget(@widget)
     end
-    
+
     def render_widget(widget)
       wid = "w#{widget.object_id}_c"
       div :class => :widget_container, :id => wid do
@@ -28,7 +28,7 @@ module OMF::Web::Theme
           render_widget_info(widget)
           render_widget_body(widget)
           render_widget_footer(widget)
-        end        
+        end
       end
     end
 
@@ -41,7 +41,7 @@ module OMF::Web::Theme
 
     def render_tools_menu
       menu = @opts[:menu] || {}
-      span :class => 'widget_tools_menu', :style => 'float:right' do 
+      span :class => 'widget_tools_menu', :style => 'float:right' do
         ol :class => :widget_tools_menu do
           menu.each do |m|
             lopts = {}
@@ -57,17 +57,19 @@ module OMF::Web::Theme
             a :id => "w#{object_id}_info_a", :href => "#"  do
               span 'Info' , :class => :widget_tools_menu
             end
-          end 
-        end         
+          end
+        end
       end
-      js = menu.map do |m| 
+      js = menu.map do |m|
         %{
           $('\##{m[:id]}_a').click(function(){
             return #{m[:js_function]}(#{m.to_json});
           });
-        } 
+        }
       end
-      javascript js.join("\n")
+      javascript %{
+        #{js.join("\n")}
+      }
     end
 
     def render_widget_info(widget)
@@ -75,7 +77,7 @@ module OMF::Web::Theme
         wp = "w#{object_id}"
         div :id => "#{wp}_info", :class => 'widget_info', :style => 'display:none' do
           text widget_info
-        end  
+        end
         javascript %{
           $('\##{wp}_info_a').click(function(){
             $('\##{wp}_info').slideToggle("slow");
@@ -95,7 +97,7 @@ module OMF::Web::Theme
 
     def render_widget_footer(widget)
       # NOTHING
-    end    
+    end
 
   end # class widget
 end # OMF::Web::Theme

data/lib/omf-web/theme.rb

@@ -1,7 +1,7 @@
 
 
 module OMF::Web::Theme
-  extend OMF::Common::Loggable
+  extend OMF::Base::Loggable
 
   DEFAULT_THEME = 'omf-web/theme/bright'
   @@search_order = [DEFAULT_THEME]  # default theme

data/lib/omf-web/thin/logging.rb

@@ -1,18 +1,18 @@
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 
 module Thin
-  # Overwrite thin's logging mix-in to work more nicely 
+  # Overwrite thin's logging mix-in to work more nicely
   # with log4r
   #
   module Logging
     class << self
       attr_writer :trace, :debug, :silent
-      
+
       def trace?;  !@silent && @trace  end
       def debug?;  !@silent && @debug  end
       def silent?;  @silent            end
     end
-    
+
     # # Global silencer methods
     # def silent
       # Logging.silent?
@@ -20,33 +20,38 @@ module Thin
     # def silent=(value)
       # Logging.silent = value
     # end
-    
+
     # Log a message to the console
     def log(msg)
-      (@logger ||= OMF::Common::LObject.new(self.class)).info(msg)
+      (@logger ||= OMF::Base::LObject.new(self.class)).info(msg)
     end
     module_function :log
     public :log
-    
+
     # Log a message to the console if tracing is activated
     def trace(msg=nil)
-      return unless msg      
-      (@logger ||= OMF::Common::LObject.new(self.class)).debug(msg)
+      ### DO NOT COMMIT!!!! Can't figure out where tracing is switched on
+      return
+      #####
+
+
+      return unless msg
+      (@logger ||= OMF::Base::LObject.new(self.class)).debug(msg)
     end
     module_function :trace
     public :trace
-    
+
     # Log a message to the console if debugging is activated
     def debug(msg=nil)
       return unless msg
-      (@logger ||= OMF::Common::LObject.new(self.class)).debug(msg)
+      (@logger ||= OMF::Base::LObject.new(self.class)).debug(msg)
     end
     module_function :debug
     public :debug
-    
+
     # Log an error backtrace if debugging is activated
     def log_error(e = $!)
-      (@logger ||= OMF::Common::LObject.new(self.class)).error(e)
+      (@logger ||= OMF::Base::LObject.new(self.class)).error(e)
     end
     module_function :log_error
     public :log_error

data/lib/omf-web/thin/runner.rb

@@ -15,7 +15,7 @@ end
 
 module OMF::Web
   class Runner < Thin::Runner
-    include OMF::Common::Loggable
+    include OMF::Base::Loggable
 
     @@instance = nil
 
@@ -89,7 +89,7 @@ module OMF::Web
       # Change the name of the root logger so we can apply different logging
       # policies depending on environment.
       #
-      OMF::Common::Loggable.set_environment @options[:environment]
+      OMF::Base::Loggable.set_environment @options[:environment]
 
       if css = opts[:include_css]
         require 'omf-web/theme'

data/lib/omf-web/thin/server.rb

@@ -1,5 +1,5 @@
 require 'json'
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 require 'omf_web'
 
 module OMF::Web
@@ -9,17 +9,16 @@ module OMF::Web
   # USAGE:
   #
   #
-  class Server < OMF::Common::LObject
+  class Server < OMF::Base::LObject
 
     def self.start(server_name, description, top_dir, opts = {})
       self.new(server_name, description, top_dir, opts)
     end
 
     def initialize(server_name, description, top_dir, opts)
-      OMF::Common::Loggable.init_log server_name
-
+      OMF::Base::Loggable.init_log(server_name)
+      #OMF::Base::Loggable.init_log server_name
       opts = {
-        static_dirs_pre: ["#{top_dir}/htdocs"],
         handlers: {
           pre_parse: lambda do |p, runner|
             p.on("--config CONF_FILE", "File holding description of web site") {|f| runner.options[:omf_config_file] = f}
@@ -32,8 +31,10 @@ module OMF::Web
         }
       }.merge(opts)
 
+      @server_name = server_name
       @top_dir = top_dir
       @databases = {}
+      @omsp_endpoints = {}
 
       OMF::Web.start(opts)
     end
@@ -49,9 +50,15 @@ module OMF::Web
         abort
       end
 
-      @top_dir ||= File.dirname(cf)
+      @cfg_dir = File.dirname(cf)
+      opts[:static_dirs].insert(0, File.absolute_path(File.join(@cfg_dir, 'htdocs')))
+      @top_dir ||= @cfg_dir
       cfg = _rec_sym_keys(YAML.load_file(cf))
 
+      if log_opts = cfg[:logging]
+        # TODO: Deal with custom logging option
+      end
+
       (cfg[:server] || {}).each do |k, v|
         k = k.to_sym
         case k
@@ -82,29 +89,41 @@ module OMF::Web
         puts "Missing id in datasource configuration"
         abort
       end
-      case type = config[:type] || 'database'
-      when 'database'
-        load_database(config)
-      when 'file'
+      if config[:database]
+        load_database(id, config)
+      elsif config[:file]
         load_datasource_file(id, config)
+      elsif config[:omsp]
+        load_omsp_endpoint(id, config)
       else
-        abort "Unknown datasource type '#{type}'."
+        abort "Unknown datasource type - #{config}"
       end
     end
 
-    def load_database(config)
-      unless table_name = config[:table]
-        puts "Missing 'table' in datasource configuration '#{id}'"
-        abort
-      end
+    def load_database(id, config)
       unless db_cfg = config[:database]
-        puts "Missing database configuration in datasource '#{id}'"
+        puts "Missing database configuration in datasource '#{config}'"
         abort
       end
       db = get_database(db_cfg)
-      unless table = db.create_table(table_name)
-        puts "Can't find table '#{table_name}' in database '#{db}'"
-        abort
+      if query_s = config[:query]
+        unless schema = config[:schema]
+          puts "Missing schema configuration in datasource '#{config}'"
+          abort
+        end
+        require 'omf_oml/schema'
+        config[:schema] = OMF::OML::OmlSchema.create(schema)
+        table = db.create_table(id, config)
+      else
+        unless table_name = config.delete(:table)
+          puts "Missing 'table' in datasource configuration '#{config}'"
+          abort
+        end
+        config[:name] = id
+        unless table = db.create_table(table_name, config)
+          puts "Can't find table '#{table_name}' in database '#{db_cfg}'"
+          abort
+        end
       end
       OMF::Web.register_datasource table, name: id
     end
@@ -120,25 +139,30 @@ module OMF::Web
         puts "Database '#{config}' not defined - (#{@databases.keys})"
         abort
       end
-      unless id = config[:id]
+      unless id = config.delete(:id)
         puts "Missing id in database configuration"
         abort
       end
+      if db = @databases[id.to_s] # already known
+        return db
+      end
+
       # unless id = config[:id]
         # puts "Database '#{config}' not defined - (#{@databases.keys})"
         # abort
       # end
-      unless url = config[:url]
+      unless url = config.delete(:url)
         puts "Missing URL for database '#{id}'"
         abort
       end
-      if url.start_with?('sqlite://') && ! url.start_with?('sqlite:///')
+      if url.start_with?('sqlite:') && ! url.start_with?('sqlite:/')
         # inject top dir
-        url.insert('sqlite://'.length, @top_dir + '/')
+        url.insert('sqlite:'.length, '//' + @cfg_dir + '/')
       end
-      puts "URL: #{url}"
+      config[:check_interval] ||= 3.0
+      puts "URL: #{url} - #{config}"
       begin
-        return @databases[id] = OMF::OML::OmlSqlSource.new(url, :check_interval => 3.0)
+        return @databases[id] = OMF::OML::OmlSqlSource.new(url, config)
       rescue Exception => ex
         puts "Can't connect to database '#{id}' - #{ex}"
         abort
@@ -174,6 +198,17 @@ module OMF::Web
       OMF::Web.register_datasource ds, name: name
     end
 
+    def load_omsp_endpoint(id, config)
+      oconfig = config[:omsp]
+      unless port = oconfig[:port]
+        puts "Need port in OMSP definition '#{oconfig}' - datasource '#{id}'"
+        abort
+      end
+      ep = @omsp_endpoints[port] ||= OmspEndpointProxy.new(port)
+      ep.add_datasource(id, config)
+    end
+
+
     def load_repository(config)
       unless id = config[:id]
         puts "Missing id in respository configuration"
@@ -221,7 +256,7 @@ module OMF::Web
     # This class simulates a DataSource to transfer a JSON file as a database with one row and column
 
 
-    class JSONDataSource < OMF::Common::LObject
+    class JSONDataSource < OMF::Base::LObject
 
       def initialize(file)
         raw = File.read(file)
@@ -251,5 +286,48 @@ module OMF::Web
         # do nothing
       end
     end
+
+    # This class manages an OMSP Endpoint and all the related
+    # data sources
+    #
+    class OmspEndpointProxy < OMF::Base::LObject
+      def initialize(port)
+        @streams = {}
+        @sources = {}
+        @tables = {}
+        require 'omf_oml/endpoint'
+        @ep = OMF::OML::OmlEndpoint.new(port)
+        @ep.on_new_stream() do |name, stream|
+          _on_new_stream(name, stream)
+        end
+        Thread.new do # delay starting up endpoint, can't use EM yet
+          sleep 2
+          @ep.run(false)
+        end
+      end
+
+      def add_datasource(name, config)
+        stream_name = config[:omsp][:stream_name] || name
+        config.delete(:omsp)
+        (@sources[stream_name.to_s] ||= []) << config
+      end
+
+      def _on_new_stream(name, stream)
+        debug "New stream: #{name}-#{stream}"
+        (@sources[name] || []).each do |tdef|
+          puts "TDEF: #{tdef}"
+          tname = tdef.dup.delete(:id)
+          unless table = @tables[tname]
+            table = @tables[tname] = stream.create_table(tname, tdef)
+            OMF::Web.register_datasource table
+            puts "ADDED: #{table}"
+          else
+            warn "Looks like reconnection, should reconnect to table as well"
+          end
+        end
+      end
+
+    end # class OmspEndpointProxy
+
   end # class
 end # module

data/lib/omf-web/version.rb

@@ -1,7 +1,7 @@
 
 module OMF
   module Web
-    VERSION = '1.0.0'
+    VERSION = '1.2.0'
     # Used for finding the example directory
     TOP_DIR = File.dirname(File.dirname(File.dirname(__FILE__)))
   end

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

@@ -1,14 +1,14 @@
 
 require 'erector'
-require 'omf_common/lobject'
+require 'omf_base/lobject'
 
 module OMF::Web::Widget
       
   # Maintains the context for a particular code rendering within a specific session.
   #
   class AbstractWidget < Erector::Widget
-    extend OMF::Common::Loggable
-    include OMF::Common::Loggable    
+    extend OMF::Base::Loggable
+    include OMF::Base::Loggable    
     
     attr_reader :widget_id, :widget_type, :name, :opts
     

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

@@ -25,6 +25,7 @@ module OMF::Web::Widget
         raise "Missing widget option ':viz_type' for widget '#{name}' (#{opts.inspect})"
       end
       name = opts[:name] ||= 'Unknown'
+      opts[:js_module] = "graph/#{vizType}"
       opts[:js_url] = "graph/js/#{vizType}.js"
       opts[:js_class] = "OML.#{vizType}"
       opts[:base_el] = "\##{dom_id}"