omf_web 1.2.6 → 1.2.7

data/example/topo_discovery/widgets/node_info.yaml

@@ -0,0 +1,23 @@
+data_sources:
+  - id: node_info
+    file: data_sources/node_info.csv
+
+widgets:
+  - id: node_info
+    type: data/table2
+    title: Node Info
+    data_source:
+      name: node_info
+      slice:
+        slice_column: nodeID
+        event:
+          name: "graph.network/nodes.selected"
+          key: id
+    columns:
+      - field: property
+        #name: Name
+      - field: value
+        #name: Value
+
+    margin:
+      left: 5

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

@@ -33,7 +33,6 @@ module OMF::Web
       end
     end
 
-    #
     # Return an array of file names which are in the repository and
     # match 'search_pattern'
     #
@@ -51,5 +50,10 @@ module OMF::Web
       end.compact
     end
 
+    protected
+
+    def _create_if_not_exists
+      FileUtils.mkdir_p(@top_dir) unless File.exist?(@top_dir)
+    end
   end # class
 end # module

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

@@ -80,5 +80,16 @@ module OMF::Web
       end
       res
     end
+
+    protected
+
+    def _create_if_not_exists
+      unless File.exist?("#{@top_dir}/.git")
+        FileUtils.mkdir_p(@top_dir)
+        Dir.chdir(@top_dir) do
+          system "git init"
+        end
+      end
+    end
   end # class
 end # module

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

@@ -77,7 +77,7 @@ module OMF::Web
         # raise "Unknown repository type '#{type}'"
       # end
 
-      @@repositories[name] = r = create(opts)
+      @@repositories[name] = r = create(name, opts)
       @@primary_repository = r if opts[:is_primary]
       r
     end
@@ -191,11 +191,15 @@ module OMF::Web
       return GitContentRepository.create_url(path, strictly_new)
     end
 
+    def self.register_mime_type(mapping)
+      MIME_TYPE.merge!(mapping)
+    end
 
     attr_reader :name, :top_dir
 
     # params opts [Hash]
     # opts read_only [Boolean] If true, write will fail
+    # opts create_if_not_exists [Boolean]
     def initialize(name, opts)
       @name = name
       @url_prefix = "#{@name}:"
@@ -207,6 +211,8 @@ module OMF::Web
         end
         @top_dir = File.expand_path(@top_dir)
         debug "Creating repo '#{name} with top dir: #{@top_dir}"
+
+        _create_if_not_exists if opts[:create_if_not_exists]
       end
     end
 
@@ -313,7 +319,6 @@ module OMF::Web
       return path
     end
 
-    #
     # Return a URL for a path in this repo
     #
     def get_url_for_path(path)
@@ -325,5 +330,11 @@ module OMF::Web
       #"\#<#{self.class}-#{@name} - #{@top_dir}>"
       "\#<#{self.class}-#{@name}>"
     end
+
+    protected
+
+    def _create_if_not_exists
+      raise NotImplementedError, "#{__method__} NOT implementated in #{self.class}"
+    end
   end # class
 end # module

data/lib/omf-web/data_source_proxy.rb

@@ -67,9 +67,21 @@ module OMF::Web
       unless ds_name = ds_descr[:id] || ds_descr[:stream] || ds_descr[:name]
         raise "Missing 'name' attribute in datasource description. (#{ds_descr.inspect})"
       end
-      ds_name = ds_name.to_sym
-      ds = @@datasources[ds_name]
-      ds != nil
+      if ds_descr[:sub_sources]
+        res = ds_descr[:sub_sources].inject(true) do |ok, name|
+          #puts ">>>>> #{ok} - #{name}"
+          ok && (@@datasources["#{ds_name}/#{name}".to_sym] != nil)
+        end
+      else
+        ds_name = ds_name.to_sym
+        ds = @@datasources[ds_name]
+        return true if ds
+
+        # Check for automatic sub sources
+        top = "#{ds_name}/"
+        names = @@datasources.keys.find_all { |ds_name| ds_name.to_s.start_with? top }
+        !names.empty?
+      end
     end
 
     # Return proxies for 'ds_name'. Note, there can be more then
@@ -85,8 +97,8 @@ module OMF::Web
       unless ds_descr.is_a? Hash
         raise "Expected Hash, but got '#{ds_descr.class}::#{ds_descr.inspect}'"
       end
-      unless ds_name = ds_descr[:name]
-        raise "Missing 'name' attribute in datasource description. (#{ds_descr.inspect})"
+      unless ds_name = ds_descr[:stream] || ds_descr[:name]
+        raise "Missing 'stream' or 'name' attribute in datasource description. (#{ds_descr.inspect})"
       end
       ds_name = ds_name.to_sym
       ds = @@datasources[ds_name]
@@ -104,11 +116,11 @@ module OMF::Web
       end
       if ds.is_a? Hash
         raise "Is this actually used anywhere?"
-        proxies = ds.map do |name, ds|
-          id = "#{ds_name}_#{name}".to_sym
-          proxy = OMF::Web::SessionStore[id, :dsp] ||= self.new(id, ds)
-        end
-        return proxies
+        # proxies = ds.map do |name, ds|
+          # id = "#{ds_name}_#{name}".to_sym
+          # proxy = OMF::Web::SessionStore[id, :dsp] ||= self.new(id, ds)
+        # end
+        # return proxies
       end
 
       #debug ">>>>> DS: #{ds_descr.inspect} - #{ds}"

data/lib/omf-web/theme.rb

@@ -26,7 +26,7 @@ module OMF::Web::Theme
 
   def self.register_renderer(name, klass, theme = DEFAULT_THEME)
     tr = @@additional_renderers[theme.to_s] ||= {}
-    tr[name] = klass
+    tr[name.to_sym] = klass
   end
 
   # Set additional themes to search in the given order for
@@ -40,17 +40,24 @@ module OMF::Web::Theme
 
   # Return a named renderer for this theme initialised with 'widget'
   #
-  def self.create_renderer(name, widget)
+  def self.create_renderer(name, widget, opts = {})
     name = name.to_sym
     @@search_order.each do |theme|
       if tr = @@additional_renderers[theme.to_s]
         if klass = tr[name]
           #self.require(name)
-          return klass.new(widget)
+          return klass.new(widget, opts)
         end
       end
     end
-    raise "Can't find class implementing renderer '#{name}' in '#{@@search_order.join(', ')}'"
+    renderers = Set.new
+    @@search_order.each do |theme|
+      if tr = @@additional_renderers[theme.to_s]
+        tr.keys.each {|n| renderers << n}
+      end
+    end
+    #raise "Can't find class implementing renderer '#{name}' in '#{@@search_order.join(', ')}'"
+    raise "Can't find class implementing renderer '#{name}' - #{renderers.to_a.inspect}"
   end
 
   def self.require(name)

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

@@ -19,6 +19,11 @@ module OMF::Web::Theme
     depends_on :script, %{
       // ABSTRACT PAGE
       if (typeof(OML) == "undefined") OML = {};
+      OML._shim = {}
+      OML.require_dependency = function(target, dependencies) {
+        OML._shim[target] = dependencies
+        require.config({shim: OML._shim});
+      }
     }
 
     attr_reader :opts

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

@@ -23,14 +23,17 @@ module OMF::Web
           pre_parse: lambda do |p, runner|
             p.on("--config CONF_FILE", "File holding description of web site") {|f| runner.options[:omf_config_file] = f}
             p.on("--top-dir DIR", "Directory to start from for relative data paths [directory of config file]") {|td| @top_dir = td }
-          end,
-          post_parse: lambda { |r| load_environment(r.options) },
+          end
         },
         authentication: {
           required: false
         }
       }.merge(opts)
-
+      post_parse = opts[:handlers][:post_parse]
+      opts[:handlers][:post_parse] = lambda do |r|
+        post_parse.call(r) if post_parse
+        load_environment(r.options)
+      end
       @server_name = server_name
       @top_dir = top_dir
       @databases = {}
@@ -53,6 +56,16 @@ module OMF::Web
       @cfg_dir = File.dirname(cf)
       opts[:static_dirs].insert(0, File.absolute_path(File.join(@cfg_dir, 'htdocs')))
       @top_dir ||= @cfg_dir
+      load_config_file(cf, opts)
+    end
+
+    def load_config_file(cf, opts)
+      unless File.readable? cf
+        fatal "Can't read config file '#{cf}'"
+        abort
+      end
+
+      debug "Loading config file '#{cf}'"
       cfg = _rec_sym_keys(YAML.load_file(cf))
 
       if log_opts = cfg[:logging]
@@ -80,20 +93,54 @@ module OMF::Web
         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
+      # if widgets.empty?
+        # fatal "Can't find 'widgets' or 'tabs' section in config file '#{cf}' - #{cfg.keys}"
+        # abort
+      # end
       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]
+      if load = cfg[:load]
+        unless load.is_a? Enumerable
+          load = [load]
+        end
+        load.each do |g| #{|f| load_ruby_file(f) }
+          unless g.start_with? '/'
+            g = File.absolute_path(g, File.dirname(cf))
+          end
+          found_something = false
+          Dir.glob(g).each do |f|
+            found_something = true
+            load_ruby_file(f)
+          end
+          unless found_something
+            fatal "Couldn't find any load file for pattern '#{g}'"
+            abort
+          end
+        end
+      end
+
+      # Any other configure to load
+      if include = cfg[:include]
+        unless include.is_a? Enumerable
+          include = [include]
+        end
+        include.each do |g|
+          unless g.start_with? '/'
+            g = File.absolute_path(g, File.dirname(cf))
+          end
+          found_something = false
+          Dir.glob(g).each do |f|
+            found_something = true
+            load_config_file(f, opts)
+          end
+          unless found_something
+            fatal "Couldn't find any config file for pattern '#{g}'"
+            abort
+          end
         end
-        init.each {|f| load_ruby_file(f) }
       end
 
     end
@@ -147,7 +194,6 @@ module OMF::Web
     def get_database(config)
       require 'omf_oml/table'
       require 'omf_oml/sql_source'
-
       if config.is_a? String
         if db = @databases[config]
           return db
@@ -173,8 +219,8 @@ module OMF::Web
         # inject top dir
         url.insert('sqlite:'.length, '//' + @cfg_dir + '/')
       end
-      config[:check_interval] ||= 3.0
-      puts "URL: #{url} - #{config}"
+      #config[:check_interval] ||= 3.0
+      #puts "URL: #{url} - #{config}"
       begin
         db = OMF::OML::OmlSqlSource.new(url, config)
         @databases[id] = db if id
@@ -195,7 +241,7 @@ module OMF::Web
         abort
       end
       unless file.start_with? '/'
-        File.absolute_path(file, @cfg_dir)
+        file = File.absolute_path(file, @cfg_dir)
       end
       unless File.readable? file
         fatal "Can't read file '#{file}'"
@@ -298,7 +344,7 @@ module OMF::Web
         require 'digest/md5'
         w[:id] = Digest::MD5.hexdigest(w[:name] || "tab#{rand(10000)}")[0, 8]
       end
-      w[:top_level] = true
+      #w[:top_level] = true
       w[:type] ||= 'layout/one_column'
       OMF::Web.register_widget w
     end

data/lib/omf-web/version.rb

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

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

@@ -3,62 +3,63 @@ require 'omf-web/widget/abstract_widget'
 require 'omf-web/content/repository'
 
 module OMF::Web::Widget
-  
+
   # Maintains the context for a particular code rendering within a specific session.
   #
   class CodeWidget < AbstractWidget
-    
+
     def self.create_code_widget(type, wdescr)
       return self.new(wdescr)
     end
-    
+
     attr_accessor :content_proxy
-    
+
     def initialize(opts)
       super opts
       unless (content_descr = opts[:content])
         raise "Missing 'content' option in '#{opts.describe}'"
-      end  
+      end
       @content_proxy = OMF::Web::ContentRepository.create_content_proxy_for(content_descr, opts)
     end
-    
-    def title 
+
+    def title
       @content_proxy.name
     end
-    
+
     def mime_type
       @content_proxy.mime_type
     end
-    
+
     def update_url
       @content_proxy.content_url
     end
- 
+
     def content_id
-      @content_proxy.content_id
+      @content_proxy.content_url
+      #@content_proxy.content_id
     end
-   
+
     def content()
       OMF::Web::Theme.require 'code_renderer'
       mode = @content_proxy.mime_type.split('/')[-1]
       OMF::Web::Theme::CodeRenderer.new(self, @content_proxy.content, mode, @opts)
     end
-    
+
     def collect_data_sources(ds_set)
       ds_set
     end
-    
-  
+
+
     # @@codeType2mime = {
       # :ruby => '/text/ruby',
       # :xml => '/text/xml'
     # }
-    
+
     # def render_code(source)
       # content = load_content(source)
       # type = code_type(source)
       # mimeType = @@codeType2mime[type]
-#       
+#
       # begin
         # CodeRay.scan content, type
         # #tokens.html :line_numbers => :inline, :tab_width => 2, :wrap => :div
@@ -67,15 +68,15 @@ module OMF::Web::Widget
         # debug ex.backtrace.join("\n")
       # end
     # end
-    
+
     # def load_content(source)
       # unless File.readable?(source)
         # raise "Cannot read text file '#{source}'"
       # end
       # content = File.open(source).read
     # end
-        
-    # Return the language the code is written in 
+
+    # Return the language the code is written in
     #
     def code_type(source)
       if source.end_with? '.rb'
@@ -86,8 +87,8 @@ module OMF::Web::Widget
         :text
       end
     end
-    
-    
+
+
   end # CodeWidget
-  
+
 end