Merge pull request #4 from preprocess/refactor-for-new-plugin

Refactor for new plugin

.gitignore

@@ -1,2 +1,3 @@
+coverage
 vendor
 composer.lock

composer.json

@@ -3,27 +3,17 @@
     "name": "pre/collections",
     "license": "MIT",
     "require": {
-        "pre/plugin": "^0.7.3"
+        "pre/plugin": "^0.10.0"
     },
     "autoload": {
-        "files": [
-            "src/parsers.php"
-        ],
         "psr-4": {
-            "Pre\\Collections\\": "src"
+            "Pre\\Collections\\": "source"
         }
     },
     "require-dev": {
         "phpunit/phpunit": "^5.0|^6.0"
     },
-    "autoload-dev": {
-        "psr-4": {
-            "Pre\\Collections\\": "tests"
-        }
-    },
     "extra": {
-        "macros": [
-            "src/macros.yay"
-        ]
+        "macros": ["source/macros.yay"]
     }
 }

phpunit.xml

@@ -2,7 +2,7 @@
 <phpunit
     backupGlobals="false"
     backupStaticAttributes="false"
-    bootstrap="tests/bootstrap.php"
+    bootstrap="vendor/autoload.php"
     colors="true"
     convertErrorsToExceptions="true"
     convertNoticesToExceptions="true"
@@ -18,10 +18,7 @@
     </testsuites>
     <filter>
         <whitelist addUncoveredFilesFromWhitelist="true">
-            <directory suffix=".php">src</directory>
-            <exclude>
-                <file>src/parsers.php</file>
-            </exclude>
+            <directory suffix=".php">source</directory>
         </whitelist>
     </filter>
 </phpunit>

src/macros.yay → source/macros.yay

@@ -3,7 +3,7 @@
 macro ·recursion {
     ·chain(
         ·token("{"),
-        ·angle_layer()·values,
+        ·layer()·values,
         ·token("}"),
         ·token("="),
         ·_()·keys
@@ -48,7 +48,7 @@ macro ·recursion {
             )
         )·before,
         ·token("{"),
-        ·optional(·angle_layer())·values,
+        ·optional(·layer())·values,
         ·token("}"),
         ·_()·is_array,
         ·_()·is_not_array

tests/CollectionTest.php

@@ -1,10 +1,5 @@
 <?php
 
-namespace Pre\Collections;
-
-use ArrayIterator;
-use InvalidArgumentException;
-use Iterator;
 use PHPUnit\Framework\TestCase;
 use Pre\Collections\Collection;
 

tests/MacroTest.php

@@ -1,13 +1,42 @@
 <?php
 
-namespace Pre\Collections;
+use PHPUnit\Framework\TestCase;
 
-use Pre\Plugin\Testing\Runner;
-
-class MacroTest extends Runner
+class MacroTest extends TestCase
 {
-    protected function path(): string
+    /**
+     * @test
+     * @dataProvider specs
+     */
+    public function can_transform_code($from, $expected)
+    {
+        Pre\Plugin\addMacro(__DIR__ . "/../source/macros.yay");
+
+        $actual = Pre\plugin\format(Pre\Plugin\parse($this->format($from)));
+        $this->assertEquals($this->format($expected), $actual);
+    }
+
+    private function format($code)
     {
-        return __DIR__ . "/specs";
+        return "<?php\n\n" . trim($code) . "\n";
+    }
+
+    public static function specs()
+    {
+        $specs = [];
+
+        $files = [
+            __DIR__ . "/specs/collections.spec",
+        ];
+
+        foreach ($files as $file) {
+            $contents = file_get_contents($file);
+
+            foreach (explode("---", $contents) as $spec) {
+                array_push($specs, explode("~~~", $spec));
+            }
+        }
+
+        return $specs;
     }
 }

tests/specs/collections.spec

@@ -1,9 +1,3 @@
---DESCRIPTION--
-
-Test collections macros
-
---GIVEN--
-
 ({});
 
 [{}];
@@ -42,7 +36,7 @@ $d = {
 
 ["foo" => {"bar" => "baz"}]
 
---EXPECT--
+~~~
 
 ( (new \Pre\Collections\Collection()));