omf_web 0.9.6 → 0.9.7

data/lib/omf-web/data_source_proxy.rb

@@ -1,7 +1,7 @@
 
 
 require 'omf_common/lobject'
-require 'omf-oml/network'
+require 'omf_oml/network'
 
 module OMF::Web
         
@@ -25,11 +25,14 @@ module OMF::Web
         raise "Repeated try to register data source '#{name}'"
       end
       if data_source.is_a? OMF::OML::OmlNetwork
-        dsh = data_source.to_tables(opts)
-        @@datasources[name] = dsh
-      else
-        @@datasources[name] = data_source
+        raise "Register link and node table separately "
       end
+        # dsh = data_source.to_tables(opts)
+        # @@datasources[name] = dsh
+      # else
+        # @@datasources[name] = data_source
+      # end
+      @@datasources[name] = data_source      
     end
     
     def self.[](name)
@@ -63,36 +66,35 @@ module OMF::Web
       ds_name = ds_name.to_sym
       ds = @@datasources[ds_name]
       unless ds
-        # let's check for sub table, such as network/nodes
-        main, sub = ds_descr[:name].split('/')
-        if (sub)
-          if ds_top = @@datasources[main.to_sym]
-            ds = ds_top[sub.to_sym]
+        top = "#{ds_name}/"
+        names = @@datasources.keys.find_all { |ds_name| ds_name.to_s.start_with? top }
+        unless names.empty?
+          return names.map do |ds_name| 
+            OMF::Web::SessionStore[ds_name, :dsp] ||= self.new(ds_name, @@datasources[ds_name]) 
           end
         end
+        # debug ">>>> #{dsa}"
+        # # let's check for sub table, such as network/nodes
+        # main, sub = ds_descr[:name].split('/')
+        # if (sub)
+          # if ds_top = @@datasources[main.to_sym]
+            # ds = ds_top[sub.to_sym]
+          # end
+        # end
         unless ds
           raise "Unknown data source '#{ds_name}' (#{@@datasources.keys.inspect})"
         end
       end
       if ds.is_a? Hash
+        raise "Is this actually used anywhere?"
         proxies = ds.map do |name, ds|
           id = "#{ds_name}_#{name}".to_sym
           proxy = OMF::Web::SessionStore[id, :dsp] ||= self.new(id, ds)
         end
         return proxies
-          
-        # n_name = "#{ds_name}_nodes".to_sym
-        # l_name = "#{ds_name}_links".to_sym
-        # if (nodes = OMF::Web::SessionStore[n_name, :dsp])
-          # # assume links exist as well
-          # links = OMF::Web::SessionStore[l_name, :dsp]                
-        # else
-          # nodes = OMF::Web::SessionStore[n_name, :dsp] = self.new(n_name, ds[:nodes])
-          # links = OMF::Web::SessionStore[l_name, :dsp] = self.new(l_name, ds[:links])
-        # end
-        # return [nodes, links]
       end
       
+      #debug ">>>>> DS: #{ds_descr.inspect} - #{ds}"
       proxy = OMF::Web::SessionStore[ds_name, :dsp] ||= self.new(ds_name, ds)
       return [proxy]
     end
@@ -119,11 +121,11 @@ module OMF::Web
       rows = ds.rows[(offset - ds.offset) .. -1]
       if rows && rows.length > 0
         debug "on_changed: sending #{rows.length}"
-        block.call rows, ds.offset
+        block.call :added, rows
       end
-      @data_source.on_row_added(block.object_id) do |row, offset|
-        debug "on_changed: more data: #{row.inspect}"
-        block.call [row], offset
+      @data_source.on_content_changed(block.object_id) do |action, rows|
+        debug "on_changed: #{action}: #{rows.inspect}"
+        block.call action, rows
       end
     end
     
@@ -144,7 +146,8 @@ module OMF::Web
       opts[:update_url] = "/_update/#{@name}?sid=#{sid}"
       opts[:sid] = sid
       unless opts[:slice] # don't send any data if this is a sliced one
-        opts[:rows] = @data_source.rows[0 .. 20]
+        #opts[:rows] = @data_source.rows[0 .. 20]
+        opts[:rows] = []
         opts[:offset] = @data_source.offset
       end
       #puts "to_java2>>>>> #{opts.to_json.inspect}"

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

