omf_web 1.2.1 → 1.2.2

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

@@ -41,12 +41,12 @@ module OMF::Web
 
     def load_environment(opts)
       unless cf = opts[:omf_config_file]
-        puts "Missing config file"
+        fatal "Missing config file"
         abort
       end
 
       unless File.readable? cf
-        puts "Can't read config file '#{cf}'"
+        fatal "Can't read config file '#{cf}'"
         abort
       end
 
@@ -75,18 +75,32 @@ module OMF::Web
         load_repository(repo)
       end
 
-      unless wa = cfg[:widgets]
-        puts "Can't find 'widgets' section in config file '#{cf}' - #{cfg.keys}"
+      widgets = cfg[:widgets] || []
+      if (tabs = cfg[:tabs])
+        tabs.each {|t| t[:top_level] = true}
+        widgets += tabs
+      end
+      if widgets.empty?
+        fatal "Can't find 'widgets' or 'tabs' section in config file '#{cf}' - #{cfg.keys}"
         abort
       end
-      wa.each do |w|
-        OMF::Web.register_widget w
+      widgets.each do |w|
+        register_widget w
+      end
+
+      # Any other file to load before opening shop
+      if init = cfg[:init]
+        unless init.is_a? Enumerable
+          init = [init]
+        end
+        init.each {|f| load_ruby_file(f) }
       end
+
     end
 
     def load_datasource(config)
       unless id = config[:id]
-        puts "Missing id in datasource configuration"
+        fatal "Missing id in datasource configuration"
         abort
       end
       if config[:database]
@@ -95,6 +109,8 @@ module OMF::Web
         load_datasource_file(id, config)
       elsif config[:omsp]
         load_omsp_endpoint(id, config)
+      elsif config[:generator]
+        load_generator(id, config[:generator])
       else
         abort "Unknown datasource type - #{config}"
       end
@@ -102,13 +118,13 @@ module OMF::Web
 
     def load_database(id, config)
       unless db_cfg = config[:database]
-        puts "Missing database configuration in datasource '#{config}'"
+        fatal "Missing database configuration in datasource '#{config}'"
         abort
       end
       db = get_database(db_cfg)
       if query_s = config[:query]
         unless schema = config[:schema]
-          puts "Missing schema configuration in datasource '#{config}'"
+          fatal "Missing schema configuration in datasource '#{config}'"
           abort
         end
         require 'omf_oml/schema'
@@ -116,12 +132,12 @@ module OMF::Web
         table = db.create_table(id, config)
       else
         unless table_name = config.delete(:table)
-          puts "Missing 'table' in datasource configuration '#{config}'"
+          fatal "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}'"
+          fatal "Can't find table '#{table_name}' in database '#{db_cfg}'"
           abort
         end
       end
@@ -136,23 +152,21 @@ module OMF::Web
         if db = @databases[config]
           return db
         end
-        puts "Database '#{config}' not defined - (#{@databases.keys})"
-        abort
-      end
-      unless id = config.delete(:id)
-        puts "Missing id in database configuration"
+        fatal "Database '#{config}' not defined - (#{@databases.keys})"
         abort
       end
-      if db = @databases[id.to_s] # already known
-        return db
+      if id = config.delete(:id)
+        if db = @databases[id.to_s] # already known
+          return db
+        end
       end
 
       # unless id = config[:id]
-        # puts "Database '#{config}' not defined - (#{@databases.keys})"
+        # fatal "Database '#{config}' not defined - (#{@databases.keys})"
         # abort
       # end
       unless url = config.delete(:url)
-        puts "Missing URL for database '#{id}'"
+        fatal "Missing URL for database '#{id}'"
         abort
       end
       if url.start_with?('sqlite:') && ! url.start_with?('sqlite:/')
@@ -162,9 +176,11 @@ module OMF::Web
       config[:check_interval] ||= 3.0
       puts "URL: #{url} - #{config}"
       begin
-        return @databases[id] = OMF::OML::OmlSqlSource.new(url, config)
+        db = OMF::OML::OmlSqlSource.new(url, config)
+        @databases[id] = db if id
+        return db
       rescue Exception => ex
-        puts "Can't connect to database '#{id}' - #{ex}"
+        fatal "Can't connect to database '#{id}' - #{ex}"
         abort
       end
     end
