omf_web 0.9.9 → 1.0.0

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

@@ -9,10 +9,10 @@ require 'omf-web/session_store'
 require 'omf-web/widget'
 require 'omf-web/theme'
 
-      
-module OMF::Web::Rack      
+
+module OMF::Web::Rack
   class TabMapper < OMF::Common::LObject
-    
+
 
     def initialize(opts = {})
       @opts = opts
@@ -20,38 +20,31 @@ module OMF::Web::Rack
       @tabs = {}
       find_tabs()
     end
-    
+
     def find_tabs()
       tabs = OMF::Web::Widget.toplevel_widgets(@opts[:use_tabs])
-      @enabled_tabs = {} 
-      tabs.each do |t| 
+      @enabled_tabs = {}
+      tabs.each do |t|
         name = t[:id].to_sym
-        @enabled_tabs[name] = t  
+        @enabled_tabs[name] = t
       end
       @opts[:tabs] = tabs
     end
-    
+
     def call(env)
       #puts env.keys.inspect
 
       req = ::Rack::Request.new(env)
-      #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'      
+      debug "Requesting #{req.path}"
+
+      OMF::Web::Theme.require 'page'
       body, headers = render_page(req)
       if headers.kind_of? String
         headers = {"Content-Type" => headers}
       end
-      [200, headers, [body]] # required for ruby > 1.9.2 
+      [200, headers, [body]] # required for ruby > 1.9.2
     end
-    
+
     def _component_name(path)
       unless comp_name = path[1]
         comp_name = ((@opts[:tabs] || [])[0] || {})[:id]
@@ -60,17 +53,18 @@ module OMF::Web::Rack
       #puts "PATH: #{path} - #{comp_name}"
       comp_name
     end
-    
+
     def render_card(req)
       #puts ">>>> REQ: #{req.path_info}::#{req.inspect}"
-      
+
       opts = @opts.dup
       opts[:prefix] = req.script_name
-      opts[:request] = req      
+      opts[:request] = req
       opts[:path] = req.path_info
 
       path = req.path_info.split('/')
       unless comp_name = _component_name(path)
+puts ">>>>> #{path} - #{opts[:tabs]}"
         return render_no_card(opts)
       end
       opts[:component_name] = comp_name.to_sym
@@ -82,24 +76,24 @@ module OMF::Web::Rack
         return render_unknown_card(comp_name, opts)
       end
       opts[:tab] = tab_id = tab[:id]
-      
+
       widget = find_top_widget(tab, req)
       OMF::Web::Theme.require 'page'
       page = OMF::Web::Theme::Page.new(widget, opts)
       [page.to_html, 'text/html']
     end
-    
-    
+
+
     def find_top_widget(tab, req)
       sid = req.params['sid']
       tab_id = tab[:id]
-      @tabs[tab_id] ||= OMF::Web::Widget.create_widget(tab_id) 
-      #inst = OMF::Web::SessionStore[tab_id, :tab] 
+      @tabs[tab_id] ||= OMF::Web::Widget.create_widget(tab_id)
+      #inst = OMF::Web::SessionStore[tab_id, :tab]
     end
-    
+
     def render_unknown_card(comp_name, popts)
       #popts[:active_id] = 'unknown'
-      popts[:flash] = {:alert => %{Unknonw component '#{comp_name}'. To select any of the available 
+      popts[:flash] = {:alert => %{Unknonw component '#{comp_name}'. To select any of the available
         components, please click on one of the tabs above.}}
 
       [OMF::Web::Theme::Page.new(nil, popts).to_html, 'text/html']
@@ -108,18 +102,18 @@ module OMF::Web::Rack
     def render_no_card(popts)
       popts[:active_id] = 'unknown'
       popts[:flash] = {:alert => %{There are no components defined for this site.}}
-      popts[:tabs] = []      
+      popts[:tabs] = []
       [OMF::Web::Theme::Page.new(nil, popts).to_html, 'text/html']
     end
-   
+
     def render_page(req)
       render_card(req)
     end
-  
+
   end # Tab Mapper
-  
+
 end # OMF:Common::Web2
 
 
-      
-        
+
+

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

@@ -1,22 +1,23 @@
 
+
 require 'rack/websocket'
 require 'omf_common/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 
-    
-    MESSAGE_DELAY = 0.5 # Delay in pushing action message to browser 
-                        # after receiving a 'on_change' from monitored data proxy 
-    
+    extend OMF::Common::Loggable
+
+    MESSAGE_DELAY = 0.5 # Delay in pushing action message to browser
+                        # after receiving a 'on_change' from monitored data proxy
+
     def on_open(env)
       #puts ">>>>> OPEN"
-    end   
-  
+    end
+
     def on_message(env, msg_s)
       begin
         req = ::Rack::Request.new(env)
@@ -41,7 +42,7 @@ module OMF::Web::Rack
         send_data({type: 'reply', status: 'exception', err_msg: ex.to_s}.to_json)
       end
     end
-  
+
     def on_close(env)
       begin
         debug "client disconnected"
@@ -51,29 +52,29 @@ module OMF::Web::Rack
         error(ex)
       end
     end
-    
+
     def on_register_data_source(args, context)
       dsp = find_data_source(args)
       return unless dsp  # should define appropriate exception
       debug "Received registration for datasource proxy '#{dsp}'"
       send_data({type: 'reply', status: 'ok'}.to_json)
-      
+
       mutex = Mutex.new
       semaphore = ConditionVariable.new
       action_queue = {}
-      
+
       dsp.on_changed(args['offset']) do |action, rows|
         mutex.synchronize do
           (action_queue[action] ||= []).concat(rows)
           semaphore.signal
         end
       end
-      
+
       # Send the rows in a separate thread, waiting a bit after the first one arriving
       # to 'bunch' things into more manageable number of messages
       Thread.new do
-        begin 
-          loop do 
+        begin
+          loop do
             # Now lets send them
             mutex.synchronize do
               action_queue.each do |action, rows|
@@ -86,14 +87,14 @@ module OMF::Web::Rack
                   action: action
                   #offset: offset
                 }
-                send_data(msg.to_json)
+                send_data(msg.to_json.force_encoding("UTF-8"))
                 rows.clear
               end
 
               # wait until there is more to send
               semaphore.wait(mutex)
             end
-            
+
             # OK, there is something to do, but let's wait a bit, maybe there is more
             sleep MESSAGE_DELAY
           end
@@ -102,19 +103,19 @@ module OMF::Web::Rack
           debug "#{ex.backtrace.join("\n")}"
         end
       end
-      
+
     end
-    
+
     # args {"slice"=>{"col_name"=>"id", "col_value"=>"e8..."}, "ds_name"=>"individual_link"}}
     def on_request_slice(args, context)
       dsp = find_data_source(args)
       return unless dsp  # should define appropriate exception
-      
+
       sargs = args['slice']
       col_name = sargs['col_name']
       col_value = sargs['col_value']
       debug "Creating slice '#{col_name}:#{col_value}' data source '#{dsp}'"
-      
+
       if old_sdsp = context[:sliced_datasource]
         return if old_sdsp[:column_name] == col_name
         old_sdsp[:dsp].release
@@ -129,8 +130,8 @@ module OMF::Web::Rack
           action: action
           #offset: offset
         }
-        send_data(msg.to_json)
-#         
+        send_data(msg.to_json.force_encoding("UTF-8"))
+#
         # do |new_rows, offset|
         # msg = {
           # type: 'datasource_update',
@@ -141,7 +142,7 @@ module OMF::Web::Rack
         # send_data(msg.to_json)
       end
     end
-    
+
     def find_data_source(args)
       ds_name = args['ds_name']
       unless dsp = OMF::Web::DataSourceProxy[ds_name]
@@ -153,5 +154,5 @@ module OMF::Web::Rack
     end
 
   end # WebsocketHandler
-  
+
 end # module

data/lib/omf-web/session_store.rb

@@ -3,18 +3,18 @@ require 'omf_common/lobject'
 
 
 module OMF::Web
-        
+
   # Keeps session state.
   #
   # TODO: Implement cleanup thread
   #
   class SessionStore < OMF::Common::LObject
     @@sessions = {}
-    
+
     def self.[](key, domain)
       self.session["#{domain}:#{key}"]
     end
-    
+
     def self.[]=(key, domain, value)
       self.session["#{domain}:#{key}"] = value
     end
