masterview 0.3.2 → 0.3.3

data/lib/masterview/template_spec.rb

@@ -12,7 +12,7 @@ module MasterView
       Conflicts = 'Conflict(s)'
       InvalidXHTML = 'Invalid XHTML'
     end
-    
+
     def initialize(path = nil)
       @path = path
       @status = ''
@@ -20,7 +20,7 @@ module MasterView
       @gen_parts = []
       @build_list = []
     end
-    
+
     # get short base name of path
     def basename
       File.basename @path
@@ -69,7 +69,7 @@ module MasterView
     def self.scan_template(template, path, content_hash = {})
       template_spec = TemplateSpec.new(path)
       listener = MasterView::Analyzer::Listener.new( :template_pathname => Pathname.for_path(path) )
-      begin 
+      begin
         MasterView::Parser.parse( template, :rescue_exceptions => false, :listeners => [listener])
         template_spec.build_list = listener.list
         conflicts = content_hash.keys & listener.content.keys
@@ -105,7 +105,7 @@ module MasterView
       invalid
     end
 
-    # rebuild template updating all imports, returns the string contents, 
+    # rebuild template updating all imports, returns the string contents,
     # if options[:write_to_file] = true then it will write the contents to file if different and return true, if identical then returns false
     # otherwise this method returns the content of the template
     # raise error for any other problems. options[:backup] = true to make backup before rebuilding, uses MasterView::IOMgr.backup to determine
@@ -148,6 +148,24 @@ module MasterView
       IOMgr.backup.path(backup_path).write(contents_to_backup)
     end
 
+    # remove file
+    def remove_rhtml(options={})
+      removed = []
+      self.gen_parts.each do |gen_rhtml|
+        mio = IOMgr.erb.path(gen_rhtml)
+        if mio.exist?
+          mio.remove
+          removed << gen_rhtml
+        end
+      end
+      removed
+    end
+
+    # file exist?
+    def file_exist?
+      IOMgr.template.path(self.path).exist?
+    end
+
     # create empty shell file consisting of layout and a comment for where to insert new content, return contents
     def self.create_empty_shell(template_spec_to_copy, content_hash, content_to_insert, options = {} )
       from_spec = template_spec_to_copy
@@ -168,9 +186,9 @@ module MasterView
     class CreateShellERBValues
       attr_reader :controller_name, :action_name, :controller_file_name, :controller_view_dir_name
       def initialize(controller_name, action_name)
-        @controller_name = Inflector.underscore(Inflector.singularize(controller_name)) 
-        @action_name = Inflector.underscore(Inflector.singularize(action_name)) 
-        @controller_file_name = @controller_name 
+        @controller_name = Inflector.underscore(Inflector.singularize(controller_name))
+        @action_name = Inflector.underscore(Inflector.singularize(action_name))
+        @controller_file_name = @controller_name
         @controller_view_dir_name = @controller_file_name
       end
 
@@ -181,9 +199,9 @@ module MasterView
 
 
     # create empty shell file consisting of layout and a comment for where to insert new content. Use action_to_create
-    # to infer the destination name controller_action.html and to customize the inserted place holder. Pass the 
+    # to infer the destination name controller_action.html and to customize the inserted place holder. Pass the
     # empty insert erb (rhtml) content in which will be rendered with appropriate controller and action values.
-    # Valid options: 
+    # Valid options:
     #    :write_to_file => true (write to file and return filename, if false then simply return generated contents)
     #    :template_source => source_for_template (use this source instead of reading from file)
     #    :content_hash => use this content_hash, otherwise it will scan the masterview template directory to create content_hash

data/lib/masterview.rb

@@ -64,7 +64,7 @@ if should_run_initializer
 end
 
 #external requires
-require 'rexml/parsers/sax2parser_with_doctype_fix'
+require 'rexml/rexml'
 require 'rexml/sax2listener'
 require 'cgi'
 require 'fileutils'

data/test/tmp/dst/public/images/FOO.GIF

@@ -0,0 +1 @@
+testfile

