From 4627c5a19bca043c2e35aa84df68e133e0009530 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 12 Dec 2004 16:04:31 +0000 Subject: [PATCH] * lib/pathname.rb (cleanpath_aggressive): make it private. (cleanpath_conservative): ditto. Suggested by Daniel Berger. [ruby-core:3914] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/pathname.rb | 6 ++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index a40e5b560f..6f55ba7fdd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Mon Dec 13 00:58:02 2004 Tanaka Akira + + * 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 * 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.