Changeset 25690

Timestamp:

12/02/08 17:37:21 (5 weeks ago)

Author:

miyagawa

Message:

Added Path::Class::File->ufile

Location:

lang/perl/Path-Class-URI/trunk

Files:

• lib/Path/Class/Unicode.pm (modified) (3 diffs)
• t/02_unicode.t (modified) (2 diffs)

lang/perl/Path-Class-URI/trunk/lib/Path/Class/Unicode.pm

@@ -19 +19 @@
 sub udir {
     __PACKAGE__->new(dir(@_));
+}
+
+sub Path::Class::File::ufile {
+    my $file = shift;
+    ufile(_decode_filename($file), @_);
+}
+
+sub Path::Class::Dir::udir {
+    my $dir = shift;
+    udir(_decode_filename($dir), @_);
 }
 
@@ -66 +76 @@
 our $encoding;
 
-sub stringify {
-    my $self = shift;
-
+sub init_encoding {
     unless ($encoding) {
         $encoding = 'utf-8';
@@ -79 +87 @@
         }
     }
+}
 
+sub stringify {
+    my $self = shift;
+    init_encoding();
     Encode::encode($encoding, $self->{path}->stringify);
+}
+
+sub _decode_filename {
+    init_encoding();
+    my $filename = shift;
+    Encode::decode($encoding, "$filename");
 }
 

lang/perl/Path-Class-URI/trunk/t/02_unicode.t

@@ -4 +4 @@
 use Path::Class;
 use Path::Class::Unicode;
-plan tests => 4 * blocks;
+plan tests => 5 * blocks;
 
 filters 'chomp', 'eval_str';
@@ -16 +16 @@
     is $f2, $f;
 
-    $Path::Class::Unicode::encoding = "utf-8";
-    is file($f2->stringify)->basename, $block->local_utf8;
+    {
+        local $Path::Class::Unicode::encoding = "utf-8";
+        is file($f2->stringify)->basename, $block->local_utf8;
 
-    $Path::Class::Unicode::encoding = "cp932";
-    is file($f2->stringify)->basename, $block->local_cp932;
+        local $Path::Class::Unicode::encoding = "cp932";
+        is file($f2->stringify)->basename, $block->local_cp932;
+    }
+
+    is file($f2->stringify)->ufile, $f;
 };