masterview 0.1.5 → 0.2.0

data/lib/masterview/analyzer.rb

@@ -5,12 +5,12 @@ module MasterView
 
     module Common
       def calc_hash(data)
-        #data.gsub( /\s+/, '' ).hash 
-        data.hash
+        #MasterView::Log.warn { 'hash= '+data.hash.to_s+' data='+data }
+        data.gsub( /\s+/, ' ' ).hash #collapse whitespace
       end
 
       def src_hash(data_orig)
-        data = data_orig.gsub MasterView::NamespacePrefix+'import_render', MasterView::NamespacePrefix+'gen_render'
+        data = data_orig.gsub MasterView::NamespacePrefix+'import_render', MasterView::NamespacePrefix+'gen_partial'
         data = data.gsub MasterView::NamespacePrefix+'import', MasterView::NamespacePrefix+'generate'
         calc_hash(data)
       end
@@ -79,9 +79,10 @@ module MasterView
       def data(name, index)
         content = ''
         content_parts = @content_hash[name]
+        content_parts_length = (content_parts) ? content_parts.length : 0
         next_index_to_use = (nind = @builder_hash[name]) ? nind : 0
-        next_index_to_use = 0 if (-1 == index) && (next_index_to_use+1 > content_parts.length) # allow -1 to rerequest part as needed (singlefile)
-        return '' if content_parts.nil? || (next_index_to_use+1 > content_parts.length)
+        next_index_to_use = 0 if (-1 == index) && (next_index_to_use+1 > content_parts_length) # allow -1 to rerequest part as needed (singlefile)
+        return '' if content_parts.nil? || (next_index_to_use+1 > content_parts_length)
         highest_index = content_parts.length - 1
         requested_index = (index == -1) ? highest_index : index
         content = content_parts[next_index_to_use..requested_index].collect do |ce| 
@@ -106,6 +107,9 @@ module MasterView
         @options = options
         @only_check_hash = options[:only_check_hash] || false
         @builder = Builder.new(@content)
+        @default_extname = options[:default_extname] || ::MasterView::IOMgr.erb.default_extension
+        @keyword_expander = KeywordExpander.new
+        @keyword_expander.set_template_pathname( options[:template_pathname], @default_extname ) if options[:template_pathname]
         Log.debug { "only_check_hash => true" } if @only_check_hash
       end
 
@@ -131,16 +135,22 @@ module MasterView
 
         import = false
         if attributes[::MasterView::NamespacePrefix+'generate']
-          path = attributes[::MasterView::NamespacePrefix+'generate']
-        elsif attributes[::MasterView::NamespacePrefix+'gen_render']
-          partial = find_string_val_in_string_hash( attributes[::MasterView::NamespacePrefix+'gen_render'], :partial) 
-          path = render_partial_name_to_file_name(partial)
+          path = @keyword_expander.expand_keywords(attributes[::MasterView::NamespacePrefix+'generate'])
+          attributes[::MasterView::NamespacePrefix+'generate'] = path # put back expanded version in case of rebuilding
+        elsif attributes[::MasterView::NamespacePrefix+'gen_partial']
+          expanded_partial_attr = @keyword_expander.expand_keywords(attributes[::MasterView::NamespacePrefix+'gen_partial'])
+          attributes[::MasterView::NamespacePrefix+'gen_partial'] = expanded_partial_attr # put back expanded version in case of rebuilding
+          partial = find_string_val_in_string_hash( expanded_partial_attr, :partial) 
+          path = render_partial_name_to_file_name(partial, @default_extname)
         elsif attributes[::MasterView::NamespacePrefix+'import']
-          path = attributes[::MasterView::NamespacePrefix+'import']
+          path = @keyword_expander.expand_keywords(attributes[::MasterView::NamespacePrefix+'import'])
+          attributes[::MasterView::NamespacePrefix+'import'] = path # put back expanded version in case of rebuilding
           import = true
         elsif attributes[::MasterView::NamespacePrefix+'import_render']
-          partial = find_string_val_in_string_hash( attributes[::MasterView::NamespacePrefix+'import_render'], :partial) 
-          path = render_partial_name_to_file_name(partial)
+          expanded_partial_attr = @keyword_expander.expand_keywords(attributes[::MasterView::NamespacePrefix+'import_render'])
+          attributes[::MasterView::NamespacePrefix+'import_render'] = expanded_partial_attr # put back expanded version in case of rebuilding
+          partial = find_string_val_in_string_hash( expanded_partial_attr, :partial) 
+          path = render_partial_name_to_file_name(partial, @default_extname)
           import = true
         end
 
@@ -151,12 +161,12 @@ module MasterView
 
         unless @stack.empty?
           @stack.last.buffer << "<#{qname}" 
-          sorted_attributes = attributes.sort do |a,b| # sort import and import_render like generate and gen_render so hashs work
+          sorted_attributes = attributes.sort do |a,b| # sort import and import_render like generate and gen_partial so hashs work
             a_working = a[0]
             b_working = b[0]
             working_cmp = [a_working, b_working].collect do |working|
               if working == ::MasterView::NamespacePrefix+'import_render'
-                working = ::MasterView::NamespacePrefix+'gen_render'
+                working = ::MasterView::NamespacePrefix+'gen_partial'
               elsif working == ::MasterView::NamespacePrefix+'import'
                 working = ::MasterView::NamespacePrefix+'generate'
               end
@@ -193,7 +203,7 @@ module MasterView
           end
         end
         
-        if @depth == @stack.last.depth
+        if @stack.last && @depth == @stack.last.depth
           store_last_buffer true
           @stack.pop
         end

data/lib/masterview/directive_base.rb

@@ -1,5 +1,9 @@
 module MasterView
 
+  # establish the module into which directives define themselves
+  module Directives #:nodoc
+  end
+
   class DirectiveBase
     include PluginLoadTracking
     include DirectiveHelpers

data/lib/masterview/directive_helpers.rb

@@ -23,11 +23,13 @@ module MasterView
     end
 
     # convert render_partial_name to file_name, ex foo/bar to foo/_bar.rhtml
-    def render_partial_name_to_file_name(render_partial_name)
-      dir = File.dirname(render_partial_name)
-      base = File.basename(render_partial_name, PartialExtension) 
-      filename = '_'+base+PartialExtension
-      path = ( (dir != '.') ? File.join(dir,filename) : filename )
+    def render_partial_name_to_file_name(render_partial_name, default_extension)
+      pathname = Pathname.for_path(render_partial_name)
+      dir_pathname = pathname.dirname
+      base = pathname.basename(pathname.extname).to_s
+      filename = '_'+base
+      filename += default_extension if default_extension
+      path = (dir_pathname+filename).to_s
     end
 
     

data/lib/masterview/directives/import_render.rb

@@ -7,6 +7,12 @@ module MasterView
         DirectivePriorities::VeryHigh
       end
 
+      # need to expand keywords
+      def initialize(attribute_value)
+        super(attribute_value)
+        @attribute_value = Renderer.last_renderer.keyword_expander.expand_keywords(attribute_value)
+      end
+
       def stag(dcs)
         #output nothing
       end

data/lib/masterview/directives/insert_generated_comment.rb

@@ -5,20 +5,20 @@ module MasterView
     # and should not be edited, else changes could be lost. It includes the path to
     # the original file that should be edited instead
     class Insert_generated_comment < MasterView::DirectiveBase
-      Generated_comment_text = MasterView::GeneratedCommentTemplate || <<-END
-#    WARNING - This file was generated by MasterView plugin. 
-#    Do not edit this file otherwise you may lose your changes
-#    when this file is re-generated.
-# 
-#    To make changes edit the MasterView file which is located at: 
-  END
+
+      Eval_comment_template = 'comment_text = "' + MasterView::GeneratedCommentText + '"'
 
       def priority
         DirectivePriorities::VeryLow
       end
 
       def stag(directive_call_stack)
-        comment = "\n<% \n" + Generated_comment_text  + "#    "+ attr_value + "\n-%>"
+        # do variable substitution to fill in any slots in the template
+        template_path = attr_value
+        #TBD: any other std name bindings we want to support?
+        comment_text = ''
+        eval(Eval_comment_template, binding)
+        comment = "\n<%\n#{comment_text}\n-%>"
 
         ret = []
         ret << directive_call_stack.render

data/lib/masterview/extras/app/controllers/masterview_controller.rb

