diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/pathname.rb | 6 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Mon Dec 13 00:58:02 2004 Tanaka Akira <akr@m17n.org> + + * lib/pathname.rb (cleanpath_aggressive): make it private. + (cleanpath_conservative): ditto. + Suggested by Daniel Berger. [ruby-core:3914] + Sun Dec 12 21:32:14 2004 Nobuyoshi Nakada <nobu@ruby-lang.org> * test/ruby/test_super.rb (TestSuper#test_define_method): now methods diff --git a/lib/pathname.rb b/lib/pathname.rb index bd8afb081d..be1cb29b43 100644 --- a/lib/pathname.rb +++ b/lib/pathname.rb @@ -256,7 +256,7 @@ class Pathname # Clean the path simply by resolving and removing excess "." and ".." entries. # Nothing more, nothing less. # - def cleanpath_aggressive # :nodoc: + def cleanpath_aggressive # cleanpath_aggressive assumes: # * no symlink # * all pathname prefix contained in the pathname is existing directory @@ -282,8 +282,9 @@ class Pathname path << names.join('/') Pathname.new(path) end + private :cleanpath_aggressive - def cleanpath_conservative # :nodoc: + def cleanpath_conservative return Pathname.new('') if @path == '' names = @path.scan(%r{[^/]+}) last_dot = names.last == '.' @@ -301,6 +302,7 @@ class Pathname end Pathname.new(path) end + private :cleanpath_conservative # # Returns a real (absolute) pathname of +self+ in the actual filesystem. |