omf_web 1.0.0 → 1.2.0

metadata

@@ -1,228 +1,244 @@
 --- !ruby/object:Gem::Specification
 name: omf_web
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.2.0
+  prerelease: 
 platform: ruby
 authors:
 - NICTA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-05 00:00:00.000000000 Z
+date: 2013-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omf_oml
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: erector
+  name: omf_base
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: erector
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '0.9'
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.5
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: coderay
+  name: thin
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.6
+        version: '1'
 - !ruby/object:Gem::Dependency
-  name: log4r
+  name: coderay
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.10
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.10
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: maruku
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: ritex
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.3
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: grit
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '2.5'
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-- !ruby/object:Gem::Dependency
-  name: postgres-pr
+  name: websocket-rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.3
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: websocket-rack
+  name: rack-accept
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: rack-accept
+  name: i18n
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-openid
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -230,6 +246,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -238,9 +255,7 @@ description: OMF's Web based control and visualization framework.
 email:
 - omf-user@lists.nicta.com.au
 executables:
-- omf_web_demo
-- omf_web_demo.sh
-- omf_web_server.rb
+- omf_web_server
 extensions: []
 extra_rdoc_files: []
 files:
@@ -248,9 +263,7 @@ files:
 - Gemfile
 - README.md
 - Rakefile
-- bin/omf_web_demo
-- bin/omf_web_demo.sh
-- bin/omf_web_server.rb
+- bin/omf_web_server
 - debug/README
 - debug/brooklyn.dat
 - debug/ca.crt
@@ -313,6 +326,7 @@ files:
 - example/NOT_WORKING/wimax/test.rb
 - example/NOT_WORKING/wimax/uplink.yaml
 - example/NOT_WORKING/wimax/viz_server.rb
+- example/bridge/README.md
 - example/bridge/auth_basic.rb
 - example/bridge/bridge_ctl.sh
 - example/bridge/bridge_log4r.yaml
@@ -381,6 +395,8 @@ files:
 - example/simple/sample.sql
 - example/simple/simple.yaml
 - example/simple/simple_dynamic.yaml
+- example/web_rtc/web_rtc.yaml
+- example/web_rtc/webrtc-exp_1381786573.sq3
 - lib/irods4r.rb
 - lib/irods4r/directory.rb
 - lib/irods4r/file.rb
@@ -459,11 +475,8 @@ files:
 - lib/omf-web/widget/text/maruku/output/to_html.rb
 - lib/omf-web/widget/text/text_widget.rb
 - lib/omf-web/xmpp_adapter.rb
-- lib/omf_common/lobject.rb
-- lib/omf_common/log4r_outputter.rb
 - lib/omf_web.rb
 - omf_web.gemspec
-- sample.sq3
 - share/htdocs/UNUSED/log/table.js
 - share/htdocs/graph/css/graph.css
 - share/htdocs/graph/img/bar_chart.png
@@ -498,11 +511,12 @@ files:
 - share/htdocs/graph/js/pie_chart2.js
 - share/htdocs/graph/js/scatter_plot.js
 - share/htdocs/graph/js/table2.js
-- share/htdocs/js/data_source.js
-- share/htdocs/js/data_source2.js
+- share/htdocs/js/app.js
+- share/htdocs/js/data_source3.js
+- share/htdocs/js/data_source_repo.js
 - share/htdocs/js/mustache.js
-- share/htdocs/js/require3.js
 - share/htdocs/js/stacktrace.js
+- share/htdocs/require/nv_d3.js
 - share/htdocs/theme/abstract/abstract.js
 - share/htdocs/theme/bright/css/bright.css
 - share/htdocs/theme/bright/css/codemirror.css
@@ -1224,6 +1238,16 @@ files:
 - share/htdocs/vendor/raphael-1.5.2/raphael.primitives.js
 - share/htdocs/vendor/raphael-1.5.2/raphael.shadow.js
 - share/htdocs/vendor/raphael-2.1.0/raphael.js
+- share/htdocs/vendor/require-2.1.8/require.js
+- share/htdocs/vendor/require-2.1.8/require.min.js
+- share/htdocs/vendor/require-css-0.0.7/.gitignore
+- share/htdocs/vendor/require-css-0.0.7/LICENSE
+- share/htdocs/vendor/require-css-0.0.7/README.md
+- share/htdocs/vendor/require-css-0.0.7/bower.json
+- share/htdocs/vendor/require-css-0.0.7/css-builder.js
+- share/htdocs/vendor/require-css-0.0.7/css.js
+- share/htdocs/vendor/require-css-0.0.7/normalize.js
+- share/htdocs/vendor/require-css-0.0.7/package.json
 - share/htdocs/vendor/silk_icons_v013/icons/accept.png
 - share/htdocs/vendor/silk_icons_v013/icons/add.png
 - share/htdocs/vendor/silk_icons_v013/icons/anchor.png
@@ -2413,25 +2437,27 @@ files:
 - share/htdocs/vendor/valums-file-uploader-cf7bfb1/tests/test-upload-handlers.htm
 homepage: https://www.mytestbed.net
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: omf_web
-rubygems_version: 2.0.6
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: OMF's web frontend.
 test_files: []
+has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: a076091a3915e52b1dddc6ed1f2f65b4a28c6905
-  data.tar.gz: b861770697dad3299f6f9a8e1c0b800b9c32058a
-SHA512:
-  metadata.gz: d5d66a617e076f8960fe39656f1fe6ce77b82d5df76bcf6f12fc6f61822d57b5d8aef43b3a6df72a46a09b60a44f29c18301ab3a2a383c7e579bd1aae44d6497
-  data.tar.gz: ab162397635d906b9d0ded7117723d75dd81ce53bacb8f64e5f6b5547ccbf4bac985964785e946663140e0a7b093919fae6e1ed1b3a253ff8c60901b07607129

data/bin/omf_web_demo

@@ -1,3 +0,0 @@
-
-load File.join(File.dirname(__FILE__), '../example/demo/demo_viz_server.rb')
-OmfWebDemo.start

data/bin/omf_web_demo.sh

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-
-TOP_DIR=`ruby -rubygems -e "require 'omf-web/version'; puts OMF::Web::TOP_DIR"`
-
-cd $TOP_DIR
-ruby -rubygems $TOP_DIR/example/demo/demo_viz_server.rb $* start

data/bin/omf_web_server.rb

@@ -1,157 +0,0 @@
-#!/usr/bin/env ruby
-BIN_DIR = File.dirname(File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__)
-TOP_DIR = File.join(BIN_DIR, '..')
-$: << File.join(TOP_DIR, 'lib')
-
-DESCR = %{
-Start an OMF WEB site ...
-}
-
-require 'omf_common/lobject'
-require 'omf_oml/table'
-require 'omf_oml/sql_source'
-
-
-OMF::Common::Loggable.init_log 'omf_web'
-
-$config_file_dir = nil
-
-require 'omf_oml/table'
-
-def load_environment(opts)
-  unless cf = opts[:omf_config_file]
-    puts "Missing config file"
-    abort
-  end
-
-  unless File.readable? cf
-    puts "Can't read config file '#{cf}'"
-    abort
-  end
-
-  $config_file_dir = File.dirname(cf)
-  cfg = YAML.load_file(cf)
-  (cfg['server'] || {}).each do |k, v|
-    k = k.to_sym
-    case k
-    when :port
-      opts[:port] = v.to_i
-    else
-      opts[k] = v
-    end
-  end
-  databases = {}
-  (cfg['data_sources'] || []).each do |ds|
-    load_datasource(ds, databases)
-  end
-  (cfg['repositories'] || []).each do |repo|
-    load_repository(repo)
-  end
-
-  unless wa = cfg['widgets']
-    puts "Can't find 'widgets' section in config file '#{cf}' - #{cfg.keys}"
-    abort
-  end
-  wa.each do |w|
-    OMF::Web.register_widget w
-  end
-end
-
-def load_datasource(config, databases)
-  unless id = config['id']
-    puts "Missing id in datasource configuration"
-    abort
-  end
-  unless table_name = config['table']
-    puts "Missing 'table' in datasource configuration '#{id}'"
-    abort
-  end
-  unless db_cfg = config['database']
-    puts "Missing database configuration in datasource '#{id}'"
-    abort
-  end
-  db = get_database(db_cfg, databases)
-  unless table = db.create_table(table_name, :limit => config['limit'], :check_interval => config['dynamic'])
-    puts "Can't find table '#{table_name}' in database '#{db}'"
-    abort
-  end
-
-  OMF::Web.register_datasource table, name: id
-end
-
-def get_database(config, databases)
-  if config.is_a? String
-    if db = databases[config]
-      return db
-    end
-    puts "Database '#{config}' not defined - (#{databases.keys})"
-    abort
-  end
-  unless id = config['id']
-    puts "Missing id in database configuration"
-    abort
-  end
-  unless id = config['id']
-    puts "Database '#{config}' not defined - (#{databases.keys})"
-    abort
-  end
-  unless url = config['url']
-    puts "Missing URL for database '#{id}'"
-    abort
-  end
-  if url.start_with?('sqlite://') && ! url.start_with?('sqlite:///')
-    # inject top dir
-    url.insert('sqlite://'.length, $config_file_dir + '/')
-  end
-  puts "URL: #{url}"
-  begin
-    return databases[id] = OMF::OML::OmlSqlSource.new(url, :check_interval => 3.0)
-  rescue Exception => ex
-    puts "Can't connect to database '#{id}' - #{ex}"
-    abort
-  end
-end
-
-def load_repository(config)
-  unless id = config['id']
-    puts "Missing id in respository configuration"
-    abort
-  end
-  unless type = config['type']
-    puts "Missing 'type' in respository configuration '#{id}'"
-    abort
-  end
-
-  require 'omf-web/content/repository'
-  case type
-  when 'file'
-    unless top_dir = config['top_dir']
-      puts "Missing 'top_dir' in respository configuration '#{id}'"
-      abort
-    end
-    unless top_dir.start_with? '/'
-      top_dir = File.join($config_file_dir, top_dir)
-    end
-    OMF::Web::ContentRepository.register_repo(id, type: :file, top_dir: top_dir)
-  else
-    puts "Unknown repository type '#{type}'. Only supporting 'file'."
-    abort
-  end
-end
-
-# Configure the web server
-#
-opts = {
-  app_name: 'simple',
-  page_title: 'Simple Demo',
-  port: 4000,
-  handlers: {
-    pre_parse: lambda do |p, runner|
-      p.on("--config CONF_FILE", "File holding description of web site") {|f| runner.options[:omf_config_file] = f}
-    end,
-    # delay connecting to databases to AFTER we may run as daemon
-    post_parse: lambda { |r| load_environment(r.options) },
-  }
-}
-require 'omf_web'
-OMF::Web.start(opts)