Skip to content
This repository has been archived by the owner on Jul 8, 2022. It is now read-only.

Commit

Permalink
Cleanup & Coding Standard
Browse files Browse the repository at this point in the history
  • Loading branch information
@Vrtak-CZ
Vrtak-CZ committed Feb 22, 2014
1 parent 0216479 commit 5edc557
Show file tree
Hide file tree
Showing 75 changed files with 950 additions and 1,431 deletions.
55 changes: 24 additions & 31 deletions app/Api/presenters/ComposerPresenter.php
View file
Expand Up @@ -2,42 +2,35 @@

namespace NetteAddons\Api;

use NetteAddons\Model\Addon,
NetteAddons\Model\AddonVersion,
NetteAddons\Model\Addons,
NetteAddons\Model\AddonDownloads,
NetteAddons\Model\AddonVersions,
NetteAddons\Model\Utils\Composer;
use NetteAddons\Model\Addon;
use NetteAddons\Model\Addons;
use NetteAddons\Model\AddonVersion;
use NetteAddons\Model\AddonVersions;
use NetteAddons\Model\AddonDownloads;
use NetteAddons\Model\Utils\Composer;



/**
* @author Jan Marek
* @author Jan Tvrdík
* @author Jan Dolecek <juzna.cz@gmail.com>
* @author Patrik Votoček
*/
final class ComposerPresenter extends \NetteAddons\BasePresenter
{
/**
* @var \NetteAddons\Model\Addons
* @inject
*/
/** @var \NetteAddons\Model\Addons */
public $addons;

/**
* @var \NetteAddons\Model\AddonDownloads
* @inject
*/
/** @var \NetteAddons\Model\AddonDownloads */
public $addonDownloads;

/**
* @var \NetteAddons\Model\AddonVersions
* @inject
*/
/** @var \NetteAddons\Model\AddonVersions */
public $addonVersions;


public function __construct(Addons $addons, AddonDownloads $addonDownloads, AddonVersions $addonVersions)
{
parent::__construct();

$this->addons = $addons;
$this->addonDownloads = $addonDownloads;
$this->addonVersions = $addonVersions;
}


public function renderPackages()
{
Expand All @@ -46,29 +39,29 @@ public function renderPackages()

$packagesJson = Composer::createPackagesJson($addons);
$packagesJson->notify = str_replace(
'placeholder', '%package%',
'placeholder',
'%package%',
$this->link('//downloadNotify', array('package' => 'placeholder'))
);
$this->sendJson($packagesJson);
}



/**
* Called when composer installs a package to increase counters.
*
* @link http://getcomposer.org/doc/05-repositories.md#notify
*
* @param string
*/
public function actionDownloadNotify($package)
{
$post = $this->getRequest()->post;
$post = $this->getRequest()->getPost();
if (!isset($post['version'])) {
$this->error('Invalid request.');
}
$version = (string) $post['version'];


if (!$addonRow = $this->addons->findOneByComposerFullName($package)) {
$this->error('Package not found.');
}
Expand All @@ -81,7 +74,7 @@ public function actionDownloadNotify($package)
));

if (!$versionRow) {
$this->error("Version of package not found.");
$this->error('Version of package not found.');
}

$version = AddonVersion::fromActiveRow($versionRow);
Expand All @@ -93,6 +86,6 @@ public function actionDownloadNotify($package)
$this->getHttpRequest()->getHeader('user-agent')
);

$this->sendJson(array('status' => "success"));
$this->sendJson(array('status' => 'success'));
}
}
68 changes: 32 additions & 36 deletions app/Api/presenters/GithubPresenter.php
View file
Expand Up @@ -2,56 +2,52 @@

namespace NetteAddons\Api;

use Nette\Utils\Json,
NetteAddons\Model\Addon,
NetteAddons\Model\Addons,
NetteAddons\Model\Users,
NetteAddons\Model\Facade\AddonManageFacade,
NetteAddons\Model\Importers\GitHubImporter,
NetteAddons\Model\Importers\RepositoryImporterManager;



/**
* GitHub API
*
* @author Jan Dolecek <juzna.cz@gmail.com>
* @author Patrik Votoček
*/
use Nette\Utils\Json;
use Nette\Http\IResponse;
use NetteAddons\Model\Addon;
use NetteAddons\Model\Addons;
use NetteAddons\Model\Users;
use NetteAddons\Model\Facade\AddonManageFacade;
use NetteAddons\Model\Importers\GitHubImporter;
use NetteAddons\Model\Importers\RepositoryImporterManager;


