masterview 0.2.2 → 0.2.3

data/lib/masterview/directives/stylesheet_link.rb

@@ -3,7 +3,9 @@ module MasterView
 
     #creates a link_to
     class Stylesheet_link < MasterView::DirectiveBase
-      STYLESHEET_SRC_EXTRACT_REGEX = /public\/stylesheets\/(.*)/
+
+      # /public\/stylesheets\/(.*)/
+      STYLESHEET_SRC_EXTRACT_REGEX = MasterView::ConfigSettings.template_asset_base_ref_pattern[:stylesheets] 
 
       def stag(dcs)
       end
@@ -19,5 +21,6 @@ module MasterView
         erb_content('stylesheet_link_tag ' + quote(ss_loc))
       end
     end
+
   end
 end

data/lib/masterview/directives/text_area.rb

@@ -11,8 +11,8 @@ module MasterView
         obj = args[0]
         method = args[1]
 
-        obj = quote(obj) unless obj =~ /^:|'|"/
-        method = quote(method) unless method =~ /^:|'|"/
+        obj = quote_if(obj)
+        method = quote_if(method)
 
         options = {}
         options[:rows] = attrs_lck['rows'].to_i if attrs_lck['rows']

data/lib/masterview/directives/text_field.rb

@@ -11,8 +11,8 @@ module MasterView
         obj = args[0]
         method = args[1]
 
-        obj = quote(obj) unless obj =~ /^:|'|"/
-        method = quote(method) unless method =~ /^:|'|"/
+        obj = quote_if(obj)
+        method = quote_if(method)
 
         options = {}
         options[:size] = attrs_lck['size'].to_i if attrs_lck['size']

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

@@ -44,13 +44,24 @@
 # [DJL 17-Jun-2006]
 #++
 # 
+
+
 class MasterviewController < ApplicationController
 
   before_filter :check_authorization, :except => [ :access_not_allowed ]
 
+  ENABLE_ADMIN_LAYOUT = false #:nodoc:  #UNDER CONSTRUCTION - fine idea, but doesn't work yet [DJL 03-Jun-2006]
+
   # Describe the MasterView configuration option settings
   def configuration
-    render :text => configuration_html, :layout => true
+    if ENABLE_ADMIN_LAYOUT
+      smart_render_with_layout('masterview/admin/configuration', 'masterview_admin')
+    else
+      #ugly, but keep this version
+      aint_got_no_layout_backstop = '<div style="padding-top: 6px;">(back to <a href=".">Admin home</a>)</div>'
+      config_html = MasterView::Info.to_html( :postscript => aint_got_no_layout_backstop )
+      render :text => config_html
+    end
   end
   
   def index
@@ -155,61 +166,6 @@ class MasterviewController < ApplicationController
     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
@@ -225,9 +181,40 @@ class MasterviewController < ApplicationController
     if File.exist?(local_path)
       render :template => short_path
     else
-       mv_path = File.join(File.dirname(__FILE__), '../../app/views', short_path)+'.rhtml'
-       MasterView::Log.debug { 'mv_path='+mv_path }
-       render :file => mv_path
+      mv_path = File.join(File.dirname(__FILE__), '../../app/views', short_path)+'.rhtml'
+      MasterView::Log.debug { 'mv_path='+mv_path }
+      render :file => mv_path
+    end
+  end
+
+  # render local template file if exists otherwise render file from mv
+  def smart_render_with_layout(short_path, layout) #:nodoc:  #UNDER CONSTRUCTION
+    #DOESN'T WORK YET - we get the right path, but need a way into template rendering
+    # (usual path through rails bolts in assumption of app/views rel path)
+    # [DJL 03-Jul-2006]
+    local_path = File.join(RAILS_ROOT, 'app/views', short_path)+'.rhtml'
+    if File.exist?(local_path)
+      render :template => short_path, :layout => smart_layout_path(layout)
+    else
+      mv_path = File.join(File.dirname(__FILE__), '../../app/views', short_path)+'.rhtml'
+      MasterView::Log.debug { 'mv_path='+mv_path }
+      render :file => mv_path, :layout => smart_layout_path(layout)
+    end
+  end
+
+  def smart_layout_path(short_path)  #:nodoc:  #UNDER CONSTRUCTION
+    local_path = File.join(RAILS_ROOT, 'app/views/layouts', short_path)+'.rhtml'
+    if File.exist?(local_path)
+      short_path
+    else
+      mv_layouts_dir_path = File.expand_path( File.join(File.dirname(__FILE__), '../../app/views/layouts') )
+      mv_path = File.join(mv_layouts_dir_path, short_path)+'.rhtml'
+      if File.exist?(mv_path)
+        MasterView::Log.debug { 'admin layout mv_path='+mv_path }
+      else
+        MasterView::Log.error { '***BAD ADMIN PAGE LAYOUT REF: mv_path='+mv_path }
+      end
+      mv_path
     end
   end
 

