omf_web 1.2.4 → 1.2.5

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

@@ -4,19 +4,19 @@ require 'omf_base/lobject'
 require 'omf_web'
 
 module OMF::Web
-        
-  # This object maintains synchronization between a JS DataSource object 
+
+  # This object maintains synchronization between a JS DataSource object
   # in a web browser and the corresponding +OmlTable+ in this server.
   #
   #
   class ContentProxy < OMF::Base::LObject
-    
+
     @@proxies = {}
 
     def self.[](url)
       @@proxies[url.to_s]
     end
-    
+
     def self.create(content_descr, repo)
       unless key = content_descr[:url_key]
         raise "Missing ':url_key' in content descriptor '#{content_descr.inspect}'"
@@ -27,21 +27,21 @@ module OMF::Web
       debug "Create content proxy for '#{key}' (#{content_descr.inspect})"
       @@proxies[key] = self.new(content_descr, repo)
     end
-    
-    attr_reader :content_descriptor, :content_url, :content_id, :name, :mime_type
-    
-    
+
+    attr_reader :content_descriptor, :content_url, :content_id, :name, :mime_type, :repository
+
+
     def on_get(req)
       c = content()
       [c.to_s, "text"]
     end
-    
+
     def on_post(req)
       data = req.POST
       write(data['content'], data['message'])
       [true.to_json, "text/json"]
     end
-    
+
     def write(content, message = "")
       if content != @content
         debug "Updating '#{@content_descriptor.inspect}'"
@@ -49,15 +49,15 @@ module OMF::Web
         @repository.write(@content_descriptor, content, message)
       end
     end
-    
+
     def content()
       unless @content
         @content = @repository.read(@content_descriptor)
       end
       @content
     end
-    alias :read :content 
-    
+    alias :read :content
+
     # Return a new proxy for a url relative to this one
     def create_proxy_for_url(url)
       unless url.match ':'
@@ -72,21 +72,21 @@ module OMF::Web
     end
 
     private
-    
+
     def initialize(content_descriptor, repository)
       @content_descriptor = content_descriptor
       @repository = repository
       #@path = File.join(repository.top_dir, content_handle) # requires 1.9 File.absolute_path(@content_handle, @repository.top_dir)
-      
+
       @content_id = content_descriptor[:url_key]
       @content_url = "/_content/#{@content_id}"  # That most likley should come from the content handler
-      
+
       @mime_type = @content_descriptor[:mime_type] ||= repository.mime_type_for_file(content_descriptor)
       @name = content_descriptor[:name]
 
       @@proxies[@content_id] = self
     end
-    
+
   end
-  
+
 end

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

@@ -45,9 +45,13 @@ module OMF::Web
     end
 
     def write(content_descr, content, message)
+      raise ReadOnlyContentRepositoryException.new if @read_only
+
       path = _get_path(content_descr)
       Dir.chdir(@top_dir) do
-        unless File.writable?(path)
+        d_name = File.dirname(path)
+        FileUtils.mkpath(d_name) unless File.exist?(d_name)
+        unless File.writable?(path) || File.writable?(d_name)
           raise "Cannot write to file '#{path}'"
         end
         f = File.open(path, 'w')
@@ -89,4 +93,4 @@ module OMF::Web
     end
 
   end # class
-end # module
+end # module

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

@@ -192,6 +192,10 @@ module OMF::Web
       unless path
         raise "Can't find path information in '#{content_descr.inspect}'"
       end
+      if path.start_with? '/'
+        # Remove leading '/' .. need to stay within git directory tree
+        path = path[1 .. -1]
+      end
       return path
     end
 

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

@@ -8,6 +8,9 @@ require 'omf-web/content/content_proxy'
 
 module OMF::Web
 
+  class ContentRepositoryException < Exception; end
+  class ReadOnlyContentRepositoryException < ContentRepositoryException; end
+
   # This class provides an interface to a particular content repository.
   # It retrieves, archives and versions content.
   #
@@ -153,8 +156,12 @@ module OMF::Web
 
     attr_reader :name, :top_dir
 
+    # params opts [Hash]
+    # opts read_only [Boolean] If true, write will fail
     def initialize(name, opts)
       @name = name
+      @read_only = (opts[:read_only] == true)
+
       if @top_dir = opts[:top_dir]
         @top_dir = File.expand_path(@top_dir)
       end
@@ -189,6 +196,10 @@ module OMF::Web
       end
     end
 
+    def write(content_descr, content, message)
+      raise "Missing implementation"
+    end
+
     def absolute_path(content_descr)
       path = _get_path(content_descr)
       File.join(@top_dir, path)

data/lib/omf-web/data_source_proxy.rb

@@ -37,11 +37,6 @@ module OMF::Web
       if data_source.is_a? OMF::OML::OmlNetwork
         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
 
@@ -103,14 +98,6 @@ module OMF::Web
             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

data/lib/omf-web/session_store.rb

@@ -29,7 +29,7 @@ module OMF::Web
 
     def self.session_id
       sid = Thread.current["sessionID"]