@@ -25,30 +25,33 @@ module OMF::Web
       #puts "STORE>> #{sid} = #{session[:content].keys.inspect}"
       session[:ts] = Time.now
       session[:content]
-    end    
-    
+    end
+
     def self.session_id
       sid = Thread.current["sessionID"]
-      unless sid
-        raise "Missing session id 'sid'"
-      end
+      raise "Missing session id 'sid'" if sid.nil?
+      sid
     end
-    
+
     def self.find_tab_from_path(comp_path)
       sid = comp_path.shift
       unless session = self.session(sid)
         raise "Can't find session '#{sid}', may have timed out"
       end
       tid = comp_path.shift.to_sym
-      unless tab_inst = session[tid] 
-        raise "Can't find tab '#{tid}'"   
+      unless tab_inst = session[tid]
+        raise "Can't find tab '#{tid}'"
       end
       {:sid => sid, :tab_inst => tab_inst, :sub_path => comp_path}
     end
+
+    def self.find_across_sessions(&block)
+      @@sessions.values.map { |v| v[:content] }.find(&block)
+    end
   end # SessionStore
 
 end # OMF:Web
 
 
-      
-        
+
+

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

@@ -4,40 +4,45 @@ require 'omf-web/data_source_proxy'
 
 module OMF::Web::Theme
   class AbstractPage < Erector::Widget
-    
+
     depends_on :js,  '/resource/vendor/stacktrace/stacktrace.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/vendor/backbone/backbone.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"
 
     attr_reader :opts
-    
+
+    def self.add_depends_on(type, url)
+      depends_on type.to_sym, url
+    end
+
     def initialize(widget, opts)
       #puts "KEYS>>>>> #{opts.keys.inspect}"
       super opts
       @widget = widget
       @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', ['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
       return unless @flash
-      if @flash[:notice] 
+      if @flash[:notice]
         div :class => 'flash_notice flash' do
           text @flash[:notice]
         end
@@ -55,7 +60,7 @@ module OMF::Web::Theme
         end
       end
     end # render_flesh
-    
+
     # Return an array of widgets to collect data sources from
     #
     def data_source_widgets
@@ -66,13 +71,13 @@ module OMF::Web::Theme
         [@widget]
       # end
     end
-    
+
     def render_data_sources
       return unless @widget
-      
+
       require 'omf_oml/table'
       require 'set'
-      
+
       dss = Set.new
       data_source_widgets.each do |w|
         w.collect_data_sources(dss)
@@ -86,11 +91,11 @@ module OMF::Web::Theme
 
       #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
@@ -103,7 +108,7 @@ module OMF::Web::Theme
         </script>
       }
     end
-    
+
     def render_data_source(ds)
       dspa = OMF::Web::DataSourceProxy.for_source(ds)
       dspa.collect do |dsp|
@@ -111,7 +116,7 @@ module OMF::Web::Theme
         dsp.to_javascript(ds)
       end.join("\n")
     end
-    
+
     def render_additional_headers
       #"\n\n<link href='/resource/css/incoming.css' media='all' rel='stylesheet' type='text/css' />\n"
     end
@@ -119,9 +124,9 @@ module OMF::Web::Theme
     def collect_data_sources(dsa)
       dsa
     end
-  
+
     def to_html(opts = {})
-      page_title = @title  # context may get screwed up below, so put title into scope
+      page_title = @page_title  # context may get screwed up below, so put title into scope
       b = super
       if @opts[:request].params.key?('embedded')
         b
@@ -141,9 +146,8 @@ module OMF::Web::Theme
             end
           end
         end
-        r.to_html(opts)  
+        r.to_html(opts)
       end
     end
   end # class AbstractPage
 end # OMF::Web::Theme
-  

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

@@ -1,37 +1,37 @@
 require 'omf-web/theme/abstract_page'
-require 'omf-web/rack/session_authenticator'   
+require 'omf-web/rack/session_authenticator'
 
 module OMF::Web::Theme
   class Page < OMF::Web::Theme::AbstractPage
-    
+
     depends_on :css, '/resource/theme/bright/css/reset-fonts-grids.css'
     depends_on :css, "/resource/theme/bright/css/bright.css"
