fixed composer dep

badges · Jun 30, 2014 · cbca156 · cbca156
1 parent 322dfbb
commit cbca156
Show file tree

Hide file tree

Showing 8 changed files with 92 additions and 33 deletions.
diff --git a/README.md b/README.md
@@ -46,6 +46,10 @@ Flush an image
     echo $poser->generate('license', 'MIT', '428F7E', 'svg');
     // or
     echo $poser->generateFromURI('license-MIT-428F7E.svg');
+    // or
+    $image = $poser->generate('license', 'MIT', '428F7E', 'svg');
+
+    echo $image->getFormat();
 ```
 
 ## Encoding

diff --git a/composer.json b/composer.json
@@ -23,7 +23,7 @@
         "psr-4": { "PUGX\\Poser\\": "src/" }
     },
     "require": {
-        "symfony/console": "dev-master"
+        "symfony/console": "~2"
     },
     "require-dev": {
         "phpspec/phpspec": "dev-master",

diff --git a/spec/PUGX/Poser/PoserSpec.php b/spec/PUGX/Poser/PoserSpec.php
@@ -40,20 +40,14 @@ function it_should_be_able_to_generate_an_svg_image_from_URI()
     public function getMatchers()
     {
         return array(
-            'beAValidSVGImage' => function($subject) {
-
-                    $regex = '/^<svg.*width="((.|\n)*)<\/svg>$/';
-                    $matches = array();
-
-                    return preg_match($regex, $subject, $matches, PREG_OFFSET_CAPTURE, 0);
-                },
-            'beAValidSVGImageContaining' => function($object, $subject, $status) {
+            'beAValidSVGImageContaining' => function($object, $subject, $status)
+             {
 
                     $regex = '/^<svg.*width="((.|\n)*)'.$subject.'((.|\n)*)'.$status.'((.|\n)*)<\/svg>$/';
                     $matches = array();
 
                     return preg_match($regex, $object, $matches, PREG_OFFSET_CAPTURE, 0);
-                },
+             },
         );
     }
 }
diff --git a/spec/PUGX/Poser/Render/SvgRenderSpec.php b/spec/PUGX/Poser/Render/SvgRenderSpec.php
@@ -30,15 +30,8 @@ public function getMatchers()
                     $regex = '/^<svg.*width="((.|\n)*)<\/svg>$/';
                     $matches = array();
 
-                    return preg_match($regex, $subject, $matches, PREG_OFFSET_CAPTURE, 0);
-                },
-            'beAValidSVGImageContaining' => function($object, $subject, $status) {
-
-                    $regex = '/^<svg.*width="((.|\n)*)'.$subject.'((.|\n)*)'.$status.'((.|\n)*)<\/svg>$/';
-                    $matches = array();
-
-                    return preg_match($regex, $object, $matches, PREG_OFFSET_CAPTURE, 0);
-                },
+                    return preg_match($regex, (string) $subject, $matches, PREG_OFFSET_CAPTURE, 0);
+            }
         );
     }
 } 
diff --git a/src/Image.php b/src/Image.php
@@ -0,0 +1,69 @@
+<?php
+
+/*
+ * This file is part of the badge-poser package.
+ *
+ * (c) PUGX <http://pugx.github.io/>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace PUGX\Poser;
+
+/**
+ * Class Image, an Image value Object
+ *
+ * @author Claudio D'Alicandro <[email protected]>
+ * @author Giulio De Donato <[email protected]>
+ */
+class Image
+{
+    /**
+     * @var string $content
+     */
+    private $content;
+    /**
+     * @var string $format
+     */
+    private $format;
+
+    /**
+     * @param string $content
+     * @param string $format
+     */
+    private function __construct($content, $format)
+    {
+        $this->content = $content;
+        $this->format = $format;
+    }
+
+    /**
+     * Returns the image content as binary string
+     */
+    public function __toString()
+    {
+        return $this->content;
+    }
+
+    /**
+     * Factory method
+     *
+     * @param string $content
+     * @param string $format
+     *
+     * @return Image
+     */
+    public static function createFromString($content, $format)
+    {
+        return new self($content, $format);
+    }
+
+    /**
+     * @return string
+     */
+    public function getFormat()
+    {
+        return $this->format;
+    }
+}
diff --git a/src/Poser.php b/src/Poser.php
@@ -33,7 +33,7 @@ public function __construct($renders)
      * @param $color
      * @param $format
      *
-     * @return string
+     * @return Image
      */
     public function generate($subject, $status, $color, $format)
     {
@@ -47,7 +47,7 @@ public function generate($subject, $status, $color, $format)
      * eg license-MIT-blue.svg or I_m-liuggio-yellow.svg.
      *
      * @param $string
-     * @return mixed
+     * @return Image
      */
     public function generateFromURI($string)
     {

diff --git a/src/Render/RenderInterface.php b/src/Render/RenderInterface.php
@@ -20,7 +20,7 @@ interface RenderInterface
      *
      * @param Badge $badge
      *
-     * @return string
+     * @return \PUGX\Poser\Image
      */
     public function render(Badge $badge);
 

diff --git a/src/Render/SvgRender.php b/src/Render/SvgRender.php
@@ -14,7 +14,7 @@
 use PUGX\Poser\Badge;
 use PUGX\Poser\Calculator\TextSizeCalculatorInterface;
 use PUGX\Poser\Calculator\GDTextSizeCalculator;
-
+use PUGX\Poser\Image;
 /**
  * Class SvgGenerator
  *
@@ -24,9 +24,9 @@
 class SvgRender implements RenderInterface
 {
     const VENDOR_COLOR            = '#555';
-
     private $textSizeCalculator;
-    private static $template = '<svg xmlns="http://www.w3.org/2000/svg" width="{{ totalWidth }}" height="18">
+    private static $template  = <<<EOF
+<svg xmlns="http://www.w3.org/2000/svg" width="{{ totalWidth }}" height="18">
     <linearGradient id="smooth" x2="0" y2="100%">
         <stop offset="0"  stop-color="#fff" stop-opacity=".7"/>
         <stop offset=".1" stop-color="#aaa" stop-opacity=".1"/>
@@ -43,7 +43,8 @@ class SvgRender implements RenderInterface
         <text x="{{ valueStartPosition }}" y="13" fill="#010101" fill-opacity=".3">{{ value }}</text>
         <text x="{{ valueStartPosition }}" y="12">{{ value }}</text>
     </g>
-</svg>';
+</svg>
+EOF;
 
     /**
      * Constructor.
@@ -78,15 +79,13 @@ public function render(Badge $badge)
         $parameters['vendorStartPosition'] = round($parameters['vendorWidth'] / 2, 1) + 1;
         $parameters['valueStartPosition']  = $parameters['vendorWidth'] + round($parameters['valueWidth'] / 2, 1) - 1;
 
-        return $this->renderSvg(self::$template, $parameters);
+        return $this->renderSvg(self::$template, $parameters, $badge->getFormat());
     }
 
     /**
-     * Render a badge.
-     *
-     * @param Badge $badge
+     * A list of all supported formats.
      *
-     * @return string
+     * @return array
      */
     public function supportedFormats()
     {
@@ -98,12 +97,12 @@ private function stringWidth($text)
         return $this->textSizeCalculator->calculateWidth($text);
     }
 
-    private function renderSvg($render, $parameters)
+    private function renderSvg($render, $parameters, $format)
     {
         foreach ($parameters as $key => $variable) {
             $render = str_replace(sprintf('{{ %s }}', $key), $variable, $render);
         }
 
-        return $render;
+        return Image::createFromString($render, $format);
     }
 }