rubypath 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: abb6c94466f483db24dffb93c4d1189f03b4185f
-  data.tar.gz: 990985cb06e27d114519e0e1a8d40f7959732e27
+  metadata.gz: 6df90ac78c9d807079619ae1314eae27e22a67e5
+  data.tar.gz: 16f3ec885b28ab92f6c0824e151eeed40068c71b
 SHA512:
-  metadata.gz: 553935c6bd6a3ff6d1a345d8748f696660cbd406ab34ed49177f0daafa6e975724aee217dcca59eadde17d65126e03daf2b7f889921479003b5d1640302637d3
-  data.tar.gz: 71ae0d548402827369e38368c7f13d298a0f6558ef4fe85e5304db22bb3c65514c2874897690db408ab6ab79293b76ea80cd603ad7c351d32b73ef3e1f3dfeee
+  metadata.gz: f40eabbf4d332f94fb182c784717feaf0ed4377e1db071493351a17a2580778bee42b1f99eb6c0f2fa3de8df3b028647ff8b655925ea54dcbfaa48543dd1be12
+  data.tar.gz: 235c60462c6bd7e0b1ed16e67be434f06efac87390082934b41afd773e1420122f0b33280a4cbd9108a64edf4f355e54a985ccce95faefb56a7108ebf6e6518e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changes
 
+## 0.3.2
+
+* Fix infinite loop bug in #relative_from
+* Fix handling of trailing slash in #cleanpath (and depended methods)
+
 ## 0.3.1
 
 * Fix missing require 'tmpdir' for using with mocked backend

data/lib/rubypath/path_operations.rb

@@ -82,8 +82,8 @@ class Path
   #
   # @return [Array<String>] File names.
   #
-  def components
-    each_component.to_a
+  def components(*args)
+    each_component(*args).to_a
   end
 
   # Converts a pathname to an absolute pathname. Given arguments will be
@@ -268,13 +268,15 @@ class Path
   def relative_from(base)
     base, path = Path(base).cleanpath, cleanpath
 
+    return Path '.' if base == path
+
     if (base.relative? && path.absolute?) || (base.absolute? && path.relative?)
       raise ArgumentError.new \
         "Different prefix: #{base.inspect} and #{path.inspect}"
     end
 
-    base, path = base.components, path.components
-    base.shift && path.shift while base.first == path.first
+    base, path = base.components(empty: true), path.components(empty: true)
+    base.shift && path.shift while base.first == path.first && !(base.empty? || path.empty?)
 
     Path(*((['..'] * base.size) + path))
   end
@@ -299,7 +301,11 @@ class Path
     if path == internal_path
       self
     else
-      Path path
+      if internal_path[-1] == Path.separator
+        Path path, ''
+      else
+        Path path
+      end
     end
   end
 end

data/lib/rubypath/version.rb

@@ -2,7 +2,7 @@ class Path
   module VERSION
     MAJOR = 0
     MINOR = 3
-    PATCH = 1
+    PATCH = 2
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.').freeze
 

data/spec/rubypath/path_operations_spec.rb

@@ -63,6 +63,11 @@ describe Path do
         let(:path) { Path 'path/to/../../opath/to/./../file.txt' }
         it { should eq 'opath/file.txt' }
       end
+
+      context 'with trailing slash' do
+        let(:path) { Path 'path/to/../../dir/' }
+        it { expect(subject.to_s).to eq 'dir/' }
+      end
     end
 
     describe_method :each_component do
@@ -104,6 +109,13 @@ describe Path do
 
       it { should be_a Array }
       it { should eq %w(path to templates index.html) }
+
+      context 'with should include leading empty components' do
+        let(:str) { 'path/to/dir/' }
+        subject { path.send described_method, empty: true }
+
+        it { should eq ['path', 'to', 'dir', ''] }
+      end
     end
 
     describe_method :dirname, aliases: [:parent] do
@@ -331,6 +343,26 @@ describe Path do
         let(:path) { Path '/path/one/two/six' }
         it { should eq 'six' }
       end
+
+      context 'with same path (I)' do
+        let(:base) { Path '/path/one/two/six'  }
+        let(:path) { Path '/path/one/two/six' }
+        it { should eq '.' }
+        it { expect(subject.to_s).to eq '.' }
+      end
+
+      context 'with same path (I)' do
+        let(:base) { Path '/'  }
+        let(:path) { Path '/' }
+        it { should eq '.' }
+        it { expect(subject.to_s).to eq '.' }
+      end
+
+      describe 'preserve trailing slash' do
+        let(:base) { Path('/blog/2014/06/my-blog-title-1/').dirname  }
+        let(:path) { Path '/blog/2014/07/another-blog-title/' }
+        it { expect(subject.to_s).to eq '../07/another-blog-title/' }
+      end
     end
 
     describe_method :ascend, aliases: [:each_ancestors] do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubypath
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-21 00:00:00.000000000 Z
+date: 2014-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler