Skip to content

Commit

Permalink
Merge pull request PUGX#16 from agiuliano/master
Browse files Browse the repository at this point in the history
as commit says "remove unused namespace"
  • Loading branch information
leopro committed May 30, 2013
2 parents ab25b83 + d2811d9 commit 340c90a
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 21 deletions.
23 changes: 3 additions & 20 deletions app/config/routing.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,4 @@
pugx_badge:
path: /{repository}/downloads.png
defaults: { _controller: PUGXBadgeBundle:Badge:downloads}
methods: [GET]
requirements:
repository: "[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?"

pugx_badge_stat:
path: /{repository}/d/{type}.png
defaults: { _controller: PUGXBadgeBundle:Badge:downloads, type: 'total' }
methods: [GET]
requirements:
type: total|daily|monthly
repository: "[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?"

pugx_badge_version:
path: /{repository}/version.png
defaults: { _controller: PUGXBadgeBundle:Badge:version }
methods: [GET]
requirements:
repository: "[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?"
resource: "@PUGXBadgeBundle/Controller/"
type: annotation
prefix: /
40 changes: 39 additions & 1 deletion src/PUGX/BadgeBundle/Controller/BadgeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,36 @@

use Symfony\Component\DependencyInjection\ContainerAware;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
use Symfony\Component\HttpFoundation\StreamedResponse;
use Symfony\Component\HttpFoundation\ResponseHeaderBag;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;

use PUGX\BadgeBundle\Service\ImageCreator;
use PUGX\BadgeBundle\Exception\InvalidArgumentException;

class BadgeController extends ContainerAware
{
/**
* @Route("/{repository}/downloads.png",
* name = "pugx_badge",
* requirements = {"repository" = "[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?"}
* )
* @Route("/{repository}/d/{type}.png",
* name = "pugx_badge_stat",
* defaults = {"type" = "total"},
* requirements = {
* "type" = "total|daily|monthly",
* "repository" = "[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?"
* }
* )
* @Method({"GET"})
*
* @param string $repository
* @param string $type
*
* @return StreamedResponse
*/
public function downloadsAction($repository, $type = 'total')
{
$imageCreator = $this->container->get('image_creator');
Expand All @@ -43,6 +64,17 @@ public function downloadsAction($repository, $type = 'total')
return $this->streamImage($image, $outputFilename);
}

/**
* @Route("/{repository}/version.png",
* name="pugx_badge_version",
* requirements={"repository" = "[A-Za-z0-9_.-]+/[A-Za-z0-9_.-]+?"}
* )
* @Method({"GET"})
*
* @param string $repository
*
* @return StreamedResponse
*/
public function versionAction($repository)
{
$imageCreator = $this->container->get('image_creator');
Expand All @@ -59,6 +91,12 @@ public function versionAction($repository)
return $this->streamImage($image, $outputFilename);
}

/**
* @param resource $image
* @param string $outputFilename
*
* @return StreamedResponse
*/
protected function streamImage($image, $outputFilename)
{
$imageCreator = $this->container->get('image_creator');
Expand Down

0 comments on commit 340c90a

Please sign in to comment.