masterview 0.1.5 → 0.2.0

data/test/unit/string_hash_mio_test.rb

@@ -0,0 +1,320 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../../lib/masterview/io' )
+
+class TestStringHashMIO < Test::Unit::TestCase
+  include MasterView
+
+  MVTestDir = File.expand_path( File.join(File.dirname(__FILE__), '..' ) )
+  TemplateDir = "#{MVTestDir}/tmp/template"
+  TemplateErbDir = "#{MVTestDir}/tmp/erb"
+
+  HelloWorldPath = 'hello_world.txt'
+  #HelloWorldFullPath = "#{TemplateDir}/hello_world.txt"
+  TestWritePath = 'foo.txt'
+  #TestWriteFullPath = "#{TemplateDir}/foo.txt"
+  #TestWritePathname = Pathname.new(TestWriteFullPath)
+
+  IOMgr = MIOTrees.new
+
+  def setup
+    @template_hash = {}
+    @erb_hash = {}
+    @file_hash = {}
+    IOMgr.template = StringHashMIOTree.new(@template_hash, '.html')
+    IOMgr.erb = StringHashMIOTree.new(@erb_hash, '.rhtml' )
+    IOMgr.file = StringHashMIOTree.new(@file_hash)
+  end
+
+#------------------------------------------------------------------------------
+# Test Cases
+#------------------------------------------------------------------------------
+
+  def test_create_foo
+    verify_mio_handler_paths( 'foo', IOMgr.template )
+  end
+
+  def test_create_foo_with_useless_dots
+    f = IOMgr.template.path( 'foo/bar/../cat')
+    assert_equal StringMIO, f.class
+    assert_equal 'foo/cat', f.pathname.to_s
+    assert_equal 'foo/cat', f.full_pathname.to_s
+    f.write('hello')
+    assert @template_hash.has_key?('foo/cat')
+  end
+
+  def test_create_foo_with_useless_dots2
+    f = IOMgr.template.path( 'foo/bar/../cat/../dog')
+    assert_equal StringMIO, f.class
+    assert_equal 'foo/dog', f.pathname.to_s
+    assert_equal 'foo/dog', f.full_pathname.to_s
+    f.write('hello')
+    assert @template_hash.has_key?('foo/dog')
+  end
+
+  def test_create_useless_dots
+    f = IOMgr.template.path( '../../foo')
+    assert_equal StringMIO, f.class
+    assert_equal '../../foo', f.pathname.to_s
+    assert_equal '../../foo', f.full_pathname.to_s
+    f.write('hello')
+    assert @template_hash['../../foo']
+  end
+
+  def test_create_bar
+    verify_mio_handler_paths( 'bar', IOMgr.erb )
+  end
+
+  def test_create_cat
+    verify_mio_handler_paths( 'cat', IOMgr.file )
+  end
+
+  def test_create_foo_w_ext
+    verify_mio_handler_paths( 'foo.txt', IOMgr.template )
+  end
+
+  def test_create_parts
+    verify_mio_handler_paths( 'sub/one/two/three/foo.txt', IOMgr.template )
+  end
+
+  def test_read
+    file_content = "hello\nworld"
+    @template_hash[HelloWorldPath] = file_content  # stuff into IOMgr.template
+    verify_mio_handler_read( HelloWorldPath, file_content, IOMgr.template, @template_hash )
+  end
+
+  def test_read_disable_cache
+    file_content = "hello\nworld"
+    @template_hash[HelloWorldPath] = file_content  # stuff into IOMgr.template
+    verify_mio_handler_read( HelloWorldPath, file_content, IOMgr.template, @template_hash )
+
+    file_content_changed = "foo\nbar"
+    @template_hash[HelloWorldPath] = file_content_changed  # stuff into IOMgr.template
+    #verify_mio_handler_read( HelloWorldPath, file_content, IOMgr.template ) #still reading from cache, #todo enable when caching module is ready for testing
+    verify_mio_handler_read_no_cache( HelloWorldPath, file_content_changed, IOMgr.template, @template_hash )
+  end
+
+  def test_write_string
+    @template_hash.delete(TestWritePath)
+
+    file_content = "foo\nbar"
+    IOMgr.template.path( TestWritePath).write(file_content)
+    verify_mio_handler_read( TestWritePath, file_content, IOMgr.template, @template_hash )
+  end
+
+  def test_write_block
+    @template_hash.delete(TestWritePath)
+
+    file_content = "hello"
+    IOMgr.template.path( TestWritePath).write { |f| f.write(file_content) }
+    verify_mio_handler_read( TestWritePath, file_content, IOMgr.template, @template_hash )
+  end
+
+  def test_write_multi_block
+    @template_hash.delete(TestWritePath)
+
+    file_content_strings = [ 'hello', 'world']
+    file_content = file_content_strings.join('')
+    IOMgr.template.path( TestWritePath).write do |f| 
+      file_content_strings.each { |str| f.write(str) }
+    end
+    verify_mio_handler_read( TestWritePath, file_content, IOMgr.template, @template_hash )
+  end
+
+  def test_write_mkpath
+    @template_hash.clear
+
+    file_content = "foo\nbar"
+    IOMgr.template.path( TestWritePath).write(file_content)
+    verify_mio_handler_read( TestWritePath, file_content, IOMgr.template, @template_hash )
+  end
+
+  def test_exist
+    @template_hash.clear
+    assert_equal false, IOMgr.template.path( TestWritePath ).exist?
+    assert @template_hash.empty?
+    IOMgr.template.path( TestWritePath).write("foo")
+    assert_equal true, IOMgr.template.path( TestWritePath).exist?
+  end
+
+  def test_identical
+    @template_hash.clear
+    assert_equal false, IOMgr.template.path( TestWritePath).identical?("hello\nworld")
+    @template_hash[TestWritePath] = "hello\nworld"
+    assert_equal true, IOMgr.template.path( TestWritePath).identical?("hello\nworld")
+    assert_equal false, IOMgr.template.path( TestWritePath).identical?("foo")
+  end
+
+  def test_findfiles_single_dir
+    @template_hash.clear
+    IOMgr.template.path( 'apple.txt').write('foo')
+    IOMgr.template.path( 'bar.txt').write('foo')
+    @template_hash[('baz.txt').to_s] = 'foo'
+    found = IOMgr.template.find
+    assert_equal 3, found.length
+    assert_equal StringMIO, found[0].class
+    assert_equal StringMIO, found[1].class
+    assert_equal StringMIO, found[2].class
+    assert_equal 'apple.txt', found[0].pathname.to_s
+    assert_equal 'bar.txt', found[1].pathname.to_s
+    assert_equal ('baz.txt').to_s, found[2].pathname.to_s
+    assert_equal ('baz.txt').to_s, found[2].full_pathname.to_s
+  end
+
+  def test_findfiles_single_sub_dir
+    @template_hash.clear
+    IOMgr.template.path( 'sub/apple.txt').write('foo')
+    IOMgr.template.path( 'sub/bar.txt').write('foo')
+    IOMgr.template.path( 'sub/baz.txt').write('foo')
+    found = IOMgr.template.find(:path => 'sub')
+    assert_equal 3, found.length
+    assert_equal StringMIO, found[0].class
+    assert_equal StringMIO, found[1].class
+    assert_equal StringMIO, found[2].class
+    assert_equal 'sub/apple.txt', found[0].pathname.to_s
+    assert_equal 'sub/bar.txt', found[1].pathname.to_s
+    assert_equal 'sub/baz.txt', found[2].pathname.to_s
+  end
+
+  def test_findfiles_single_sub2_dir_multi_arg
+    @template_hash.clear
+    IOMgr.template.path( 'sub/two/apple.txt').write('foo')
+    IOMgr.template.path( 'sub/two/bar.txt').write('foo')
+    IOMgr.template.path( 'sub/two/baz.txt').write { |f| f.write('foo') }
+    found = IOMgr.template.find(:path => 'sub/two')
+    assert_equal 3, found.length
+    assert_equal StringMIO, found[0].class
+    assert_equal StringMIO, found[1].class
+    assert_equal StringMIO, found[2].class
+    assert_equal 'sub/two/apple.txt', found[0].full_pathname.to_s
+    assert_equal 'sub/two/apple.txt', found[0].pathname.to_s
+    assert_equal 'sub/two/bar.txt', found[1].pathname.to_s
+    assert_equal 'sub/two/baz.txt', found[2].pathname.to_s
+  end
+
+  def test_findfiles_single_dir_pattern 
+    @template_hash.clear
+    IOMgr.template.path( 'sub/two/apple.txt').write('foo')
+    IOMgr.template.path( 'sub/two/bar.log').write('foo')
+    @template_hash['sub/two/baz.txt'] = 'foo'
+    found = IOMgr.template.find(:path => 'sub/two', :pattern => '*.txt')
+    assert_equal 2, found.length
+    assert_equal StringMIO, found[0].class
+    assert_equal StringMIO, found[1].class
+    assert_equal 'sub/two/apple.txt', found[0].pathname.to_s
+    assert_equal 'sub/two/baz.txt', found[1].pathname.to_s
+  end
+
+  def test_findfiles_multi_dir_root 
+    @template_hash.clear
+    IOMgr.template.path( 'one/two/three.txt').write('foo')
+    IOMgr.template.path( 'sub/two/apple.txt').write('foo')
+    IOMgr.template.path( 'sub/two/bar.log').write('foo')
+    IOMgr.template.path( 'sub/two/baz.txt').write { |f| f.write('foo') }
+    found = IOMgr.template.find
+    assert_equal 4, found.length
+    assert_equal StringMIO, found[0].class
+    assert_equal StringMIO, found[1].class
+    assert_equal StringMIO, found[2].class
+    assert_equal StringMIO, found[3].class
+    assert_equal 'one/two/three.txt', found[0].pathname.to_s
+    assert_equal 'sub/two/apple.txt', found[1].pathname.to_s
+    assert_equal 'sub/two/bar.log', found[2].pathname.to_s
+    assert_equal 'sub/two/baz.txt', found[3].pathname.to_s
+  end
+
+  def test_findfiles_multi_dir_pattern 
+    @template_hash.clear
+    IOMgr.template.path( 'one/two/three.txt').write('foo')
+    IOMgr.template.path( 'sub/two/apple.txt').write('foo')
+    IOMgr.template.path( 'sub/two/bar.log').write('foo')
+    IOMgr.template.path( 'sub/two/baz.txt').write('foo')
+    found = IOMgr.template.find(:pattern => '*.txt')
+    assert_equal 3, found.length
+    assert_equal StringMIO, found[0].class
+    assert_equal StringMIO, found[1].class
+    assert_equal StringMIO, found[2].class
+    assert_equal 'one/two/three.txt', found[0].pathname.to_s
+    assert_equal 'sub/two/apple.txt', found[1].pathname.to_s
+    assert_equal 'sub/two/baz.txt', found[2].pathname.to_s
+  end
+
+  def test_findfiles_multi_dir_pattern_deep 
+    @template_hash.clear
+    IOMgr.template.path( 'one/two/three.txt').write('foo')
+    IOMgr.template.path( 'sub/two/apple.txt').write('foo')
+    IOMgr.template.path( 'sub/two/bar.log').write('foo')
+    IOMgr.template.path( 'sub/two/baz.txt').write('foo')
+    found = IOMgr.template.find(:path => 'sub/two', :pattern => '*.txt')
+    assert_equal 2, found.length
+    assert_equal StringMIO, found[0].class
+    assert_equal StringMIO, found[1].class
+    assert_equal 'sub/two/apple.txt', found[0].pathname.to_s
+    assert_equal 'sub/two/baz.txt', found[1].pathname.to_s
+  end
+
+  def test_findfiles_multi_dir_pattern_deep_with_block
+    @template_hash.clear
+    IOMgr.template.path( 'one/two/three.txt').write('foo')
+    IOMgr.template.path( 'sub/two/apple.txt').write('foo')
+    IOMgr.template.path( 'sub/two/bar.log').write('foo')
+    IOMgr.template.path( 'sub/two/baz.txt').write('foo')
+    array_of_mio = []
+    found = IOMgr.template.find(:path => 'sub/two', :pattern => '*.txt'){ |mio| array_of_mio << mio }
+    assert_equal 2, found.length
+    assert_equal StringMIO, found[0].class
+    assert_equal StringMIO, found[1].class
+    assert_equal 'sub/two/apple.txt', found[0].pathname.to_s
+    assert_equal 'sub/two/baz.txt', found[1].pathname.to_s
+    assert_equal 2, array_of_mio.length
+    assert_kind_of StringMIO, array_of_mio[0]
+    assert_kind_of StringMIO, array_of_mio[1]
+    assert_equal 'sub/two/apple.txt', array_of_mio[0].pathname.to_s
+    assert_equal 'sub/two/baz.txt', array_of_mio[1].pathname.to_s
+  end
+
+#------------------------------------------------------------------------------
+# Test helpers
+#------------------------------------------------------------------------------
+
+  # verify that a string-hash mio_handler produces the expected file reference paths
+  def verify_mio_handler_paths( rel_path, mio_handler )
+    #ISSUE: should consider supporting symmetric protocol with FileMIO (pathname)
+    #assert_equal '', mio_handler.to_s  # this is just std object impl right now
+    assert_equal true, mio_handler.respond_to?(:to_s)
+    assert_equal false, mio_handler.respond_to?(:to_str)
+
+    file_path = mio_handler.path( rel_path )
+    assert_equal StringMIO, file_path.class
+    assert_equal rel_path, file_path.pathname.to_s
+    assert_equal rel_path, file_path.full_pathname.to_s
+  end
+
+  # verify that the string-hash mio_handler reads the expected content
+  def verify_mio_handler_read( rel_path, file_content, mio_handler, hash_storage )
+
+    # verify the actual hash contents are as expected
+    assert_equal file_content, hash_storage[rel_path]
+
+    # verify that the MIO handler obtains the expected content
+    file_path = mio_handler.path( rel_path )
+    #n/a: assert_equal rel_path, file_path.to_str
+    assert_equal file_content, file_path.read
+    assert_equal file_content, hash_storage[rel_path]
+  end
+
+  # verify that the string-hash mio_handler reads the expected content
+  def verify_mio_handler_read_no_cache( rel_path, file_content, mio_handler, hash_storage )
+
+    # verify the actual hash contents are as expected
+    assert_equal file_content, hash_storage[rel_path]
+
+    # verify that the MIO handler obtains the expected content
+    file_path = mio_handler.path( rel_path )
+    #n/a: assert_equal rel_path, file_path.to_str
+    assert_equal file_content, file_path.read(:disable_cache => true)
+  end
+
+end

data/test/unit/template_file_watcher_test.rb

@@ -0,0 +1,107 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../../lib/masterview' )
+require 'masterview/extras/watcher.rb'
+
+class TestTemplateWatcher < Test::Unit::TestCase
+
+  MVTestDir = File.expand_path( File.join(File.dirname(__FILE__), '..' ) )
+  TestFixturesDir = "#{MVTestDir}/fixtures/templates"
+  TemplateSrcDir = "#{MVTestDir}/tmp/templates_src"
+  TemplateFilenamePattern = '*.html'
+  TemplateDstDir = "#{MVTestDir}/tmp/views"
+
+  DEBUG_TRACE = false
+  if DEBUG_TRACE
+    STDOUT.puts "\nTEST TEMPLATE CHANGE-DETECTION"
+    STDOUT.puts "\nTest case root directories:"
+    STDOUT.puts "...MvTestDir=#{MVTestDir}"
+    STDOUT.puts "...TestFixturesDir=#{TestFixturesDir}"
+    STDOUT.puts "...TemplateSrcDir=#{TemplateSrcDir}"
+    STDOUT.puts "...TemplateDstDir=#{TemplateDstDir}"
+  end
+ 
+  # a template file that we'll monitor to verify change detection
+  TestSubjectFileShortName = 'product.html'
+  TestFixtureFile = "#{TestFixturesDir}/product.html"
+  TestSubjectFile = "#{TemplateSrcDir}/#{TestSubjectFileShortName}"
+
+  def setup
+    unless File.exists?(TestSubjectFile)
+      # isolate a copy of the observed template file in our templates source test dir 
+      # so we can bash its file timestamp to test changed-file detection
+      FileUtils.mkdir_p TemplateSrcDir unless File.directory?(TemplateSrcDir)
+      FileUtils.copy TestFixtureFile, TestSubjectFile, :preserve => false  #WAS: true
+      STDOUT.puts "\n========== test setup ==================" if DEBUG_TRACE
+      STDOUT.puts "...installed test fixture #{TestFixtureFile}" if DEBUG_TRACE
+      STDOUT.puts "...#{TestSubjectFileShortName} template timestamp=#{File.mtime(TestSubjectFile)}" if DEBUG_TRACE
+    end
+    @template_mio_tree = MasterView::FileMIOTree.new(TemplateSrcDir, '.html')
+    @output_mio_tree = MasterView::FileMIOTree.new(TemplateDstDir, '.rhtml')
+  end
+
+  def test_a_parse_template_on_startup
+    STDOUT.puts "\n========== test_a_parse_template_on_startup ==========" if DEBUG_TRACE
+    STDOUT.puts "...#{TestSubjectFileShortName} template timestamp=#{File.mtime(TestSubjectFile)}" if DEBUG_TRACE
+    STDOUT.puts "...clearing dir #{TemplateDstDir}" if DEBUG_TRACE && File.exists?(TemplateDstDir)
+
+    FileUtils.remove_dir(TemplateDstDir, true)
+    files_processed = MasterView::TemplateWatcher.check_updated(@template_mio_tree, TemplateFilenamePattern) do |mio|
+      MasterView::Parser.parse_mio( mio, @output_mio_tree )
+    end
+
+    assert_equal [ TestSubjectFileShortName ], files_processed
+    assert File.exist?(TemplateDstDir+'/layouts/product.rhtml')
+    assert File.exist?(TemplateDstDir+'/product/_form.rhtml')
+    assert File.exist?(TemplateDstDir+'/product/edit.rhtml')
+    assert File.exist?(TemplateDstDir+'/product/list.rhtml')
+    assert File.exist?(TemplateDstDir+'/product/new.rhtml')
+    assert File.exist?(TemplateDstDir+'/product/show.rhtml')
+
+    STDOUT.puts "...files_processed [ #{files_processed.join(', ')} ]" if DEBUG_TRACE
+  end
+
+  def test_b_check_template_no_change
+    STDOUT.puts "\n========== test_b_check_template_no_change =============" if DEBUG_TRACE
+    STDOUT.puts "...#{TestSubjectFileShortName} template timestamp=#{File.mtime(TestSubjectFile)}" if DEBUG_TRACE
+
+    assert_equal true, File.directory?(TemplateDstDir)
+    files_processed = parse_changed_templates
+
+    assert_equal [], files_processed
+    STDOUT.puts "...files_processed [ #{files_processed.join(', ')} ]" if DEBUG_TRACE
+  end
+
+  def test_c_reparse_changed_template
+    STDOUT.puts "\n========== test_c_reparse_changed_template =============" if DEBUG_TRACE
+    STDOUT.puts "...#{TestSubjectFileShortName} template timestamp=#{File.mtime(TestSubjectFile)}" if DEBUG_TRACE
+
+    # touch gets permission-denied error on Win32, so work around
+    sleep 1 # make sure noticeable time passes
+    if RUBY_PLATFORM =~ /mswin32/
+      # re-copy the test fixture to get a new timestamp
+      STDOUT.puts "...forcing update of template #{TestSubjectFileShortName}" if DEBUG_TRACE
+      #FileUtils.copy TestFixtureFile, TestSubjectFile, :preserve => false
+      File.open( TestSubjectFile, 'a' ){ |file| file.write("\n          ") }
+    else
+      FileUtils.touch TestSubjectFile
+    end   
+    STDOUT.puts "...#{TestSubjectFileShortName} template timestamp=#{File.mtime(TestSubjectFile)}" if DEBUG_TRACE
+
+    files_processed = parse_changed_templates
+    assert_equal [ TestSubjectFileShortName ], files_processed
+    STDOUT.puts "...files_processed [ #{files_processed.join(', ')} ]" if DEBUG_TRACE
+  end
+
+  def parse_changed_templates
+    files_processed = MasterView::TemplateWatcher.check_updated(@template_mio_tree, TemplateFilenamePattern) do |mio|
+      MasterView::Parser.parse_mio( mio, @output_mio_tree )
+    end
+    files_processed
+  end
+
+end
+
+

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