@@ -0,0 +1,93 @@
+
+require 'omf_common/lobject'
+require 'rack'
+require 'omf-web/session_store'
+
+      
+module OMF::Web::Rack      
+  class SessionAuthenticator < OMF::Common::LObject
+    
+    def self.active?
+      @@active
+    end
+
+    def self.authenticated?
+      self[:authenticated]
+    end
+
+    def self.authenticate
+      self[:authenticated] = true
+      self[:valid_until] = Time.now + @@expire_after
+    end
+    
+    def self.logout
+      self[:authenticated] = false
+    end
+
+    def self.[](key)
+      OMF::Web::SessionStore[key, :authenticator]
+    end
+    
+    def self.[]=(key, value)
+      OMF::Web::SessionStore[key, :authenticator] = value
+    end
+
+    @@active = false
+    # Expire authenticated session after being idle for that many seconds
+    @@expire_after = 2592000
+    
+    #
+    # opts -
+    #   :no_session - Array of regexp to ignore
+    #
+    def initialize(app, opts = {})
+      @app = app
+      @opts = opts
+      @opts[:no_session] = (@opts[:no_session] || []).map { |s| Regexp.new(s) }
+      if @opts[:expire_after]
+        @@expire_after = @opts[:expire_after]
+      end
+      @@active = true
+    end
+    
+    
+    def call(env)
+      #puts env.keys.inspect
+      req = ::Rack::Request.new(env)
+      sid = nil
+      path_info = req.path_info
+      #puts "REQUEST: #{path_info}"
+      unless @opts[:no_session].find {|rx| rx.match(path_info) }
+        sid = req.cookies['sid'] || "s#{(rand * 10000000).to_i}_#{(rand * 10000000).to_i}"
+        debug "Setting session for '#{req.path_info}' to '#{sid}'"
+        Thread.current["sessionID"] = sid
+        # If 'login_url' is defined, check if this session is authenticated
+        login_url = @opts[:login_url] 
+        if login_url && login_url != req.path_info
+          if authenticated = self.class[:authenticated]
+            # Check if it hasn't imed out
+            if self.class[:valid_until] < Time.now
+              debug "Session '#{sid}' expired"
+              authenticated = false
+            end    
+          end
+          unless authenticated
+            return [301, {'Location' => login_url, "Content-Type" => ""}, ['Login first']]
+          end
+        end
+        self.class[:valid_until] = Time.now + @@expire_after
+      end
+            
+      status, headers, body = @app.call(env)
+      if sid
+        headers['Set-Cookie'] = "sid=#{sid}"  ##: name2=value2; Expires=Wed, 09-Jun-2021 ]
+      end
+      [status, headers, body]      
+    end
+  end # class
+  
+end # module
+
+
+      
+        

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

@@ -32,12 +32,17 @@ module OMF::Web::Rack
     end
     
     def call(env)
+      #puts env.keys.inspect
+
       req = ::Rack::Request.new(env)
-      sessionID = req.params['sid']
-      if sessionID.nil? || sessionID.empty?
-        sessionID = "s#{(rand * 10000000).to_i}"
-      end
-      Thread.current["sessionID"] = sessionID
+      #puts "COOKIES>>>> #{req.cookies.inspect}"
+      #req.cookies['user'] = 'booo'
+      
+      # sessionID = req.params['sid']
+      # if sessionID.nil? || sessionID.empty?
+        # sessionID = "s#{(rand * 10000000).to_i}"
+      # end
+      # Thread.current["sessionID"] = sessionID
       
       OMF::Web::Theme.require 'page'      
       body, headers = render_page(req)

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

@@ -53,12 +53,13 @@ module OMF::Web::Rack
       dsp = find_data_source(args)
       return unless dsp  # should define appropriate exception
       debug "Received registration for datasource proxy '#{dsp}'"
-      dsp.on_changed(args['offset']) do |new_rows, offset|
+      dsp.on_changed(args['offset']) do |action, rows|
         msg = {
           type: 'datasource_update',
           datasource: dsp.name,
-          rows: new_rows,
-          offset: offset
+          rows: rows,
+          action: action
+          #offset: offset
         }
         send_data(msg.to_json)
       end
@@ -81,14 +82,24 @@ module OMF::Web::Rack
       end
       sdsp = dsp.create_slice(col_name, col_value)
       context[:sliced_datasource] = {:col_name => col_name, :dsp => sdsp}
-      sdsp.on_changed(0) do |new_rows, offset|
+      sdsp.on_changed(0) do |action, rows|
         msg = {
           type: 'datasource_update',
           datasource: args['ds_name'],
-          rows: new_rows,
-          offset: offset
+          rows: rows,
+          action: action
+          #offset: offset
         }
         send_data(msg.to_json)
+#         
+        # do |new_rows, offset|
+        # msg = {
+          # type: 'datasource_update',
+          # datasource: args['ds_name'],
+          # rows: new_rows,
+          # offset: offset
+        # }
+        # send_data(msg.to_json)
       end
     end
     

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

@@ -70,7 +70,7 @@ module OMF::Web::Theme
     def render_data_sources
       return unless @widget
       
-      require 'omf-oml/table'
+      require 'omf_oml/table'
       require 'set'
       
       dss = Set.new

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

@@ -1,9 +1,9 @@
 
-require 'omf-web/theme/bright/widget_chrome'
+require 'omf-web/theme/bright/layout_renderer'
 
 module OMF::Web::Theme
   
-  class FlowRenderer < Erector::Widget
+  class FlowRenderer < LayoutRenderer
     
     def initialize(layout_widget, widgets, opts)
       super opts

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

@@ -0,0 +1,15 @@
+
+require 'omf-web/theme/bright/widget_chrome'
+
+module OMF::Web::Theme
+  
+  class LayoutRenderer < Erector::Widget
+    
+    def render? partial
+      a = (@opts[:render] ||= {})[partial] 
+      a != false
+    end
+
+  end # class
+
+end # OMF::Web::Theme

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

