masterview 0.2.4 → 0.2.5

data/CHANGELOG

@@ -1,4 +1,12 @@
-0.2.4
+0.2.5 - August 19th, 2006
+Added default generate filter which will add in a default generate directive if none is found in template
+Changed default_parser_options to be merged in with original set rather than to be absolute replacement
+Corrected example settings.rb win32 tidy_path to point to tidy.dll not tidy.exe.
+Fix AdminPage compatibility with Rails 1.1.5+ which uses safe_load_paths to find controllers
+Fix rake mv:view_rhtml RHTML=foo/_bar.rhtml was not able to find partials
+Fix rails environment not being passed into configuration
+
+0.2.4 - July 26, 2006
 Added interactive render to admin pages with example templates
 Fixed problem where apache2 with scgi was failing to initialize MasterView
 Updated documentation.

data/RELEASE_NOTES

@@ -1,4 +1,19 @@
-= MasterView - Rails-optimized (x)html friendly template engine 
+= MasterView - Rails-optimized (x)html friendly template engine
+
+== Recent changes (Release 0.2.5)
+Fix AdminPage compatibility with Rails 1.1.5+ which uses safe_load_paths to find controllers
+Fix rake mv:view_rhtml RHTML=foo/_bar.rhtml was not able to find partials
+Fix rails environment not being passed into configuration
+Added default generate filter which will add in a default generate directive if none is found in template
+Changed default_parser_options to be merged in with original set rather than to be absolute replacement
+Corrected example settings.rb win32 tidy_path to point to tidy.dll not tidy.exe.
+
+
+== Recent changes (Release 0.2.4)
+Maintenance release to add scgi support for MasterView.
+Also introduced interactive template page to admin pages allowing
+template html to be tested in MasterView showing the rendered
+rhtml.
 
 == Recent changes (Release 0.2.3)
 

data/TODO

@@ -3,6 +3,7 @@
 - create namespace for mv and publish, update generated files
 - more videos
 - allow multiple namespace prefixes for directives (allow custom directives to declare their own namespace)
+- publish .xsd namespace definition for builtin directives to enable xhmtl docs using mv markup to validate
 - wiki for site
 - render from db
 - app for syntax
@@ -33,6 +34,8 @@
 
 --####################
 
+- make tidy installation easier
+
 DSL for creating directives
 maybe something like
 

data/doc/configuration.html

@@ -387,6 +387,13 @@ with the pathname of the source template file.
 <td class="description">Escape <code>&lt;%&nbsp;%&gt;</code> before parsing</td>
 </tr>
 <tr>
+<td>&nbsp;</td>
+<td class="default"><b>:default_generate</b> => true</td>
+<td class="description">Ensure that a mv:generate or mv:gen_partial is present in a template, 
+otherwise add a mv:generate="{template_path}" to the body tag if one is present or the root
+element. If a body tag is present and mv:generate is being added then also add mv:omit_tag="".</td>
+</tr>
+<tr>
 <td class="setting">tidy_path</td>
 <td class="default">&nbsp;</td>
 <td class="description">Path on this system to tidy library if <b>:tidy</b> parser option is enabled so that masterview templates will be run through tidy before being parsed.</td>

data/doc/directives.html

@@ -86,6 +86,18 @@ it's relative path within the Rails <code>app/views</code> directory in the
 directive markup in the template.
 </p>
 
+<h3>Default generation (output)</h3>
+<p>
+Typically MasterView template files will contain mv:generate or mv:gen_partial directives
+to tell MasterView where to output the rendered rhtml. However if none are found in the template
+file, MasterView will automatically add in a mv:generate="{template_path}" to the body tag
+if found otherwise the root element. Additionally if MasterView was adding this to the body tag, 
+it will add in a mv:omit_tag="" which will prevent the body tag from being included in the generated 
+output. If you wish to disable this default generate mechanism, set the 
+config.default_parser_options[:default_generate] = false in your masterview settings or
+environments files.
+</p>
+
 
 <h2>Directives Summary</h2>
 <table class="toc" summary="summary of directives, grouped by functional area">

data/examples/rails_app_config/masterview/settings.rb