@@ -2,12 +2,13 @@
 
 require 'test/unit'
 currentPath = File.dirname(__FILE__)
-require File.join( currentPath, '../lib/masterview' )
+require File.join( currentPath, '../../lib/masterview' )
 
 class TestTemplateSpec < Test::Unit::TestCase
   CurrentPath = File.dirname(__FILE__)
-  MasterViewHTMLFile = File.join(CurrentPath, '../examples/product.html')
-  MasterViewHTMLImportFile = File.join(CurrentPath, '../examples/test.import')
+  TestFixturesDir = File.join(CurrentPath, '../fixtures/templates')
+  MasterViewHTMLFile = File.join(TestFixturesDir, 'product.html')
+  MasterViewHTMLImportFile = File.join(TestFixturesDir, 'test.import')
 
   def setup
   end
@@ -18,7 +19,7 @@ class TestTemplateSpec < Test::Unit::TestCase
       <html mv:generate="layout/foo.rhtml">
         <body>
           <div mv:generate="bar/baz.rhtml">
-            <div mv:gen_render=":partial => 'cat/foo'">
+            <div mv:gen_partial=":partial => 'cat/foo'">
               Hello
             </div>
           </div>
@@ -38,7 +39,7 @@ class TestTemplateSpec < Test::Unit::TestCase
         </breakthisxhtml>
         <body>
           <div mv:generate="bar/baz.rhtml">
-            <div mv:gen_render=":partial => 'cat/foo'">
+            <div mv:gen_partial=":partial => 'cat/foo'">
               Hello
             </div>
           </div>
@@ -57,7 +58,7 @@ class TestTemplateSpec < Test::Unit::TestCase
       <html mv:generate="layout/foo.rhtml">
         <body>
           <div mv:generate="bar/baz.rhtml">
-            <div mv:gen_render=":partial => 'cat/foo'">
+            <div mv:gen_partial=":partial => 'cat/foo'">
               Hello
             </div>
           </div>
@@ -69,7 +70,7 @@ class TestTemplateSpec < Test::Unit::TestCase
       <html mv:generate="layout/foo.rhtml">
         <body>
           <div mv:import="bar/baz.rhtml">
-            <div mv:gen_render=":partial => 'cat/foo'">
+            <div mv:gen_partial=":partial => 'cat/foo'">
               Hello
             </div>
           </div>
@@ -100,7 +101,7 @@ class TestTemplateSpec < Test::Unit::TestCase
       <html mv:generate="layout/foo.rhtml">
         <body>
           <div mv:generate="bar/baz.rhtml">
-            <div mv:gen_render=":partial => 'cat/foo'">
+            <div mv:gen_partial=":partial => 'cat/foo'">
               Hello
             </div>
           </div>
@@ -109,14 +110,14 @@ class TestTemplateSpec < Test::Unit::TestCase
     END
     spec2 = MasterView::TemplateSpec.scan_template(template2, 'world', content_hash)
 
-    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template1, content_hash)
+    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template1, 'hello', content_hash)
     spec1.update_status_from_invalid_parts(invalid_parts)
     assert_equal [], invalid_parts
     assert_equal MasterView::TemplateSpec::Status::OK, spec1.status
     assert_equal '', spec1.message
     assert_equal [], spec1.gen_parts
 
-    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template2, content_hash)
+    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template2, 'world', content_hash)
     spec2.update_status_from_invalid_parts(invalid_parts)
     assert_equal [], invalid_parts
     assert_equal MasterView::TemplateSpec::Status::OK, spec2.status
@@ -143,7 +144,7 @@ class TestTemplateSpec < Test::Unit::TestCase
       <html mv:generate="layout/foo.rhtml">
         <body>
           <div mv:generate="bar/baz.rhtml">
-            <div mv:gen_render=":partial => 'cat/foo'">
+            <div mv:gen_partial=":partial => 'cat/foo'">
               Hello
             </div>
           </div>
@@ -152,14 +153,14 @@ class TestTemplateSpec < Test::Unit::TestCase
     END
     spec2 = MasterView::TemplateSpec.scan_template(template2, 'world', content_hash)
 
-    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template1, content_hash)
+    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template1, 'hello', content_hash)
     spec1.update_status_from_invalid_parts(invalid_parts)
     assert_equal %w{ cat/_foo.rhtml layout/foo.rhtml }, invalid_parts
     assert_equal MasterView::TemplateSpec::Status::ImportsOutdated, spec1.status
     assert_equal 'Outdated parts: cat/_foo.rhtml, layout/foo.rhtml', spec1.message
     assert_equal [], spec1.gen_parts
 
-    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template2, content_hash)
+    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template2, 'world', content_hash)
     spec2.update_status_from_invalid_parts(invalid_parts)
     assert_equal [], invalid_parts
     assert_equal MasterView::TemplateSpec::Status::OK, spec2.status
@@ -186,7 +187,7 @@ END
 <html mv:generate="layout/foo.rhtml">
   <body>
     <div mv:generate="bar/baz.rhtml">
-      <div mv:gen_render=":partial => 'cat/foo'">
+      <div mv:gen_partial=":partial => 'cat/foo'">
         Hello
       </div>
     </div>
@@ -195,7 +196,7 @@ END
 END
     spec2 = MasterView::TemplateSpec.scan_template(template2, 'world', content_hash)
 
-    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template1, content_hash)
+    invalid_parts = MasterView::TemplateSpec.template_out_of_sync?(template1, 'hello', content_hash)
     spec1.update_status_from_invalid_parts(invalid_parts)
     assert_equal %w{ cat/_foo.rhtml layout/foo.rhtml }, invalid_parts
     assert_equal MasterView::TemplateSpec::Status::ImportsOutdated, spec1.status
@@ -224,7 +225,7 @@ END
 <html mv:generate="layout/foo.rhtml">
   <body>
     <div mv:generate="foo/bar.rhtml">
-      <div mv:gen_render=":partial => 'foo/messages'">
+      <div mv:gen_partial=":partial => 'foo/messages'">
         Hello
       </div>
     </div>
@@ -250,7 +251,7 @@ END
 </html>
 END
 
-    src_path = 'foo_bar.html'
+    src_path = 'foo/bar.html'
     content_hash = {}
     template_spec_to_copy_from = MasterView::TemplateSpec.scan_template(source, src_path, content_hash) # setup content_hash since not getting from dir
     options = { :template_source => source, :content_hash => content_hash }
@@ -264,7 +265,7 @@ END
 <html mv:generate="layout/foo.rhtml">
   <body>
     <div mv:generate="foo/bar.rhtml">
-      <div mv:gen_render=":partial => 'foo/messages'">
+      <div mv:gen_partial=":partial => 'foo/messages'">
         Hello
       </div>
     </div>
@@ -290,7 +291,7 @@ END
 </html>
 END
 
-    src_path = 'app/views/masterview/foo_bar.html'
+    src_path = 'foo/bar.html'
     content_hash = {}
     template_spec_to_copy_from = MasterView::TemplateSpec.scan_template(source, src_path, content_hash) # setup content_hash since not getting from dir
     options = { :template_source => source, :content_hash => content_hash }
@@ -304,7 +305,7 @@ END
 <html mv:generate="layout/foo.rhtml">
   <body>
     <div mv:generate="foo/bar.rhtml">
-      <div mv:gen_render=":partial => 'foo/messages'">
+      <div mv:gen_partial=":partial => 'foo/messages'">
         Hello
       </div>
     </div>
@@ -330,7 +331,7 @@ END
 </html>
 END
 
-    src_path = 'foo_bar'
+    src_path = 'foo/bar'
     content_hash = {}
     template_spec_to_copy_from = MasterView::TemplateSpec.scan_template(source, src_path, content_hash) # setup content_hash since not getting from dir
     options = { :template_source => source, :content_hash => content_hash }
@@ -338,6 +339,41 @@ END
     assert_equal expected_result.strip, result
   end
 
+  def test_simple_html_no_mv_directives
+    source = <<-END
+      <html>
+        <body>
+          Hello
+        </body>
+      </html>
+    END
+    source.strip!
+    content_hash = {}
+    src_path = 'foo/bar'
+    template_spec = MasterView::TemplateSpec.scan_template(source, src_path, content_hash) # setup content_hash since not getting from dir
+    assert_equal MasterView::TemplateSpec::Status::OK, template_spec.status
+    assert_equal [], template_spec.build_list
+  end
+
+
+  def test_simple_html_one_mv_directive
+    source = <<-END
+      <html>
+        <body>
+           <div mv:generate="one/two.rhtml">
+              <two>world</two>
+           </div>
+        </body>
+      </html>
+    END
+    source.strip!
+    content_hash = {}
+    src_path = 'foo/bar'
+    template_spec = MasterView::TemplateSpec.scan_template(source, src_path, content_hash) # setup content_hash since not getting from dir
+    assert_equal MasterView::TemplateSpec::Status::OK, template_spec.status
+    assert_equal 1, template_spec.build_list.length
+    assert_equal 'one/two.rhtml', template_spec.build_list[0].name
+  end
 
 end