final class GithubPresenter extends \NetteAddons\BasePresenter
{
/**
* @var \NetteAddons\Model\Facade\AddonManageFacade
* @inject
*/
/** @var \NetteAddons\Model\Facade\AddonManageFacade */
public $manager;

/**
* @var \NetteAddons\Model\Importers\RepositoryImporterManager
* @inject
*/
/** @var \NetteAddons\Model\Importers\RepositoryImporterManager */
public $importerManager;

/**
* @var \NetteAddons\Model\Users
* @inject
*/
/** @var \NetteAddons\Model\Users */
public $users;

/**
* @var \NetteAddons\Model\Addons
* @inject
*/
/** @var \NetteAddons\Model\Addons */
public $addons;


public function __construct(
AddonManageFacade $manager,
RepositoryImporterManager $importerManager,
Users $users,
Addons $addons
) {
parent::__construct();

$this->manager = $manager;
$this->importerManager = $importerManager;
$this->users = $users;
$this->addons = $addons;
}


/**
* Post receive hook, updates addon info
*/
public function actionPostReceive()
{
$post = $this->getRequest()->post;
$post = $this->getRequest()->getPost();
if (!isset($post['payload'], $post['username'], $post['apiToken'])) {
$this->error('Invalid request.');
}
Expand All @@ -61,7 +57,7 @@ public function actionPostReceive()
try {
$payload = Json::decode($post['payload']);
if (!isset($payload->repository->url)) {
$response->setCode(400); // Bad Request
$response->setCode(IResponse::S400_BAD_REQUEST);
$this->sendJson(array(
'status' => 'error',
'message' => 'Missing or invalid payload',
Expand All @@ -76,15 +72,15 @@ public function actionPostReceive()

$user = $this->users->findOneByName($username);
if (!$user || $user->apiToken !== $token) {
$response->setCode(403); // Forbidden
$response->setCode(IResponse::S403_FORBIDDEN);
$this->sendJson(array(
'status' => 'error',
'message' => 'Invalid credentials'
));
}

if (!GitHubImporter::isValid($payload->repository->url)) {
$response->setCode(400); // Bad Request
$response->setCode(IResponse::S400_BAD_REQUEST);
$this->sendJson(array(
'status' => 'error',
'message' => 'Could not parse payload repository URL'
Expand Down
10 changes: 3 additions & 7 deletions app/Manage/forms/AddAddonFormFactory.php
View file
Expand Up @@ -2,21 +2,18 @@

namespace NetteAddons\Manage\Forms;

use Nette\Utils\Strings,
Nette\Security\IIdentity;
use Nette\Utils\Strings;
use Nette\Security\IIdentity;


/**
* Form for new addon registration. When importing from GitHub, most of the fields should be prefilled.
* The license input won't be visible when composer.json is available.
*
* @author Patrik Votoček
*/
class AddAddonFormFactory extends AddonFormFactory
{

/**
* @param IIdentity
* @param \Nette\Security\IIdentity
* @param string
* @return AddonForm
*/
Expand All @@ -38,5 +35,4 @@ public function create(IIdentity $user, $token)

return $form;
}

}
47 changes: 18 additions & 29 deletions app/Manage/forms/AddVersionForm.php
View file
Expand Up @@ -2,20 +2,15 @@

namespace NetteAddons\Manage\Forms;

use Nette\Security\IIdentity,
NetteAddons\Model\Addon,
NetteAddons\Model\AddonVersions,
NetteAddons\Model\Utils\VersionParser,
NetteAddons\Model\Utils\Licenses,
NetteAddons\Model\Utils\FormValidators,
NetteAddons\Model\Facade\AddonManageFacade;


/**
* Form for addon version creation.
*
* @author Patrik Votoček
*/
use Nette\Security\IIdentity;
use NetteAddons\Model\Addon;
use NetteAddons\Model\AddonVersions;
use NetteAddons\Model\Utils\VersionParser;
use NetteAddons\Model\Utils\Licenses;
use NetteAddons\Model\Utils\FormValidators;
use NetteAddons\Model\Facade\AddonManageFacade;


class AddVersionFormFactory extends \Nette\Object
{
/** @var \NetteAddons\Model\Facade\AddonManageFacade */
Expand All @@ -37,16 +32,13 @@ class AddVersionFormFactory extends \Nette\Object
protected $addon;



/**
* @param \NetteAddons\Model\Facade\AddonManageFacade
* @param \NetteAddons\Model\Utils\VersionParser
* @param \NetteAddons\Model\Utils\FormValidators
* @param \NetteAddons\Model\Utils\Licenses
* @param \NetteAddons\Model\AddonVersions
*/
public function __construct(AddonManageFacade $manager, VersionParser $versionParser, FormValidators $validators, Licenses $licenses, AddonVersions $model)
{
public function __construct(
AddonManageFacade $manager,
VersionParser $versionParser,
FormValidators $validators,
Licenses $licenses,
AddonVersions $model
) {
$this->model = $model;
$this->manager = $manager;
$this->versionParser = $versionParser;
Expand All @@ -55,10 +47,9 @@ public function __construct(AddonManageFacade $manager, VersionParser $versionPa
}



/**
* @param Addon
* @param IIdentity
* @param \NetteAddons\Model\Addon
* @param \Nette\Security\IIdentity
* @param string
* @return VersionForm
*/
Expand All @@ -77,7 +68,6 @@ public function create(Addon $addon, IIdentity $user, $token)

try {
$version = $manager->addVersionFromValues($addon, $values, $user, $versionParser);

} catch (\NetteAddons\IOException $e) {
$form['archive']->addError('Uploading file failed.');
return;
Expand All @@ -89,7 +79,6 @@ public function create(Addon $addon, IIdentity $user, $token)
} catch (\NetteAddons\DuplicateEntryException $e) {
$form['version']->addError(sprintf("Version '%s' already exists.", $version->version));
}

} else {
$manager->storeAddon($values->token, $addon);
}
Expand Down

0 comments on commit 5edc557

Please sign in to comment.