@@ -1,15 +1,75 @@
+#
+# == MasterView Admin Controller
+# 
+# The MasterviewController is a Rails controller that you can enable
+# in your Rails application to provide administrative operations
+# for the MasterView template engine.
+# 
+# To enable or disable the admin controller, use the
+# MasterView::Configuration setting +enable_admin_pages+
+# to enable or disable its availability in your
+# config/masterview/settngs.rb or a suitable environment
+# settings file, according to your intended usage:
+# 
+#   config.enable_admin_pages = true
+# 
+# When enabled, the MasterView admin controller is accessable
+# in your application at the address:
+# 
+#    http://yourapp.foo/masterview
+# 
+# The controller places its stylesheets in a +masterview+ subdirectory 
+# in your rails stylesheets directory (app/stylesheets/masterview).
+# 
+# The MasterView admin controller is primarily a developer facility; 
+# it is not generally appropriate for end-users of your rails application.
+# If you enable this facility in your production environment,
+# you should consider restricting access to authorized users.
+#
+#--
+# ISSUE: we need to work through scenario of how mv admin controller fits
+# into overall scheme of one's rails application.  How/when would developer
+# integrate stylesheets and layout into their overal app look?
+# How/when would access restriction actually be hooked up?
+# Standard technique is to do something along the lines of using
+# a before_filter which invokes things like :check_authentication 
+# and :check_authorization services in the app framework
+# (or, say, predicate can_access? or has_permission? or...].
+# But... this whole area of user authentication and authorization 
+# has no specific conventions in the Rails ecosystem yet,
+# so we really can't make any assumptions yet about any particular
+# approach that MasterviewController itself could hook into.
+# We'll have to leave this as an exercise for the user and give
+# them tips on how to make it happen.
+# [DJL 17-Jun-2006]
+#++
+# 
 class MasterviewController < ApplicationController
+
+  before_filter :check_authorization, :except => [ :access_not_allowed ]
+
+  # Describe the MasterView configuration option settings
+  def configuration
+    render :text => configuration_html, :layout => true
+  end
   
   def index
     redirect_to :action => :list
   end
 
+  # List the templates in the application and their status.
+  # Provide operations to force rebuild (reparse and regenerate) 
+  # of specific templates or all templates and
+  # create utility to ...mumble...
+  # 
   def list
     template_specs, content_hash = MasterView::TemplateSpec.scan
     @template_specs_sorted = template_specs.sort
     smart_render 'masterview/admin/list'
   end
 
+  # Rebuild all templates in the application.
+  # Invoked from the main masterview admin page.
   def rebuild_all
     files_rebuilt = []
     MasterView::TemplateSpec.scan do |template_spec, content_hash|
@@ -24,6 +84,8 @@ class MasterviewController < ApplicationController
     redirect_to :action => :list
   end
 
+  # Rebuild a specific template.
+  # Invoked from the main masterview admin page.
   def rebuild
     path = params[:id]
     template_specs, content_hash = MasterView::TemplateSpec.scan
@@ -37,11 +99,12 @@ class MasterviewController < ApplicationController
     redirect_to :action => :list
   end
 
+  # Create a new, empty template.
+  # Invoked from the main masterview admin page.
   def create
     if @request.post?
       action_to_create = params[:action_name]
-      short_name = File.basename(params[:id])
-      src_file = File.join('app/views', MasterView::TemplateSrcRelativePath, short_name)
+      src_file = params[:id]
 
       empty_file_path = find_path('app/views/masterview/admin/empty.rhtml')
       empty_insert_erb = File.readlines(empty_file_path).join
@@ -54,6 +117,95 @@ class MasterviewController < ApplicationController
     end
   end
 
+  # View the generated rhtml
+  def view_rhtml
+    raise "View RHTML is disabled. Edit your config/masterview/settings.rb (or config/masterview/environments/xxxx.rb) file and set config.enable_view_rhtml = true. Restart application for change to take effect." unless MasterView::EnableMasterViewAdminViewRHTML
+    @rhtml_file = params[:id]
+    raise "RHTML file not specified" unless @rhtml_file
+    f = MasterView::IOMgr.erb.path(@rhtml_file)
+    raise "RHTML file ("+@rhtml_file+") not found. Maybe automatic parsing is disabled. You may invoke parsing manually by using rake mv:parse" unless f.exist?
+    @rhtml_content = f.read
+    smart_render 'masterview/admin/view_rhtml'
+  end
+
+  def access_not_allowed #:nodoc:
+    render :text => '<p>We\'re sorry, but the page you have requested is only available to authorized users.</p>', 
+            :status => 500
+  end
+
+  protected
+
+  # Default implementation of authorization check
+  # to restrict access to administrative services
+  def allow_access?
+    # a more general solution might look something like:
+    # current_user && user_has_perm?('mv-admin')
+    # backstop: only allow for developer testing on local machine
+    local_request?
+  end
+
+  # Check that the current user has authorization to access admin operations
+  def check_authorization
+    if ! allow_access?
+      redirect_to :action => :access_not_allowed
+    end
+  end
+
+  # Answer an HTML rendering of the current MasterView configuration
+  def configuration_html
+    # This is a quick-and-dirty impl until a more elegant solution is provided
+    #e.g. do something more like Rails::Info
+
+    config = MasterView::ConfigSettings
+
+    section_general_options = 'General Options'
+    section_specs = [
+      # [ <section-name>, [prop-name [, prop-name]... ] ]
+      [ 'MasterView Roots', 
+          [ :mv_installation_dir, :rails_app?, :on_rails? ] ],
+      [ section_general_options, 
+          [ :root_path, :config_dir_path, :environment  ] ],  #:directive_paths
+      [ 'Template Source Options', 
+          [ :template_src_dir_path, :template_filename_pattern ] ],
+      [ 'Template Generation Options', 
+          [ :template_dst_dir_path, :output_filename_extension, :generated_file_default_extension, :include_generated_file_comment ] ],
+      [ 'Template Parsing Options', 
+          [ :default_parser_options, :namespace_prefix ] ],
+      [ 'Rails Application Options', 
+          [ :parse_masterview_templates_at_startup, :reparse_changed_masterview_templates, :generate_rhtml_files ] ]
+      ]
+
+    #"<h1>MasterView Configuration</h1>\n<table>\n<tbody>\n#{html}</tbody>\n</table>\n<div style=\"padding-top: 6px;\">(back to <a href=\".\">Admin home</a>)</div>"
+    html_config_settings = "<h1>MasterView Configuration</h1>\n<table>\n<tbody>\n%s</tbody>\n</table>\n<div style=\"padding-top: 6px;\">(back to <a href=\".\">Admin home</a>)</div>" % '%s'
+
+    #"<tr style=\"background-color: #dcdcdc; font-weight: bold; margin-top: 6px;\"><td colspan=\"2\">#{section_name}</td></tr>"
+    html_subsection_entry = '<tr style="background-color: #dcdcdc; font-weight: bold; margin-top: 6px;"><td colspan="2">%s</td></tr>' #parm: section_name
+
+    # "<tr><td><b>#{option_name}</b></td><td>#{option_value}</td></tr>"
+    html_option_entry = '<tr><td style="padding-left: 6px; padding-right: 6px; font-weight: bold;">%s</td><td>%s</td></tr>' #parms: option_name, option_value
+
+    html = []
+    section_specs.each { | section_name, options | 
+      html << html_subsection_entry % section_name
+      options.each { | option |
+        option_name = CGI.escapeHTML(option.to_s)
+        option_value = config.send(option)
+        #tbd: option_value.kind_of?(Hash) then make it pretty?
+        option_value = option_value.nil? ? '(nil)' : CGI.escapeHTML(option_value.inspect)
+        html << html_option_entry % [ option_name, option_value ]
+      }
+      if section_name == section_general_options
+        option_name = 'logger'
+        option_value = MasterView::Log.class.name
+        html << html_option_entry % [ option_name, option_value ]
+        option_name = 'log_level'
+        option_value = MasterView.log_level
+        html << html_option_entry % [ option_name, option_value ]
+      end
+    }
+    html_config_settings % html.join("\n")
+  end
+
   private 
 
   # checks app path first for views and files, then falls back to files in MV

data/lib/masterview/extras/app/views/masterview/admin/create.rhtml

@@ -2,9 +2,9 @@
   <head>
       <title>Masterview Admin</title>
 
-      <%= stylesheet_link_tag 'scaffold' %>
-      <%= stylesheet_link_tag 'sidebox' %>
-      <%= stylesheet_link_tag 'color-scheme' %>
+      <%= stylesheet_link_tag 'masterview/style' %>
+      <%= stylesheet_link_tag 'masterview/sidebox' %>
+      <%= stylesheet_link_tag 'masterview/color-scheme' %>
       <%= javascript_include_tag :defaults %>
       
   </head>
