use console_commandline for parameter parsing

diff --git a/src/bdrem/Cli.php b/src/bdrem/Cli.php
index 21991610cf2dfcbe696dbe8a025d8f34f6a193d7..ec849f42cac05f8267326ed1c8d9efc52a8c2eef 100644 (file)
--- a/src/bdrem/Cli.php
+++ b/src/bdrem/Cli.php
@@ -5,33 +5,11 @@ class Cli extends UserInterface
 {
     protected function loadParameters()
     {
-        $params = $GLOBALS['argv'];
-        array_shift($params);
-        $storeInto = null;
-        foreach ($params as $param) {
-            if ($storeInto !== null) {
-                $this->config->$storeInto = (int)$param;
-                $storeInto = null;
-                continue;
-            }
+        $parser = parent::loadParameters();
+        //set default renderer to console
+        $parser->options['renderer']->default = 'console';
 
-            if ($param == '--days-after' || $param == '-a') {
-                $storeInto = 'daysAfter';
-                continue;
-            } else if ($param == '--days-before' || $param == '-b') {
-                $storeInto = 'daysBefore';
-                continue;
-            }
-            $storeInto = null;
-        }
-    }
-
-    protected function render($arEvents)
-    {
-        $r = new Renderer_Mail();
-        $r->config = $this->config;
-        $r->ansi = true;
-        echo $r->render($arEvents);
+        return $parser;
     }
 }
 ?>

diff --git a/src/bdrem/Renderer.php b/src/bdrem/Renderer.php
new file mode 100644 (file)
index 0000000..a8da7a1
--- /dev/null
+++ b/src/bdrem/Renderer.php
@@ -0,0 +1,18 @@
+<?php
+namespace bdrem;
+
+abstract class Renderer
+{
+    protected $httpContentType = null;
+
+    public function renderAndOutput($arEvents)
+    {
+        if (PHP_SAPI != 'cli' && $this->httpContentType !== null) {
+            header('Content-type: ' . $this->httpContentType);
+        }
+        echo $this->render($arEvents);
+    }
+
+    abstract public function render($arEvents);
+}
+?>

diff --git a/src/bdrem/Renderer/Console.php b/src/bdrem/Renderer/Console.php
index fc2174f72b73964c6a3c5761880a330dac30a92d..b4ef8a80380efef95493bddb028d5f5b7c0245c1 100644 (file)
--- a/src/bdrem/Renderer/Console.php
+++ b/src/bdrem/Renderer/Console.php
@@ -1,8 +1,10 @@
 <?php
 namespace bdrem;
 
-class Renderer_Console
+class Renderer_Console extends Renderer
 {
+    protected $httpContentType = 'text/plain; charset=utf-8';
+
     /**
      * Use ANSI color codes for output coloring
      *
@@ -17,6 +19,7 @@ class Renderer_Console
 
     public function render($arEvents)
     {
+        $this->loadConfig();
         if ($this->ansi) {
             $this->cc = new \Console_Color2();
         }
@@ -80,5 +83,12 @@ class Renderer_Console
         }
         return $data;
     }
+
+    protected function loadConfig()
+    {
+        if (isset($this->config->ansi)) {
+            $this->ansi = $this->config->ansi;
+        }
+    }
 }
 ?>

diff --git a/src/bdrem/Renderer/Html.php b/src/bdrem/Renderer/Html.php
index bb027d2eeca77ed9e32a8acd4a328255abf7bdf4..af48e0ea179da6cb5279995b525a6ab5395fa52b 100644 (file)
--- a/src/bdrem/Renderer/Html.php
+++ b/src/bdrem/Renderer/Html.php
@@ -1,8 +1,10 @@
 <?php
 namespace bdrem;
 
-class Renderer_Html
+class Renderer_Html extends Renderer
 {
+    protected $httpContentType = 'application/xhtml+xml; charset=utf-8';
+
     public function render($arEvents)
     {
         $tr = new Renderer_HtmlTable();

diff --git a/src/bdrem/Renderer/HtmlTable.php b/src/bdrem/Renderer/HtmlTable.php
index 574036fdb8c1fda9746313ce10f9e15f7bf73058..bcfa9fe0d3e893aaf506b557f1f18fc7e11a6a03 100644 (file)
--- a/src/bdrem/Renderer/HtmlTable.php
+++ b/src/bdrem/Renderer/HtmlTable.php
@@ -1,8 +1,10 @@
 <?php
 namespace bdrem;
 
-class Renderer_HtmlTable
+class Renderer_HtmlTable extends Renderer
 {
+    protected $httpContentType = 'text/html; charset=utf-8';
+
     public function render($arEvents)
     {
         $s = <<<HTM

diff --git a/src/bdrem/Renderer/Mail.php b/src/bdrem/Renderer/Mail.php
index eee8dec76242e918766156726c930e27d1488f80..4b1c8d7ae4cd5e186e5e327aa9baa9d48901ba44 100644 (file)
--- a/src/bdrem/Renderer/Mail.php
+++ b/src/bdrem/Renderer/Mail.php
@@ -3,7 +3,7 @@ namespace bdrem;
 
 require_once 'Mail/mime.php';
 
-class Renderer_Mail
+class Renderer_Mail extends Renderer
 {
     public function render($arEvents)
     {

diff --git a/src/bdrem/UserInterface.php b/src/bdrem/UserInterface.php
index cd1b7ccdd1f28c6219f18315a53df9400722e6fa..cd9f7024650c9707678d135c4de08f491b1fc154 100644 (file)
--- a/src/bdrem/UserInterface.php
+++ b/src/bdrem/UserInterface.php
@@ -13,7 +13,9 @@ abstract class UserInterface
         setlocale(LC_TIME, $this->config->locale);
         $source = $this->config->loadSource();
 
-        $this->loadParameters($this->config);
+        $parser = $this->loadParameters();
+        $this->parseParameters($parser);
+
         $arEvents = $source->getEvents(
             $this->config->date,
             $this->config->daysBefore, $this->config->daysAfter
@@ -24,8 +26,95 @@ abstract class UserInterface
 
     protected function loadParameters()
     {
+        $parser = new \Console_CommandLine();
+        $parser->description = 'Birthday reminder';
+        $parser->version = '0.1.0';
+
+        $parser->addOption(
+            'daysAfter',
+            array(
+                'short_name'  => '-a',
+                'long_name'   => '--days-after',
+                'description' => 'Show NUM days after date',
+                'help_name'   => 'NUM',
+                'action'      => 'StoreInt',
+                'default'     => $this->config->daysAfter,
+            )
+        );
+        $parser->addOption(
+            'daysBefore',
+            array(
+                'short_name'  => '-b',
+                'long_name'   => '--days-before',
+                'description' => 'Show NUM days before date',
+                'help_name'   => 'NUM',
+                'action'      => 'StoreInt',
+                'default'     => $this->config->daysBefore,
+            )
+        );
+        $parser->addOption(
+            'renderer',
+            array(
+                'short_name'  => '-r',
+                'long_name'   => '--renderer',
+                'description' => 'Output mode',
+                'action'      => 'StoreString',
+                'choices'     => array(
+                    'console',
+                    'html',
+                    'htmltable',
+                    'mail',
+                ),
+                'default'     => 'console',
+                'add_list_option' => true,
+            )
+        );
+        $parser->addOption(
+            'quiet',
+            array(
+                'short_name'  => '-q',
+                'long_name'   => '--quiet',
+                'description' => "Don't print status messages to stdout",
+                'action'      => 'StoreTrue'
+            )
+        );
+        return $parser;
+    }
+
+    protected function parseParameters($parser)
+    {
+        try {
+            $result = $parser->parse();
+            // do something with the result object
+            $this->config->daysAfter  = $result->options['daysAfter'];
+            $this->config->daysBefore = $result->options['daysBefore'];
+            $this->config->renderer   = $result->options['renderer'];
+            $this->config->quiet      = $result->options['quiet'];
+        } catch (\Exception $exc) {
+            $this->preRenderParameterError();
+            $parser->displayError($exc->getMessage());
+        }
     }
 
-    abstract protected function render($arEvents);
+    protected function render($arEvents)
+    {
+        $r = $this->getRenderer();
+        $r->config = $this->config;
+        $r->renderAndOutput($arEvents);
+    }
+
+    protected function getRenderer()
+    {
+        $renderer = ucfirst($this->config->renderer);
+        if ($renderer == 'Htmltable') {
+            $renderer = 'HtmlTable';
+        }
+        $class = '\\bdrem\\Renderer_' . $renderer;
+        return new $class();
+    }
+
+    protected function preRenderParameterError()
+    {
+    }
 }
 ?>
\ No newline at end of file

diff --git a/src/bdrem/Web.php b/src/bdrem/Web.php
index b076520d286a6bae795768e52c2733205a7ddb07..10120ec8b909af4245b26cd3c31f43ebb4ef6710 100644 (file)
--- a/src/bdrem/Web.php
+++ b/src/bdrem/Web.php
@@ -3,20 +3,18 @@ namespace bdrem;
 
 class Web extends UserInterface
 {
-    protected function render($arEvents)
+    protected function loadParameters()
     {
-        $r = new Renderer_Html();
-        echo $r->render($arEvents);
+        $parser = parent::loadParameters();
+        //set default renderer to html
+        $parser->options['renderer']->default = 'html';
+
+        return $parser;
     }
 
-    protected function loadParameters()
+    protected function preRenderParameterError()
     {
-        if (isset($_GET['daysBefore'])) {
-            $this->config->daysBefore = (int) $_GET['daysBefore'];
-        }
-        if (isset($_GET['daysAfter'])) {
-            $this->config->daysAfter = (int) $_GET['daysAfter'];
-        }
+        header('Content-type: text/plain; charset=utf-8');
     }
 }
 ?>

diff --git a/src/bdrem/WebText.php b/src/bdrem/WebText.php
index aaace51145f6cac202e215961f0810137ecb7b73..3587f702bfd9f41363499b102300206b157f093e 100644 (file)
--- a/src/bdrem/WebText.php
+++ b/src/bdrem/WebText.php
@@ -3,11 +3,13 @@ namespace bdrem;
 
 class WebText extends Web
 {
-    protected function render($arEvents)
+    protected function loadParameters()
     {
-        header('Content-type: text/plain; charset=utf-8');
-        $r = new Renderer_Console();
-        echo $r->render($arEvents);
+        $parser = parent::loadParameters();
+        //set default renderer to console
+        $parser->options['renderer']->default = 'console';
+
+        return $parser;
     }
 }
 ?>