data/test/tmp/dst/public/images/bar/baz.png

@@ -0,0 +1 @@
+updated

data/test/tmp/dst/public/images/blank.gif

@@ -0,0 +1 @@
+updated

data/test/tmp/dst/public/images/cat/dog/mouse.JPG

@@ -0,0 +1 @@
+testfile

data/test/tmp/dst/public/images/star.jpg

@@ -0,0 +1 @@
+testfile

data/test/tmp/dst/public/images/test.png

@@ -0,0 +1 @@
+testfile

data/test/tmp/dst/public/javascript/custom/script.js

@@ -0,0 +1 @@
+updated

data/test/tmp/dst/public/javascript/nested/custom/foo.js

@@ -0,0 +1 @@
+testfile

data/test/tmp/dst/public/javascript/prototype.js

@@ -0,0 +1 @@
+testfile

data/test/tmp/dst/public/javascript/scriptaculous.js

@@ -0,0 +1 @@
+testfile

data/test/tmp/dst/public/stylesheets/client/standard/great1.css

@@ -0,0 +1 @@
+updated

data/test/tmp/dst/public/stylesheets/custom/blue.css

@@ -0,0 +1 @@
+testfile

data/test/tmp/dst/public/stylesheets/style.css

@@ -0,0 +1 @@
+updated

data/test/tmp/src/css/client/standard/great1.css

@@ -0,0 +1 @@
+updated

data/test/tmp/src/css/custom/blue.css

@@ -0,0 +1 @@
+testfile

data/test/tmp/src/css/style.css

@@ -0,0 +1 @@
+updated

data/test/tmp/src/images/FOO.GIF

@@ -0,0 +1 @@
+testfile

data/test/tmp/src/images/bar/baz.png

@@ -0,0 +1 @@
+updated

data/test/tmp/src/images/blank.gif

@@ -0,0 +1 @@
+updated

data/test/tmp/src/images/cat/dog/mouse.JPG

@@ -0,0 +1 @@
+testfile

data/test/tmp/src/images/star.jpg

@@ -0,0 +1 @@
+testfile

data/test/tmp/src/images/test.png

@@ -0,0 +1 @@
+testfile

data/test/tmp/src/mixed/FOO.GIF

@@ -0,0 +1 @@
+testfile

data/test/tmp/src/mixed/bar/baz.png

@@ -0,0 +1 @@
+updated

data/test/tmp/src/mixed/blank.gif

@@ -0,0 +1 @@
+updated

data/test/tmp/src/mixed/cat/dog/mouse.JPG

@@ -0,0 +1 @@
+testfile

data/test/tmp/src/mixed/client/standard/great1.css

@@ -0,0 +1 @@
+updated

data/test/tmp/src/mixed/custom/blue.css

@@ -0,0 +1 @@
+testfile

data/test/tmp/src/mixed/custom/script.js

@@ -0,0 +1 @@
+updated

data/test/tmp/src/mixed/nested/custom/foo.js

@@ -0,0 +1 @@
+testfile

data/test/tmp/src/mixed/prototype.js

@@ -0,0 +1 @@
+testfile

data/test/tmp/src/mixed/scriptaculous.js

@@ -0,0 +1 @@
+testfile

data/test/tmp/src/mixed/star.jpg

@@ -0,0 +1 @@
+testfile

data/test/tmp/src/mixed/style.css

@@ -0,0 +1 @@
+updated

data/test/tmp/src/mixed/test.png

@@ -0,0 +1 @@
+testfile

data/test/tmp/src/scripts/custom/script.js

@@ -0,0 +1 @@
+updated

data/test/tmp/src/scripts/nested/custom/foo.js

@@ -0,0 +1 @@
+testfile

data/test/tmp/src/scripts/prototype.js

@@ -0,0 +1 @@
+testfile

data/test/tmp/src/scripts/scriptaculous.js

@@ -0,0 +1 @@
+testfile

data/test/unit/auto_copy_test.rb

