Updating examples in the tests

kevinkhill · Mar 10, 2016 · 1773c3f · 1773c3f
1 parent 553a253
commit 1773c3f
Show file tree

Hide file tree

Showing 14 changed files with 80 additions and 142 deletions.
diff --git a/tests/Examples/Charts/AreaChart.php b/tests/Examples/Charts/AreaChart.php
@@ -8,16 +8,7 @@
         $data->addRow(['2016-1-'.$a, rand(100,200), rand(100,200)]);
     }
 
-    $lava->AreaChart('Things!', $data, [
+    $lava->AreaChart($title, $data, [
         'width' => $width,
         'height' => $height
     ]);
-?>
-
-<html>
-    <head></head>
-    <body>
-        <div class="render" id="chart"></div>
-        <?= $lava->render('AreaChart', 'Things!', 'chart'); ?>
-    </body>
-</html>
diff --git a/tests/Examples/Charts/BarChart.php b/tests/Examples/Charts/BarChart.php
@@ -8,16 +8,7 @@
         ->addRow(array('Apples', rand(1000,5000)))
         ->addRow(array('Fish', rand(1000,5000)));
 
-  $lava->BarChart('Votes', $votes, [
+  $lava->BarChart($title, $votes, [
       'width' => $width,
       'height' => $height
   ]);
-?>
-
-<html>
-    <head></head>
-    <body>
-        <div class="render" id="chart"></div>
-        <?= $lava->render('BarChart', 'Votes', 'chart'); ?>
-    </body>
-</html>
diff --git a/tests/Examples/Charts/CalendarChart.php b/tests/Examples/Charts/CalendarChart.php
@@ -10,7 +10,7 @@
         }
     }
 
-    $lava->CalendarChart('Sales', $sales, [
+    $lava->CalendarChart($title, $sales, [
         'title' => 'Cars Sold',
         'width' => $width,
         'height' => $height,
@@ -33,12 +33,3 @@
             'colors' => ['black', 'green']
         ]
     ]);
-?>
-
-<html>
-    <head></head>
-    <body>
-        <div class="render" id="chart"></div>
-        <?= $lava->render('CalendarChart', 'Sales', 'chart'); ?>
-    </body>
-</html>
diff --git a/tests/Examples/Charts/ColumnChart.php b/tests/Examples/Charts/ColumnChart.php
@@ -9,7 +9,7 @@
              ->addRow(['2006', 660, 1120])
              ->addRow(['2007', 1030, 54]);
 
-    $lava->ColumnChart('Finances', $finances, [
+    $lava->ColumnChart($title, $finances, [
         'title' => 'Company Performance',
         'width' => $width,
         'height' => $height,
@@ -18,12 +18,3 @@
             'fontSize' => 14
         ]
     ]);
-?>
-
-<html>
-    <head></head>
-    <body>
-        <div class="render" id="chart"></div>
-        <?= $lava->render('ColumnChart', 'Finances', 'chart'); ?>
-    </body>
-</html>
diff --git a/tests/Examples/Charts/ComboChart.php b/tests/Examples/Charts/ComboChart.php
@@ -10,7 +10,7 @@
              ->addRow(['2012-1-1', 1250, 600, 1243])
              ->addRow(['2013-1-1', 1100, 550, 1462]);
 
-    $lava->ComboChart('Finances', $finances, [
+    $lava->ComboChart($title, $finances, [
         'title' => 'Company Performance',
         'width' => $width,
         'height' => $height,
@@ -29,12 +29,3 @@
             ]
         ]
     ]);
-?>
-
-<html>
-    <head></head>
-    <body>
-        <div class="render" id="chart"></div>
-        <?= $lava->render('ComboChart', 'Finances', 'chart'); ?>
-    </body>
-</html>
diff --git a/tests/Examples/Charts/Dashboard.php b/tests/Examples/Charts/Dashboard.php
@@ -12,7 +12,7 @@
         ['Margareth', 8]
     ]);
 
-    $pieChart = $lava->PieChart('Stuff', $data, [
+    $pieChart = $lava->PieChart($title, $data, [
         'width' => $width,
         'height' => $height,
         'chartArea' => [
@@ -28,19 +28,9 @@
             'labelStacking' => 'vertical'
         ]
     ]);
-    $control = $lava->ControlWrapper($filter, 'control-div-id');
-    $chart   = $lava->ChartWrapper($pieChart, 'chart-div-id');
-    $dash    = $lava->Dashboard('Donuts')
-                    ->bind($control, $chart);
-?>
 
-<html>
-    <head></head>
-    <body>
-        <div class="render" id="dashboard-div-id">
-            <div id="chart-div-id"></div>
-            <div id="control-div-id"></div>
-        </div>
-        <?= $lava->render('Dashboard', 'Donuts', 'dashboard-div-id'); ?>
-    </body>
-</html>
+    $controlWrap = $lava->ControlWrapper($filter, 'control-div-id');
+    $chartWrap   = $lava->ChartWrapper($pieChart, 'chart-div-id');
+
+    $dash = $lava->Dashboard('MyDashboard')
+                 ->bind($controlWrap, $chartWrap);
diff --git a/tests/Examples/Charts/DonutChart.php b/tests/Examples/Charts/DonutChart.php
@@ -7,18 +7,8 @@
             ->addRow(['See Actors Other Work', 4])
             ->addRow(['Settle Argument', 89]);
 
-    $lava->DonutChart('IMDB', $reasons, [
+    $lava->DonutChart($title, $reasons, [
         'title'=>'Reasons I visit IMDB',
         'width' => $width,
         'height' => $height,
     ]);
-?>
-
-<html>
-    <head></head>
-    <body>
-        <div class="render" id="chart"></div>
-        <?= $lava->render('DonutChart', 'IMDB', 'chart'); ?>
-    </body>
-</html>
-
diff --git a/tests/Examples/Charts/GaugeChart.php b/tests/Examples/Charts/GaugeChart.php
@@ -6,7 +6,7 @@
           ->addRow(['Case', rand(0,100)])
           ->addRow(['Graphics', rand(0,100)]);
 
-    $lava->GaugeChart('Temps', $temps, [
+    $lava->GaugeChart($title, $temps, [
         'width' => $width,
         'height' => $height,
         'greenFrom' => 0,
@@ -20,12 +20,3 @@
             'Critical'
         ]
     ]);
-?>
-
-<html>
-    <head></head>
-    <body>
-        <div class="render" id="chart"></div>
-        <?= $lava->render('GaugeChart', 'Temps', 'chart'); ?>
-    </body>
-</html>
diff --git a/tests/Examples/Charts/GeoChart.php b/tests/Examples/Charts/GeoChart.php
@@ -9,16 +9,7 @@
                ->addRow(['France', 600])
                ->addRow(['RU', 700]);
 
-    $lava->GeoChart('Popularity', $popularity, [
+    $lava->GeoChart($title, $popularity, [
         'width' => $width,
         'height' => $height
     ]);
-?>
-
-<html>
-    <head></head>
-    <body>
-        <div class="render" id="chart"></div>
-        <?= $lava->render('GeoChart', 'Popularity', 'chart'); ?>
-    </body>
-</html>
diff --git a/tests/Examples/Charts/LineChart.php b/tests/Examples/Charts/LineChart.php
@@ -23,7 +23,7 @@
          ->addRow(['2014-10-17', 72, 66, 60])
          ->addRow(['2014-10-18', 63, 62, 62]);
 
-    $lava->LineChart('Temperature', $data, [
+    $lava->LineChart($title, $data, [
         'title' => 'Weather in October',
         'width' => $width,
         'height' => $height,
@@ -33,12 +33,3 @@
             'strokeWidth' => 8
         ]
     ]);
-?>
-
-<html>
-    <head></head>
-    <body>
-        <div class="render" id="chart"></div>
-        <?= $lava->render('LineChart', 'Temperature', 'chart'); ?>
-    </body>
-</html>
diff --git a/tests/Examples/Charts/PieChart.php b/tests/Examples/Charts/PieChart.php
@@ -7,7 +7,7 @@
             ->addRow(['See Actors Other Work', 4])
             ->addRow(['Settle Argument', 89]);
 
-    $lava->PieChart('IMDB', $reasons, [
+    $lava->PieChart($title, $reasons, [
         'title' => 'Reasons I visit IMDB',
         'width' => $width,
         'height' => $height,
@@ -18,14 +18,4 @@
             ['offset' => 0.3]
         ]
     ]);
-?>
-
-<html>
-    <head></head>
-    <body>
-        <div class="render" id="chart"></div>
-        <?= $lava->render('PieChart', 'IMDB', 'chart'); ?>
-    </body>
-</html>
-
 
diff --git a/tests/Examples/Charts/ScatterChart.php b/tests/Examples/Charts/ScatterChart.php
@@ -7,7 +7,7 @@
         $data->addRow([rand(20, 40), rand(100, 300)]);
     }
 
-    $lava->ScatterChart('AgeWeight', $data, [
+    $lava->ScatterChart($title, $data, [
         'title' => 'Age vs. Weight comparison',
         'width' => $width,
         'height' => $height,
@@ -25,12 +25,3 @@
             'position' => 'none'
         ]
     ]);
-?>
-
-<html>
-    <head></head>
-    <body>
-        <div class="render" id="chart"></div>
-        <?= $lava->render('ScatterChart', 'AgeWeight', 'chart'); ?>
-    </body>
-</html>
diff --git a/tests/Examples/Charts/TableChart.php b/tests/Examples/Charts/TableChart.php
@@ -12,16 +12,7 @@
              ['2015-4-1', 1030, null, null,  540]
          ]);
 
-    $lava->TableChart('Sales', $data, [
+    $lava->TableChart($title, $data, [
         'width' => $width,
         'height' => $height
     ]);
-?>
-
-<html>
-    <head></head>
-    <body>
-        <div class="render" id="chart"></div>
-        <?= $lava->render('TableChart', 'Sales', 'chart'); ?>
-    </body>
-</html>
diff --git a/tests/Examples/router.php b/tests/Examples/router.php
@@ -2,15 +2,73 @@
 
 require('../../vendor/autoload.php');
 
+$lava = new \Khill\Lavacharts\Lavacharts;
+
 if (preg_match('/\.(?:png|jpg|jpeg|gif)$/', $_SERVER["REQUEST_URI"])) {
     return false;    // serve the requested resource as-is.
 } else {
     $chart = trim($_SERVER["REQUEST_URI"], '/');
 
-    $lava = new \Khill\Lavacharts\Lavacharts;
+    if ($chart !== "") {
+        $width  = 600;
+        $height = (int) floor($width*(6/19));
 
-    $width  = 900;
-    $height = 400;
+        $title = 'My'.$chart;
+        $id = strtolower($chart);
 
-    require_once(__DIR__ . '/Charts/' . $chart . '.php');
+        require_once(__DIR__ . '/Charts/' . $chart . '.php');
+    }
 }
+?>
+
+<html>
+    <head>
+        <title>Lavacharts Test</title>
+        <style type="text/css">
+            #logo{text-align:center}
+            #lavachart{width:99%}
+            .grey{background-color:#f3f3f3;border:1px solid #666}
+        </style>
+    </head>
+    <body>
+        <div id="logo">
+            <img src="data:image/gif;base64,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"/>
+        </div>
+<?php
+        if ($chart !== "") {
+?>
+            <h1><?= $chart ?></h1>
+            <div id="lavachart">
+                <? if ($chart == 'Dashboard') { ?>
+                    <div id="chart-div-id"></div>
+                    <div id="control-div-id"></div>
+                <? } ?>
+            </div>
+            <h1>Code</h1>
+            <pre class="grey">
+            <?php
+                $file = file_get_contents(__DIR__ . '/Charts/' . $chart . '.php');
+                echo ltrim($file, '<?php');
+            ?>
+            </pre>
+<?php
+            echo $lava->render($chart, $title, 'lavachart');
+        } else {
+            echo '<h1>Supported Charts</h1>';
+            echo '<ul>';
+
+            $refObj = new \ReflectionClass($lava);
+            $refProp = $refObj->getProperty('chartClasses');
+            $refProp->setAccessible(true);
+
+            $charts = $refProp->getValue($lava);
+
+            foreach ($charts as $chart) {
+                echo sprintf('<li><a href="%1$s">%1$s</a></li>', $chart);
+            }
+            echo '</ul>';
+            echo '<ul><li><a href="Dashboard">Dashboard</a></li></ul>';
+        }
+?>
+    </body>
+</html>