@@ -44,7 +44,7 @@
 #config.handle_parse_exceptions = true
 #config.default_parser_options = { :tidy => false, :escape_erb => true }
 #config.tidy_path = '/usr/lib/libtidy.so'  # *nix
-#config.tidy_path = 'tidy.exe'  # Win32 (assumes on system PATH)
+#config.tidy_path = 'c:/tidy/lib/tidy.dll'  # Win32 
 #config.namespace_prefix = 'mv:'
 #config.inline_erb_start = '{{{'
 #config.inline_erb_end = '}}}'

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

@@ -47,6 +47,7 @@
 require 'masterview/extras/sample_templates'
 
 class MasterviewController < ApplicationController
+  include MasterView::DefaultGenerateMIOFilter
 
   before_filter :check_authorization, :except => [ :access_not_allowed ]
 
@@ -148,8 +149,10 @@ class MasterviewController < ApplicationController
     @results = []
     @src = params[:src]
     if @src
-      sh_mio = MasterView::StringHashMIOTree.new({}, '.rhtml')
-      MasterView::Parser.parse( @src, { :output_mio_tree => sh_mio, :omit_comment => true } )
+      sh_mio = MasterView::StringHashMIOTree.new({}, MasterView::LoadedConfiguration.generated_file_default_extension )
+      
+      src_with_default_gen = add_default_gen_if_needed(@src) # apply a default generate
+      MasterView::Parser.parse( src_with_default_gen, { :output_mio_tree => sh_mio, :omit_comment => true, :template_pathname => 'YOUR_TEMPLATE_PATH_HERE' } )
       @results = sh_mio.string_hash.sort.collect do |file,rhtml| 
         os = OpenStruct.new
         os.file = file

data/lib/masterview/extras/init_mv_admin_pages.rb

@@ -0,0 +1,55 @@
+
+# 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) 
+  # 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_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'  
+  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)
+  stylesheet_specs.each { | from, to |
+    src_file = src_dir_accessor.path(from)
+    dst_file = dst_dir_accessor.path(to)
+    dst_file.write( src_file.read ) unless dst_file.exist?
+  }
+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 }
+
+# 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
+
+  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
+
+      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}
+      end
+    end
+  END
+
+end
+
+MasterView::Log.info{ 'MasterView Admin pages enabled' }

data/lib/masterview/initializer.rb

@@ -44,6 +44,9 @@
 # [JJB 13-Jun-2006]
 #++
 #
+
+require 'date'
+
 module MasterView
 
   # A Configuration holds all the configuration settings used the 
@@ -76,7 +79,6 @@ module MasterView
   #   MasterView::Initializer.run( :process, config )
   #
   class Configuration
-
     # directory in which the MasterView plugin or gem is installed
     attr_reader :mv_installation_dir #:nodoc:
 
@@ -323,6 +325,7 @@ module MasterView
     # Default option settings for template parsing (a hash)
     #   :tidy => false - run tidy before parsing (tidy_path must be set if enabled)
     #   :escape_erb => true - escapes <% %> before parsing
+    #   :default_generate => true - adds in mv:generate="{template_path}" if none found
     attr_accessor :default_parser_options
 
     # Path on this system to tidy library if <tt>:tidy</tt> parser option is enabled
@@ -413,6 +416,12 @@ module MasterView
     # Default: +false+
     attr_accessor :generate_rhtml_files
 
+    # These are the original default parser options, whatever is set in the config
+    # will be merged with these to arrive at the result. This allows us to easily 
+    # add new defaults in and even if users empty this hash, the defaults will get added
+    # to disable they specifically set something to false or nil
+    OriginalDefaultParserOptions = { :tidy => false, :escape_erb => true, :default_generate => true } # :nodoc: save the originals
+
     # Create a new Configuration instance, initialized with the default
     # values.
     # 
@@ -429,13 +438,19 @@ 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={} )
 
+      rails_env = (defined?(RAILS_ENV)) ? RAILS_ENV : nil
       # unpack the supported keyword args
       app_root_path = params[:app_root_path]
       rails_app_root_path = params[:rails_app_root_path]
-      env = params[:environment]
-
+      env = params[:environment] || rails_env
       is_development = env == 'development'
 
       program_root_path = File.expand_path( '.' )
@@ -556,9 +571,9 @@ module MasterView
 
       # template parsing options
       self.handle_parse_exceptions = true
-      self.default_parser_options = { :tidy => false, :escape_erb => true }
+      self.default_parser_options = OriginalDefaultParserOptions.clone #we'll merge in whatever changes they make over the original set in const above
       # default locations where tidy likely to be found; assume on user's PATH if on Windows
-      self.tidy_path = RUBY_PLATFORM =~ /mswin32/ ? 'tidy.exe' : '/usr/lib/libtidy.so'
+      self.tidy_path = RUBY_PLATFORM =~ /mswin32/ ? 'c:/tidy/lib/tidy.dll' : '/usr/lib/libtidy.so'
       self.namespace_prefix = 'mv:'
       self.inline_erb_start = '{{{'
       self.inline_erb_end = '}}}'
@@ -573,6 +588,8 @@ module MasterView
  
       STDOUT.puts "...mv config initialized with default settings\n" if debug_TRACE_HACK
 
+      self.initialization_messages = []  # for installer validation checking and problem reporting
+
     end
 
     def decide_if_running_rails #:nodoc:
@@ -682,9 +699,8 @@ module MasterView
     
     # Create a new Initializer instance that references the given Configuration
     # instance.
-    def initialize(configuration) #:nodoc:
-      @configuration = configuration
-      @log_msg_q = []  # collect log messages that arrive prior to the logger
+    def initialize(config) #:nodoc:
+      @configuration = config
     end
 
     # Load the MasterView configuration settings
@@ -701,12 +717,15 @@ module MasterView
     # Intended for use in testing.
     def initialize_configuration
       #?? return if MasterView.const_defined?(:ConfigSettings) ??
+      #ISSUE: support format_datetime option on the logger settings?? [DJL 30-Jul-2006]
+      configuration.initialization_messages << [ :info, 
+                      "Initializing MasterView configuration (#{DateTime.now.strftime('%Y-%m-%d %H:%M')})" ]
+      configuration.initialization_messages << [ :info, 
+                      "Program name = #{$PROGRAM_NAME}" ] # log the program that is starting the session
       load_config_settings
       ensure_valid_settings
       install_config_settings
       # make a final check for running_rails? (in case config settings changed scripts spec)
-      # this logging didn't seem to work??
-      # @log_msg_q << [ :info, 'Program name = '+$PROGRAM_NAME ] # log the program that is starting
       configuration.decide_if_running_rails
       # keep a permananent record of how we got started
       configuration.freeze
@@ -752,11 +771,12 @@ module MasterView
       if not config.directive_paths.empty?
         clean_paths = []
         config.directive_paths.each { | dir |
-          if dir.nil? || ! File.directory?(dir)
+          if dir.nil?: continue; end
+          if ! 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 ]
+            #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
@@ -794,6 +814,9 @@ module MasterView
     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
@@ -814,7 +837,7 @@ module MasterView
 
       # template parsing options
       MasterView.const_set('RescueExceptions', config.handle_parse_exceptions)
-      MasterView.const_set('DefaultParserOptions', config.default_parser_options)
+      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)
@@ -840,11 +863,11 @@ module MasterView
       require 'masterview' #:nodoc:
     end
 
-    # Complete installation of masterview after its code has been loaded
+    # Complete installation of masterview after its own code has been loaded
     def complete_plugin_installation #:nodoc:
       #?? return if MasterView.const_defined?(:Initialized) ??
-      initialize_mio
       initialize_logger
+      initialize_mio
       #Back out experiment: causes load order problems
       ##load_directives  # held off on this until logger is installed
       install_in_rails
@@ -853,6 +876,16 @@ module MasterView
       after_initialize  # callback to client's afer_initialize block
     end
 
+    # Initialize MasterView::Log with a logger which emits to std output, default DEBUG level
+    def initialize_logger #:nodoc:
+      #?return if defined?(Log)
+      require 'masterview/extras/init_logger'
+      # release any queued-up initialization messages yearning to be free
+      configuration.initialization_messages.each { | msg_level, msg |
+        Log.send msg_level, msg
+      }
+    end
+
     # Initialize the MasterView I/O subsystem
     def initialize_mio
       config = configuration
@@ -861,11 +894,13 @@ module MasterView
       io_mgr = MIOTrees.new
       template_extension = File.extname( config.template_filename_pattern )
       io_mgr.template = FileMIOTree.new( config.template_src_dir_path, template_extension, 
-                          :escape_erb => config.default_parser_options[:escape_erb], 
-                          :tidy => config.default_parser_options[:tidy], 
+                          :escape_erb => DefaultParserOptions[:escape_erb],  # use DefaultParserOptions since already has config merged
+                          :tidy => DefaultParserOptions[:tidy], 
+                          :default_generate => DefaultParserOptions[:default_generate],
                           #TODO: expose the following in Configuration.default_parser_options and document
                           :caching => false, 
                           :logging => true )
+                          
       if config.generate_rhtml_files
         io_mgr.erb = FileMIOTree.new( config.template_dst_dir_path, config.generated_file_default_extension, :logging => true)
       else
@@ -876,17 +911,6 @@ module MasterView
       MasterView::LoadedFeatures[:tidy_template_read] = config.default_parser_options[:tidy]
     end
 
-    # Initialize MasterView::Log with a logger which emits to std output, default DEBUG level
-    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??
@@ -907,38 +931,7 @@ module MasterView
     # install the MasterviewController to support masterview admin pages in the site
     def enable_mv_admin_pages #:nodoc:
       return if ! configuration.enable_admin_pages  #MasterView::EnableMasterViewAdminPages
-      MasterView::Log.info{ 'MasterView Admin pages enabled' }
-
-      # verify that stylesheets we use are available and if not copy them to public/stylesheets
-      mv_generator_templates_dir = "#{configuration.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 = configuration.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'  
-        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)
-        stylesheet_specs.each { | from, to |
-          src_file = src_dir_accessor.path(from)
-          dst_file = dst_dir_accessor.path(to)
-          dst_file.write( src_file.read ) unless dst_file.exist?
-        }
-      end
-      # add our app directories with the masterview_controller to the load path
-      mv_controller_code_dirs = Dir[File.join(configuration.mv_code_base_dir, '/extras/app/**/*')].select { |dir| 
-        File.directory?(dir) }
-      mv_controller_code_dirs.each { |dir| $LOAD_PATH.push dir }
+      require 'masterview/extras/init_mv_admin_pages'
     end
 
     def parse_templates_at_startup #:nodoc:

data/lib/masterview/io.rb

@@ -43,6 +43,7 @@ module MasterView
     # options[:tidy] = true enables tidy processing to cleanup bad xhtml
     # options[:caching] = true enables caching so that reads are cached
     # options[:logging] = true enables logging of reads and writes 
+    # options[:default_generate] = true enables creation of default generate directive if none found
     def apply_filters(mio, options, block)
       if block
         block.call(mio)
@@ -56,6 +57,7 @@ module MasterView
       lambda do |mio|
         mio.extend EscapeErbMIOFilter if options[:escape_erb]
         mio.extend TidyMIOFilter if options[:tidy]
+        mio.extend DefaultGenerateMIOFilter if options[:default_generate]
         mio.extend CachingMIOFilter if options[:caching]
         mio.extend ReadWriteLoggingMIOFilter if options[:logging]
       end
@@ -328,6 +330,48 @@ module MasterView
     end
   end
 
+  # checks to see that mv:generate or mv:gen_partial has been used somewhere in file
+  # and if not then it puts in a default mv:generate directive based on the following 
+  # logic. If a body tag exists then add the mv:generate directive to the body tag
+  # and also add a mv:omit_tag="" directive. This is based on the assumption that we are
+  # body will be defined in a layout somewhere so we are only interested in the 
+  # internal content of it (excluding the body tag itself).
+  # If a body tag does not exist, then simply add the mv:generate tag to the root element.
+  #
+  # Examples:
+  # <html><body>Hello world</body></html>
+  # becomes
+  # <html><body mv:generate="{template_path}" mv:omit_tag="">Hello world</body></html>
+  # 
+  # <div>Hello</div>
+  # becomes
+  # <div mv:generate="{template_path}">Hello</div>
+  module DefaultGenerateMIOFilter
+    def read(options={})
+      content = super
+      add_default_gen_if_needed(content)
+    end
+
+    # 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=)' )
+
+      # 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}"'
+
+      unless content =~ @@generate_gen_partial_search_regex
+        Log.debug { "no generate or gen_partial directives found, DefaultGenerateFilter is adding generate=\"{template_path}\"" }
+        content = content.clone # leave original alone
+        unless content.sub!( /<body/i ){ |x| x+' '+@@generate_body_directives } # unless we found body tag and substituted
+          content.sub!( /<\w+/ ){ |x| x+' '+@@generate_non_body_directives }
+        end
+      end
+      content
+    end
+  end
+
   module ReadWriteLoggingMIOFilter #todo
     def read(options={})
       Log.debug { "reading file="+self.full_pathname } unless options[:disable_logging]

data/lib/masterview/masterview_version.rb

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

data/lib/masterview/parser.rb

@@ -122,9 +122,10 @@ module MasterView
     def stag(dcs)
       context = dcs.context
       ret = []
-      ret << "<#{context[:tag].tag_name}" 
-      context[:tag].attributes.sort.each do |name, value| 
-        ret << " #{name}=\"#{value}\""
+      ret << "<#{context[:tag].tag_name.to_s}" # allow for symbol tag_name
+      sorted_attributes = context[:tag].attributes.sort { |a,b| a[0].to_s <=> b[0].to_s } #allow for symbols using to_s
+      sorted_attributes.each do |name, value| 
+        ret << " #{name.to_s}=\"#{value}\"" # allow for key to by symbol
       end
       ret << '>' #must output as separate string so simplify_empty_elements can find it
     end
@@ -146,7 +147,7 @@ module MasterView
 
     def etag(dcs)
       context = dcs.context
-      [] << '</' << "#{context[:tag].tag_name}>" #must output </ as separate string so simplify_empty_elements can find it
+      [] << '</' << "#{context[:tag].tag_name.to_s}>" #must output </ as separate string so simplify_empty_elements can find it
     end
     
   end

data/test/unit/default_generate_mio_filter_test.rb

@@ -0,0 +1,183 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../../lib/masterview' )
+require File.join( currentPath, '../test_helper' )
+
+class TestDefaultGenerateMIOFilter < Test::Unit::TestCase
+  include MasterView::DefaultGenerateMIOFilter
+
+  def setup
+    MasterView::IOMgr.template = MasterView::StringHashMIOTree.new({}, '.rhtml', :logging => true, :default_generate => true )
+    MasterView::IOMgr.erb = MasterView::StringHashMIOTree.new({}, '.rhtml', :logging => true)
+  end
+
+
+
+  def test_no_gen_no_body_str
+    template = <<-END
+      <div>
+        <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+      </div>
+    END
+    expected = <<-END
+      <div mv:generate="{template_path}">
+        <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+      </div>
+    END
+    assert_equal expected, add_default_gen_if_needed(template)
+  end
+
+  def test_no_gen_extract_body_str
+    template = <<-END
+      <html>
+        <body>
+          <div>
+            <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+          </div>
+        </body>
+      </html>
+    END
+    expected = <<-END
+      <html>
+        <body mv:generate="{template_path}" mv:omit_tag="">
+          <div>
+            <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+          </div>
+        </body>
+      </html>
+    END
+    assert_equal expected, add_default_gen_if_needed(template)
+  end
+
+  def test_no_gen_extract_capital_body_str
+    template = <<-END
+      <html>
+        <BODY>
+          <div>
+            <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+          </div>
+        </BODY>
+      </html>
+    END
+    expected = <<-END
+      <html>
+        <BODY mv:generate="{template_path}" mv:omit_tag="">
+          <div>
+            <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+          </div>
+        </BODY>
+      </html>
+    END
+    assert_equal expected, add_default_gen_if_needed(template)
+  end
+
+  def test_has_gen_no_body
+    template = <<-END
+      <div>
+        <div mv:generate="one/two">
+          <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+        </div>
+      </div>
+    END
+    expected = <<-END
+      <div>
+        <div mv:generate="one/two">
+          <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+        </div>
+      </div>
+    END
+    assert_equal expected, add_default_gen_if_needed(template)
+  end
+
+  def test_has_gen_with_body
+    template = <<-END
+      <html>
+      <body>
+      <div>
+        <div mv:generate="one/two">
+          <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+        </div>
+      </div>
+      </body>
+      </html>
+    END
+    expected = <<-END
+      <html>
+      <body>
+      <div>
+        <div mv:generate="one/two">
+          <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+        </div>
+      </div>
+      </body>
+      </html>
+    END
+    assert_equal expected, add_default_gen_if_needed(template)
+  end
+
+  def test_has_gen_partial_no_body
+    template = <<-END
+      <div>
+        <div mv:gen_partial=":partial => 'one/two'">
+          <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+        </div>
+      </div>
+    END
+    expected = <<-END
+      <div>
+        <div mv:gen_partial=":partial => 'one/two'">
+          <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+        </div>
+      </div>
+    END
+    assert_equal expected, add_default_gen_if_needed(template)
+  end
+
+  def test_has_gen_partial_with_body
+    template = <<-END
+      <html>
+      <body>
+      <div>
+        <div mv:gen_partial=":partial => 'one/two'">
+          <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+        </div>
+      </div>
+      </body>
+      </html>
+    END
+    expected = <<-END
+      <html>
+      <body>
+      <div>
+        <div mv:gen_partial=":partial => 'one/two'">
+          <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+        </div>
+      </div>
+      </body>
+      </html>
+    END
+    assert_equal expected, add_default_gen_if_needed(template)
+  end
+
+  def test_no_gen_no_body_using_filter
+    template = <<-END
+      <div>
+        <span class="red" mv:attr=":class => 'blue', :id => 'testid'">foo bar</span>
+      </div>
+    END
+    expected = {
+      'foo/bar.rhtml' => "<div><span class=\"blue\" id=\"testid\">foo bar</span></div>"
+    }
+
+    # write template to mio, then read it through filter
+    MasterView::IOMgr.template.path('foo/bar.html').write(template)
+    template_read = MasterView::IOMgr.template.path('foo/bar.html').read
+
+    assert_template_result expected, template_read, :template_pathname => 'foo/bar.html'
+  end
+
+
+
+end

data/test/unit/parser_test.rb

@@ -108,18 +108,25 @@ class TestParser < Test::Unit::TestCase
     dcs.context = { :tag => t2 }
     ret = s.stag(dcs)
     assert_equal "<foo", ret[0]
+    assert_equal " bar=\"baz\"", ret[1]
+    assert_equal " can=\"dog\"", ret[2]
     assert_equal '>', ret[3]
-    assert ret.include?(" bar=\"baz\"" )
-    assert ret.include?(" can=\"dog\"" )
     
     dcs.context[:content_part] = 'hello'
     assert_equal ['hello'], s.characters(dcs)
-
     assert_equal ['<!-- ', 'hello', ' -->'], s.comment(dcs)
-
     assert_equal ['<![CDATA[', 'hello', ']]>'], s.cdata(dcs)
-
     assert_equal ['</', 'foo>'], s.etag(dcs)
+
+    attributes = { :can => 'dog', :bar => 'baz' } # test that we can use symbols for keys
+    tag_name = :foo
+    t3 = MasterView::Tag.new(directives, tag_name, attributes, mode_type, parent)
+    dcs.context = { :tag => t3 }
+    ret = s.stag(dcs)
+    assert_equal "<foo", ret[0]
+    assert_equal " bar=\"baz\"", ret[1]
+    assert_equal " can=\"dog\"", ret[2]
+    assert_equal '>', ret[3]
   end
 
   def test_tag

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: masterview
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
-date: 2006-07-26 00:00:00 -05:00
+  version: 0.2.5
+date: 2006-08-19 00:00:00 -05:00
 summary: A (x)html friendly template engine for rails with the power of layouts, and partials.
 require_paths: 
 - lib
@@ -45,28 +45,33 @@ files:
 - lib/masterview/io.rb
 - lib/masterview/plugin_load_tracking.rb
 - lib/masterview/initializer.rb
-- lib/masterview/string_extensions.rb
 - lib/masterview/analyzer.rb
+- lib/masterview/string_extensions.rb
 - lib/masterview/template_spec.rb
 - lib/masterview/masterview_version.rb
 - lib/masterview/parser.rb
 - lib/masterview/mtime_tracking_hash.rb
 - lib/masterview/directive_helpers.rb
+- lib/masterview/masterview_info.rb
 - lib/masterview/runtime_helpers.rb
+- lib/masterview/directive_registry.rb
 - lib/masterview/pathname_extensions.rb
 - lib/masterview/filter_helpers.rb
 - lib/masterview/directive_base.rb
 - lib/masterview/keyword_expander.rb
 - lib/masterview/attr_string_parser.rb
-- lib/masterview/directive_registry.rb
-- lib/masterview/masterview_info.rb
-- lib/masterview/directives/global_inline_erb.rb
 - lib/masterview/directives/link_to_if.rb
-- lib/masterview/directives/preview.rb
+- lib/masterview/directives/image_tag.rb
 - lib/masterview/directives/testfilter.rb
-- lib/masterview/directives/password_field.rb
+- lib/masterview/directives/select.rb
+- lib/masterview/directives/preview.rb
+- lib/masterview/directives/check_box.rb
+- lib/masterview/directives/javascript_include.rb
+- lib/masterview/directives/global_inline_erb.rb
 - lib/masterview/directives/text_field.rb
 - lib/masterview/directives/else.rb
+- lib/masterview/directives/radio_button.rb
+- lib/masterview/directives/collection_select.rb
 - lib/masterview/directives/block.rb
 - lib/masterview/directives/if.rb
 - lib/masterview/directives/hidden_field.rb
@@ -75,67 +80,63 @@ files:
 - lib/masterview/directives/form.rb
 - lib/masterview/directives/omit_tag.rb
 - lib/masterview/directives/submit.rb
-- lib/masterview/directives/replace.rb
-- lib/masterview/directives/attr.rb
+- lib/masterview/directives/password_field.rb
 - lib/masterview/directives/insert_generated_comment.rb
 - lib/masterview/directives/stylesheet_link.rb
-- lib/masterview/directives/javascript_include.rb
-- lib/masterview/directives/import_render.rb
 - lib/masterview/directives/link_to_remote.rb
+- lib/masterview/directives/import_render.rb
 - lib/masterview/directives/import.rb
 - lib/masterview/directives/content.rb
-- lib/masterview/directives/radio_button.rb
+- lib/masterview/directives/attr.rb
+- lib/masterview/directives/replace.rb
 - lib/masterview/directives/text_area.rb
-- lib/masterview/directives/image_tag.rb
-- lib/masterview/directives/check_box.rb
-- lib/masterview/directives/select.rb
-- lib/masterview/directives/collection_select.rb
 - lib/masterview/extras/app
 - lib/masterview/extras/init_logger.rb
 - lib/masterview/extras/watcher.rb
+- lib/masterview/extras/sample_templates.rb
 - lib/masterview/extras/init_rails_reparse_checking.rb
 - lib/masterview/extras/init_rails_erb_mv_direct.rb
-- lib/masterview/extras/sample_templates.rb
+- lib/masterview/extras/init_mv_admin_pages.rb
 - lib/masterview/extras/app/controllers
 - lib/masterview/extras/app/views
 - lib/masterview/extras/app/controllers/masterview_controller.rb
-- lib/masterview/extras/app/views/masterview
 - lib/masterview/extras/app/views/layouts
+- lib/masterview/extras/app/views/masterview
+- lib/masterview/extras/app/views/layouts/masterview_admin.rhtml
 - lib/masterview/extras/app/views/masterview/admin
-- lib/masterview/extras/app/views/masterview/admin/view_rhtml.rhtml
+- lib/masterview/extras/app/views/masterview/admin/features.rhtml
 - lib/masterview/extras/app/views/masterview/admin/list.rhtml
 - lib/masterview/extras/app/views/masterview/admin/empty.rhtml
-- lib/masterview/extras/app/views/masterview/admin/interact.rhtml
-- lib/masterview/extras/app/views/masterview/admin/create.rhtml
-- lib/masterview/extras/app/views/masterview/admin/features.rhtml
 - lib/masterview/extras/app/views/masterview/admin/configuration.rhtml