@@ -0,0 +1,181 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+currentPath = File.dirname(__FILE__)
+require File.join( currentPath, '../../lib/masterview' )
+
+class TestAutoCopy < Test::Unit::TestCase
+
+  MVTestDir = File.expand_path( File.join(File.dirname(__FILE__), '..' ) )
+
+  ImageSrcDir = "#{MVTestDir}/tmp/src/images"
+  ImageDstDir = "#{MVTestDir}/tmp/dst/public/images"
+
+  CSSSrcDir = "#{MVTestDir}/tmp/src/css"
+  CSSDstDir = "#{MVTestDir}/tmp/dst/public/stylesheets"
+
+  JavascriptSrcDir = "#{MVTestDir}/tmp/src/scripts"
+  JavascriptDstDir = "#{MVTestDir}/tmp/dst/public/javascript"
+
+  AllDirs = [ImageSrcDir, ImageDstDir, CSSSrcDir, CSSDstDir, JavascriptSrcDir, JavascriptDstDir]
+  
+  ImageSrcMIO = MasterView::MIO::FileMIOTree.new(ImageSrcDir)
+  ImageDstMIO = MasterView::MIO::FileMIOTree.new(ImageDstDir)
+  
+  CSSSrcMIO = MasterView::MIO::FileMIOTree.new(CSSSrcDir)
+  CSSDstMIO = MasterView::MIO::FileMIOTree.new(CSSDstDir)
+  
+  JavascriptSrcMIO = MasterView::MIO::FileMIOTree.new(JavascriptSrcDir)
+  JavascriptDstMIO = MasterView::MIO::FileMIOTree.new(JavascriptDstDir)
+  
+  ImageFiles = ['blank.gif', 'star.jpg', 'test.png', 'FOO.GIF', 'bar/baz.png', 'cat/dog/mouse.JPG']
+  CSSFiles = ['style.css', 'custom/blue.css', 'client/standard/great1.css']
+  JavascriptFiles = ['prototype.js', 'scriptaculous.js', 'custom/script.js', 'nested/custom/foo.js']
+  
+  ModImageFiles = [ImageFiles[0], ImageFiles[4]]
+  ModCSSFiles = [CSSFiles[0], CSSFiles[2]]
+  ModJavascriptFiles = [JavascriptFiles[2]]
+  
+  MixedSrcDir = "#{MVTestDir}/tmp/src/mixed"
+  
+  
+  def setup
+    AllDirs.each do |dir| # clear out old tree, and insure that it exists
+      pathname = Pathname.new(dir)
+      pathname.rmtree if pathname.exist?
+      pathname.mkpath
+    end
+    
+    ImageFiles.each { |f| ImageSrcMIO.path(f).write('testfile') } # create each test file
+    CSSFiles.each { |f| CSSSrcMIO.path(f).write('testfile') } # create each test file
+    JavascriptFiles.each { |f| JavascriptSrcMIO.path(f).write('testfile') } # create each test file
+    
+    @image_auto_copy = MasterView::AutoCopy.new(ImageSrcMIO, ImageDstMIO)
+    @css_auto_copy = MasterView::AutoCopy.new(CSSSrcMIO, CSSDstMIO)
+    @javascript_auto_copy = MasterView::AutoCopy.new(JavascriptSrcMIO, JavascriptDstMIO)
+  end
+  
+
+#------------------------------------------------------------------------------
+# Test Cases
+#------------------------------------------------------------------------------
+
+  def test_instance_auto_copy_wildcarded
+    sleep(1) # make sure time (seconds) change before updating so timestamp will be different
+    copied_files = @image_auto_copy.copy_updated_files
+    assert_equal(ImageFiles.sort, copied_files.sort)
+    ModImageFiles.each { |f| ImageSrcMIO.path(f).write('updated') }
+    assert_equal(ModImageFiles.sort, @image_auto_copy.copy_updated_files.sort)
+
+    copied_files = @css_auto_copy.copy_updated_files
+    assert_equal(CSSFiles.sort, copied_files.sort)
+    ModCSSFiles.each { |f| CSSSrcMIO.path(f).write('updated') }
+    assert_equal(ModCSSFiles.sort, @css_auto_copy.copy_updated_files.sort)
+
+    copied_files = @javascript_auto_copy.copy_updated_files
+    assert_equal(JavascriptFiles.sort, copied_files.sort)
+    ModJavascriptFiles.each { |f| JavascriptSrcMIO.path(f).write('updated') }
+    assert_equal(ModJavascriptFiles.sort, @javascript_auto_copy.copy_updated_files.sort)
+  end
+  
+
+  def test_instance_auto_copy_pattern_specified
+    sleep(1) # make sure time (seconds) change before updating so timestamp will be different
+    @image_auto_copy = MasterView::AutoCopy.new(ImageSrcMIO, ImageDstMIO, ['*.gif', '*.jpg', '*.png', '*.GIF', '*.JPG'])
+    @css_auto_copy = MasterView::AutoCopy.new(CSSSrcMIO, CSSDstMIO, ['*.css'])
+    @javascript_auto_copy = MasterView::AutoCopy.new(JavascriptSrcMIO, JavascriptDstMIO, ['*.js'])
+    
+    copied_files = @image_auto_copy.copy_updated_files
+    assert_equal(ImageFiles.sort, copied_files.sort)
+    ModImageFiles.each { |f| ImageSrcMIO.path(f).write('updated') }
+    assert_equal(ModImageFiles.sort, @image_auto_copy.copy_updated_files.sort)
+
+    copied_files = @css_auto_copy.copy_updated_files
+    assert_equal(CSSFiles.sort, copied_files.sort)
+    ModCSSFiles.each { |f| CSSSrcMIO.path(f).write('updated') }
+    assert_equal(ModCSSFiles.sort, @css_auto_copy.copy_updated_files.sort)
+
+    copied_files = @javascript_auto_copy.copy_updated_files
+    assert_equal(JavascriptFiles.sort, copied_files.sort)
+    ModJavascriptFiles.each { |f| JavascriptSrcMIO.path(f).write('updated') }
+    assert_equal(ModJavascriptFiles.sort, @javascript_auto_copy.copy_updated_files.sort)
+  end
+  
+
+  def test_instance_mixed_files_copied_to_different_directories
+    mixedSourceMIO = MasterView::MIO::FileMIOTree.new(MixedSrcDir)
+    allFiles = ImageFiles+CSSFiles+JavascriptFiles
+    allFiles.each { |f| mixedSourceMIO.path(f).write('testfile') } # create each test file
+    sleep(1) # so timestamp will differ on update
+    @image_auto_copy = MasterView::AutoCopy.new(mixedSourceMIO, ImageDstMIO, ['*.gif', '*.jpg', '*.png', '*.GIF', '*.JPG'])
+    @css_auto_copy = MasterView::AutoCopy.new(mixedSourceMIO, CSSDstMIO, ['*.css'])
+    @javascript_auto_copy = MasterView::AutoCopy.new(mixedSourceMIO, JavascriptDstMIO, ['*.js'])
+    
+    copied_files = @image_auto_copy.copy_updated_files
+    assert_equal(ImageFiles.sort, copied_files.sort)
+    ModImageFiles.each { |f| mixedSourceMIO.path(f).write('updated') }
+    assert_equal(ModImageFiles.sort, @image_auto_copy.copy_updated_files.sort)
+
+    copied_files = @css_auto_copy.copy_updated_files
+    assert_equal(CSSFiles.sort, copied_files.sort)
+    ModCSSFiles.each { |f| mixedSourceMIO.path(f).write('updated') }
+    assert_equal(ModCSSFiles.sort, @css_auto_copy.copy_updated_files.sort)
+
+    copied_files = @javascript_auto_copy.copy_updated_files
+    assert_equal(JavascriptFiles.sort, copied_files.sort)
+    ModJavascriptFiles.each { |f| mixedSourceMIO.path(f).write('updated') }
+    assert_equal(ModJavascriptFiles.sort, @javascript_auto_copy.copy_updated_files.sort)
+  end
+  
+  def test_instance_auto_copy_pattern_lc_only
+    @image_auto_copy = MasterView::AutoCopy.new(ImageSrcMIO, ImageDstMIO, ['*.gif', '*.jpg', '*.png'])
+    copied_files = @image_auto_copy.copy_updated_files
+    assert_equal([ImageFiles[0], ImageFiles[1], ImageFiles[2], ImageFiles[4]].sort, copied_files.sort) # only lowercase ones copied
+  end
+
+  def test_instance_auto_copy_pattern_lc_only_symbol_extensions
+    symbol_extensions = [:gif, :jpg, :png]
+    filename_patterns = symbol_extensions.collect{ |s| "*.#{s.to_s}" }
+    @image_auto_copy = MasterView::AutoCopy.new(ImageSrcMIO, ImageDstMIO, filename_patterns)
+    copied_files = @image_auto_copy.copy_updated_files
+    assert_equal([ImageFiles[0], ImageFiles[1], ImageFiles[2], ImageFiles[4]].sort, copied_files.sort) # only lowercase ones copied
+  end
+
+  def test_registered_auto_copy
+    sleep(1) # make sure time (seconds) change before updating so timestamp will be different
+    MasterView::AutoCopy.clear_registrations
+    MasterView::AutoCopy.register(ImageSrcMIO, ImageDstMIO)
+    MasterView::AutoCopy.register(CSSSrcMIO, CSSDstMIO, ['*.css'])
+    MasterView::AutoCopy.register(JavascriptSrcMIO, JavascriptDstMIO)
+    expected_array_copied = ImageFiles+CSSFiles+JavascriptFiles
+    assert_equal(expected_array_copied.sort, MasterView::AutoCopy.copy_all_updated_files.sort)
+    
+    ModImageFiles.each { |f| ImageSrcMIO.path(f).write('updated') }
+    ModCSSFiles.each { |f| CSSSrcMIO.path(f).write('updated') }
+    ModJavascriptFiles.each { |f| JavascriptSrcMIO.path(f).write('updated') }
+    expected_array_copied = ModImageFiles+ModCSSFiles+ModJavascriptFiles
+    assert_equal(expected_array_copied.sort, MasterView::AutoCopy.copy_all_updated_files.sort)
+  end
+  
+  # test the clear, after clear will only copy the one set
+  def test_clear_registered_auto_copy
+    sleep(1) # make sure time (seconds) change before updating so timestamp will be different
+    MasterView::AutoCopy.clear_registrations
+    MasterView::AutoCopy.register(ImageSrcMIO, ImageDstMIO)
+    MasterView::AutoCopy.register(CSSSrcMIO, CSSDstMIO, ['*.css'])
+    MasterView::AutoCopy.register(JavascriptSrcMIO, JavascriptDstMIO)
+    expected_array_copied = ImageFiles+CSSFiles+JavascriptFiles
+    assert_equal(expected_array_copied.sort, MasterView::AutoCopy.copy_all_updated_files.sort)
+
+    
+    sleep(1) # make sure time (seconds) change before updating so timestamp will be different
+    MasterView::AutoCopy.clear_registrations
+    MasterView::AutoCopy.register(ImageSrcMIO, ImageDstMIO)
+    ImageFiles.each { |f| ImageSrcMIO.path(f).write('updated') }
+    CSSFiles.each { |f| CSSSrcMIO.path(f).write('updated') }
+    JavascriptFiles.each { |f| JavascriptSrcMIO.path(f).write('updated') }
+    expected_array_copied = ImageFiles # only the image files this time after clear and reset
+    assert_equal(expected_array_copied.sort, MasterView::AutoCopy.copy_all_updated_files.sort)
+  end
+  
+end

data/test/unit/directive_form_test.rb

@@ -55,4 +55,67 @@ class TestForm < Test::Unit::TestCase
     assert_equal "<%= form_tag( { :action => 'create' }, :method => \"POST\" ) %>", render_element_event(:stag)
   end
 
+  def test_put
+    create_template_element ELEMENT_TAG, :attributes => { 'method' => 'put' }
+    attr_value = ":action => 'update'"
+    create_directive Form, attr_value
+    assert_equal "<%= form_tag( { :action => 'update' }, :method => \"put\" ) %>", render_element_event(:stag)
+  end
+
+  def test_put_uppercase
+    create_template_element ELEMENT_TAG, :attributes => { 'method' => 'PUT' }
+    attr_value = ":action => 'update'"
+    create_directive Form, attr_value
+    assert_equal "<%= form_tag( { :action => 'update' }, :method => \"PUT\" ) %>", render_element_event(:stag)
+  end
+
+
+  def test_multipart_form
+    create_template_element ELEMENT_TAG, :attributes => { 'method' => 'post', 'enctype' => 'multipart/form-data' }
+    attr_value = ":action => 'create'"
+    create_directive Form, attr_value
+    assert_equal "<%= form_tag( { :action => 'create' }, :method => \"post\", :multipart => true ) %>", render_element_event(:stag)
+  end
+
+  def test_multipart_form_uppercase
+    create_template_element ELEMENT_TAG, :attributes => { 'method' => 'post', 'enctype' => 'MULTIPART/FORM-DATA' }
+    attr_value = ":action => 'create'"
+    create_directive Form, attr_value
+    assert_equal "<%= form_tag( { :action => 'create' }, :method => \"post\", :multipart => true ) %>", render_element_event(:stag)
+  end
+
+  # test for using string for action
+  def test_string_action
+    create_template_element ELEMENT_TAG
+    attr_value = "'/create'"
+    create_directive Form, attr_value
+    assert_equal "<%= form_tag( '/create' ) %>", render_element_event(:stag)
+    assert_equal "</form>", render_element_event(:etag)
+  end
+
+  def test_string_action2
+    create_template_element ELEMENT_TAG
+    attr_value = "'/create/foo'"
+    create_directive Form, attr_value
+    assert_equal "<%= form_tag( '/create/foo' ) %>", render_element_event(:stag)
+    assert_equal "</form>", render_element_event(:etag)
+  end
+
+  def test_string_action_get
+    create_template_element ELEMENT_TAG, :attributes => { 'method' => 'get' }
+    attr_value = "'/foo/create'"
+    create_directive Form, attr_value
+    assert_equal "<%= form_tag( '/foo/create', :method => \"get\" ) %>", render_element_event(:stag)
+  end
+
+  # test for using parameters
+  def test_params
+    create_template_element ELEMENT_TAG, :attributes => { 'method' => 'get' }
+    attr_value = "{:action => 'create'}, {}, foo, bar"
+    create_directive Form, attr_value
+    assert_equal "<%= form_tag( {:action => 'create'}, {:method => \"get\"}, foo, bar ) %>", render_element_event(:stag)
+  end
+
+
+
 end