@@ -0,0 +1,29 @@
+
+require 'omf-web/theme/abstract_page'
+
+module OMF::Web::Theme
+
+  class MustacheRenderer < Erector::Widget
+    
+    def initialize(widget, opts)
+      super opts
+      @widget = widget
+      @opts = opts
+    end
+        
+    def content()
+      base_id = "mr#{self.object_id}"
+      opts = @opts.dup
+      opts[:base_id] = base_id
+      div :id => base_id, :class => "mustache_widget" do
+        javascript(%{
+          L.require('#OML.mustache', 'js/mustache', function() {
+            OML.mustache(#{opts.to_json});
+          });
+        })
+      end
+    end
+    
+  end
+  
+end

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

@@ -1,9 +1,9 @@
 
-require 'omf-web/theme/bright/widget_chrome'
+require 'omf-web/theme/bright/layout_renderer'
 
 module OMF::Web::Theme
   
-  class OneColumnRenderer < Erector::Widget
+  class OneColumnRenderer < LayoutRenderer
     
     def initialize(widgets, opts)
       super opts

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

@@ -1,4 +1,5 @@
 require 'omf-web/theme/abstract_page'
+require 'omf-web/rack/session_authenticator'   
 
 module OMF::Web::Theme
   class Page < OMF::Web::Theme::AbstractPage
@@ -33,16 +34,25 @@ module OMF::Web::Theme
  
     def content
       super
+      @renderer = @widget.content
       div :id => 'doc3' do
-        div :id => 'hd' do
-          render_top_line
-          h1 @page_title || 'Missing :page_title' 
+        if @renderer.render? :header
+          div :id => 'hd' do
+            if @renderer.render? :top_line
+              render_top_line
+            end
+            if @renderer.render? :title
+              h1 @page_title || 'Missing :page_title'
+            end 
+          end
         end
         div :id => 'bd' do
           render_body
         end
-        div :id => 'ft' do
-          render_footer
+        if @renderer.render? :footer
+          div :id => 'ft' do
+            render_footer
+          end
         end
       end
     end
@@ -59,7 +69,8 @@ module OMF::Web::Theme
         @tabs.each do |h|
           lopts = h[:id] == @tab ? {:class => :current} : {}
           li lopts do 
-            a :href => "#{@prefix}/#{h[:id]}?sid=#{Thread.current["sessionID"]}" do
+            #a :href => "#{@prefix}/#{h[:id]}?sid=#{Thread.current["sessionID"]}" do
+            a :href => "#{@prefix}/#{h[:id]}" do
               span h[:name], :class => :tab_text
             end
           end
@@ -69,8 +80,22 @@ module OMF::Web::Theme
             
     def render_tools_menu
       div :id => :tools_menu do
-        a 'Log in', :href => '/login'
+        render_authentication
+      end
+    end
+    
+    def render_authentication
+      if OMF::Web::Rack::SessionAuthenticator.active?
+        if OMF::Web::Rack::SessionAuthenticator.authenticated?
+          # text OMF::Web::Rack::Session[:name]
+          # text ' | '
+          a 'Log out', :href => '/logout'          
+        else
+          a 'Log in', :href => '/tab/login'
+        end
       end
+        
+      
     end
     
     def render_body
@@ -81,7 +106,7 @@ module OMF::Web::Theme
     def render_card_body
       return unless @widget
       Thread.current["top_renderer"] = self
-      rawtext @widget.content.to_html
+      rawtext @renderer.to_html
     end
         
     def render_footer

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

@@ -1,9 +1,8 @@
-
-require 'omf-web/theme/bright/widget_chrome'
+require 'omf-web/theme/bright/layout_renderer'
 
 module OMF::Web::Theme
   
-  class TabbedRenderer < Erector::Widget
+  class TabbedRenderer < LayoutRenderer
     
     def initialize(layout_widget, widgets, opts)
       super opts

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

@@ -1,10 +1,9 @@
-
-require 'omf-web/theme/bright/widget_chrome'
+require 'omf-web/theme/bright/layout_renderer'
 
 module OMF::Web::Theme
   
-  class TwoColumnsRenderer < Erector::Widget
-    
+  class TwoColumnsRenderer < LayoutRenderer
+
     DEFAULT_LAYOUT = '66_33'
     
     @@layout2class = {

data/lib/omf-web/version.rb

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

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

@@ -19,12 +19,6 @@ module OMF::Web::Widget
       unless (content_descr = opts[:content])
         raise "Missing 'content' option in '#{opts.describe}'"
       end  
-      # if content_descr.is_a? OMF::Web::ContentProxy
-        # @content_proxy = content_descr
-      # else    
-        # #@content_proxy = OMF::Web::ContentRepository[opts].load(content_descr)
-        # @content_proxy = OMF::Web::Repository.create_content_proxy_for(content_descr, opts)
-      # end
       @content_proxy = OMF::Web::ContentRepository.create_content_proxy_for(content_descr, opts)
     end
     
@@ -36,7 +30,6 @@ module OMF::Web::Widget
       @content_proxy.mime_type
     end
     
-    
     def update_url
       @content_proxy.content_url
     end

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

@@ -8,8 +8,9 @@ module OMF::Web::Widget::Layout
 
     def initialize(type, opts)
       super opts
-      @left = (opts[:left] || []).map {|w| OMF::Web::Widget.create_widget(w)}
-      @right = (opts[:right] || []).map {|w| OMF::Web::Widget.create_widget(w)}      
+      wt = opts[:widgets] || opts # support opts[:left] as well as opts[:widgets][:left]
+      @left = (wt[:left] || []).map {|w| OMF::Web::Widget.create_widget(w)}
+      @right = (wt[:right] || []).map {|w| OMF::Web::Widget.create_widget(w)}      
     end
 
     def content()

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

@@ -0,0 +1,44 @@
+
+require 'omf-web/widget/abstract_widget'
+require 'omf-web/content/repository'
+
+module OMF::Web::Widget
+  
+  # Renders the content of a moustache file in the context of a data source
+  #
+  class MustacheWidget < AbstractWidget
+    
+    def self.create_mustache_widget(type, wdescr)
+      return self.new(wdescr)
+    end
+    
+    attr_accessor :content_proxy
+    
+    def initialize(opts)
+      super opts
+      # if (content_descr = opts[:content])
+        # opts[:content_proxy] = OMF::Web::ContentRepository.create_content_proxy_for(content_descr, opts)  
+      # end  
+    end
+    
+    def title 
+      @opts[:title] || 'No Title'
+    end
+       
+    def content()
+      OMF::Web::Theme.require 'mustache_renderer'
+      OMF::Web::Theme::MustacheRenderer.new(self, @opts)
+    end
+    
+    def collect_data_sources(ds_set)
+      if @opts[:data_sources]
+        @opts[:data_sources].each do |ds|
+          ds_set.add(ds[:stream])
+        end
+      end
+      ds_set
+    end
+    
+  end # class
+  
+end

data/lib/omf-web/widget.rb

@@ -5,7 +5,8 @@ module OMF::Web::Widget
   
     
     @@widgets = {}
-    @@descriptions = {}    
+    @@descriptions = {}  
+    @@type2class = {}  
     
     def self.register_widget(wdescr)
       unless id = wdescr[:id]
@@ -22,6 +23,15 @@ module OMF::Web::Widget
       @@descriptions
     end
     
+    def self.register_widget_type(id, widget_class)
+      id = id.to_sym
+      if (@@type2class.key? id)
+        raise "Repeated try to register widget type '#{id}'"
+      end  
+      @@type2class[id] = widget_class
+    end
+    
+    
     # Return the number of top level widgets. If 'restrict_to' is an
     # array, only return those. 
     #
@@ -82,6 +92,9 @@ module OMF::Web::Widget
       when /^code/
         require 'omf-web/widget/code_widget'
         w =  OMF::Web::Widget::CodeWidget.create_code_widget(type, wdescr)        
+      when /^moustache/
+        require 'omf-web/widget/mustache_widget'
+        w =  OMF::Web::Widget::MustacheWidget.create_mustache_widget(type, wdescr)        
       else
         raise "Unknown widget type '#{type}' (#{wdescr.inspect})"
       end

data/lib/omf_common/lobject.rb

@@ -150,9 +150,12 @@ module OMF::Common
     end
 
     def _logger(category = nil)
-      unless @logger && category.nil?
-        category ||= self.class.to_s 
-        @logger = OMF::Common::Loggable.logger(category)
+      unless @logger #&& category.nil?
+        cat = self.class.to_s 
+        if category
+          cat = "#{cat}-#{category}"
+        end
+        @logger = OMF::Common::Loggable.logger(cat)
       end
       return @logger
     end

data/omf_web.gemspec

@@ -21,7 +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-oml", "~> 0.9"
+  s.add_runtime_dependency "omf_oml", "~> 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"
@@ -33,4 +33,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "json", "~> 1.7.3"
   s.add_runtime_dependency "grit", "~> 2.5.0"
   s.add_runtime_dependency "sqlite3", "~> 1.3.6"
+  s.add_runtime_dependency "postgres-pr", "~> 0.6.3" 
+  s.add_runtime_dependency "websocket-rack", "~> 0.4.0"
 end

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

@@ -26,7 +26,14 @@ L.provide('OML.abstract_nv_chart', ["graph/js/abstract_chart", "#OML.abstract_ch
       margin: {
         top: 0, right: 0, bottom: 0, left: 50 // not sure what impact this really has?
       }    
+    },
+    
+    defaults: function() {
+      return this.deep_defaults({
+        transition_duration: 500
+      }, OML.abstract_nv_chart.__super__.defaults.call(this));      
     },    
+      
 
     configure_base_layer: function(vis) {
       this.base_layer = vis;
@@ -116,10 +123,13 @@ L.provide('OML.abstract_nv_chart', ["graph/js/abstract_chart", "#OML.abstract_ch
     },
   
     redraw: function(data) {
-      this.base_layer//.select(".chart_layer")
-        .datum(this._datum(data, this.chart))
-        .transition().duration(500)
-          .call(this.chart);
+      var bl = this.base_layer//.select(".chart_layer")
+                  .datum(this._datum(data, this.chart))
+                  ;
+      if (this.opts.transition_duration > 0) {
+        bl = bl.transition().duration(500)
+      }
+      bl.call(this.chart);
     },
     
   })

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

@@ -282,6 +282,7 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
          switch (type) {
          case 'int': 
          case 'float':        
+         case 'key' :
            var scale = descr.scale;
            var min_value = descr.min;
            var max_value = descr.max;
@@ -311,10 +312,10 @@ L.provide('OML.abstract_widget', ["vendor/d3/d3.js"], function () {
              var color = color_f(v);
              return color;
            };
-         case 'key' :
-           return function(d) {
-             return d[index];
-           }
+         // case 'key' :
+           // return function(d) {
+             // return d[index];
+           // }
          default:    
            throw "Unknown mapping type '" + type + "'";
          }