@@ -45,7 +45,7 @@
   <form action="<%= url_for :controller => 'masterview', :action => 'create' %>" method="post">
 
   <p>Submitting this form will copy/import the layout from the source MasterView template file and will
-     create a new MasterView template file (controller_action.html) containing the imported layout. By providing
+     create a new MasterView template file (controller/action.html) containing the imported layout. By providing
      a action name, it will create some default placeholder content in the file. It will 
      not create any controller class methods or models.
   </p>

data/lib/masterview/extras/app/views/masterview/admin/empty.rhtml

@@ -2,7 +2,7 @@
 	  <div class="<%= @controller_file_name %>_<%= @action_name %> sidebar LHS">
 	    <h2>Tasks:</h2>
 	    <ul>
-	      <li><a class="list_link" href="#" mv:link_to=":action => 'list'">Back to overview</a></li>
+	      <li><a class="list_link" href="list.html" mv:link_to=":action => 'list'">Back to overview</a></li>
 	    </ul>
 	  </div>
 

data/lib/masterview/extras/app/views/masterview/admin/list.rhtml

@@ -2,9 +2,9 @@
   <head>
       <title>Masterview Admin</title>
 
-      <%= stylesheet_link_tag 'scaffold' %>
-      <%= stylesheet_link_tag 'sidebox' %>
-      <%= stylesheet_link_tag 'color-scheme' %>
+      <%= stylesheet_link_tag 'masterview/style' %>
+      <%= stylesheet_link_tag 'masterview/sidebox' %>
+      <%= stylesheet_link_tag 'masterview/color-scheme' %>
       <%= javascript_include_tag :defaults %>
       
   </head>
@@ -26,6 +26,7 @@
 	  <div class="mv_admin_list sidebar LHS">
 	    <h2>Tasks:</h2>
 	    <ul>
+        <li><%= link_to 'View Configuration', :action => 'configuration' %></li>
 	      <li><%= link_to 'Rebuild all outdated templates', :action => 'rebuild_all' %></li>
 	    </ul>
 	  </div>
@@ -46,13 +47,13 @@
   <th>Status</th>
   <th>Operations</th>
   <th>Messages</th>
-  <th>Generated Files</th>
+  <th>Generated Files (rhtml/erb)</th>
 </tr>
 <% @template_specs_sorted.each do |path, template_spec| %> 
   <tr>
-    <td><%= template_spec.basename %></td>
+    <td><%= path %></td>
     <td>
-      <%= template_spec.status %>
+      <%= h template_spec.status %>
    </td>
    <td>
       <% if template_spec.status == MasterView::TemplateSpec::Status::ImportsOutdated %>
@@ -63,10 +64,14 @@
         <%= link_to 'Copy', :action => 'create', :id => path %> 
       <% end %>
    </td> 
-    <td><%= template_spec.message %></td>
+    <td><%= h template_spec.message %></td>
     <td>
       <% template_spec.gen_parts.each do |part| %>
-        <%= part %>
+        <% if MasterView::EnableMasterViewAdminViewRHTML %>
+	  <%= link_to part, {:action => :view_rhtml, :id => part}, :title => 'View RHTML - '+part %>
+        <% else %>
+          <%= part %>
+        <% end %>
       <% end %>
     </td>
   </tr>
@@ -88,7 +93,7 @@
       </div>
       
       <div>
-        Powered by MasterView
+        <a href="http://masterview.org">Powered by MasterView</a>
       </div>
     </div>
 

data/lib/masterview/extras/app/views/masterview/admin/view_rhtml.rhtml