-   
+
     depends_on :script, %{
       OML.session_id = '#{Thread.current["sessionID"]}'
       OML.show_widget = function(opts) {
         var prefix = opts.inner_class;
         var index = opts.index;
         var widget_id = opts.widget_id;
-        
+
         $('.' + prefix).hide();
         $('#' + prefix + '_' + index).show();
-        
+
         var current = $('#' + prefix + '_l_' + index);
         current.addClass('current');
         current.siblings().removeClass('current');
-        
+
         // May be a bit overkill, but this should shake out the widgets hidden so far
-        OHUB.trigger('layout.resize', {}); 
-          
+        OHUB.trigger('layout.resize', {});
+
         return false;
       };
     }
-       
+
     # def initialize(widget, opts)
       # super
     # end
- 
+
     def content
       super
       @renderer = @widget.content
@@ -42,8 +42,8 @@ module OMF::Web::Theme
               render_top_line
             end
             if @renderer.render? :title
-              h1 @page_title || 'Missing :page_title'
-            end 
+              render_title
+            end
           end
         end
         div :id => 'bd' do
@@ -56,19 +56,19 @@ module OMF::Web::Theme
         end
       end
     end
-    
+
     def render_top_line
       div :id => :top_line do
         render_tab_menu
         render_tools_menu
       end
     end
-        
+
     def render_tab_menu
       ol :id => :tab_menu do
         @tabs.each do |h|
           lopts = h[:id] == @tab ? {:class => :current} : {}
-          li lopts do 
+          li lopts do
             #a :href => "#{@prefix}/#{h[:id]}?sid=#{Thread.current["sessionID"]}" do
             a :href => "#{@prefix}/#{h[:id]}" do
               span h[:name], :class => :tab_text
@@ -77,38 +77,88 @@ module OMF::Web::Theme
         end
       end
     end
-            
+
+    # def render_tools_menu
+      # div :id => :tools_menu do
+        # render_authentication
+      # end
+    # end
+
     def render_tools_menu
-      div :id => :tools_menu do
-        render_authentication
+      ol :id => :tools_menu do
+        render_tools_menu_authenticate
       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'          
+
+    def render_tools_menu_authenticate
+      if user = OMF::Web::Rack::SessionAuthenticator.user()
+        puts "USER>>>>> #{user}"
+        li do
+          a href: '#', class: 'user' do
+            i class: "icon-user icon-white"
+            text user[:name]
+          end
+        end
+        li id: 'logout_li' do
+          a id: 'logout_a', href: '#', class: 'logout' do
+            i class: "icon-off icon-white"
+            text 'Log out'
+          end
+        end
+        am = "render_tools_menu_authenticate_#{user[:method]}".to_sym
+        puts "METHOD>>>>> #{am}"
+        if respond_to?(am)
+          send(am, user)
         else
-          a 'Log in', :href => '/tab/login'
+          javascript %{
+            $('#logout_a').href = '/auth/logout'
+          }
         end
       end
-        
-      
     end
-    
+
+    def render_tools_menu_authenticate_persona(user)
+      javascript %{
+        $('#logout_li').hide();
+        $.getScript("https://login.persona.org/include.js")
+          .done(function(script, textStatus) {
+            $('#logout_li').show();
+            $('#logout_a').click(function() {
+              navigator.id.logout();
+            })
+            navigator.id.watch({
+              loggedInUser: '#{user}',
+              onlogin: function(assertion) {},
+              onlogout: function() {
+                $.ajax({
+                  type: 'POST',
+                  url: '/auth/logout',
+                  success: function(res, status, xhr) {
+                    window.location = '/';
+                  },
+                  error: function(xhr, status, err) { alert("Logout failure: " + err); }
+                });
+              }
+            })
+          });
+      }
+    end
+
+    def render_title
+      h1 @page_title || 'Missing :page_title'
+    end
+
     def render_body
       render_flash
       render_card_body
     end
-    
+
     def render_card_body
       return unless @widget
       Thread.current["top_renderer"] = self
       rawtext @renderer.to_html
     end
-        
+
     def render_footer
       if @footer_right.is_a? Proc
         widget(Erector.inline(&@footer_right))
@@ -122,11 +172,11 @@ module OMF::Web::Theme
       else
         text @footer_left || 'Brought to you by the TEMPO Team'
       end
-        
+
     end
-    
 
-  
+
+
 
   end # class Page
 end # OMF::Web::Theme