data/lib/masterview/extras/app/views/layouts/masterview_admin.rhtml

@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" 
+                        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" 
+      xml:lang="en" lang="en">
+
+<head>
+  <title>MasterView Admin</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+
+  <%= 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</span> 
+      <div class="menuBar">
+        <%= link_to 'Home', :action => :index %>
+	<!--  | <a href="">Another link</a>  -->
+      </div>
+    </div>
+
+
+    <div class="main">
+
+	  <div class="mv_admin_list sidebar LHS">
+	    <h2>Tasks:</h2>
+	    <ul>
+        <li><%= link_to 'View Configuration', :action => 'configuration' %></li>
+        <li><%= link_to 'View Loaded Features', :action => 'features' %></li>
+	    <li style="margin-top: 6px; padding-top: 4px; border-top: 1px dashed;"><%= link_to 'Rebuild all outdated templates', :action => 'rebuild_all' %></li>
+	    </ul>
+	  </div>
+
+	  <div class="mv_admin_list content">
+	    <h1>MasterView Admin</h1>
+
+	    <% if @flash[:notice] %>
+	      <div class="messages" id="admin_messages">
+	        <%= h @flash[:notice] %>
+	      </div>
+	    <% end %>
+
+<%= @content_for_layout %>
+
+	  </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>
+        <a href="http://masterview.org">Powered by MasterView</a>
+      </div>
+    </div>
+
+</body>
+</html>

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

@@ -0,0 +1 @@
+<%= MasterView::Info.to_html() %>

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

@@ -28,7 +28,7 @@
 	    <ul>
         <li><%= link_to 'View Configuration', :action => 'configuration' %></li>
         <li><%= link_to 'View Loaded Features', :action => 'features' %></li>
-	      <li><%= link_to 'Rebuild all outdated templates', :action => 'rebuild_all' %></li>
+	    <li style="margin-top: 6px; padding-top: 4px; border-top: 1px dashed;"><%= link_to 'Rebuild all outdated templates', :action => 'rebuild_all' %></li>
 	    </ul>
 	  </div>
 

data/lib/masterview/initializer.rb

@@ -227,6 +227,27 @@ module MasterView
     # Default: <tt>'*.html'</tt>
     attr_accessor :template_filename_pattern
 
+    # Regex pattern specifications for identifying the base directory
+    # on asset references in a template document to convert
+    # design-time assert references for images, stylesheets,
+    # and javascript files into relative references for use
+    # with the standard Rails asset helper functions.
+    # 
+    # The patterns are a hash indexed by asset type.
+    # Asset types are :images, :stylesheets, :javascripts
+    # 
+    # The standard patterns match path prefixes up through 
+    # <code>public/<i>asset-type</i></code>.  For example,
+    # an <code>mv:stylesheet_link</code> directive of the form:
+    # 
+    #   <link rel="stylesheet" type="text/css" href="../../../public/stylesheets/mystyles.css" mv:stylesheet_link="" />
+    # 
+    # would match the standard base-dir prefix and result in:
+    # 
+    #   <%= stylesheet_link_tag "mystyles" %>
+    # 
+    attr_accessor :template_asset_base_ref_pattern
+
     # === Template Generation Options
 
     # Path to the directory where Masterview template output (rhtml)
@@ -415,6 +436,8 @@ module MasterView
       rails_app_root_path = params[:rails_app_root_path]
       env = params[:environment]
 
+      is_development = env == 'development'
+
       program_root_path = File.expand_path( '.' )
       #assert program_root_path == Dir.pwd
 
@@ -487,6 +510,7 @@ module MasterView
       self.config_dir_path = rails_app? ? "config/masterview" : nil
       self.environment = on_rails? ? ::RAILS_ENV : env
       self.directive_paths = [ builtin_directives_path ]
+      discover_standard_directive_path_additions()
 
       #TODO: if rails_app? && File.exist?( "#{rails_root_path}/app/masterview/directives" ) THEN append it as well
       self.rebuild_backups_tmp_dir_path = rails_app? ? File.join( rails_root_path, 'tmp/masterview/rebuild/backups') : nil 
@@ -507,6 +531,11 @@ module MasterView
       # template source options
       self.template_src_dir_path = rails_app? ? 'app/views' : 'masterview/templates'  # bolts down abs ref
       self.template_filename_pattern = '*.html'
+      self.template_asset_base_ref_pattern = {
+        :images => /public\/images\/(.*)/,
+        :stylesheets => /public\/stylesheets\/(.*)/,
+        :javascripts => /public\/javascripts\/(.*)/,
+      }
 
       STDOUT.puts "...template_src_dir_path=#{template_src_dir_path || 'nil'}" if debug_TRACE_HACK
 
@@ -538,8 +567,8 @@ module MasterView
       # Rails application options
       self.parse_masterview_templates_at_startup = true
       self.reparse_changed_masterview_templates = on_rails? ? (not ActionController::Base.perform_caching) : false
-      self.enable_admin_pages = false
-      self.enable_view_rhtml = false
+      self.enable_admin_pages = is_development
+      self.enable_view_rhtml = is_development
       self.generate_rhtml_files = false
  
       STDOUT.puts "...mv config initialized with default settings\n" if debug_TRACE_HACK
@@ -559,6 +588,16 @@ module MasterView
       true
     end
 
+    # automatically append directives in std app dir to mv builtins, if available
+    def discover_standard_directive_path_additions() #:nodoc:
+      return if ! rails_app?  #?or can we take a point of view of std loc? e.g., 'masterview/directives'
+      app_directives_path = rails_app? ? "app/masterview/directives" : nil #??"masterview/directives"?
+      app_directives_path = File.join( root_path, app_directives_path )
+      if File.directory?(app_directives_path)  #?and not empty?
+        directive_paths << app_directives_path  #root_path already expanded
+      end
+    end
+
     # The path to the application's config settings file.
     # By default the file is at <tt>config/masterview/settings.rb</tt>.
     def app_settings_path
@@ -641,6 +680,7 @@ module MasterView
     # instance.
     def initialize(configuration) #:nodoc:
       @configuration = configuration
+      @log_msg_q = []  # collect log messages that arrive prior to the logger
     end
 
     # Load the MasterView configuration settings
@@ -659,7 +699,6 @@ module MasterView
       #?? return if MasterView.const_defined?(:ConfigSettings) ??
       load_config_settings
       ensure_valid_settings
-      discover_standard_directive_path_additions
       install_config_settings
       # make a final check for running_rails? (in case config settings changed scripts spec)
       configuration.decide_if_running_rails
@@ -695,21 +734,6 @@ module MasterView
       eval(IO.read(config_file_path), binding)
     end
 
-    def discover_standard_directive_path_additions #:nodoc:
-      #TODO: check for config/masterview/directives and automatically
-      # append to the configuration.directive_paths if found.
-      # We have to wait until all the config settings are loaded so that
-      # all references to root locations and client's own prefs for
-      # locating directives.
-      # [DJL 01-Jun-2006]
-      #... something like:
-      #return if not config_dir_path
-      #config_directives_path = File.join(configuration.config_dir_path, 'directives')
-      #if File.directory?(config_directives_path)
-      # configuration.directivePaths << File.expand_path(config_directives_path unless it's already there
-      #end
-    end
-
     # ensure that the requested configuration settings are consistent and valid
     # before we actually install anything.  Normalize representations as needed.
     def ensure_valid_settings #:nodoc:
@@ -718,8 +742,22 @@ module MasterView
 
       #??config.root_path = File.expand_path(config.root_path) if config.root_path  #?? ensure bolted down firmly?
 