data/test/unit/directive_stylesheet_link_test.rb

@@ -30,7 +30,7 @@ class StylesheetLinkTest < Test::Unit::TestCase
 
   def test_empty_infer_path
     link_tag = create_template_element ELEMENT_TAG,
-                      :attributes => { 'src' => '../../public/stylesheets/foo.css' }
+                      :attributes => { 'href' => '../../public/stylesheets/foo.css' }
     attr_value = ""
     create_directive StylesheetLink, attr_value
     assert_equal '', render_element_event(:stag)
@@ -40,7 +40,7 @@ class StylesheetLinkTest < Test::Unit::TestCase
 
   def test_empty_infer_path_sub
     link_tag = create_template_element ELEMENT_TAG,
-                      :attributes => { 'src' => '../../public/stylesheets/bar/foo.css' }
+                      :attributes => { 'href' => '../../public/stylesheets/bar/foo.css' }
     attr_value = ""
     create_directive StylesheetLink, attr_value
     assert_equal '', render_element_event(:stag)
@@ -50,7 +50,7 @@ class StylesheetLinkTest < Test::Unit::TestCase
 
   def test_empty_use_src
     link_tag = create_template_element ELEMENT_TAG,
-                      :attributes => { 'src' => '/mystylesheets/foo.css' }
+                      :attributes => { 'href' => '/mystylesheets/foo.css' }
     attr_value = ""
     create_directive StylesheetLink, attr_value
     assert_equal '', render_element_event(:stag)

data/test/unit/file_mio_test.rb

@@ -43,7 +43,7 @@ class TestFileMIO < Test::Unit::TestCase
 #------------------------------------------------------------------------------
 
   # ensure that sandbox limits writing to files outside of root path even if dot dot exists in path
-  def test_sandbox_dotdot 
+  def test_sandbox_dotdot
     assert_raise(InvalidIOPathError){ f = IOMgr.template.path( '../bad') }
     assert_raise(InvalidIOPathError){ f = IOMgr.template.path( 'bad/../dog/../../foo') }
     assert_raise(InvalidIOPathError){ f = IOMgr.template.path( 'bad/../../foo') }
@@ -97,8 +97,8 @@ class TestFileMIO < Test::Unit::TestCase
 
     file_content_changed = "foo\nbar"
     File.open( HelloWorldFullPath, 'w' ){ |file| file.write(file_content_changed) }
-    #verify_mio_handler_read( HelloWorldPath, file_content, IOMgr.template ) # still hitting cache #todo turn this on when caching is ready for testing   
-    verify_mio_handler_read_no_cache( HelloWorldPath, HelloWorldFullPath, file_content_changed, IOMgr.template )    
+    #verify_mio_handler_read( HelloWorldPath, file_content, IOMgr.template ) # still hitting cache #todo turn this on when caching is ready for testing
+    verify_mio_handler_read_no_cache( HelloWorldPath, HelloWorldFullPath, file_content_changed, IOMgr.template )
   end
 
   def test_write_string
@@ -130,7 +130,7 @@ class TestFileMIO < Test::Unit::TestCase
 
     file_content_strings = [ 'hello', 'world']
     file_content = file_content_strings.join('')
-    IOMgr.template.path( TestWritePath).write do |f| 
+    IOMgr.template.path( TestWritePath).write do |f|
       file_content_strings.each { |str| f.write(str) }
     end
     verify_mio_handler_read( TestWritePath, TestWriteFullPath, file_content, IOMgr.template )
@@ -158,6 +158,22 @@ class TestFileMIO < Test::Unit::TestCase
     assert_equal true, IOMgr.template.path( TestWritePath).exist?
   end
 
+  def test_remove
+    file_content = "foo"
+
+    TestFileMIOTemplatePathname.rmtree if TestFileMIOTemplatePathname.exist?
+    IOMgr.template.path( TestWritePath).write(file_content)
+    assert_equal true, IOMgr.template.path( TestWritePath).exist?
+    IOMgr.template.path(TestWritePath).remove
+    assert_equal false, IOMgr.template.path( TestWritePath).exist?
+  end
+
+  def test_remove_file_doesnt_exist
+    TestFileMIOTemplatePathname.rmtree if TestFileMIOTemplatePathname.exist?
+    assert_equal false, IOMgr.template.path( TestWritePath).exist?
+    assert_raise(Errno::ENOENT){ IOMgr.template.path(TestWritePath).remove }
+  end
+
   def test_identical
     file_content = "hello\nworld"
     file_content_foo = "foo"
@@ -243,7 +259,7 @@ class TestFileMIO < Test::Unit::TestCase
     assert_equal 'sub/two/baz.txt', found[2].pathname.to_s
   end
 
-  def test_findfiles_single_dir_pattern 
+  def test_findfiles_single_dir_pattern
     TestFileMIOTemplatePathname.rmtree if TestFileMIOTemplatePathname.exist?
     IOMgr.template.path( 'sub/two/apple.txt').write('foo')
     IOMgr.template.path( 'sub/two/bar.log').write('foo')
@@ -257,7 +273,7 @@ class TestFileMIO < Test::Unit::TestCase
     assert_equal 'sub/two/baz.txt', found[1].pathname.to_s
   end
 
-  def test_findfiles_multi_dir_root 
+  def test_findfiles_multi_dir_root
     TestFileMIOTemplatePathname.rmtree if TestFileMIOTemplatePathname.exist?
     IOMgr.template.path( 'one/two/three.txt').write('foo')
     IOMgr.template.path( 'sub/two/apple.txt').write('foo')
@@ -276,7 +292,7 @@ class TestFileMIO < Test::Unit::TestCase
     assert_equal 'sub/two/baz.txt', found[3].pathname.to_s
   end
 
-  def test_findfiles_multi_dir_pattern 
+  def test_findfiles_multi_dir_pattern
     TestFileMIOTemplatePathname.rmtree if TestFileMIOTemplatePathname.exist?
     IOMgr.template.path( 'one/two/three.txt').write('foo')
     IOMgr.template.path( 'sub/two/apple.txt').write('foo')
@@ -293,7 +309,7 @@ class TestFileMIO < Test::Unit::TestCase
     assert_equal 'sub/two/baz.txt', found[2].pathname.to_s
   end
 
-  def test_findfiles_multi_dir_pattern_deep 
+  def test_findfiles_multi_dir_pattern_deep
     TestFileMIOTemplatePathname.rmtree if TestFileMIOTemplatePathname.exist?
     IOMgr.template.path( 'one/two/three.txt').write('foo')
     IOMgr.template.path( 'sub/two/apple.txt').write('foo')

data/test/unit/mtime_string_hash_mio_tree_test.rb

@@ -133,8 +133,8 @@ class TestMTimeStringHashMIO < Test::Unit::TestCase
 
   def test_write_multi_block
     @template_hash.delete(TestWritePath)
-    IOMgr.template.path( TestWritePath).write do |f| 
-      f.write('hello') 
+    IOMgr.template.path( TestWritePath).write do |f|
+      f.write('hello')
       f.write('world')
     end
     assert_equal "helloworld", IOMgr.template.path( TestWritePath).read
@@ -154,6 +154,19 @@ class TestMTimeStringHashMIO < Test::Unit::TestCase
     assert_equal true, IOMgr.template.path( TestWritePath).exist?
   end
 
+  def test_remove
+    IOMgr.template.path( TestWritePath).write("foo")
+    assert_equal true, IOMgr.template.path( TestWritePath).exist?
+    IOMgr.template.path(TestWritePath).remove
+    assert_equal false, IOMgr.template.path( TestWritePath).exist?
+  end
+
+  def test_remove_file_doesnt_exist
+    @template_hash.clear
+    assert_equal false, IOMgr.template.path( TestWritePath).exist?
+    assert_nil(IOMgr.template.path(TestWritePath).remove)
+  end
+
   def test_identical
     @template_hash.clear
     assert_equal false, IOMgr.template.path( TestWritePath).identical?("hello\nworld")
@@ -209,7 +222,7 @@ class TestMTimeStringHashMIO < Test::Unit::TestCase
     assert_equal 'sub/two/baz.txt', found[2].pathname.to_s
   end
 
-  def test_findfiles_single_dir_pattern 
+  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')
@@ -222,7 +235,7 @@ class TestMTimeStringHashMIO < Test::Unit::TestCase
     assert_equal 'sub/two/baz.txt', found[1].pathname.to_s
   end
 
-  def test_findfiles_multi_dir_root 
+  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')
@@ -240,7 +253,7 @@ class TestMTimeStringHashMIO < Test::Unit::TestCase
     assert_equal 'sub/two/baz.txt', found[3].pathname.to_s
   end
 
-  def test_findfiles_multi_dir_pattern 
+  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')
@@ -256,7 +269,7 @@ class TestMTimeStringHashMIO < Test::Unit::TestCase
     assert_equal 'sub/two/baz.txt', found[2].pathname.to_s
   end
 
-  def test_findfiles_multi_dir_pattern_deep 
+  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')