RubyGems - masterview - Versions diffs - 0.2.5 → 0.3.0 - Mend

masterview 0.2.5 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (155) hide show

data/CHANGELOG +31 -1
data/README +70 -69
data/RELEASE_NOTES +70 -64
data/Rakefile +26 -27
data/TODO +13 -29
data/doc/about.html +246 -0
data/doc/configuration.html +49 -36
data/doc/developer.html +423 -41
data/doc/directives.html +139 -51
data/doc/guide.html +19 -9
data/doc/index.html +90 -224
data/doc/installation.html +36 -28
data/doc/media_list.html +30 -20
data/doc/simple_diagram.html +3 -5
data/doc/stylesheets/masterview.css +16 -1
data/examples/rails_app_config/masterview/settings.rb +2 -1
data/init.rb +1 -1
data/lib/#ChangeLog# +6 -0
data/lib/masterview/analyzer.rb +48 -34
data/lib/masterview/attr_string_parser.rb +5 -1
data/lib/masterview/case_insensitive_hash.rb +69 -0
data/lib/masterview/{pathname_extensions.rb → core_ext/pathname.rb} +0 -0
data/lib/masterview/{string_extensions.rb → core_ext/string.rb} +0 -0
data/lib/masterview/deprecated/directive_base.rb +362 -0
data/lib/masterview/directive_base.rb +201 -179
data/lib/masterview/directive_dsl.rb +457 -0
data/lib/masterview/directive_helpers.rb +28 -141
data/lib/masterview/directive_load_path.rb +388 -0
data/lib/masterview/directive_metadata.rb +377 -0
data/lib/masterview/directive_registry.rb +259 -69
data/lib/masterview/directives/.metadata +16 -0
data/lib/masterview/directives/attr.rb +9 -8
data/lib/masterview/directives/block.rb +11 -14
data/lib/masterview/directives/check_box.rb +13 -18
data/lib/masterview/directives/collection_select.rb +15 -29
data/lib/masterview/directives/content.rb +9 -3
data/lib/masterview/directives/else.rb +15 -13
data/lib/masterview/directives/elsif.rb +14 -13
data/lib/masterview/directives/eval.rb +20 -0
data/lib/masterview/directives/form.rb +56 -9
data/lib/masterview/directives/form_remote.rb +26 -0
data/lib/masterview/directives/global_inline_erb.rb +10 -14
data/lib/masterview/directives/hidden_field.rb +11 -20
data/lib/masterview/directives/if.rb +13 -12
data/lib/masterview/directives/image_tag.rb +20 -28
data/lib/masterview/directives/import.rb +5 -12
data/lib/masterview/directives/import_render.rb +7 -19
data/lib/masterview/directives/insert_generated_comment.rb +8 -11
data/lib/masterview/directives/javascript_include.rb +21 -12
data/lib/masterview/directives/link_to.rb +14 -8
data/lib/masterview/directives/link_to_function.rb +22 -0
data/lib/masterview/directives/link_to_if.rb +15 -13
data/lib/masterview/directives/link_to_remote.rb +13 -8
data/lib/masterview/directives/omit_tag.rb +32 -16
data/lib/masterview/directives/password_field.rb +10 -22
data/lib/masterview/directives/radio_button.rb +11 -22
data/lib/masterview/directives/replace.rb +7 -8
data/lib/masterview/directives/select.rb +11 -24
data/lib/masterview/directives/stylesheet_link.rb +20 -12
data/lib/masterview/directives/submit.rb +11 -5
data/lib/masterview/directives/text_area.rb +10 -23
data/lib/masterview/directives/text_field.rb +10 -22
data/lib/masterview/exceptions.rb +21 -0
data/lib/masterview/extras/app/controllers/masterview_controller.rb +102 -75
data/lib/masterview/extras/app/views/layouts/masterview_admin.rhtml +24 -23
data/lib/masterview/extras/app/views/layouts/masterview_admin_config.rhtml +81 -0
data/lib/masterview/extras/app/views/masterview/admin/configuration.rhtml +5 -1
data/lib/masterview/extras/app/views/masterview/admin/create.rhtml +2 -2
data/lib/masterview/extras/app/views/masterview/admin/directives.rhtml +5 -0
data/lib/masterview/extras/app/views/masterview/admin/features.rhtml +5 -79
data/lib/masterview/extras/app/views/masterview/admin/interact.rhtml +5 -0
data/lib/masterview/extras/app/views/masterview/admin/list.rhtml +3 -71
data/lib/masterview/extras/init_mv_admin_pages.rb +42 -23
data/lib/masterview/filter_helpers.rb +26 -0
data/lib/masterview/initializer.rb +99 -53
data/lib/masterview/io.rb +19 -15
data/lib/masterview/keyword_expander.rb +7 -2
data/lib/masterview/masterview_info.rb +229 -23
data/lib/masterview/masterview_version.rb +2 -2
data/lib/masterview/parser.rb +275 -105
data/lib/masterview/parser_helpers.rb +54 -0
data/lib/masterview/rails_ext/action_controller_erb_direct.rb +29 -0
data/lib/masterview/rails_ext/action_controller_reparse_checking.rb +27 -0
data/lib/masterview/{extras/init_rails_erb_mv_direct.rb → rails_ext/action_view_erb_direct.rb} +12 -59
data/lib/masterview/template_spec.rb +3 -2
data/lib/masterview.rb +21 -12
data/lib/rexml/parsers/baseparser_with_doctype_fix.rb +473 -0
data/lib/rexml/parsers/sax2parser_with_doctype_fix.rb +243 -0
data/test/directive_test_helper.rb +135 -0
data/test/fixtures/directives/id_check.rb +18 -0
data/test/fixtures/directives/test_directive_events.rb +70 -0
data/test/test_helper.rb +18 -5
data/test/tmp/views/layouts/product.rhtml +10 -10
data/test/tmp/views/product/_form.rhtml +4 -4
data/test/tmp/views/product/_product.rhtml +3 -3
data/test/tmp/views/product/destroy.rhtml +5 -5
data/test/tmp/views/product/edit.rhtml +4 -4
data/test/tmp/views/product/list.rhtml +3 -3
data/test/tmp/views/product/new.rhtml +4 -4
data/test/tmp/views/product/show.rhtml +2 -2
data/test/unit/attr_string_parser_test.rb +105 -0
data/test/unit/case_insensitive_hash_mod_test.rb +104 -0
data/test/unit/config_settings_test.rb +13 -1
data/test/unit/default_generate_mio_filter_test.rb +3 -3
data/test/unit/deprecated_directive_base_test.rb +30 -0
data/test/unit/directive_attr_test.rb +111 -35
data/test/unit/directive_base_test.rb +520 -1
data/test/unit/directive_block_test.rb +30 -22
data/test/unit/directive_content_test.rb +24 -11
data/test/unit/directive_else_test.rb +18 -15
data/test/unit/directive_elsif_test.rb +17 -15
data/test/unit/directive_form_remote_test.rb +59 -0
data/test/unit/directive_form_test.rb +31 -39
data/test/unit/directive_global_inline_erb_test.rb +28 -17
data/test/unit/directive_grid_test_notready.rb +38 -0
data/test/unit/directive_helpers_test.rb +39 -0
data/test/unit/directive_hidden_field_test.rb +44 -29
data/test/unit/directive_if_test.rb +10 -7
data/test/unit/directive_image_tag_test.rb +69 -61
data/test/unit/directive_import_render_test.rb +28 -38
data/test/unit/directive_import_test.rb +16 -14
data/test/unit/directive_insert_generated_comment_test.rb +32 -0
data/test/unit/directive_javascript_include_test.rb +40 -43
data/test/unit/directive_link_to_function_test.rb +40 -0
data/test/unit/directive_link_to_if_test.rb +52 -12
data/test/unit/directive_link_to_remote_test.rb +58 -0
data/test/unit/directive_link_to_test.rb +46 -31
data/test/unit/directive_load_path_test.rb +257 -0
data/test/unit/directive_metadata_test.rb +313 -0
data/test/unit/directive_omit_tag_test.rb +73 -21
data/test/unit/directive_password_field_test.rb +44 -38
data/test/unit/directive_registry_test.rb +44 -0
data/test/unit/directive_replace_test.rb +28 -12
data/test/unit/directive_stylesheet_link_test.rb +43 -36
data/test/unit/directive_submit_test.rb +29 -30
data/test/unit/directive_text_area_test.rb +40 -36
data/test/unit/directive_text_field_test.rb +44 -38
data/test/unit/example_directive_child_events_test.rb +41 -0
data/test/unit/example_test.rb +31 -4
data/test/unit/file_mio_test.rb +18 -13
data/test/unit/filter_helpers_test.rb +10 -8
data/test/unit/find_directive_parent_test.rb +174 -0
data/test/unit/keyword_expander_test.rb +4 -2
data/test/unit/mio_test.rb +18 -11
data/test/unit/mtime_string_hash_mio_tree_test.rb +5 -1
data/test/unit/parser_test.rb +41 -29
data/test/unit/pathname_extensions_test.rb +1 -1
data/test/unit/run_parser_test.rb +2 -2
data/test/unit/simplified_directive_base_test.rb +256 -0
data/test/unit/string_hash_mio_test.rb +5 -1
data/test/unit/template_file_watcher_test.rb +2 -2
data/test/unit/template_test.rb +221 -46
metadata +86 -45
data/lib/masterview/directives/testfilter.rb +0 -55
data/lib/masterview/extras/init_rails_reparse_checking.rb +0 -62

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

@@ -1,48 +1,3 @@
-<html>
-  <head>
-      <title>Masterview Admin</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</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><%= link_to 'Interactive Render', :action => 'interact' %></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 %>
 <table border="1">
 <tr>
   <th>Template</th>
@@ -59,18 +14,18 @@
    </td>
    <td>
       <% if template_spec.status == MasterView::TemplateSpec::Status::ImportsOutdated %>
-        <%= link_to 'Rebuild', :action => :rebuild, :id => path %>
+        <%= link_to 'Rebuild', :action => :rebuild, :file => path %>
       <% end %>
       <% if template_spec.status == MasterView::TemplateSpec::Status::OK %>
-        <%= link_to 'Copy', :action => 'create', :id => path %>
+        <%= link_to 'Copy', :action => 'create', :file => path %>
       <% end %>
    </td>
     <td><%= h template_spec.message %></td>
     <td>
       <% template_spec.gen_parts.each do |part| %>
         <% if MasterView::EnableMasterViewAdminViewRHTML %>
-	  <%= link_to part, {:action => :view_rhtml, :id => part}, :title => 'View RHTML - '+part %>
+	  <%= link_to part, {:action => :view_rhtml, :file => part}, :title => 'View RHTML - '+part %>
         <% else %>
           <%= part %>
         <% end %>
@@ -79,26 +34,3 @@
   </tr>
 <% end %>
 </table>
-</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/init_mv_admin_pages.rb CHANGED Viewed

@@ -1,24 +1,24 @@
 # verify that stylesheets we use are available and if not copy them to public/stylesheets
-mv_generator_templates_dir = "#{MasterView::LoadedConfiguration.mv_installation_dir}/generators/masterview/templates"
-unless File.exist?(mv_generator_templates_dir)
+mv_generator_templates_dir = "#{MasterView::ConfigSettings.mv_installation_dir}/generators/masterview/templates"
+unless File.exist?(mv_generator_templates_dir)
   # we are in a gem so things are in different directories
   MasterView::Log.debug{ 'MasterView appears to be installed as a gem...' }
-  mv_generator_dir = MasterView::LoadedConfiguration.mv_installation_dir.gsub('\\','/').gsub( %r{/masterview-([^/]+)$}, '/masterview_generator-\1' )
+  mv_generator_dir = MasterView::ConfigSettings.mv_installation_dir.gsub('\\','/').gsub( %r{/masterview-([^/]+)$}, '/masterview_generator-\1' )
   mv_generator_templates_dir = "#{mv_generator_dir}/templates"
 end
 MasterView::Log.debug{ 'MasterView gem admin stylesheet src dir='+mv_generator_templates_dir }
 if File.directory?(mv_generator_templates_dir)
-  rails_app_stylesheets_dir = Pathname.for_path(RAILS_ROOT) + 'public/stylesheets/masterview'
+  rails_app_stylesheets_dir = Pathname.for_path(RAILS_ROOT) + 'public/stylesheets/masterview'
   stylesheet_specs = [
     # from/to spec: [ <src filename in templates dir>, <target filename in app stylesheets dir> ]
     [ 'style.css', 'style.css' ],
     [ 'sidebox.css', 'sidebox.css' ],
     [ 'color-scheme.css', 'color-scheme.css' ]
   ]
-  src_dir_accessor = MasterView::FileMIOTree.new( mv_generator_templates_dir )
-  dst_dir_accessor = MasterView::FileMIOTree.new( rails_app_stylesheets_dir, '.css', :logging => true)
+  src_dir_accessor = MasterView::MIO::FileMIOTree.new( mv_generator_templates_dir )
+  dst_dir_accessor = MasterView::MIO::FileMIOTree.new( rails_app_stylesheets_dir, '.css', :logging => true)
   stylesheet_specs.each { | from, to |
     src_file = src_dir_accessor.path(from)
     dst_file = dst_dir_accessor.path(to)
@@ -27,29 +27,48 @@ if File.directory?(mv_generator_templates_dir)
 end
 # add our app directories with the masterview_controller to the load path
-mv_controller_code_dirs = Dir[File.join(MasterView::LoadedConfiguration.mv_code_base_dir, '/extras/app/controllers')].select { |dir| File.directory?(dir) }
-mv_controller_code_dirs.each { |dir| $LOAD_PATH.push dir }
-MasterView::Log.debug{ 'MasterView AdminPages controller directories = '+mv_controller_code_dirs.inspect }
+mv_controller_code_dirs = Dir[File.join(MasterView::ConfigSettings.mv_code_base_dir, '/extras/app/controllers')].select { |dir| File.directory?(dir) }
-# rails 1.1.5+ added additional safe_load_path which we need to add our directories so that controller will be found
-if (not mv_controller_code_dirs.empty? and                                                     #we have dirs to add
-      ActionController::Routing::ControllerComponent.respond_to?(:safe_load_paths) and         #we are in rails 1.1.5+
-      not ActionController::Routing::ControllerComponent.respond_to?(:safe_load_paths_pre_mv)) # we have not already been added
+if (not mv_controller_code_dirs.empty?) # we have some controller dirs to get into load path
+  mv_controller_code_dirs.each { |dir| $LOAD_PATH.push dir }
+  MasterView::Log.debug{ 'MasterView AdminPages controller directories = '+mv_controller_code_dirs.inspect }
-  MasterView::Log.info{ 'Adding MasterView AdminPages controller directory to safe_load_path' }
-  ActionController::Routing::ControllerComponent.class_eval <<-END
-    class << self
-      alias_method :safe_load_paths_pre_mv, :safe_load_paths
+  # rails 1.2 introduced controller_paths mattr_accessor
+  if( ActionController::Routing.respond_to?(:controller_paths) and
+      defined?(:Dependencies) and Dependencies.respond_to?(:load_paths) )
+    MasterView::Log.info{ 'Adding MasterView AdminPages controller directories to controller_paths' }
+    ActionController::Routing.class_eval(<<-EOS, __FILE__, __LINE__)
+      class << self
+        alias_method :controller_paths_pre_mv, :controller_paths
-      protected
+        def controller_paths #:nodoc:
+          # concatenate our controller dirs to original controller_paths
+          controller_paths_pre_mv.concat #{mv_controller_code_dirs.inspect}
+        end
+      end
+    EOS
+    mv_controller_code_dirs.each { |dir| Dependencies.load_paths.push(dir) }
+  # rails 1.1.5+ added additional safe_load_path which we need to add our directories so that controller will be found
+  elsif (ActionController::Routing.const_defined?(:ControllerComponent) and             #we have ControllerComponent
+         ActionController::Routing::ControllerComponent.respond_to?(:safe_load_paths))  #we are in rails 1.1.5+
+    MasterView::Log.info{ 'Adding MasterView AdminPages controller directory to safe_load_path' }
+    ActionController::Routing::ControllerComponent.class_eval(<<-EOS, __FILE__, __LINE__)
+      class << self
+        alias_method :safe_load_paths_pre_mv, :safe_load_paths
+        protected
-      def safe_load_paths #:nodoc:
-        # concatenate our controller dirs to original safe_load_path
-        safe_load_paths_pre_mv.concat #{mv_controller_code_dirs.inspect}
+        def safe_load_paths #:nodoc:
+          # concatenate our controller dirs to original safe_load_path
+          safe_load_paths_pre_mv.concat #{mv_controller_code_dirs.inspect}
+        end
       end
-    end
-  END
+    EOS
+  end
 end
 MasterView::Log.info{ 'MasterView Admin pages enabled' }

data/lib/masterview/filter_helpers.rb CHANGED Viewed

@@ -1,5 +1,26 @@
 module MasterView
+  # Helper services to support a preprocessing filter to run a template
+  # document through HTML Tidy to automatically clean up the markup
+  # to ensure valid xhtml.  Optionally applied to all incoming templates
+  # prior to MasterView processing if the MasterView <code>:tidy</code> parser
+  # option is enabled.
+  #
+  # Unlike web browsers, which for historical and cultural reasons typically
+  # accept all sorts of mangled and invalid html and attempt to always
+  # produce some form of rendering, MasterView's template parsing is
+  # based on XML parsing technology and requires a syntactically valid
+  # xhtml document.  If you're not sure your templates are well-formed,
+  # you can turn on the MasterView <code>:tidy</code> parser option
+  # to have tidy automatically applied as a preprocessing filter
+  # on your templates.  (Requires that you have tidy installed on your system;
+  # use the MasterView <code>:tidy_path</code> option to specify how
+  # MasterView should invoke tidy)
+  #
   module TidyHelper
+    # Run HTML tidy on an html document and return the tidy'd output.
+    #
     def self.tidy(html)
       Tidy.path = ::MasterView::TidyPath unless Tidy.path
       xml = Tidy.open do |tidy|
@@ -16,6 +37,11 @@ module MasterView
   end
+  # Helper service to support a preprocessing filter to escape Erb markup
+  # into inline-erb notation within a template document.
+  # Optionally applied to all incoming templates prior to MasterView processing
+  # if the MasterView <code>:escape_erb</code> parser option is enabled.
+  #
   module EscapeErbHelper
     def self.escape_erb(html)
       html = html.gsub(/<%/, InlineErbStart)

data/lib/masterview/initializer.rb CHANGED Viewed

@@ -46,6 +46,13 @@
 #
 require 'date'
+# we can't be assured of the load path state if initializer is run standalone
+# to construct a configuration prior to full MasterView initialization
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, 'directive_metadata' )
+require File.join( currentPath, 'directive_load_path' )
+DEBUG_DIRECTIVE_PATH = false #:nodoc:  # temp debug
 module MasterView
@@ -154,10 +161,43 @@ module MasterView
     # that directory is also automatically added to the directives
     # load path.
     #
-    # Append additional path(s) to load custom directives from specific
-    # locations.
-    attr_accessor :directive_paths
+    # A directive load path entry specifiess a directory path
+    # from which masterview directives are loaded.
+    # Configuration options can optionally be specified to override
+    # or extend any .metadata specifications in the directory.
+    #
+    # Use add_directive_path to append additional directory path(s)
+    # from which to load custom directives.
+    #
+    attr_accessor :directive_load_path
+    # Deprecated - use directive_load_path
+    def directive_paths
+      @directive_load_path
+    end
+    # For use by Initializer to reset cleaned path
+    def directive_load_path=(path) #:nodoc:
+      @directive_load_path = path
+    end
+    # Add an entry to the directive_load_path list for a directory
+    # containing directive implementation classes to be loaded
+    # into the MasterView processing configuration.
+    #
+    # Optionally specify options for the directives loaded
+    # from this directory:
+    #
+    #     :default - metadata defaults
+    #
+    # Metadata defaults extend or override any defaults specified
+    # in the dir_path/.metadata file, if defined, allowing application
+    # customization of the default defaults.
+    #
+    def add_directive_path(dir_path, options=nil)
+      directive_load_path << DirectiveLoadPath::PathEntry.new( dir_path, options )
+    end
     # Relative path from +root_path+ of the temp directory used for creating
     # backup files before rebuilding/updating a template file.
     #
@@ -333,12 +373,18 @@ module MasterView
     # Allows invalid xhmtl to be corrected before masterview template parsing is performed.
     attr_accessor :tidy_path
-    # XML name space prefix for MasterView directive attributes in template html.
+    # XML name space prefix for builtin MasterView directive attributes in template html.
     # e.g. mv:generate="target.rhtml".
     #
     # Default: <tt>'mv:'</tt>
     attr_accessor :namespace_prefix
+    # XML name space prefix for MasterView extension directive attributes in template html.
+    # e.g. mvx:custom_directive="foo".
+    #
+    # Default: <tt>'mvx:'</tt>
+    attr_accessor :namespace_prefix_extensions
     # Xhtml-safe substitution for '<%' in a masterview template
     # NOTE: you must also update inline_erb_substitution_regex if this is changed.
     #
@@ -422,6 +468,10 @@ module MasterView
     # to disable they specifically set something to false or nil
     OriginalDefaultParserOptions = { :tidy => false, :escape_erb => true, :default_generate => true } # :nodoc: save the originals
+    # list of [ :log_level, msg ] pairs for config initialization/validation messages
+    # used by the initializer to validate load path and report any problems
+    attr_accessor :initialization_messages #:nodoc:
     # Create a new Configuration instance, initialized with the default
     # values.
     #
@@ -438,13 +488,7 @@ module MasterView
     # Use +rails_app_root_path+ when operating on a Rails application which
     # isn't actually running; use +app_root_path+ for a non-rails application.
     #
-    # list of [ :log_level, msg ] pairs for config initialization/validation messages
-    # used by the initializer to validate load path and report any problems
-    attr_accessor :initialization_messages #:nodoc:
-    ####:invalid_directive_paths
-    def initialize( params={} )
+    def initialize( params={} ) #:nodoc:
       rails_env = (defined?(RAILS_ENV)) ? RAILS_ENV : nil
       # unpack the supported keyword args
@@ -524,7 +568,8 @@ module MasterView
       # A standalone client needs to proactively tell us where to find their settings.
       self.config_dir_path = rails_app? ? "config/masterview" : nil
       self.environment = on_rails? ? ::RAILS_ENV : env
-      self.directive_paths = [ builtin_directives_path ]
+      self.directive_load_path = DirectiveLoadPath::Path.new
+      add_directive_path builtin_directives_path, { :use_masterview_namespace => true, }
       discover_standard_directive_path_additions()
       #TODO: if rails_app? && File.exist?( "#{rails_root_path}/app/masterview/directives" ) THEN append it as well
@@ -540,7 +585,7 @@ module MasterView
         STDOUT.puts "...root_path=#{root_path}"
         STDOUT.puts "...config_dir_path=#{config_dir_path || 'nil'}"
         STDOUT.puts "...environment=#{environment || 'nil'}"
-        STDOUT.puts "...directive_paths=[ #{directive_paths.join(', ')} ]"
+        STDOUT.puts "...directive_load_path=[ #{directive_load_path.directory_paths.join(', ')} ]"
       end
       # template source options
@@ -575,6 +620,7 @@ module MasterView
       # default locations where tidy likely to be found; assume on user's PATH if on Windows
       self.tidy_path = RUBY_PLATFORM =~ /mswin32/ ? 'c:/tidy/lib/tidy.dll' : '/usr/lib/libtidy.so'
       self.namespace_prefix = 'mv:'
+      self.namespace_prefix_extensions = 'mvx:'
       self.inline_erb_start = '{{{'
       self.inline_erb_end = '}}}'
       self.inline_erb_substitution_regex = /\{\{\{(([^}]|\}[^}]|\}\}[^}])*)\}\}\}/
@@ -615,7 +661,8 @@ module MasterView
       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
+        #{ :use_masterview_namespace => false, }
+        add_directive_path app_directives_path  #root_path already expanded
       end
     end
@@ -729,7 +776,6 @@ module MasterView
       configuration.decide_if_running_rails
       # keep a permananent record of how we got started
       configuration.freeze
-      configuration.directive_paths.freeze
       MasterView.const_set('ConfigSettings', configuration)
     end
@@ -768,21 +814,15 @@ module MasterView
       #??config.root_path = File.expand_path(config.root_path) if config.root_path  #?? ensure bolted down firmly?
       # 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?: continue; end
-          if ! File.directory?(dir)
-            err_msg = "Invalid directive load path directory: '#{dir}'"
-            #overzealous: raise InvalidPathError.new(err_msg)
-            # just note the problem and let initializer report it later
-            config.initialization_messages << [ :error, err_msg ]
-          else
-            dir_path = File.expand_path( dir )
-            clean_paths << dir_path if ! clean_paths.include?(dir_path)  # no dups
-          end
+      if not config.directive_load_path.empty?
+        STDOUT.puts "###DEBUG: cleaning directive_load_path #{config.directive_load_path.inspect}" if DEBUG_DIRECTIVE_PATH
+        clean_path = DirectiveLoadPath.clean_path( config.directive_load_path, :dup_policy => :use_latest ) { | ex |
+          # record validation error from a path entry and press on
+          # just note the problem and let initializer report it later
+          config.initialization_messages << [ :error, ex.message ]
         }
-        config.directive_paths = clean_paths
+        config.directive_load_path = clean_path
+        STDOUT.puts "###DEBUG: CLEANED directive_load_path #{config.directive_load_path.inspect}" if DEBUG_DIRECTIVE_PATH
       end
       # template source and generation options
@@ -809,14 +849,12 @@ module MasterView
     # Install the configuration settings
     def install_config_settings #:nodoc:
       set_module_constants
+      DirectiveLoadPath.default_path_specs = configuration.directive_load_path  # does clone before freezing config
     end
     def set_module_constants #:nodoc:
       config = configuration
-      # save configuration so we can get to it later
-      MasterView.const_set('LoadedConfiguration', config)
       # create loaded feature map - this map will track exactly what was loaded taking into account failures, so it can differ
       # from what is configured. key = feature symbol, value = true if enabled and loaded
@@ -825,8 +863,6 @@ module MasterView
       # we don't record root_path or config_dir_path - their purpose is satisfied
       # by the time we're done processing this installation configuration
-      MasterView.const_set('DefaultDirectiveLoadPaths', config.directive_paths.clone)  # clone before freezing
       # template source options
       MasterView.const_set('TemplateFilenamePattern', config.template_filename_pattern)
@@ -839,7 +875,6 @@ module MasterView
       MasterView.const_set('RescueExceptions', config.handle_parse_exceptions)
       MasterView.const_set('DefaultParserOptions', Configuration::OriginalDefaultParserOptions.merge(config.default_parser_options)) # merge in changes with original, so we can add more defaults later, users have to explicitly set an option to false to cancel them
       MasterView.const_set('TidyPath', config.tidy_path)
-      MasterView.const_set('NamespacePrefix', config.namespace_prefix)
       MasterView.const_set('InlineErbStart', config.inline_erb_start)
       MasterView.const_set('InlineErbEnd', config.inline_erb_end)
       MasterView.const_set('InlineErbSubstitutionRegex', config.inline_erb_substitution_regex)
@@ -850,12 +885,6 @@ module MasterView
       MasterView.const_set('EnableMasterViewAdminPages', config.enable_admin_pages)
       MasterView.const_set('EnableMasterViewAdminViewRHTML', config.enable_view_rhtml)
-      # convenience constants for MV attributes involving output generation and imports
-      MasterView.const_set('GenerateAttribute', config.namespace_prefix + 'generate')
-      MasterView.const_set('ImportAttribute', config.namespace_prefix + 'import')
-      MasterView.const_set('GenRenderAttribute', config.namespace_prefix + 'gen_partial')
-      MasterView.const_set('ImportRenderAttribute', config.namespace_prefix + 'import_render')
     end
     # Load the masterview code
@@ -866,6 +895,9 @@ module MasterView
     # Complete installation of masterview after its own code has been loaded
     def complete_plugin_installation #:nodoc:
       #?? return if MasterView.const_defined?(:Initialized) ??
+      MasterView::DirectiveRegistry.register_default_namespaces(
+                                        configuration.namespace_prefix,
+                                        configuration.namespace_prefix_extensions )
       initialize_logger
       initialize_mio
       #Back out experiment: causes load order problems
@@ -889,11 +921,11 @@ module MasterView
     # Initialize the MasterView I/O subsystem
     def initialize_mio
       config = configuration
-      MasterView.const_set('DefaultSerializer', MIOSerializer)
+      MasterView.const_set('DefaultSerializer', TemplateProcessing::MIOSerializer)
       # all root_path directory anchor points for I/O are expanded absolute paths
-      io_mgr = MIOTrees.new
+      io_mgr = MIO::MIOTrees.new
       template_extension = File.extname( config.template_filename_pattern )
-      io_mgr.template = FileMIOTree.new( config.template_src_dir_path, template_extension,
+      io_mgr.template = MIO::FileMIOTree.new( config.template_src_dir_path, template_extension,
                           :escape_erb => DefaultParserOptions[:escape_erb],  # use DefaultParserOptions since already has config merged
                           :tidy => DefaultParserOptions[:tidy],
                           :default_generate => DefaultParserOptions[:default_generate],
@@ -902,21 +934,22 @@ module MasterView
                           :logging => true )
       if config.generate_rhtml_files
-        io_mgr.erb = FileMIOTree.new( config.template_dst_dir_path, config.generated_file_default_extension, :logging => true)
+        io_mgr.erb = MIO::FileMIOTree.new( config.template_dst_dir_path, config.generated_file_default_extension, :logging => true)
       else
-        io_mgr.erb = RailsErbCacheMIOTree.new( config.generated_file_default_extension, :logging => true)
+        io_mgr.erb = MIO::RailsErbCacheMIOTree.new( config.generated_file_default_extension, :logging => true)
       end
-      io_mgr.backup = FileMIOTree.new( config.rebuild_backups_tmp_dir_path ) if config.rebuild_backups_tmp_dir_path
+      io_mgr.backup = MIO::FileMIOTree.new( config.rebuild_backups_tmp_dir_path ) if config.rebuild_backups_tmp_dir_path
       MasterView.const_set('IOMgr', io_mgr)
       MasterView::LoadedFeatures[:tidy_template_read] = config.default_parser_options[:tidy]
     end
+    #NOTE: not currently used - caused problems during startup, so reverted to original
+    # scheme where loading is triggered on demand by template parsing
+    # [SJL 20-Sep-2006]
     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 )
+      MasterView::DirectiveRegistry.current.process_directives_load_path( configuration.directive_load_path )
     end
     def install_in_rails #:nodoc:
@@ -945,19 +978,32 @@ module MasterView
       end
     end
+    #--
+    # DBC-style notation per DbC - rubydbc-0.1 (Andy Hunt's Design by Contract)
+    #pre( MasterView::ParseMasterViewTemplatesAtStartup )
+    #pre( MasterView::ReparseChangedMasterViewTemplates )
+    #pre( defined?(ActionController) &&  ActionController::Base.perform_caching )
+    #++
     def enable_reparse_changed_templates  #:nodoc:
       if configuration.reparse_changed_masterview_templates #MasterView::ReparseChangedMasterViewTemplates
         # if not caching then check for masterview updates on every request
-        # assert not ActionController::Base.perform_caching
+        # DBC-style notation per DbC - rubydbc-0.1 (Andy Hunt's Design by Contract)
+        #pre( MasterView::ParseMasterViewTemplatesAtStartup )
+        #pre( defined?(ActionController) && ActionController::Base.perform_caching )
         require 'masterview/extras/watcher' #:nodoc:
-        require 'masterview/extras/init_rails_reparse_checking'
+        MasterView::Log.info { 'Adding hook to allow MasterView to check for templates that have changed when processing a request' }
+        require 'masterview/rails_ext/action_controller_reparse_checking' #:nodoc:
+        MasterView::LoadedFeatures[:rails_reparse_checking] = true
       end
     end
     def enable_rails_erb_direct #:nodoc:
       unless configuration.generate_rhtml_files
         # if not generating rhtml the read erb directly from masterview
-        require 'masterview/extras/init_rails_erb_mv_direct'
+        MasterView::Log.info { 'Adding hooks to enable Rails to read erb directly from MasterView' }
+        require 'masterview/rails_ext/action_view_erb_direct' #:nodoc:
+        require 'masterview/rails_ext/action_controller_erb_direct' #:nodoc:
+        MasterView::LoadedFeatures[:rails_erb_mv_direct] = true
       end
     end

data/lib/masterview/io.rb CHANGED Viewed

@@ -1,12 +1,23 @@
 require 'ostruct'
 require 'pathname'
 require 'stringio'
-require File.join( File.dirname(__FILE__), 'pathname_extensions' )
-require File.join( File.dirname(__FILE__), 'mtime_tracking_hash' )
 require File.join( File.dirname(__FILE__), '../facets/core/string/starts_with' )
+require File.join( File.dirname(__FILE__), 'core_ext/pathname' )
+require File.join( File.dirname(__FILE__), 'exceptions' )
+require File.join( File.dirname(__FILE__), 'mtime_tracking_hash' )
 require File.join( File.dirname(__FILE__), 'filter_helpers' )
 module MasterView
+  # An InvalidPathError that is raised when an invalid template path is given,
+  # or if the path is outside of the root_path of the template
+  # processing operating context.
+  #
+  class InvalidIOPathError < InvalidPathError
+  end
+# The MIO module contains facilities for template processing I/O.
+module MIO
   # IOManager which retrieves the proper MasterViewIOTree object for the type of object being requested
   # set and access MasterViewIOTree by using accessors
   # IOMgr.template = FileMIOTree()
@@ -90,7 +101,7 @@ module MasterView
     end
     def path(path)
-      raise InvalidPathError.new('Invalid path specified ('+path.to_s+'). Path is limited to directories under root_path ('+self.to_s+')') unless (self+path).expand_path.to_s.starts_with?(self.expand_path.to_s) #ensure sandbox
+      raise InvalidIOPathError.new(path, 'Invalid path specified ('+path.to_s+'). Path is limited to directories under root_path ('+self.to_s+')') unless (self+path).expand_path.to_s.starts_with?(self.expand_path.to_s) #ensure sandbox
       mio = FileMIO.new(path, self + path)
       apply_filters(mio, @options, @new_mio_block)
     end
@@ -355,11 +366,12 @@ module MasterView
     # do the actual insertion of generate directive if not found
     def add_default_gen_if_needed(content)
       # building this right before needed in case the Namespace was changed during initialize
-      @@generate_gen_partial_search_regex ||= Regexp.new( '\s'+::MasterView::NamespacePrefix+'(generate=|gen_partial=)' )
+      mv_ns = DirectiveRegistry.current.mv_namespace_prefix
+      @@generate_gen_partial_search_regex ||= Regexp.new( '\s'+mv_ns+'(generate=|gen_partial=)' )
       # these are the directives that will be used for body and no body cases
-      @@generate_body_directives ||= ::MasterView::NamespacePrefix+'generate="{template_path}" '+::MasterView::NamespacePrefix+'omit_tag=""'
-      @@generate_non_body_directives ||= ::MasterView::NamespacePrefix+'generate="{template_path}"'
+      @@generate_body_directives ||= mv_ns+'generate="{template_path}" '+mv_ns+'omit_tag=""'
+      @@generate_non_body_directives ||= mv_ns+'generate="{template_path}"'
       unless content =~ @@generate_gen_partial_search_regex
         Log.debug { "no generate or gen_partial directives found, DefaultGenerateFilter is adding generate=\"{template_path}\"" }
@@ -384,13 +396,5 @@ module MasterView
     end
   end
-  # raised when an invalid path is given, or if the path is outside of the root_path
-  class InvalidPathError < RuntimeError
-  end
-  # raised when a  method is not called with the appropriate arguments
-  class InvalidArgumentError < RuntimeError
-  end
+end
 end

data/lib/masterview/keyword_expander.rb CHANGED Viewed

@@ -1,6 +1,11 @@
 module MasterView
-  # Keyword expander is used to hold variables defined to be used in expansion of
-  # attributes.
+  # KeywordExpander is used to hold variables defined to be used in expansion of
+  # directive attributes.
+  #
+  # Keywords in a directive attribute value are expanded into their variable values
+  # in the current template processing contenxt prior to invocation of the
+  # directive processing implementation.
+  #
   class KeywordExpander
     #--