@@ -0,0 +1,70 @@
+<html>
+  <head>
+      <title>Masterview Admin - View RHTML</title>
+
+      <%= stylesheet_link_tag 'masterview/style' %>
+      <%= stylesheet_link_tag 'masterview/sidebox' %>
+      <%= stylesheet_link_tag 'masterview/color-scheme' %>
+      <%= javascript_include_tag :defaults %>
+      
+  </head>
+  <body>
+
+    <!--  ###### Header ######  -->    
+
+    <div id="header"> 
+      <span class="headerTitle">Admin - View RHTML</span> 
+      <div class="menuBar">
+        <%= link_to 'Home', :action => :index %>
+	<!--  | <a href="">Another link</a>  -->
+      </div>
+    </div>
+
+
+    <div class="main">
+
+<div class="view_rhtml_div" id="mv_admin_view_rhtml"><!--  ###### view_rhtml ######  -->
+	  <div class="mv_admin_view_rhtml sidebar LHS">
+	    <h2>Tasks:</h2>
+	    <ul>
+	      <li><%= link_to 'Back to overview', :action => 'list' %></li>
+	    </ul>
+	  </div>
+
+	  <div class="mv_admin_view_rhtml content">
+	    <h1>View RHTML - <%= @rhtml_file %></h1>
+
+	    <% if @flash[:notice] %>
+	      <div class="messages" id="admin_messages">
+	        <%= h @flash[:notice] %>
+	      </div>
+	    <% end %>
+
+	    <pre><code>
+<%= h @rhtml_content %>
+            </code></pre>
+
+	  </div>
+	</div>
+
+    </div>
+
+    <!--  ###### Footer ######  -->
+
+    <div id="footer">
+      <div class="footerLHS">
+        <a href="http://validator.w3.org/check/referer">Valid XHTML 1.0 Strict</a>
+      </div>
+      
+      <div class="footerLHS">
+        <a href="http://jigsaw.w3.org/css-validator/check/referer">Valid CSS 2</a>
+      </div>
+      
+      <div>
+        Powered by MasterView
+      </div>
+    </div>
+
+
+    </body>
+</html>

data/lib/masterview/extras/init_logger.rb

@@ -0,0 +1,102 @@
+#!/usr/bin/env ruby
+
+#--
+# Copyright (c) 2006 Jeff Barczewski
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+#
+# MasterView initialization utility to install a logger in <code>MasterView::Log</code>.
+# 
+# The MasterView logger is used by the MasterView template engine
+# and directive implementations to record debug, warning, and error messages.
+# 
+#--
+# Need to do this in separate init file in order to do the
+# Log4r include for mixing into the MasterView module.
+# Can't just do +MasterView.include Log4r+ in Initializer#initialize_logger, 
+# unfortunately.
+#++
+#
+
+module MasterView #:nodoc:
+
+  if ConfigSettings.logger == 'log4r'
+    begin
+      require 'log4r'
+      include Log4r  # mix in the Log4R Logger facilities
+      Log = Logger.new 'MasterView'
+      Log.outputters = Outputter.stdout
+      LogLevels = {}
+      Log4r::LNAMES.each_index { |lindex| LogLevels[Log4r::LNAMES[lindex]] = lindex }
+    rescue LoadError, NameError
+      # fallback to built-in logger
+    end
+  end
+  if ! defined?(Log)
+    require 'logger'
+    Log = Logger.new STDOUT #:nodoc:
+    LogLevels = {}  #:nodoc:
+    LogLevels['ANY'] = nil
+    Logger::SEV_LABEL.each { |lname| LogLevels[lname] = Logger.const_get(lname) unless lname == 'ANY' }
+  end
+  if ConfigSettings.log_level
+    if LogLevels.has_key?(ConfigSettings.log_level)
+      Log.level = LogLevels[ConfigSettings.log_level]
+    else
+      Log.error "Undefined config.log_level='#{ConfigSettings.log_level}'"
+    end
+  end
+
+  # Answer the current logging severity level of the MasterView::Log.
+  # By default, answers the name of the logging level.
+  # Request :index flavor to get the logger's internal index value
+  def self.log_level( flavor=:name )
+    lindex = Log.level
+    return lindex if flavor == :index
+    lname = LogLevels.index(lindex)  # nil if unknown name - ok or should we complain?
+    lname = lname.to_sym if lname
+    lname
+  end
+
+  # Set the logging severity level for the MasterView::Log
+  def self.log_level= level
+    set_log_level(level)
+  end
+  
+  # Set the logging severity level for the MasterView::Log
+  def self.set_log_level(level)
+    #TBD: justify use case and test before enabling polymorphic parm cleverness
+    if level.kind_of? Integer
+      #TODO: ensure a valid level for this logger??
+      #Log.level = level
+      Log.error "Not supported: log_level='#{level}' (use string or symbol form of level name)"
+      return
+    end
+    #assert (level.kind_of? String) || (level.kind_of? Symbol)
+    lname = level.to_s  # stringify per internal rep
+    if LogLevels.has_key?(lname)
+      Log.level = LogLevels[lname]
+    else
+      Log.error "Undefined log level='#{level}' for #{Log.class.name} logger"
+    end
+  end
+
+end