omf_web 1.2.3 → 1.2.4

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

@@ -4,6 +4,8 @@
 require 'maruku'
 require 'maruku/ext/math'
 # Monkey patches to add line numbers to html output
+
+require 'omf_web'
 require 'omf-web/widget/text/maruku/input/parse_block'
 require 'omf-web/widget/text/maruku/output/to_html'
 require 'omf-web/widget/text/maruku/helpers'
@@ -29,31 +31,66 @@ module OMF::Web::Widget::Text
 
     # Fetch text and parse it
     #
-    def self.format_content(content_proxy)
+    def self.format_content_proxy(content_proxy)
       unless content_proxy.is_a? OMF::Web::ContentProxy
         raise "Expected content proxy, but got '#{content_proxy.class}'"
       end
-      content = content_proxy.content
-      #puts ">>>> CREATING NEW MARUKU"
+      format_content(content_proxy.content)
+    end
+
+    def self.format_content(content)
       ::Maruku.new(content)
     end
 
 
-    class WidgetElement
+    class WidgetElement < OMF::Base::LObject
+
+      @@pre_create_handlers = []
+
+      # Register a block which is presented with the
+      # widget description (Hash) we are about to create. The
+      # block is assumed to return a widget description.
+      #
+      def self.on_pre_create(&block)
+        @@pre_create_handlers << block
+      end
+
+      def self.create(wdescr)
+        wdescr = @@pre_create_handlers.reduce(wdescr) do |wd, block|
+          wd2 = block.call(wd)
+          unless wd2.is_a? Hash
+            raise "Pre_create handler '#{block}' does not return hash, but '#{wd2}'"
+          end
+          wd2
+        end
+        self.new(wdescr)
+      end
+
       attr_reader :widget
 
       def initialize(wdescr)
+        debug  "Embedding widget - #{wdescr} "
         @wdescr = wdescr
         @widget = OMF::Web::Widget.create_widget(wdescr)
+        debug "Created widget - #{@widget.class}"
       end
 
       def to_html
         content = @widget.content
         h = content.to_html
-        if title = @widget.title
-          h += "<div class='caption'>#{title}</div>"
+        klass = ['embedded']
+        if caption = @wdescr[:caption] || @widget.title
+          if mt = @wdescr[:mime-type]
+            klass << "embedded-#{mt.gsub('/', '-')}"
+          end
+          if ty = @wdescr[:type]
+            klass << "embedded-#{ty.gsub('/', '-')}"
+          end
+          h += "<div class='caption'><span class='figure'>Figure: </span><span class='text'>#{caption}</span></div>"
         end
-        ::REXML::Document.new("<div class='embedded'>#{h}</div>").root
+        root = ::REXML::Document.new("<div class='#{klass.join(' ')}'>#{h}</div>").root
+        #puts "EMBEDDED >>> #{root}"
+        root
       end
 
       def node_type
@@ -80,7 +117,7 @@ module OMF::Web::Widget::Text
         descr = YAML::load(lines.join("\n"))
         descr = OMF::Web::deep_symbolize_keys(descr)
         if (wdescr = descr[:widget])
-          wel = WidgetElement.new(wdescr)
+          wel = WidgetElement.create(wdescr)
           context << wel
           (doc.attributes[:widgets] ||= []) << wel.widget
         else
@@ -94,13 +131,12 @@ module OMF::Web::Widget::Text
 
 end # OMF::Web::Widget::Text
 
-# module MaRuKu::Out::HTML
-#
-  # def to_html_viz
-    # span = Element.new 'javascript'
-    # span.attributes['class'] = 'maruku_section_number'
-    # span << Text.new('Foooo')
-    # add_ws  span
-  # end
-#
-# end
+if __FILE__ == $0
+  unless fname = ARGV[0]
+    puts "ERROR: Missing file name"
+    exit -1
+  end
+  content = File.open(fname).read
+  x = OMF::Web::Widget::Text::Maruku.format_content(content)
+  puts x.to_html
+end

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

@@ -4,49 +4,49 @@ require 'omf-web/content/repository'
 
 module OMF::Web::Widget
 
-  # Supports widgets which displays text with 
+  # Supports widgets which displays text with
   # potentially other widgets embedded.
   #
   class TextWidget < AbstractWidget
-    
+
     def self.create_text_widget(type, wdescr)
       return self.new(wdescr)
     end
-    
+
     def initialize(opts)
       opts = opts.dup # not sure why we may need to this. Is this hash used anywhere else?
-      super opts      
+      super opts
 
       unless (content_descr = opts[:content])
         raise "Missing 'content' option in '#{opts.inspect}'"
-      end      
+      end
       # if content_descr.is_a? OMF::Web::ContentProxy
         # self.content_proxy = content_descr
-      # else    
+      # else
         # #self.content_proxy = OMF::Web::ContentRepository[opts].load(content_descr)
         # self.content_proxy = OMF::Web::ContentRepository.create_content_proxy_for(content_descr, opts)
       # end
       self.content_proxy = OMF::Web::ContentRepository.create_content_proxy_for(content_descr, opts)
     end
-    
+
     def content_proxy=(content_proxy)
       @content_proxy = content_proxy
     end
-        
+
     def content()
-      update()      
+      update()
       OMF::Web::Theme.require 'text_renderer'
       @opts[:title] = @content.attributes[:title] || opts[:title]
       OMF::Web::Theme::TextRenderer.new(self, @content, @opts)
     end
-    
+
     def update()
       # Could avoid doing the next three steps every time if we would know if the
       # content in content_proxy has changed.
-      @content = OMF::Web::Widget::Text::Maruku.format_content(@content_proxy)
+      @content = OMF::Web::Widget::Text::Maruku.format_content_proxy(@content_proxy)
       @widgets = @content.attributes[:widgets] || []
     end
-    
+
 
     def content_url
       @content_proxy.content_url
@@ -55,7 +55,7 @@ module OMF::Web::Widget
     def content_id
       @content_proxy.content_id
     end
-    
+
     def mime_type
       'text/html'
     end

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

@@ -134,7 +134,7 @@ define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
     // Find the appropriate data source and bind to it
     //
     init_single_data_source: function(ds_descr) {
-      var ds = ds_repo.lookup(ds_descr.stream);
+      var ds = ds_repo.lookup(ds_descr);
       var self = this;
       OHUB.bind(ds.event_name, function() {
         self.update();;

data/share/htdocs/js/data_source3.js

@@ -172,8 +172,8 @@ function omf_web_data_source(opts) {
     // Reset state
     rows = [];
     update_indexes();
-    var sm = {col_name: active_slice_col_name, col_value: col_value}
-    send_server_msg('request_slice', {slice: sm})
+    var sm = {col_name: active_slice_col_name, col_value: col_value};
+    send_server_msg('request_slice', {slice: sm});
   }
   var active_slice_col_name = null;
   var active_slice_value = null;
@@ -211,6 +211,28 @@ function omf_web_data_source(opts) {
     return true;
   }
 
+  function fetch_data(data_url) {
+    require(['vendor/jquery/jquery'], function() {
+      $.ajax({
+        url: data_url,
+        dataType: 'json',
+        //data: opts,
+        type: 'GET'
+      }).done(function(reply) {
+        var data = reply.data;
+        rows.splice(0, rows.length); // this is an update, not an add
+        _.each(data, function(r) { rows.push(r); });
+
+        update_indexes();
+        var evt = {data_source: data_source};
+        OHUB.trigger(event_name, evt);
+        OHUB.trigger("data_source.changed", evt);
+      }).error(function(ajax, textStatus, errorThrown) {
+        console.log("ERROR: '" + textStatus + "' - " + errorThrown);
+      });
+    });
+  }
+
   // Let's check if this data_source maintains uniqueness along one axis (column)
   if (opts.unique_column) {
     var col_name = opts.unique_column;
@@ -233,7 +255,7 @@ function omf_web_data_source(opts) {
         }
         key2row[key] = row;
         return false;
-      }
+      };
       // pre-seed
       rows = _.uniq(rows, false, function(r) { return r[index]; });
       _.each(rows, function(r) { key2row[r[index]] = r; });
@@ -262,7 +284,7 @@ function omf_web_data_source(opts) {
         var schema = msg.schema || msg.data_source.schema;
 
         var key = so.event.key;
-        var col = _.find(schema, function(cd) { return cd.name == key });
+        var col = _.find(schema, function(cd) { return cd.name == key; });
         if (col) {
           var event = msg.datum;
           var col_id = event[col.index];
@@ -270,12 +292,18 @@ function omf_web_data_source(opts) {
             set_slice_column(col_id);
           }
         }
-      })
+      });
     }
   }
 
-  if (window.WebSocket) {
+  if (window.WebSocket && opts.ws_url) {
     start_web_socket();
+  } else if (opts.update_url) {
+    throw "Missing implementation for NON web socket browsers";
+  } else if (opts.data_url) {
+    fetch_data(opts.data_url);
+  } else {
+    throw "Don't know how to fetch data source '" + name + "'.";
   }
 
   // Bind to event directly
@@ -289,7 +317,7 @@ function omf_web_data_source(opts) {
 define(function() {
   return function(opts) {
     return omf_web_data_source(opts);
-  }
-})
+  };
+});
 
 

data/share/htdocs/js/data_source_repo.js

@@ -18,15 +18,23 @@ define(['omf/data_source3'], function(data_source) {
       var name;
       var dynamic = false;
 
-      if (typeof(ds_descr) == 'object') {
-        name = ds_descr.id || ds_descr.stream || ds_descr.name;
-        dynamic = ds_descr.dynamic;
-      } else {
-        name = ds_descr;
+      if (typeof(ds_descr) != 'object') {
+        ds_descr = {name: ds_descr};
       }
+      name = ds_descr.id || ds_descr.stream || ds_descr.name;
+      dynamic = ds_descr.dynamic;
       var source = sources[name];
       if (! source) {
-        throw("Unknown data source '" + name + "'.");
+        // Let's see if we can create one out of
+        if (ds_descr.data_url) {
+          // We can try to fetch it directly
+          if (! name) {
+            name = ds_descr.id = ds_descr.data_url;
+          }
+          source = sources[name] = data_source(ds_descr);
+        } else {
+          throw("Unknown data source '" + name + "'.");
+        }
       }
       if (dynamic) {
         source.is_dynamic(dynamic);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_web
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_oml