pathname2 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a45bf8835ded8326c6c8d0667803b5ddfc1ce513
-  data.tar.gz: bddb0aa47ca5a98b5e513d0203e1ed9b086d3ef5
+  metadata.gz: 8eca512f0553c41d9258bf2b4bb6e5fb8a0eac4e
+  data.tar.gz: 5e96c3fbd0a6be1644a8e567786e040529f2cef2
 SHA512:
-  metadata.gz: a86e59426f9e6c587859d464616d968671764581615e519775ee9f3150237c170eaeb7311999ddf557e2ebe55fed5d5a0220d967f386ca9be5e1677ab3982307
-  data.tar.gz: 2e8b806858a9c318e8b7704981208d848ffadf08d589bcdde4277ef409b8d49e39255b20b14667bb0e1cfa02780b133b63107a4406d2bf1572ad7c9fb6dcb2c2
+  metadata.gz: 90f5e288f86becab946179f1e2270bfb642cd267ea487cf31b4f617304912377da722e1196d324e1f408d0af2836d156a78e2711428abcfaed71338338b7d5ac
+  data.tar.gz: 982627ffc369693216c45d976f7ff6a76572aa83a973e601cd5ceb5c534fd27a3bef2e7f99425bcdcf3654017a34c2b1d4ff0898fa2d487845bb21ab48613d4e

data/CHANGES

@@ -1,3 +1,6 @@
+== 1.7.2 - 23-Apr-2014
+* The join and expand_path methods now return Pathname objects.
+
 == 1.7.1 - 28-Mar-2014
 * Updated gemspec for Windows vs Unix.
 * Updated README and MANIFEST.

data/README

@@ -14,8 +14,8 @@
   require 'pathname2'
 
   # Unix
-  path1 = "/foo/bar/baz"
-  path2 = "../zap"
+  path1 = Pathname.new("/foo/bar/baz")
+  path2 = Pathname.new("../zap")
 
   path1 + path2 # "/foo/bar/zap"
   path1 / path2 # "/foo/bar/zap" (same as +)
@@ -24,8 +24,8 @@
   path1.to_a    # ['foo','bar','baz']
 
   # Windows
-  path1 = "C:/foo/bar/baz"
-  path2 = "../zap"
+  path1 = Pathname.new("C:/foo/bar/baz")
+  path2 = Pathname.new("../zap")
 
   path1 + path2 # "C:\\foo\\bar\\zap"
   path1.root    # "C:\\"

data/Rakefile

@@ -132,6 +132,12 @@ namespace :test do
     t.verbose = true
     t.test_files = FileList["test/#{dir}/test_is_unc.rb"]
   end
+
+  Rake::TestTask.new(:join) do |t|
+    t.warning = true
+    t.verbose = true
+    t.test_files = FileList["test/#{dir}/test_join.rb"]
+  end
  
   Rake::TestTask.new(:long_path) do |t|
     t.warning = true

data/lib/pathname2.rb

@@ -93,7 +93,7 @@ class Pathname < String
   public
 
   # The version of the pathname2 library
-  VERSION = '1.7.1'
+  VERSION = '1.7.2'
 
   # The maximum length of a path
   MAXPATH = 1024 unless defined? MAXPATH # Yes, I willfully violate POSIX
@@ -813,6 +813,26 @@ class Pathname < String
     local_path
   end
 
+  # Joins the given pathnames onto +self+ to create a new Pathname object.
+  #
+  #  path = Pathname.new("C:/Users")
+  #  path = path.join("foo", "Downloads") # => C:/Users/foo/Downloads
+  #
+  def join(*args)
+    args.unshift self
+    result = args.pop
+    result = self.class.new(result) unless result === self.class
+    return result if result.absolute?
+
+    args.reverse_each{ |path|
+      path = self.class.new(path) unless path === self.class
+      result = path + result
+      break if result.absolute?
+    }
+
+    result
+  end
+
   # A custom pretty printer
   def pretty_print(q)
     if File::ALT_SEPARATOR
@@ -972,12 +992,7 @@ class Pathname < String
 
   # File.expand_path
   def expand_path(*args)
-    File.expand_path(self, *args)
-  end
-
-  # File.join
-  def join(*args)
-    File.join(self, *args)
+    self.class.new(File.expand_path(self, *args))
   end
 
   #--

data/pathname2.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name        = 'pathname2'
-  spec.version     = '1.7.1'
+  spec.version     = '1.7.2'
   spec.author      = 'Daniel J. Berger'
   spec.license     = 'Artistic 2.0'
   spec.email       = 'djberg96@gmail.com'

data/test/test_version.rb

@@ -8,6 +8,6 @@ require 'test-unit'
 
 class TC_Pathname_Version < Test::Unit::TestCase
   test "version is set to expected value" do
-    assert_equal('1.7.1', Pathname::VERSION)
+    assert_equal('1.7.2', Pathname::VERSION)
   end
 end

data/test/windows/test_join.rb

@@ -0,0 +1,52 @@
+########################################################################
+# test_join.rb
+#
+# Test suite for the Pathname#join method.
+########################################################################
+require 'test-unit'
+require 'pathname2'
+
+class TC_Pathname_Join < Test::Unit::TestCase
+  def setup
+    @apath = Pathname.new("C:\\foo\\bar")
+    @rpath = Pathname.new("foo\\bar\\baz")
+  end
+
+  def assert_pathname_join(final, initial, *rest)
+    a = Pathname.new(final)
+    b = Pathname.new(initial)
+    assert_equal(a, b.join(*rest))
+  end
+
+  test "join method accepts one or more arguments" do
+    assert_nothing_raised{ @apath.join("foo") }
+    assert_nothing_raised{ @apath.join("foo", "bar") }
+    assert_nothing_raised{ @apath.join("foo", "bar", "baz") }
+  end
+
+  test "join method returns expected results when joining relative paths to an absolute path" do
+    assert_pathname_join("C:\\foo", "C:\\", "foo")
+    assert_pathname_join("C:\\foo\\bar", "C:\\foo", "bar")
+    assert_pathname_join("C:\\foo\\bar\\baz", "C:\\foo", "bar", "baz")
+  end
+
+  test "join method returns expected results when joining relative paths to a relative path" do
+    assert_pathname_join("foo\\bar", "foo", "bar")
+    assert_pathname_join("foo\\bar\\baz", "foo", "bar", "baz")
+  end
+
+  test "join method returns expected results when joining an absolute path to an absolute path" do
+    assert_pathname_join("D:\\", "C:\\", "D:\\")
+    assert_pathname_join("D:\\foo", "C:\\", "D:\\", "foo")
+    assert_pathname_join("D:\\", "C:\\", "foo", "bar", "D:\\")
+  end
+
+  test "join returns an instance of Pathname" do
+    assert_kind_of(Pathname, @apath.join("foo"))
+  end
+
+  def teardown
+    @apath = nil
+    @rpath = nil
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pathname2
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Daniel J. Berger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facade
@@ -94,6 +94,7 @@ files:
 - test/windows/test_is_relative.rb
 - test/windows/test_is_root.rb
 - test/windows/test_is_unc.rb
+- test/windows/test_join.rb
 - test/windows/test_long_path.rb
 - test/windows/test_misc.rb
 - test/windows/test_parent.rb