-- lib/masterview/extras/app/views/layouts/masterview_admin.rhtml
+- lib/masterview/extras/app/views/masterview/admin/view_rhtml.rhtml
+- lib/masterview/extras/app/views/masterview/admin/create.rhtml
+- lib/masterview/extras/app/views/masterview/admin/interact.rhtml
 - Rakefile
 - init.rb
+- doc/screenshots
+- doc/images
 - doc/stylesheets
 - doc/directives.html
 - doc/guide.html
-- doc/screenshots
+- doc/simple_diagram.html
 - doc/installation.html
+- doc/developer.html
 - doc/configuration.html
 - doc/index.html
 - doc/troubleshooting.html
 - doc/media_list.html
-- doc/images
-- doc/simple_diagram.html
-- doc/developer.html
-- doc/images/masterview_rhtml_rendering_thumbnail_smaller.png
 - doc/images/masterview_rhtml_rendering_thumbnail.png
-- doc/images/masterview_logo.png
 - doc/images/masterview_logo_gradient.png
-- doc/screenshots/generated_list.png
-- doc/screenshots/generated_new.png
+- doc/images/masterview_logo.png
+- doc/images/masterview_rhtml_rendering_thumbnail_smaller.png
+- doc/screenshots/masterview_admin_thumbnail.png
+- doc/screenshots/generated_list_thumbnail.png
 - doc/screenshots/masterview_admin.png
-- doc/screenshots/generated_new_medium.png
 - doc/screenshots/masterview_admin_medium.png
+- doc/screenshots/generated_new_medium.png
+- doc/screenshots/generated_new.png
+- doc/screenshots/generated_list.png
 - doc/screenshots/generated_list_medium.png
-- doc/screenshots/generated_list_thumbnail.png
-- doc/screenshots/masterview_admin_thumbnail.png
 - doc/screenshots/generated_new_thumbnail.png
 - doc/stylesheets/mv-directives.css
 - doc/stylesheets/mv-installation.css
@@ -158,20 +159,21 @@ files:
 - test/unit/config_settings_test.rb
 - test/unit/run_parser_test.rb
 - test/unit/mio_test.rb
-- test/unit/directive_helpers_parse_test.rb
 - test/unit/directive_global_inline_erb_test.rb
 - test/unit/directive_text_field_test.rb
 - test/unit/directive_else_test.rb
 - test/unit/mtime_string_hash_mio_tree_test.rb
 - test/unit/directive_block_test.rb
-- test/unit/parser_test.rb
+- test/unit/directive_helpers_parse_test.rb
 - test/unit/directive_hidden_field_test.rb
 - test/unit/directive_if_test.rb
+- test/unit/parser_test.rb
 - test/unit/directive_link_to_test.rb
 - test/unit/directive_elsif_test.rb
 - test/unit/directive_form_test.rb
 - test/unit/filter_helpers_test.rb
 - test/unit/directive_javascript_include_test.rb
+- test/unit/directive_base_test.rb
 - test/unit/directive_import_test.rb
 - test/unit/directive_link_to_if_test.rb
 - test/unit/template_test.rb
@@ -184,16 +186,16 @@ files:
 - test/unit/directive_omit_tag_test.rb
 - test/unit/directive_password_field_test.rb
 - test/unit/directive_stylesheet_link_test.rb
+- test/unit/default_generate_mio_filter_test.rb
 - test/unit/directive_import_render_test.rb
 - test/unit/directive_attr_test.rb
 - test/unit/directive_content_test.rb
 - test/unit/directive_replace_test.rb
 - test/unit/keyword_expander_test.rb
 - test/unit/directive_text_area_test.rb
+- test/unit/directive_image_tag_test.rb
 - test/unit/pathname_extensions_test.rb
 - test/unit/string_hash_mio_test.rb
-- test/unit/directive_image_tag_test.rb
-- test/unit/directive_base_test.rb
 - test/xtras/config_initialize_standalone.rb
 - test/xtras/config-mv-logger_config.rb
 - test/fixtures/configs
@@ -228,8 +230,8 @@ files:
 - CHANGELOG
 - TODO
 - RELEASE_NOTES
-- README
 - MIT-LICENSE
+- README
 test_files: []
 
 rdoc_options: []