-
-      ####if config.directive_paths.length > 1 then expand_path on user-appended entries??
+      # ensure that the directive load path entries are clean and available
+      if not config.directive_paths.empty?
+        clean_paths = []
+        config.directive_paths.each { | dir |
+          if dir.nil? || ! File.directory?(dir)
+            err_msg = "Invalid directive load path directory: '#{dir}'"
+            #overzealous: raise InvalidPathError.new()
+            #but doesn't exist yet: Log.error err_mage
+            @log_msg_q << [ :error, err_msg ]
+          else
+            dir_path = File.expand_path( dir )
+            clean_paths << dir_path if ! clean_paths.include?(dir_path)  # no dups
+          end
+        }
+        config.directive_paths = clean_paths
+      end
 
       # template source and generation options
       if config.on_rails?
@@ -801,6 +839,8 @@ module MasterView
       #?? return if MasterView.const_defined?(:Initialized) ??
       initialize_mio
       initialize_logger
+      #Back out experiment: causes load order problems
+      ##load_directives  # held off on this until logger is installed
       install_in_rails
       # mark the module as fully loaded and configured
       MasterView.const_set('Initialized', true)
@@ -834,6 +874,19 @@ module MasterView
     def initialize_logger #:nodoc:
       #?return if defined?(Log)
       require 'masterview/extras/init_logger'
+      # Kick out any queued-up log messages yearning to be free
+      @log_msg_q.each { | msg_level, msg |
+        Log.send err_level, msg
+      }
+      @log_msg_q.clear
+    end
+
+    def load_directives #:nodoc:
+      # get the directives loaded prior to firing up any template parsing
+      return if ! configuration.on_rails?  #ISSUE: causes problem for test cases; is this ever a good idea??
+      MasterView::DirectivesRegistry.process_directives_load_path( 
+                                        configuration.directive_paths,
+                                        configuration.namespace_prefix )
     end
 
     def install_in_rails #:nodoc:

data/lib/masterview/masterview_info.rb

@@ -0,0 +1,117 @@
+#--
+# Copyright (c) 2006 Jeff Barczewski and Deborah Lewis
+#
+# 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.
+#++
+#--
+# This gadget is (roughly) modelled after the Rails builtin/rails_info facility.
+# We don't provide masterview_info_controller in quite the same way,
+# since at the moment we just want to use this in our Admin controller,
+# but the Info module approach for exposing config properties is kinda nice.
+# [DJL 03-Jul-2006]
+#++
+
+module MasterView
+  module Info #:nodoc:
+
+    PROP_CATEGORY_ROOTS = 'MasterView Roots'
+    PROP_CATEGORY_GENERAL_OPTIONS = 'General Options'
+    PROP_CATEGORY_TEMPLATE_SRC_OPTIONS = 'Template Source Options'
+    PROP_CATEGORY_TEMPLATE_GEN_OPTIONS = 'Template Generation Options'
+    PROP_CATEGORY_TEMPLATE_PARSE_OPTIONS = 'Template Parsing Options'
+    PROP_CATEGORY_RAILS_APP_OPTIONS = 'Rails Application Options'
+
+    CATEGORIZED_PROPERTY_SPECS = [
+      # [ <section-name>, [prop-name [, prop-name]... ] ]
+      [ PROP_CATEGORY_ROOTS, 
+          [ :mv_installation_dir, :rails_app?, :on_rails? ] ],
+      [ PROP_CATEGORY_GENERAL_OPTIONS, 
+          [ :root_path, :config_dir_path, :environment  ] ],  #:directive_paths
+      [ PROP_CATEGORY_TEMPLATE_SRC_OPTIONS, 
+          [ :template_src_dir_path, :template_filename_pattern ] ],
+      [ PROP_CATEGORY_TEMPLATE_GEN_OPTIONS, 
+          [ :template_dst_dir_path, :output_filename_extension, :generated_file_default_extension, :include_generated_file_comment ] ],
+      [ PROP_CATEGORY_TEMPLATE_PARSE_OPTIONS, 
+          [ :default_parser_options, :namespace_prefix ] ],
+      [ PROP_CATEGORY_RAILS_APP_OPTIONS, 
+          [ :parse_masterview_templates_at_startup, :reparse_changed_masterview_templates, :generate_rhtml_files ] ]
+      ]
+
+    PROPERTY_CATEGORIES = CATEGORIZED_PROPERTY_SPECS.collect { | catEntry | catEntry[0] }
+
+
+    # Answer an html rendering
+    def self.to_html( params={} )
+
+      # unpack the supported keyword args
+      # Provide HTML fragment templates; optionally include class/style attributes to control rendering
+      title_html_template = params.fetch( :title, '<h1>%s</h1>' )  #parms: MV Config title
+      preamble_html_template = params.fetch( :preamble, '<p><b>MasterView Version:</b> %s</p>' )  #parms: MasterView version
+      config_settings_html_template = params.fetch( :table, "<table>\n<tbody>%s</tbody>\n</table>" % ['%s'] ) #parms: section/property table rows
+      section_entry_attrs = params.fetch( :section_attrs, 'style="background-color: #dcdcdc; font-weight: bold; margin-top: 6px;"' )
+      section_entry_html_template = params.fetch( :section_entry, '<tr%s><td colspan="2">%s</td></tr>' ) #parms: :section_attrs, section_name
+      option_entry_name_attrs = params.fetch( :option_name_attrs, 'style="padding-left: 6px; padding-right: 6px; font-weight: bold;"' )
+      option_entry_value_attrs = params.fetch( :option_value_attrs, '' )
+      option_entry_html_template = params.fetch( :option_entry, '<tr><td%s>%s</td><td%s>%s</td></tr>' ) #parms: :option_name_attrs, option_name, :option_value_attrs, option_value
+      postscript_html = params.fetch( :postscript, '' )  #'<div style="padding-top: 6px;">(back to <a href=".">Admin home</a>)</div>'
+
+      # prepare our templates for convenient use during the generation loop below
+      config_settings_html_start, config_settings_html_end = config_settings_html_template.split('%s')
+      # ensure separator space for ' style="xxx"' on the section entry style/class attr(s)
+      section_entry_attrs.insert(0, ' ') if (section_entry_attrs && section_entry_attrs != '' && section_entry_attrs[0...1] != ' ')
+      section_entry_html_template = section_entry_html_template % [ section_entry_attrs, '%s' ]  # install the optional style setting once, just plug in section_name hereafter
+      # ensure separator space for ' style="xxx"' on the option name/value style/class attr(s)
+      option_entry_name_attrs.insert(0, ' ') if (option_entry_name_attrs && option_entry_name_attrs != '' && option_entry_name_attrs[0...1] != ' ')
+      option_entry_value_attrs.insert(0, ' ') if (option_entry_value_attrs && option_entry_value_attrs != '' && option_entry_value_attrs[0...1] != ' ')
+      option_entry_html_template = option_entry_html_template % [ option_entry_name_attrs, '%s', option_entry_value_attrs, '%s' ]  # install the optional style settings once, just plug in option name/value hereafter
+
+      # and off we go at last
+      config = MasterView::ConfigSettings
+      html = []
+      html << title_html_template % [ 'MasterView Configuration' ] if title_html_template  # allow client to suppress
+      html << preamble_html_template % [ MasterView::VERSION::STRING ] if preamble_html_template
+      html << config_settings_html_start
+      CATEGORIZED_PROPERTY_SPECS.each { | section_name, options | 
+        html << section_entry_html_template % 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 << option_entry_html_template % [ option_name, option_value ]
+        }
+        # hack in options which aren't direct properties of the MasterView::Configuration
+        if section_name == PROP_CATEGORY_GENERAL_OPTIONS
+          option_name = 'logger'
+          option_value = MasterView::Log.class.name
+          html << option_entry_html_template % [ option_name, option_value ]
+          option_name = 'log_level'
+          option_value = MasterView.log_level
+          html << option_entry_html_template % [ option_name, option_value ]
+        end
+      }
+      html << config_settings_html_end
+      html << postscript_html if postscript_html
+      html.join("\n")
+
+    end
+
+  end
+end

data/lib/masterview/masterview_version.rb

@@ -2,7 +2,7 @@ module MasterView
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 2
-    TINY  = 2
+    TINY  = 3
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/lib/masterview/parser.rb

@@ -232,7 +232,8 @@ module MasterView
     XHTMLEmptyElementNameSet = %w{ base meta link hr br param img area input col }.to_set
 
     attr_reader :directive_load_paths, :mv_ns, :keyword_expander, :default_extension
-    attr_accessor :render_levels, :directive_classes, :default_render_handler, :serializer, :template_pathname, :template_full_pathname
+    attr_accessor :render_levels, :default_render_handler, :serializer, :template_pathname, :template_full_pathname
+    attr_reader :directives_registry  #:nodoc:
 
     def self.last_renderer; @@last_renderer; end
 
@@ -251,6 +252,9 @@ module MasterView
       @default_extension = (options[:output_mio_tree]) ? options[:output_mio_tree].default_extension : IOMgr.erb.default_extension
       @keyword_expander = KeywordExpander.new
       @keyword_expander.set_template_pathname(self.template_pathname, @default_extension)
+      #ISSUE: if :additional_directive_paths then do cleaning and validity checks here and now
+      # (then we don't need to keep re-checking in DirectiveRegistry or other processing)
+      # [DJL 04-Jul-2006]
       self.directive_load_paths = ( DefaultDirectiveLoadPaths << options[:additional_directive_paths] ).flatten
     end
 
@@ -262,35 +266,24 @@ module MasterView
     # Sets directive_load_paths, re-requiring all the new load paths, however any directives that were
     # already required (and loaded) will still be in memory because these are not reset.
     def directive_load_paths=( directive_paths ) 
-      @directive_classes = {}
-      @auto_directives = []
-      directive_paths.each do |directive_path|
-        next if directive_path.nil?
-        raise InvalidPathError.new('directive_path does not exist, path='+directive_path) unless File.exist? directive_path
-        Dir.open( directive_path ).each { |fn| require "#{directive_path}/#{fn}" if fn =~ /[.]rb$/ }
 
+      @directives_registry = MasterView::DirectivesRegistry
+      #ISSUE: can we optimize this if there aren't :additional_directive_paths?
+      # Do we even need/want the notion of per-invocation :additional_directive_paths
+      # given that the directives load path is configurable for the client app?
+      # [DJL 04-Jul-2006]
+      directives_registry.load_directives( directive_paths ) #?? if directive_load_paths != DefaultDirectiveLoadPaths ??
+
+      # is this a good idea? no clear that we need/want to modify mv_ns after app initialization
+      # If so, this could be simplifed.  Discuss with jeffb.
+      # [DJL 04-Jul-2006]
+      if @mv_ns != NamespacePrefix
+        @directives_registry = directives_registry.clone
       end
-      
-      Log.debug { 'directive plugins loaded:' + 
-          (DirectiveBase.loaded_classes.collect do |c| 
-            c.name.split(':').last #strip off Module prefixes for brevity
-          end).inspect
-      }
-      DirectiveBase.loaded_classes.each do |lc|
-        lc.on_load if lc.respond_to?(:on_load)
-        full_attr_name = (lc.respond_to? :full_attr_name) ? lc.full_attr_name(@mv_ns) : build_full_attribute_name(@mv_ns, lc)
-        @directive_classes[full_attr_name] = lc
-        lcinstance = lc.new(nil)
-        @auto_directives << lc if lcinstance.respond_to?(:global_directive?) && lcinstance.global_directive? 
-      end
-      Log.debug { 'auto_directives='+@auto_directives.inspect }
-    end
 
-    # this method is invoked to build the full attribute name (the attribute which will be watched for in 
-    # html attibutes. It concatenates the namespace prefix to the class name after first removing any module
-    # prefixes and then downcasing the first letter
-    def build_full_attribute_name(mv_ns, directive_class)
-      mv_ns+directive_class.name.split(':').last.downcase_first_letter
+      # only need to do the following if :additional_directive_paths or nonstd @mv_ns???
+      directives_registry.build_directive_maps( @mv_ns )
+      
     end
 
     def modes
@@ -392,14 +385,8 @@ module MasterView
 
     def select_active_directives(tag_name, attributes, mode)
       selected = DirectiveSet.new
-      directives_needed = []
-      @auto_directives.each do |directive_class|
-        directives_needed << directive_class.new(nil)
-      end
-      @directive_classes.each do |key,directive_class|
-        directives_needed << directive_class.new(attributes.delete(key)) if attributes[key]
-      end
-      sorted_directives = directives_needed.sort do |x,y| 
+      directive_processors = directives_registry.construct_directive_processors( attributes )
+      sorted_directives = directive_processors.sort do |x,y| 
         xval = (x.respond_to?(:priority)) ? x.priority : DirectivePriorities::Medium
         yval = (y.respond_to?(:priority)) ? y.priority : DirectivePriorities::Medium
         xval <=> yval