masterview 0.1.5 → 0.2.0

data/test/{template_test.rb → unit/template_test.rb}

@@ -2,10 +2,13 @@
 
 require 'test/unit'
 currentPath = File.dirname(__FILE__)
-require File.join( currentPath, '../lib/masterview' )
-require File.join( currentPath, 'test_helper' )
+require File.join( currentPath, '../../lib/masterview' )
+require File.join( currentPath, '../test_helper' )
 
 class TestTemplate < Test::Unit::TestCase
+  def setup
+    MasterView::IOMgr.erb = MasterView::StringHashMIOTree.new({}, '.rhtml', :logging => true)
+  end
 
   def test_attr
     template = <<-END
@@ -59,11 +62,11 @@ class TestTemplate < Test::Unit::TestCase
     assert_template_result expected, template
   end
 
-  def test_multi_gen_render
+  def test_multi_gen_partial
     template = <<-END
       <div mv:generate='foo/bar'>
         <span mv:replace="h product[:price]">foo bar</span>
-        <div mv:gen_render=":partial => 'baz/caz'">
+        <div mv:gen_partial=":partial => 'baz/caz'">
           <span mv:content="h product[:name]">hello world</span>
         </div>
       </div>
@@ -75,22 +78,6 @@ class TestTemplate < Test::Unit::TestCase
     assert_template_result expected, template
   end
 
-  def test_multi_spec_dir
-    template = <<-END
-      <div mv:generate='foo/bar'>
-        <span mv:replace="h product[:price]">foo bar</span>
-        <div mv:generate='baz/caz'>
-          <span mv:content="h product[:name]">hello world</span>
-        </div>
-      </div>
-    END
-    expected = {
-      '/a/b/foo/bar' => "<div><%= h product[:price] %></div>",
-      '/a/b/baz/caz' => "<div><span><%= h product[:name] %></span></div>"
-    }
-    assert_template_result expected, template, :output_dir => '/a/b' 
-  end
-
   def test_replace
     template = <<-END
       <div mv:generate='foo/bar'>
@@ -357,11 +344,11 @@ class TestTemplate < Test::Unit::TestCase
     assert_template_result expected, template
   end
 
-  def test_omit_tag_root_with_nested_gen_render
+  def test_omit_tag_root_with_nested_gen_partial
     template = <<-END
       <div mv:generate='foo/bar' mv:omit_tag="">
         first layer
-        <foo mv:gen_render=":partial => 'baz/cat'" mv:omit_tag="">hello world</foo>
+        <foo mv:gen_partial=":partial => 'baz/cat'" mv:omit_tag="">hello world</foo>
       </div>
     END
     expected = {
@@ -371,4 +358,118 @@ class TestTemplate < Test::Unit::TestCase
     assert_template_result expected, template
   end
 
+
+  # Only simplify elements that are specified in the DTD as being empty, collapsing others can cause parsing
+  # or rendering problems in browsers. Uses constant XHTMLEmptyElementNameSet to find elements that should be
+  # collapsed. 
+  # http://www.w3.org/TR/xhtml1/dtds.html#a_dtd_XHTML-1.0-Strict
+  # xhtml-1.0-Strict empty elements are:
+  # base, meta, link, hr, br, param, img, area, input, col 
+  def test_simplify_empty_elements
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <script src="boo"></script>
+        <foo></foo>
+        <base foo="bar"></base>
+        <meta foo="baz"></meta>
+        <link src="cat"></link>
+        <hr/>
+        <hr clear="left"/>
+        <hr clear="left" />
+        <hr clear="left"></hr>
+        <hr></hr>
+        <br></br>
+        <br/>
+        <param foo="bar"></param>
+        <img src="foo"></img>
+        <img src="foo"/>
+        <img src="foo" />
+        <area foo="bar"></area>
+        <input type="hidden"></input>
+        <col></col>
+        <!-- test -->
+        <![CDATA[ hello ]]>
+        1 &lt; 2
+      </div>
+    END
+    expected = {
+      'foo/bar' => %q{<div><script src="boo"></script><foo></foo><base foo="bar" />}+
+        %q{<meta foo="baz" /><link src="cat" /><hr /><hr clear="left" /><hr clear="left" /><hr clear="left" />}+
+        %q{<hr /><br /><br /><param foo="bar" /><img src="foo" /><img src="foo" /><img src="foo" />}+
+        %q{<area foo="bar" /><input type="hidden" /><col /><!-- test --><![CDATA[ hello ]]>1 &lt; 2 </div>}
+    }
+    assert_template_result expected, template
+  end
+
+
+  def test_keyword_expansion_template_path
+    template = <<-END
+      <div mv:generate='{template_path}'>hello world</div>]
+    END
+    expected = {
+      'one/two_three.rhtml' => "<div>hello world</div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
+
+  def test_keyword_expansion_template_path_foo_ext
+    begin
+      original_default_extension = MasterView::IOMgr.erb.default_extension
+      MasterView::IOMgr.erb.default_extension = '.foo'
+      template = <<-END
+        <div mv:generate='{template_path}'>hello world</div>]
+      END
+      expected = {
+        'one/two_three.foo' => "<div>hello world</div>"
+      }
+      assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+    rescue
+      raise
+    ensure
+      MasterView::IOMgr.erb.default_extension = original_default_extension
+    end
+  end
+
+  def test_keyword_expansion_template_path_original
+    template = <<-END
+      <div mv:generate='{template_dir_path}/{template_basename}{extension}'>hello world</div>]
+    END
+    expected = {
+      'one/two_three.four' => "<div>hello world</div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
+
+  def test_keyword_expansion_controller_action
+    template = <<-END
+      <div mv:generate='{template_dir_path}/{template_basename}'>
+        hello world
+      </div>
+    END
+    expected = {
+      'one/two_three' => "<div>hello world </div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
+
+  def test_keyword_expansion_gen_partial
+    template = <<-END
+      <div mv:generate='foo/bar'>
+        <span mv:replace="h product[:price]">foo bar</span>
+        <div mv:gen_partial=":partial => '{template_dir_path}/{template_basename}'">
+          <span mv:content="h product[:name]">hello world</span>
+        </div>
+      </div>
+    END
+    expected = {
+      'foo/bar' => "<div><%= h product[:price] %><%= render( :partial => 'one/two_three' ) %></div>",
+      'one/_two_three.rhtml' => "<div><span><%= h product[:name] %></span></div>"
+    }
+    assert_template_result expected, template, :template_pathname => 'one/two_three.four'
+  end
+
+
+
+
+
 end

data/test/xtras/config-mv-logger_config.rb

@@ -0,0 +1,109 @@
+# File: config-mv-logger_config.rb
+# 
+# Xtra testing stuff - requires manual installation and usage to exercise
+# 
+# MasterView initialization logger configuration tests.
+# Preferable to integrate into automated test case,
+# but in the meantime here's some config settings code
+# that can be used by hand to test/check MV logger initialization
+# from the Configuration settings and the services for working
+# with the logging level, since the levels and their names vary
+# depending on the configured logger.
+# 
+# This was used as a rails app config/masterview/environments/development.rb.
+# Use it that way or call as your own 'logtest' environment or slam into
+# your existing settings.rb or env. config settings.  Whatever ya like.
+# 
+# [DJL 14-Jun-2006]
+# 
+#--
+#------------------------------------------------------------------------------
+#++ 
+# Development environment config settings for the MasterView plugin.
+#
+# The MasterView configuration specification is referenced through +config+.
+# 
+# Settings specified here will take precedence over those specified in the 
+# general MasterView config in +config/masterview/settings.rb+.
+#
+
+STDOUT.puts "****Loading config/masterview/environments/development.rb"
+STDOUT.puts "....config=#{config}" if defined?(config)
+
+# Activate/deactive the following to verify Log4r vs. ruby Logger, initial log_level config
+#config.logger = 'logger'
+#config.logger = 'nosuchlogger' # test backstop is a standard ruby Logger
+#config.log_level = 'WARN'
+#config.log_level = 'UNDEFINED'  # test backstop falls back to logger's default
+
+# Enable/disable to verify the results of the std logging levels
+TEST_LOG_LEVELS = true
+
+STDOUT.puts "...config.logger=#{config.logger}"
+STDOUT.puts "...config.log_level=#{config.log_level || 'nil'}"
+config.after_initialize {
+  # actual log levels [NOTE: early test code, superseded by MasterView::LogLevels and services]
+  if defined?(Log4r)
+    log_type = 'log4r'
+    log_level_names = Log4r::LNAMES
+    log_levels = {}
+    log_level_names.each { |ln| log_levels[ln] = log_level_names.index(ln) }
+  else
+    log_type = 'logger'
+    log_level_names = Logger::SEV_LABEL
+    log_levels = {}
+    log_level_names.each { |ln| log_levels[ln] = (ln == 'ANY' ? 'nil' : Logger.const_get(ln)) }
+  end
+  # x-check level name mapping [NOTE: this exercise the std facilities added to MasterView for working with log levels]
+  ll_map = LogLevels.invert
+  ll_indices = ll_map.keys.reject{ | lindex | lindex.nil? }  #sigh - Logger::ANY
+  ll_map_entries = ll_indices.sort.collect { | lindex | "#{ll_map[lindex]} (#{lindex})" }
+  LogLevels.each_pair { | lname, lindex | ( ll_map_entries << "#{lname} (nil)") if lindex.nil? }
+  # right then, so let's report what's happened in MasterView logging land
+  STDOUT.puts "\nMasterView #after_initialize - plugin loading and init now complete!!"
+  STDOUT.puts "...MasterView::ConfigSettings=#{MasterView::ConfigSettings}"
+  STDOUT.puts "...MasterView::Log=#{MasterView::Log}"
+  STDOUT.puts "...MasterView::LogLevels=#{ll_map_entries.join(', ')}"
+  #STDOUT.puts "...MasterView::Log.level=#{Log4r::LNAMES[MasterView::Log.level]}"
+  STDOUT.puts "...configured logger of type '#{log_type}' at level #{log_levels.index(MasterView::Log.level)} (#{MasterView::Log.level})"
+  STDOUT.puts "...supported levels for logger type '#{log_type}':\n      " + (log_level_names.collect {|ln| "#{ln} (#{log_levels[ln]})"}).join(', ')
+  if TEST_LOG_LEVELS
+    STDOUT.puts "...TEST: verify changing the log level"
+    initial_log_level = MasterView.log_level
+    STDOUT.puts "...MasterView.log_level=#{initial_log_level} (#{MasterView.log_level(:index)})  <-** initial **"
+    MasterView::Log.debug 'TEST: log a debug message'
+    MasterView::Log.warn 'TEST: log a warning message'
+    MasterView::Log.error 'TEST: log an error message'
+    ['DEBUG', 'WARN', 'ERROR'].each { | lname |
+      MasterView.set_log_level(lname)
+      STDOUT.puts "...MasterView.log_level=#{MasterView.log_level} (#{MasterView.log_level(:index)})"
+      MasterView::Log.debug 'TEST: log a debug message'
+      MasterView::Log.warn 'TEST: log a warning message'
+      MasterView::Log.error 'TEST: log an error message'
+    }
+    MasterView.set_log_level(initial_log_level)
+    STDOUT.puts "...MasterView.log_level=#{MasterView.log_level} <- ** reset to initial **"
+    STDOUT.puts '...done checking logging level changes'
+  end
+  if TEST_LOG_LEVELS
+    STDOUT.puts "\nMasterView #after_initialize: test log_level setter vs. assignment"
+    [ 'ERROR', :WARN, 2 ].each { |level|
+      STDOUT.puts "...CHECK: set log level using #{level.class} value #{level.inspect}"
+      MasterView.log_level = level
+      STDOUT.puts "...assignment 'MasterView.log_level = #{level.inspect}' => current state is MasterView.log_level=#{MasterView.log_level} (#{MasterView.log_level(:index)})"
+      MasterView::Log.warn 'TEST: log a warning message'
+      MasterView::Log.error 'TEST: log an error message'
+      MasterView.set_log_level(level)
+      STDOUT.puts "...setter 'MasterView.set_log_level( #{level.inspect} )' => current state is MasterView.log_level=#{MasterView.log_level} (#{MasterView.log_level(:index)})"
+      MasterView::Log.warn 'TEST: log a warning message'
+      MasterView::Log.error 'TEST: log an error message'
+      MasterView.set_log_level(initial_log_level)
+    }
+    MasterView.set_log_level(initial_log_level)
+    STDOUT.puts "...MasterView.log_level=#{MasterView.log_level} <- ** reset to initial **"
+    STDOUT.puts '...done checking logging level setter/assignment protocol'
+  end
+}
+
+STDOUT.puts "...masterview #{config.environment} settings loaded"
+STDOUT.puts "...MasterView::ConfigSettings=%s" % (MasterView.const_defined?(:ConfigSettings) ? MasterView::ConfigSettings : '(not yet installed)')

data/test/xtras/config_initialize_standalone.rb

@@ -0,0 +1,53 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+
+# We want to load MasterView in a standalone configuration mode
+# so that the template engine is anchored on our test directories
+currentPath = File.dirname(__FILE__)
+#require File.join( currentPath, '../../lib/masterview' )
+require File.join( currentPath, '../../lib/masterview/initializer.rb' )
+mv_test_dir = File.expand_path( "#{currentPath}/../." )
+mv_code_base_dir = File.expand_path( "#{currentPath}/../../lib" )
+#ISSUE: Initializer#load_plugin needs to be made smarter to handle following automatically [DJL 17-Jun-2006]
+$LOAD_PATH << mv_code_base_dir  # needed so "require 'masterview'" resolves
+mv_config = MasterView::Configuration.new( :app_root_path => mv_test_dir )  #"#{mv_test_dir}/tmp"
+mv_config.template_src_dir_path = 'tmp/templates_src'
+mv_config.template_dst_dir_path = 'tmp/views'
+# our test case will replicate the standard Rails dev configuration
+#mv_config.parse_masterview_templates_at_startup = true
+#mv_config.reparse_changed_masterview_templates = true
+MasterView::Initializer.run(:process, mv_config)
+
+class TestStandaloneAppConfiguration < Test::Unit::TestCase
+
+  MVTestDir = File.expand_path( File.join(File.dirname(__FILE__), '..' ) )
+  TemplateSrcDir = "#{MVTestDir}/tmp/templates_src"
+  TemplateFilenamePattern = '*.html'
+  TemplateDstDir = "#{MVTestDir}/tmp/views"
+
+  DEBUG_TRACE = false
+  if DEBUG_TRACE
+    STDOUT.puts "\nTEST INITIALIZING MasterView FOR STANDALONE OPERATION OUTSIDE RAILS"
+    STDOUT.puts "\nTest case root directories:"
+    STDOUT.puts "...MvTestDir=#{MVTestDir}"
+    STDOUT.puts "...TemplateSrcDir=#{TemplateSrcDir}"
+    STDOUT.puts "...TemplateDstDir=#{TemplateDstDir}"
+  end
+  if DEBUG_TRACE and true
+    STDOUT.puts "\nMasterView root directories configuration:"
+    STDOUT.puts "...MasterView::ConfigSettings.root_path=#{MasterView::ConfigSettings.root_path}"
+    #assert_equal TemplateSrcDir, MasterView::COnfigSettings.template_src_dir_path
+    STDOUT.puts "...MasterView::ConfigSettings.template_src_dir_path=#{MasterView::ConfigSettings.template_src_dir_path}"
+    #assert_equal TemplateDstDir, MasterView::COnfigSettings.template_dst_dir_path
+    STDOUT.puts "...MasterView::ConfigSettings.template_dst_dir_path=#{MasterView::ConfigSettings.template_dst_dir_path}"
+  end
+
+  def test_test_app_roots
+    config = MasterView::ConfigSettings
+    assert_equal MVTestDir, config.root_path
+    assert_equal TemplateSrcDir, config.template_src_dir_path
+    assert_equal TemplateDstDir, config.template_dst_dir_path
+  end
+
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: masterview
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
-date: 2006-05-31 00:00:00 -05:00
+  version: 0.2.0
+date: 2006-06-21 00:00:00 -05:00
 summary: A (x)html friendly template engine for rails with the power of layouts, and partials.
 require_paths: 
 - lib
@@ -42,15 +42,21 @@ files:
 - lib/facets/core/string/blank.rb
 - lib/masterview/directives
 - lib/masterview/extras
+- lib/masterview/io.rb
 - lib/masterview/plugin_load_tracking.rb
-- lib/masterview/directive_helpers.rb
-- lib/masterview/analyzer.rb
-- lib/masterview/runtime_helpers.rb
+- lib/masterview/initializer.rb
 - lib/masterview/string_extensions.rb
+- lib/masterview/analyzer.rb
 - lib/masterview/template_spec.rb
-- lib/masterview/directive_base.rb
 - lib/masterview/masterview_version.rb
 - lib/masterview/parser.rb
+- lib/masterview/mtime_tracking_hash.rb
+- lib/masterview/directive_helpers.rb
+- lib/masterview/runtime_helpers.rb
+- lib/masterview/pathname_extensions.rb
+- lib/masterview/filter_helpers.rb
+- lib/masterview/directive_base.rb
+- lib/masterview/keyword_expander.rb
 - lib/masterview/directives/global_inline_erb.rb
 - lib/masterview/directives/link_to_if.rb
 - lib/masterview/directives/preview.rb
@@ -77,52 +83,119 @@ files:
 - lib/masterview/directives/content.rb
 - lib/masterview/directives/text_area.rb
 - lib/masterview/extras/app
-- lib/masterview/extras/rails_init.rb
+- lib/masterview/extras/init_logger.rb
 - lib/masterview/extras/watcher.rb
+- lib/masterview/extras/init_rails_reparse_checking.rb
+- lib/masterview/extras/init_rails_erb_mv_direct.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/masterview/admin
+- lib/masterview/extras/app/views/masterview/admin/view_rhtml.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/create.rhtml
-- test/run_parser_test.rb
+- Rakefile
+- init.rb
+- doc/stylesheets
+- doc/directives.html
+- doc/guide.html
+- doc/api
+- doc/installation.html
+- doc/configuration.html
+- doc/index.html
+- doc/troubleshooting.html
+- doc/stylesheets/mv-directives.css
+- doc/stylesheets/mv-installation.css
+- doc/stylesheets/mv-config.css
+- doc/stylesheets/masterview.css
+- examples/rails_app_config
+- examples/product.html.old
+- examples/product.html
+- examples/test.import
+- examples/rails_app_config/masterview
+- examples/rails_app_config/masterview/environment
+- examples/rails_app_config/masterview/settings.rb
+- examples/rails_app_config/masterview/environment/development.rb
+- examples/rails_app_config/masterview/environment/production.rb
+- test/unit
+- test/xtras
+- test/fixtures
+- test/tmp
 - test/test_helper.rb
-- test/global_inline_erb_test.rb
-- test/template_spec_test.rb
-- test/block_test.rb
-- test/else_test.rb
-- test/template_file_watcher_test.rb
-- test/text_field_test.rb
-- test/hidden_field_test.rb
-- test/example_test.rb
-- test/parser_test.rb
-- test/if_test.rb
-- test/text_area_test.rb
-- test/link_to_test.rb
-- test/elsif_test.rb
-- test/form_test.rb
-- test/omit_tag_test.rb
-- test/submit_test.rb
-- test/javascript_include_test.rb
-- test/password_field_test.rb
-- test/stylesheet_link_test.rb
-- test/filter_helpers_test.rb
-- test/import_test.rb
-- test/import_render_test.rb
-- test/content_test.rb
-- test/attr_test.rb
-- test/replace_test.rb
-- test/template_test.rb
-- test/link_to_if_test.rb
+- test/unit/config_settings_test.rb
+- test/unit/run_parser_test.rb
+- test/unit/mio_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_hidden_field_test.rb
+- test/unit/directive_if_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_import_test.rb
+- test/unit/directive_link_to_if_test.rb
+- test/unit/template_test.rb
+- test/unit/file_mio_test.rb
+- test/unit/template_spec_test.rb
+- test/unit/template_file_watcher_test.rb
+- test/unit/example_test.rb
+- test/unit/mtime_tracking_hash_test.rb
+- test/unit/directive_submit_test.rb
+- test/unit/directive_omit_tag_test.rb
+- test/unit/directive_password_field_test.rb
+- test/unit/directive_stylesheet_link_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/pathname_extensions_test.rb
+- test/unit/string_hash_mio_test.rb
+- test/xtras/config_initialize_standalone.rb
+- test/xtras/config-mv-logger_config.rb
+- test/fixtures/configs
+- test/fixtures/templates
+- test/fixtures/configs/fake_rails_app
+- test/fixtures/configs/fake_rails_app_with_config
+- test/fixtures/configs/fake_rails_app_with_config/config
+- test/fixtures/configs/fake_rails_app_with_config/config/masterview
+- test/fixtures/configs/fake_rails_app_with_config/config/masterview/environments
+- test/fixtures/configs/fake_rails_app_with_config/config/masterview/settings.rb
+- test/fixtures/configs/fake_rails_app_with_config/config/masterview/environments/development.rb
+- test/fixtures/configs/fake_rails_app_with_config/config/masterview/environments/production.rb
+- test/fixtures/templates/product.html
+- test/fixtures/templates/test.import
+- test/tmp/template
+- test/tmp/erb
+- test/tmp/templates_src
+- test/tmp/views
+- test/tmp/template/foo.txt
+- test/tmp/templates_src/product.html
+- test/tmp/views/product
+- test/tmp/views/layouts
+- test/tmp/views/product/_form.rhtml
+- test/tmp/views/product/new.rhtml
+- test/tmp/views/product/edit.rhtml
+- test/tmp/views/product/_product.rhtml
+- test/tmp/views/product/list.rhtml
+- test/tmp/views/product/_show.rhtml
+- test/tmp/views/product/show.rhtml
+- test/tmp/views/product/destroy.rhtml
+- test/tmp/views/layouts/product.rhtml
 - CHANGELOG
-- MIT-LICENSE
-- Rakefile
 - TODO
 - RELEASE_NOTES
 - README
-- init.rb
+- MIT-LICENSE
 test_files: []
 
 rdoc_options: []

data/lib/masterview/extras/rails_init.rb

@@ -1,72 +0,0 @@
-#!/usr/bin/env ruby
-
-#--
-# Copyright (c) 2006 Jeff Barczewski
-#
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#++
-#
-# = MasterView - Rails-optimized (x)html friendly template engine 
-# 
-# MasterView is a ruby/rails optimized HTML/XHTML friendly template engine. 
-# It is designed to use the full power and productivity of rails including 
-# layouts, partials, and rails html helpers while still being editable/styleable 
-# in a WYSIWYG HTML editor.  
-
-# setup hook so that masterview output files are always current
-# always checks mtimes before each call when perform_caching is off (development)
-# otherwise only checks the first time system is hit
-require 'masterview'
-require 'masterview/extras/watcher'
-
-if MasterView::EnableMasterViewAdminPages
-  # add our app directories to the load path
-  Dir[File.join(File.dirname(__FILE__), 'app/**/*')].select{ |d| File.directory?(d) }.each{|d| $LOAD_PATH.push d }
-end
-
-# only run if auto parsing and when launching server, check if need to update mv files
-if MasterView::AutoParseMasterViewFiles && $PROGRAM_NAME =~ /server|dispatch/ 
-  mvtemplate_src_root = File.join( ActionController::Base.template_root, MasterView::TemplateSrcRelativePath) 
-  mvtemplate_dst_root = File.join( ActionController::Base.template_root, MasterView::TemplateDestRelativePath) 
-  MasterView::TemplateFileWatcher.check(mvtemplate_src_root, MasterView::TemplateFilenamePattern, true) do |f| 
-    MasterView::Parser.parse_file( f, mvtemplate_dst_root)
-  end
-end
-
-
-if MasterView::AutoParseMasterViewFiles
-  # if not caching then check for masterview updates on every request
-  unless ActionController::Base.perform_caching
-    module ::ActionController
-      class Base
-        alias :process_orig :process
-        def process(request, response, method = :perform_action, *arguments)
-          mvtemplate_src_root = File.join(self.class.view_root, MasterView::TemplateSrcRelativePath) 
-          mvtemplate_dst_root = File.join(self.class.view_root, MasterView::TemplateDestRelativePath) 
-          MasterView::TemplateFileWatcher.check(mvtemplate_src_root, MasterView::TemplateFilenamePattern, true) do |f| 
-            MasterView::Parser.parse_file( f, mvtemplate_dst_root )
-          end
-          process_orig(request, response, method, *arguments)
-        end
-      end
-    end
-  end
-end
-

data/test/import_render_test.rb

@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
-currentPath = File.dirname(__FILE__)
-require File.join( currentPath, '../lib/masterview' )
-require File.join( currentPath, '../lib/masterview/directives/import_render')
-
-class TestImportRender < Test::Unit::TestCase
-  include MasterView::Directives
-  include MasterView::DirectiveHelpers
-
-  def setup
-    @directives = MasterView::DirectiveSet.new
-  end
-
-  def test_import_render
-    import_render_tag = MasterView::Tag.new(@directives, 'bar', {}, :normal, nil)
-    @directives.directives = []
-    attr_value = ':partial => foo/bar'
-    @directives << Import_render.new(attr_value)
-    dcs = @directives.determine_dcs(:stag)
-    dcs.context = import_render_tag.create_context
-    assert_equal nil, dcs.render
-
-    dcs = @directives.determine_dcs(:etag)
-    dcs.context = import_render_tag.create_context
-    assert_equal ERB_EVAL+'render( '+attr_value+' )'+ERB_END, dcs.render.join
-  end
-
-end