lib/rio/rl/pathmethods.rb in rio-0.5.1 vs lib/rio/rl/pathmethods.rb in rio-0.6.0

- old
+ new

@@ -1,8 +1,8 @@ #-- # =========================================================================== -# Copyright (c) 2005-2012 Christopher Kleckner +# Copyright (c) 2005-2017 Christopher Kleckner # All rights reserved # # This file is part of the Rio library for ruby. # # Rio is free software; you can redistribute it and/or modify @@ -81,11 +81,10 @@ end def merge(other) self.class.new(uri.merge(other.uri)) end def calc_abs_uri_(path_str,base_str) - #p path_str,base_str path = URI(path_str) return path unless base_str if path_str[0,1] != '/' and base_str[0,1] == '/' abs_str = [base_str,path_str].join('/').squeeze('/') return URI(abs_str) @@ -96,10 +95,9 @@ end def dirname() ::File.dirname(self.path_no_slash) end - end end end