@@ -175,24 +191,27 @@ module OMF::Web
     #
     def load_datasource_file(name, opts)
       unless file = opts[:file]
-        puts "Data source file is not defined in '#{opts}'"
+        fatal "Data source file is not defined in '#{opts}'"
         abort
       end
       unless file.start_with? '/'
-        file = File.join(@top_dir, file)
+        File.absolute_path(file, @cfg_dir)
       end
       unless File.readable? file
-        puts "Can't read file '#{file}'"
+        fatal "Can't read file '#{file}'"
         abort
       end
-      case content_type = opts[:content_type].to_s
+      unless content_type = opts[:content_type]
+        content_type = File.extname(file)[1 ..  -1]
+      end
+      case content_type.to_s
       when 'json'
         ds = JSONDataSource.new(file)
       when 'csv'
         require 'omf_oml/csv_table'
         ds = OMF::OML::OmlCsvTable.create name, file, has_csv_header: true
       else
-        puts "Unknown content type '#{content_type}'"
+        fatal "Unknown content type '#{content_type}'"
         abort
       end
       OMF::Web.register_datasource ds, name: name
@@ -201,21 +220,57 @@ module OMF::Web
     def load_omsp_endpoint(id, config)
       oconfig = config[:omsp]
       unless port = oconfig[:port]
-        puts "Need port in OMSP definition '#{oconfig}' - datasource '#{id}'"
+        fatal "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_generator(id, config)
+      if file = config[:load]
+        load_ruby_file(file)
+      end
+      unless klass_name = config[:class]
+        fatal "Missing 'class' options for generator '#{id}'"
+        abort
+      end
+      klass = nil
+      begin
+        klass = Kernel.const_get(klass_name)
+      rescue
+        fatal "Can't find class '#{klass_name}' referenced in generator '#{id}'"
+        abort
+      end
+      opts = config[:opts] || {}
+      debug "Creating new generator '#{id}' from '#{klass_name}' with '#{opts}'"
+      unless klass.respond_to? :create_data_source
+        fatal "Class '#{klass_name}' doesn't have a 'create_data_source' class method."
+        abort
+      end
+      klass.create_data_source(id, opts)
+    end
+
+    def load_ruby_file(file)
+      unless file.start_with? '/'
+        file = File.absolute_path(file, @cfg_dir)
+      end
+      unless File.readable? file
+        fatal "Can't read file '#{file}'"
+        abort
+      end
+      debug "Loading #{file}"
+      load(file)
+    end
+
 
     def load_repository(config)
       unless id = config[:id]
-        puts "Missing id in respository configuration"
+        fatal "Missing id in respository configuration"
         abort
       end
       unless type = config[:type]
-        puts "Missing 'type' in respository configuration '#{id}'"
+        fatal "Missing 'type' in respository configuration '#{id}'"
         abort
       end
 
@@ -223,20 +278,31 @@ module OMF::Web
       case type
       when 'file'
         unless top_dir = config[:top_dir]
-          puts "Missing 'top_dir' in respository configuration '#{id}'"
+          fatal "Missing 'top_dir' in respository configuration '#{id}'"
           abort
         end
         unless top_dir.start_with? '/'
-          top_dir = File.join(@top_dir, top_dir)
+          top_dir = File.join(@cfg_dir, top_dir)
         end
+        #puts "TOP>>> #{File.absolute_path top_dir}"
         OMF::Web::ContentRepository.register_repo(id, type: :file, top_dir: top_dir)
       else
-        puts "Unknown repository type '#{type}'. Only supporting 'file'."
+        fatal "Unknown repository type '#{type}'. Only supporting 'file'."
         abort
       end
 
     end
 
+    def register_widget(w)
+      unless w[:id]
+        require 'digest/md5'
+        w[:id] = Digest::MD5.hexdigest(w[:name] || "tab#{rand(10000)}")[0, 8]
+      end
+      w[:top_level] = true
+      w[:type] ||= 'layout/one_column'
+      OMF::Web.register_widget w
+    end
+
     # Recusively Symbolize keys of hash
     #
     def _rec_sym_keys(hash)
@@ -330,4 +396,4 @@ module OMF::Web
     end # class OmspEndpointProxy
 
   end # class
-end # module
+end # module

data/lib/omf-web/version.rb

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

data/omf_web.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "websocket-rack", "~> 0.4.0"
   s.add_runtime_dependency "rack-accept", "~> 0.4.0"
   s.add_runtime_dependency "i18n"
+  s.add_runtime_dependency "rake"
 
   # Do we need the next two dependencies?
   #s.add_runtime_dependency "sqlite3", "~> 1.3.6"

data/share/htdocs/graph/js/abstract_chart.js

@@ -77,6 +77,13 @@ define(["graph/abstract_widget"], function (abstract_widget) {
       this.update();
     },
 
+    configure_base_layer: function(vis) {
+      this.base_layer = vis.append("svg:g");
+      if (this.base_css_class) {
+        this.base_layer.attr("class", this.base_css_class);
+      }
+    },
+
     _resize_base_el: function(w, h) {
       // Do not add margins to the base_el, but to the inside of the SVG panes
       this.w = w;
@@ -290,4 +297,4 @@ define(["graph/abstract_widget"], function (abstract_widget) {
   });
 
   return abstract_chart;
-});
+});

data/share/htdocs/graph/js/abstract_multiple_datasource_chart.js

@@ -0,0 +1,82 @@
+
+define(["graph/abstract_chart"], function(abstract_chart) {
+
+  var graph = abstract_chart.extend({
+    // MAKE SURE THIS IS DEFINED IN SUB CLASS
+    data_source_names: ['change', 'me'],
+
+    initialize: function(opts) {
+      graph.__super__.initialize.call(this, opts);
+    },
+
+    // Find the appropriate data source and bind to it
+    //
+    init_data_source: function() {
+      var self = this;
+      var o = self.opts;
+      var sources = o.data_sources;
+      var ds_names = self.data_source_names;
+
+      if (! (sources instanceof Array)) {
+        throw "Expected an array";
+      }
+      if (sources.length != ds_names.length) {
+        throw "Expected '" + ds_names.length + "' data source, but only found '" + sources.length + "'.";
+      }
+
+      var dsh = self.data_source = {};
+      _.map(sources, function(s) {
+        dsh[s.name] = self.init_single_data_source(s);
+      });
+      _.each(ds_names, function(ds_name) {
+        if (dsh[ds_name] == undefined) {
+          throw "Missing data source '" + ds_name + "'. Check for spelling of name.";
+        }
+      });
+    },
+
+    process_schema: function() {
+      var self = this;
+      var ds_names = self.data_source_names;
+
+      var schemas = self.schema = {};
+      _.each(ds_names, function(ds_name) {
+        schemas[ds_name] = self.process_single_schema(self.data_source[ds_name]);
+      });
+
+      var om = self.opts.mapping;
+      if (om == undefined) {
+        throw "Missing mapping instructions in 'options'.";
+      }
+      self.mapping = {};
+      _.each(ds_names, function(ds_name) {
+        var mapping = om[ds_name];
+        if (mapping == undefined) {
+          throw "Missing mapping instructions in 'options' for '" + ds_name + "'.";
+        }
+        self.mapping[ds_name] = self.process_single_mapping(ds_name, mapping, self.decl_properties[ds_name]);
+      });
+    },
+
+    /*
+     * Return schema for +stream+.
+     */
+    schema_for_stream: function(stream) {
+      var schema = this.schema[stream];
+      return schema;
+    },
+
+    update: function() {
+      var data = {};
+      var self = this;
+
+      _.each(self.data_source_names, function(ds_name) {
+        data[ds_name] = self.data_source[ds_name].rows();
+      }, self);
+      self.redraw(data);
+    },
+
+  }); // end of graph
+
+  return graph;
+});

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

@@ -31,7 +31,7 @@ define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
           x: 0,
           y: 0
         },
-      }
+      };
     },
 
     //base_css_class: 'oml-chart',
@@ -93,6 +93,8 @@ define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
       }
       this._resize_base_el(w,h);
 
+      OHUB.trigger(o.id + '.resize', {width: w, height: h});
+
       return this;
     },
 
@@ -120,10 +122,10 @@ define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
       var self = this;
 
       if (! (sources instanceof Array)) {
-        throw "Expected an array"
+        throw "Expected an array";
       }
       if (sources.length != 1) {
-        throw "Can only process a SINGLE source"
+        throw "Can only process a SINGLE source";
       }
       this.data_source = this.init_single_data_source(sources[0]);
     },
@@ -136,7 +138,7 @@ define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
       var self = this;
       OHUB.bind(ds.event_name, function() {
         self.update();;
-      })
+      });
       return ds;
     },
 
@@ -166,7 +168,7 @@ define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
       _.map(properties_decl, function(a) {
         var pname = a[0]; var type = a[1]; var def = a[2];
         var descr = om[pname];
-        m[pname] = self.create_mapping(pname, descr, source_name, type, def)
+        m[pname] = self.create_mapping(pname, descr, source_name, type, def);
       });
       return m;
     },
@@ -194,7 +196,7 @@ define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
     create_mapping: function(mname, descr, stream, type, def) {
        var self = this;
        if (descr == undefined && typeof(def) == 'object') {
-         descr = def
+         descr = def;
        }
        if (descr == undefined || typeof(descr) != 'object' ) {
          if (type == 'index') {
@@ -208,7 +210,7 @@ define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
              var cf_i = cf();
              value = function(x) {
                return cf_i(x);
-             }
+             };
            }
            return value;
          }
@@ -256,7 +258,7 @@ define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
            var t = index_f(join);
            //var r = t[join];
            return t;
-         }
+         };
        } else {
          if (descr.values) {
            // provided custom mapping for values
@@ -264,7 +266,7 @@ define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
            var def_value = descr['default'];
            return function(x) {
              return values[x] || def_value;
-           }
+           };
          }
          var pname = descr.property;
          if (pname == undefined) {
@@ -331,7 +333,7 @@ define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
         if (source[prop] == null) {
           source[prop] = defaults[prop];
         } else if((typeof(source[prop]) == 'object') && defaults[prop]) {
-          this.deep_defaults(source[prop], defaults[prop])
+          this.deep_defaults(source[prop], defaults[prop]);
         }
       }
       return source;
@@ -341,4 +343,4 @@ define(['omf/data_source_repo', 'vendor/d3/d3'], function(ds_repo) {
   });
 
   return abstract_widget;
-})
+});

data/share/htdocs/js/data_source3.js

@@ -13,11 +13,11 @@ function omf_web_data_source(opts) {
     version: "0.1",
     name: name,
     schema: schema,
-    rows: function() {return rows},
+    rows: function() { return rows; },
     index_for_column: index_for_column,
     is_dynamic: is_dynamic,
     event_name: event_name,
-  }
+  };
 
   var indexes = {};
   var unique_index_check = null;
@@ -30,18 +30,18 @@ function omf_web_data_source(opts) {
     var index = indexes[i];
     if (!index) {
       index = indexes[i] = {};
-      _.each(rows, function(r) { index[r[i]] = r; })
+      _.each(rows, function(r) { index[r[i]] = r; });
     }
     return function(key) {
       return indexes[i][key]; // need fresh lookup as we may redo index
-    }
+    };
   }
 
   function update_indexes() {
     // This can most likley be done more efficiently if we consider what has changed
     _.each(indexes, function(ignore, i) {
       var index = indexes[i] = {};
-      _.each(rows, function(r) { index[r[i]] = r; })
+      _.each(rows, function(r) { index[r[i]] = r; });
     });
   }
 
@@ -53,7 +53,7 @@ function omf_web_data_source(opts) {
     var opts = _;
     var interval = -1;
     if (typeof(opts) == 'number') {
-      interval = opts
+      interval = opts;
     } else if (opts == true) {
       interval = 3;
     }

data/share/htdocs/js/data_source_repo.js

@@ -7,7 +7,7 @@ define(['omf/data_source3'], function(data_source) {
     function context() {};
 
     context.register = function(opts) {
-      var id = opts.id || opts.name;
+      var id = opts.id || opts.stream || opts.name;
       if (sources[id] == null) {
         sources[id] = data_source(opts);
       }
@@ -19,7 +19,7 @@ define(['omf/data_source3'], function(data_source) {
       var dynamic = false;
 
       if (typeof(ds_descr) == 'object') {
-        name = ds_descr.id || ds_descr.name;
+        name = ds_descr.id || ds_descr.stream || ds_descr.name;
         dynamic = ds_descr.dynamic;
       } else {
         name = ds_descr;