Improved tests

Author: mnapoli

README.md

@@ -75,7 +75,7 @@ $export = new SpreadsheetExporter();
 
 $modelBuilder->bind('companies', $companies);
 
-$export->export($modelBuilder->build('mapping.yml'), 'myFile.xslx');
+$export->export($modelBuilder->build(new YamlMappingReader('mapping.yml')), 'myFile.xslx');
 ```
 
 Here is a more complete example:
@@ -112,7 +112,7 @@ $modelBuilder->bindFunction('up', function($str) {
     return strtoupper($str);
 });
 
-$export->export($modelBuilder->build('mapping.yml'), 'myFile.xslx');
+$export->export($modelBuilder->build(new YamlMappingReader('mapping.yml')), 'myFile.xslx');
 ```
 
 ### File format

src/Xport/MappingReader/MappingReader.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Xport\MappingReader;
+
+use Xport\SpreadsheetModel\Parser\ParsingException;
+
+/**
+ * File reader
+ *
+ * @author Matthieu Napoli <matthieu@mnapoli.fr>
+ */
+abstract class MappingReader
+{
+    /**
+     * @throws ParsingException
+     * @return array
+     */
+    abstract public function getMapping();
+}

src/Xport/MappingReader/YamlMappingReader.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Xport\MappingReader;
+
+use Symfony\Component\Yaml\Yaml;
+use Xport\SpreadsheetModel\Parser\ParsingException;
+
+/**
+ * YAML file reader
+ *
+ * @author Matthieu Napoli <matthieu@mnapoli.fr>
+ */
+class YamlMappingReader extends MappingReader
+{
+    /**
+     * @var string
+     */
+    protected $fileName;
+
+    /**
+     * @param string $fileName
+     * @throws \InvalidArgumentException File not found or not readable
+     */
+    public function __construct($fileName)
+    {
+        if (!file_exists($fileName) || !is_readable($fileName)) {
+            throw new \InvalidArgumentException("The file '$fileName' has not been found or is not readable");
+        }
+        $this->fileName = $fileName;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getMapping()
+    {
+        try {
+            return Yaml::parse($this->fileName);
+        } catch (\Exception $e) {
+            throw new ParsingException($e->getMessage());
+        }
+    }
+}

src/Xport/SpreadsheetModelBuilder.php

@@ -4,10 +4,11 @@
 
 use Symfony\Component\PropertyAccess\PropertyAccess;
 use Symfony\Component\PropertyAccess\PropertyAccessor;
-use Symfony\Component\Yaml\Parser;
+use Xport\MappingReader\MappingReader;
 use Xport\SpreadsheetModel\Cell;
 use Xport\SpreadsheetModel\Column;
 use Xport\SpreadsheetModel\Parser\ForEachParser;
+use Xport\SpreadsheetModel\Parser\ParsingException;
 use Xport\SpreadsheetModel\Parser\Scope;
 use Xport\SpreadsheetModel\Parser\TwigParser;
 use Xport\SpreadsheetModel\SpreadsheetModel;
@@ -61,18 +62,14 @@ public function bind($name, $value)
     /**
      * Build a model.
      *
-     * @param $mappingFile
+     * @param MappingReader $mappingReader
+     * @throws ParsingException
      * @return SpreadsheetModel
      */
-    public function build($mappingFile)
+    public function build(MappingReader $mappingReader)
     {
-        $yaml = file_get_contents($mappingFile);
-
-        $yamlReader = new Parser();
-        $yamlStructure = $yamlReader->parse($yaml);
-
         $model = new SpreadsheetModel();
-        $this->parseRoot($model, $yamlStructure, $this->scope);
+        $this->parseRoot($model, $mappingReader->getMapping(), $this->scope);
 
         return $model;
     }
@@ -153,10 +150,10 @@ private function parseTables(Sheet $sheet, $yamlSheet, Scope $sheetScope)
     private function parseTable(Sheet $sheet, $yamlTable, Scope $tableScope)
     {
         if (!isset($yamlTable) || !array_key_exists('columns', $yamlTable)) {
-            throw new \Exception("'table' must contain 'columns'");
+            throw new ParsingException("'table' must contain 'columns'");
         }
         if (!isset($yamlTable) || !array_key_exists('lines', $yamlTable)) {
-            throw new \Exception("'table' must contain 'lines'");
+            throw new ParsingException("'table' must contain 'lines'");
         }
 
         $table = new Table();

tests/XportTest/Fixtures/excel.yml renamed to tests/XportTest/Fixtures/mapping.yml

@@ -0,0 +1,54 @@
+<?php
+
+namespace XportTest;
+
+use Xport\MappingReader\YamlMappingReader;
+use Xport\SpreadsheetModel\SpreadsheetModel;
+use Xport\SpreadsheetModel\Sheet;
+use Xport\SpreadsheetModelBuilder;
+
+class FunctionalTest extends \PHPUnit_Framework_TestCase
+{
+    public function testSpreadsheetModelBuilder()
+    {
+        $modelBuilder = new SpreadsheetModelBuilder();
+
+        $cells = [];
+
+        $cell1 = new \stdClass();
+        $cell1->name = 'Foo';
+        $inputSet11 = new \stdClass();
+        $input111 = new \stdClass();
+        $input111->value = 10;
+        $input111->uncertainty = 0.15;
+        $inputSet11->inputs = [$input111];
+        $cell1->inputSets = [$inputSet11];
+        $cells[] = $cell1;
+
+        $cell2 = new \stdClass();
+        $cell2->name = 'Bar';
+        $cell2->inputSets = [];
+        $cells[] = $cell2;
+
+        $modelBuilder->bind('cells', $cells);
+
+        /** @var SpreadsheetModel $result */
+        $result = $modelBuilder->build(new YamlMappingReader(__DIR__ . '/Fixtures/mapping.yml'));
+
+        $this->assertTrue($result instanceof SpreadsheetModel);
+        $this->assertCount(2, $result->getSheets());
+
+        foreach ($result->getSheets() as $sheet) {
+            $this->assertTrue($sheet instanceof Sheet);
+        }
+
+        $sheet = $result->getSheets()[0];
+        $this->assertEquals('1 - Foo', $sheet->getLabel());
+        $this->assertCount(1, $sheet->getTables());
+
+        $table = $sheet->getTables()[0];
+        $this->assertCount(1, $table->getLines());
+        $this->assertCount(2, $table->getColumns());
+        $this->assertCount(2, $table->getCells());
+    }
+}