-      raise "Missing session id 'sid'" if sid.nil?
+      raise "Missing session ID in thread context" if sid.nil?
       sid
     end
 
@@ -63,8 +63,13 @@ module OMF::Web
     end
 
     def call(&block)
-      Thread.current["sessionID"] = @sid
-      block.call
+      begin
+        current_sid = Thread.current["sessionID"]
+        Thread.current["sessionID"] = @sid
+        block.call
+      ensure
+        Thread.current["sessionID"] = current_sid
+      end
     end
   end
 

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

@@ -14,11 +14,8 @@ module OMF::Web::Theme
     depends_on :js, '/resource/vendor/jquery/jquery.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/theme/abstract/abstract.js"
-    # depends_on :js, "/resource/js/data_source2.js"
+
     depends_on :script, %{
       // ABSTRACT PAGE
       if (typeof(OML) == "undefined") OML = {};
@@ -64,12 +61,7 @@ module OMF::Web::Theme
     # Return an array of widgets to collect data sources from
     #
     def data_source_widgets
-      # puts ">>>>> #{@widget.class}"
-      # if @widget.respond_to? :data_source_widgets
-        # @widget.data_source_widgets
-      # else
-        [@widget]
-      # end
+      [@widget]
     end
 
     def render_data_sources

data/lib/omf-web/version.rb

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

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

@@ -69,48 +69,13 @@ module OMF::Web::Widget
       OMF::Web::Theme::DataRenderer.new(self, @opts)
     end
 
-    # A dynamic widget may open a web socket back to this service. Connect
-    # to the respective table and feed back any changes.
-    #
-    # BUG ALERT: We send the entire content of the data table initially and only
-    # start monitoring the table for new stuff when the web socket connects. Any
-    # data added in between is not covered.
-    #
-    # def on_ws_open(ws)
-      # raise "ARE WE STILL NEEDING THIS"
-      # #puts ">>>> ON_WS_OPEN"
-      # @ws = ws
-      # @data_sources.each do |name, table|
-        # table.on_row_added(self.object_id) do |row|
-          # begin
-            # # may want to queue events to group events into larger messages
-            # msg = [{:stream => name, :events => [row]}]
-            # ws.send_data msg.to_json
-          # rescue Exception => ex
-            # warn ex
-          # end
-        # end
-      # end
-    # end
-#
-    # def on_ws_close(ws)
-      # raise "ARE WE STILL NEEDING THIS"
-      # @ws = nil
-      # @data_sources.each do |name, table|
-        # table.on_row_added(self.object_id)
-      # end
-    # end
-
     def collect_data_sources(ds_set)
-      #puts "DATA_SOURCES>>>> #{@data_sources.values.inspect}"
       @opts[:data_sources].each do |ds|
-        ds_set.add(ds[:stream])
+        #ds_set.add(ds[:id] || ds[:name] || ds[:stream])
+        ds_set.add(ds)
       end
       ds_set
     end
-
-
-
   end # DataWidget
 
 end

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

@@ -13,22 +13,22 @@ module OMF::Web::Widget::Layout
 
     def content()
       OMF::Web::Theme.require 'one_column_renderer'
-      OMF::Web::Theme::OneColumnRenderer.new(@widgets, @opts)      
+      OMF::Web::Theme::OneColumnRenderer.new(@widgets, @opts)
     end
 
     def collect_data_sources(ds_set)
       @widgets.each {|w| w.collect_data_sources(ds_set) }
       ds_set
     end
-    
+
     def name
       @opts[:name] || @opts[:title]
     end
-    
+
     def layout?
       return true
     end
 
-  end 
+  end
 
 end

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

@@ -7,18 +7,10 @@ module OMF::Web::Widget::Layout
   #
   class StackedLayout < OMF::Web::Widget::AbstractWidget
     attr_reader :active_index
-    
+
     def initialize(opts)
       super opts
       widgets = opts[:widgets]
-      # if (widgets.is_a? Hash)
-        # puts "ERROR>>>> #{widgets.inspect}"
-        # raise  "NOT SURE WHY WE ARE COMING THROUGH HERE"
-        # opts = widgets
-        # #@wopts = opts[:wopts] || {}
-        # #puts ">>>> #{widgets.inspect}"
-        # widgets = @wopts[:widgets] || []
-      # end
       @widgets = widgets.collect {|w| OMF::Web::Widget.create_widget(w) }
       @active_index = 0
       @active_widget = @widgets[0]
@@ -28,21 +20,21 @@ module OMF::Web::Widget::Layout
       OMF::Web::Theme.require 'stacked_renderer'
       OMF::Web::Theme::StackedRenderer.new(self, @widgets, @active_index, @opts)
     end
-      
+
 
     def collect_data_sources(ds_set)
+      #puts "ACTIVE>>> #{@active_widget.class}"
       @active_widget.collect_data_sources(ds_set)
-      #@widgets.each {|w| w.collect_data_sources(ds_set) }
       ds_set
     end
-    
+
     def name
       @opts[:name] || @active_widget.name
     end
-    
+
     def layout?
       return true
     end
-    
+
   end
 end

data/lib/omf-web/widget/text/maruku/output/to_html.rb

@@ -160,7 +160,8 @@ Synonim for `title`.
 
 
   # Render to an HTML fragment (returns a REXML document tree)
-  def to_html_tree
+  def to_html_tree(context={})
+    Thread.current['maruku_context'] = context
     div = Element.new 'div'
       div.attributes['class'] = 'maruku_wrapper_div'
         children_to_html.each do |e|
@@ -195,7 +196,8 @@ Example:
   end
 
   # Render to a complete HTML document (returns a REXML document tree)
-  def to_html_document_tree
+  def to_html_document_tree(context={})
+    Thread.current['maruku_context'] = context
     doc = Document.new(nil,{:respect_whitespace =>:all})
   #	doc << XMLDecl.new
 

data/lib/omf-web/widget/text/maruku.rb

@@ -80,7 +80,7 @@ module OMF::Web::Widget::Text
         h = content.to_html
         klass = ['embedded']
         if caption = @wdescr[:caption] || @widget.title
-          if mt = @wdescr[:mime-type]
+          if mt = @wdescr[:'mime-type']
             klass << "embedded-#{mt.gsub('/', '-')}"
           end
           if ty = @wdescr[:type]

data/lib/omf_web.rb

@@ -6,30 +6,30 @@ module OMF
     module Tab; end
     module Rack; end
     module Widget; end
-    
+
     #VERSION = 'git:release-5.4'
-    
+
     def self.start(opts, &block)
       require 'omf-web/thin/runner'
-      
+
       if layout = opts.delete(:layout)
         load_widget_from_file(layout)
       end
-      
+
       #Thin::Logging.debug = true
       runner = OMF::Web::Runner.new(ARGV, opts)
       block.call if block
-      runner.run!      
+      runner.run!
     end
-    
+
     @@datasources = {}
     @@widgets = {}
     def self.register_datasource(data_source, opts = {})
       require 'omf-web/data_source_proxy'
       OMF::Web::DataSourceProxy.register_datasource(data_source, opts)
-      
+
     end
-    
+
     def self.register_widget(widget_descr)
       require 'omf-web/widget'
       wdescr = deep_symbolize_keys widget_descr
@@ -45,20 +45,20 @@ module OMF
         OMF::Base::LObject.error "Doesn't seem to be a widget definition. Expected 'widget' but found '#{y.keys.join(', ')}'"
       end
     end
-  
+
     def self.use_tab(tab_id)
-      OMF::Web::Tab.use_tab tab_id.to_sym          
+      OMF::Web::Tab.use_tab tab_id.to_sym
     end
-    
+
     private
-        
+
     # Taken from active_support
     #
     def self.deep_symbolize_keys(obj)
       if obj.is_a? Hash
         obj.inject({}) do |result, (key, value)|
           if value.is_a?(Hash) || value.is_a?(Array)
-            value = deep_symbolize_keys(value) 
+            value = deep_symbolize_keys(value)
           end
           result[(key.to_sym rescue key) || key] = value
           result
@@ -69,8 +69,8 @@ module OMF
         obj
       end
     end
-    
-    
+
+
   end
 end
 

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

@@ -16,7 +16,7 @@ define(["graph/abstract_chart", 'vendor/nv_d3/js/nv.d3'], function (abstract_cha
       ticks: {
         // type: 'date',
         // format: '%I:%M', // hour:minutes
-        format: ',.s',
+        format: ',.3s',
         // format: ",.0f" // integers with comma-grouping for thousands.
         //subdivide: 2, // the number of uniform subdivisions to make between major tick marks
         //size: [8, 4, 16], // set the size of major, minor and end ticks
@@ -118,7 +118,7 @@ define(["graph/abstract_chart", 'vendor/nv_d3/js/nv.d3'], function (abstract_cha
       if (this.chart) {
         this.chart.width(self.width);
         this.chart.height(self.height);
-        this.chart.update();
+        //this.chart.update();
       }
     },
 

data/share/htdocs/graph/js/histogram2.js

@@ -27,6 +27,10 @@ define(["graph/abstract_nv_chart"], function (abstract_nv_chart) {
       }, histogram2.__super__.defaults.call(this));
     },
 
+    initialize: function(opts) {
+      histogram2.__super__.initialize.call(this, opts);
+    },
+
     _create_model: function() {
       return  nv.models.multiBarChart();
     },
@@ -111,4 +115,4 @@ define(["graph/abstract_nv_chart"], function (abstract_nv_chart) {
   tab-width: 2
   indent-tabs-mode: nil
   End:
-*/
+*/

data/share/htdocs/js/data_source3.js

@@ -71,7 +71,8 @@ function omf_web_data_source(opts) {
   function start_web_socket() {
     if (ws) return; // already running
 
-    var url = 'ws://' + window.location.host + '/_ws?sid=' + (opts.sid || OML.session_id);
+    var host = (typeof window_location_host == 'function') ? window_location_host() : window.location.host;
+    var url = 'ws://' + host + '/_ws?sid=' + (opts.sid || OML.session_id);
     ws = new WebSocket(url);
     ws.onopen = on_open;
     ws.onmessage = on_message;