Fix SlugWithDateParser & SlugWithOrderParser

spatie · May 31, 2018 · be7866c · be7866c
1 parent a2b9fa1
commit be7866c
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 6 deletions.
diff --git a/src/PathParsers/SlugParser.php b/src/PathParsers/SlugParser.php
@@ -8,6 +8,6 @@ class SlugParser implements PathParser
 {
     public function parse(string $path): array
     {
-        return ['slug' => pathinfo($path, PATHINFO_FILENAME)];
+        return ['slug' => explode('.', $path)[0]];
     }
 }
diff --git a/src/PathParsers/SlugWithDateParser.php b/src/PathParsers/SlugWithDateParser.php
@@ -9,11 +9,15 @@ class SlugWithDateParser implements PathParser
 {
     public function parse(string $path): array
     {
-        [$date, $slug] = explode('.', $path);
+        $parts = explode('/', $path);
+
+        $filename = array_pop($parts);
+
+        [$date, $slug] = explode('.', $filename);
 
         return [
             'date' => Carbon::parse($date),
-            'slug' => $slug ?? '',
+            'slug' => implode('/', array_merge($parts, [$slug])),
         ];
     }
 }
diff --git a/src/PathParsers/SlugWithOrderParser.php b/src/PathParsers/SlugWithOrderParser.php
@@ -8,11 +8,15 @@ class SlugWithOrderParser implements PathParser
 {
     public function parse(string $path): array
     {
-        [$order, $slug] = explode('.', $path);
+        $parts = explode('/', $path);
+
+        $filename = array_pop($parts);
+
+        [$order, $slug] = explode('.', $filename);
 
         return [
-            'order' => (int) $order,
-            'slug' => $slug ?? '',
+            'order' => $order,
+            'slug' => implode('/', array_merge($parts, [$slug])),
         ];
     }
 }
diff --git a/tests/PathParsers/SlugParserTest.php b/tests/PathParsers/SlugParserTest.php
@@ -14,4 +14,12 @@ public function it_extracts_a_slug_attribute_from_a_path()
 
         $this->assertEquals(['slug' => 'hello-world'], $slugParser->parse('hello-world.md'));
     }
+
+    /** @test */
+    public function it_extracts_a_slug_attribute_from_a_nested_path()
+    {
+        $slugParser = new SlugParser();
+
+        $this->assertEquals(['slug' => 'pages/hello-world'], $slugParser->parse('pages/hello-world.md'));
+    }
 }
diff --git a/tests/PathParsers/SlugWithDateParserTest.php b/tests/PathParsers/SlugWithDateParserTest.php
@@ -20,4 +20,17 @@ public function it_extracts_a_date_and_slug_attribute_from_a_path()
 
         $this->assertEquals($expected, $slugWithDateParser->parse('1992-02-01.hello-world.md'));
     }
+
+    /** @test */
+    public function it_extracts_a_date_and_slug_attribute_from_a_nested_path()
+    {
+        $slugWithDateParser = new SlugWithDateParser();
+
+        $expected = [
+            'date' => Carbon::parse('1992-02-01'),
+            'slug' => 'pages/hello-world',
+        ];
+
+        $this->assertEquals($expected, $slugWithDateParser->parse('pages/1992-02-01.hello-world.md'));
+    }
 }
diff --git a/tests/PathParsers/SlugWithOrderParserTest.php b/tests/PathParsers/SlugWithOrderParserTest.php
@@ -20,4 +20,17 @@ public function it_extracts_an_order_and_slug_attribute_from_a_path()
 
         $this->assertEquals($expected, $slugWithOrderParser->parse('1.hello-world.md'));
     }
+
+    /** @test */
+    public function it_extracts_an_order_and_slug_attribute_from_a_nested_path()
+    {
+        $slugWithOrderParser = new SlugWithOrderParser();
+
+        $expected = [
+            'order' => 1,
+            'slug' => 'pages/hello-world',
+        ];
+
+        $this->assertEquals($expected, $slugWithOrderParser->parse('pages/1.hello-world.md'));
+    }
 }