win32-file 0.6.5 → 0.6.6

data/CHANGES

@@ -1,3 +1,8 @@
+== 0.6.6 - 3-Sep-2010
+* Fixed a bug in the custom File.dirname where trailing slashes were
+  affecting the result. Trailing slashes are now ignored.
+* Added a global test task and a default rake task. Both run all tests.
+
 == 0.6.5 - 19-Jul-2010
 * Removed debug print statement (oops!).
 

data/Rakefile

@@ -66,3 +66,6 @@ namespace 'test' do
     t.test_files = FileList['test/test_win32_file_stat.rb']
   end
 end
+
+task :test => ['test:all']
+task :default => ['test:all']

data/lib/win32/file.rb

@@ -19,7 +19,7 @@ class File
   extend Windows::Handle
    
   # The version of the win32-file library
-  WIN32_FILE_VERSION = '0.6.5'
+  WIN32_FILE_VERSION = '0.6.6'
 
   # Abbreviated attribute constants for convenience
 
@@ -514,6 +514,11 @@ class File
     #
     def dirname(file)
       raise TypeError unless file.is_a?(String)
+
+      # Short circuit for empty paths
+      return '.' if file.empty?
+
+      # Temporarily convert to wide-byte
       file = multi_to_wide(file)
 
       # Convert slashes to backslashes for the Windows API functions
@@ -521,10 +526,16 @@ class File
          
       # Return a root path as-is.
       return wide_to_multi(file) if PathIsRootW(file)
-       
-      # Remove trailing file name and backslash, if present
+
+      # Remove trailing slashes if present
+      while result = PathRemoveBackslashW(file)
+        break unless result.empty?
+      end
+
+      # Remove trailing file name if present
       PathRemoveFileSpecW(file)
 
+      # Return to multi-byte
       file = wide_to_multi(file)
        
       # Empty paths, short relative paths

data/test/test_win32_file_attributes.rb

@@ -26,7 +26,7 @@ class TC_Win32_File_Attributes < Test::Unit::TestCase
    end
 
    def test_version
-      assert_equal('0.6.5', File::WIN32_FILE_VERSION)
+      assert_equal('0.6.6', File::WIN32_FILE_VERSION)
    end
    
    def test_is_directory

data/test/test_win32_file_path.rb

@@ -133,9 +133,8 @@ class TC_Win32_File_Path < Test::Unit::TestCase
   test "dirname handles various edge cases as expected" do
     assert_equal(".", File.dirname(""))
     assert_equal(".", File.dirname("."))
-    assert_equal(".", File.dirname("."))
+    assert_equal(".", File.dirname(".."))
     assert_equal(".", File.dirname("./"))
-    assert_raises(TypeError){ File.dirname(nil) }
   end
       
   test "dirname method does not modify its argument" do
@@ -143,7 +142,20 @@ class TC_Win32_File_Path < Test::Unit::TestCase
     assert_nothing_raised{ File.dirname(path) }
     assert_equal("C:\\foo\\bar", path)
   end
-   
+
+  test "dirname method ignores trailing slashes" do
+    assert_equal("C:\\foo\\bar", File.dirname("C:/foo/bar/baz/"))
+    assert_equal("C:\\foo\\bar", File.dirname("C:/foo/bar/baz//"))
+    assert_equal("C:\\foo\\bar", File.dirname("C:/foo/bar/baz///"))
+    assert_equal("C:\\foo\\bar", File.dirname("C:\\foo\\bar\\baz\\"))
+    assert_equal("\\\\foo\\bar", File.dirname("\\\\foo\\bar\\baz\\"))
+  end
+
+  test "argument to dirname must be a string" do
+    assert_raises(TypeError){ File.dirname(nil) }
+    assert_raises(TypeError){ File.dirname(['foo', 'bar']) }
+  end
+
   test "split method basic functionality" do
     assert_respond_to(File, :split)
     assert_nothing_raised{ File.split("C:\\foo\\bar") }

data/win32-file.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'win32-file'
-  spec.version    = '0.6.5'
+  spec.version    = '0.6.6'
   spec.authors    = ['Daniel J. Berger', 'Park Heesob']
   spec.license    = 'Artistic 2.0'
   spec.email      = 'djberg96@gmail.com'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Daniel J. Berger
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 -07:00
+date: 2010-09-03 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency