Implemented package details page

Author: SilverFire

Diff for: src/assets/AppAsset.php

@@ -18,11 +18,13 @@ class AppAsset extends AssetBundle
     public $sourcePath = '@hiqdev/assetpackagist/assets';
     public $css = [
         'css/site.css',
+        '//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css',
     ];
     public $js = [
     ];
     public $depends = [
         'yii\web\YiiAsset',
         'yii\bootstrap\BootstrapAsset',
+        'yii\web\JqueryAsset',
     ];
 }

Diff for: src/models/Storage.php renamed to src/components/Storage.php

@@ -9,36 +9,24 @@
  * @copyright Copyright (c) 2016, HiQDev (http://hiqdev.com/)
  */
 
-namespace hiqdev\assetpackagist\models;
+namespace hiqdev\assetpackagist\components;
 
-use hiqdev\assetpackagist\helpers\Locker;
+use hiqdev\assetpackagist\models\AssetPackage;
 use Yii;
+use yii\base\Component;
 use yii\helpers\Json;
+use hiqdev\assetpackagist\helpers\Locker;
 
-class Storage
+class Storage extends Component
 {
-    protected static $_instance;
-
     protected $_path;
     protected $_locker;
 
-    protected function __construct()
+    public function init()
     {
         $this->_path = Yii::getAlias('@storage', false);
     }
 
-    /**
-     * @return static
-     */
-    public static function getInstance()
-    {
-        if (static::$_instance === null) {
-            static::$_instance = new static;
-        }
-
-        return static::$_instance;
-    }
-
     protected function getLocker()
     {
         if ($this->_locker === null) {
@@ -102,6 +90,16 @@ public function writePackage(AssetPackage $package)
         return $hash;
     }
 
+    /**
+     * Reads the $package information from the storage
+     *
+     * @param AssetPackage $package
+     * @return array|null array of two elements:
+     *  0 - string sha256 hash of the package
+     *  1 - array[] releases
+     *
+     * Returns null, when package does not exist.
+     */
     public function readPackage(AssetPackage $package)
     {
         $name = $package->getFullName();
@@ -110,11 +108,12 @@ public function readPackage(AssetPackage $package)
             return [];
         }
         $json = file_get_contents($path);
+        $updateTime = filemtime($path);
         $hash = hash('sha256', $json);
         $data = Json::decode($json);
         $releases = isset($data['packages'][$name]) ? $data['packages'][$name] : [];
 
-        return compact('hash', 'releases');
+        return compact('hash', 'releases', 'updateTime');
     }
 
     public function buildPath()

Diff for: src/config/hisite.php

@@ -34,6 +34,9 @@
             'enablePrettyUrl' => true,
             'showScriptName'  => false,
         ],
+        'packageStorage' => [
+            'class' => \hiqdev\assetpackagist\components\Storage::class
+        ]
     ],
     'modules' => [],
     'aliases' => require __DIR__ . '/aliases.php',

Diff for: src/console/AssetPackageController.php

@@ -11,8 +11,8 @@
 
 namespace hiqdev\assetpackagist\console;
 
-use hiqdev\assetpackagist\models\AssetPackage;
-use hiqdev\assetpackagist\models\Storage;
+use hiqdev\assetpackagist\components\AssetPackage;
+use hiqdev\assetpackagist\components\Storage;
 use Yii;
 use yii\base\Exception;
 use yii\helpers\Console;

Diff for: src/console/BowerPackageController.php

@@ -2,6 +2,7 @@
 
 namespace hiqdev\assetpackagist\console;
 
+use Fxp\Composer\AssetPlugin\Repository\BowerRepository;
 use Yii;
 use yii\helpers\ArrayHelper;
 use yii\helpers\Console;

Diff for: src/controllers/SiteController.php

@@ -13,10 +13,22 @@
 
 use hiqdev\assetpackagist\models\AssetPackage;
 use Yii;
-use yii\web\ServerErrorHttpException;
+use yii\filters\VerbFilter;
 
 class SiteController extends \yii\web\Controller
 {
+    public function behaviors()
+    {
+        return [
+            'access' => [
+                'class' => VerbFilter::class,
+                'actions' => [
+                    'update' => ['post']
+                ]
+            ]
+        ];
+    }
+
     public function actionIndex()
     {
         return $this->render('index');
@@ -32,20 +44,42 @@ public function actionContact()
         return $this->render('contact');
     }
 
-    public function actionSearch()
+    public function actionSearch($query)
     {
-        $query = Yii::$app->request->get('query') ?: Yii::$app->request->post('query');
+        $package = $this->getAssetPackage($query);
+        $params = ['package' => $package, 'query' => $query, 'forceUpdate' => false];
 
+        if ($package->canAutoUpdate()) {
+            $params['forceUpdate'] = true;
+        }
+
+        return $this->render('search', $params);
+    }
+
+    /**
+     * @param $query
+     * @return AssetPackage
+     */
+    private static function getAssetPackage($query)
+    {
         list($type, $name) = AssetPackage::splitFullName($query);
+        $package = new AssetPackage($type, $name);
+        $package->load();
+        return $package;
+    }
+
+    public function actionUpdate()
+    {
+        $query = Yii::$app->request->post('query');
 
-        try {
-            $package = new AssetPackage($type, $name);
+        $package = $this->getAssetPackage($query);
+        if ($package->canBeUpdated()) {
             $package->update();
-            $package->load();
-        }  catch (\Exception $e) {
-            throw new ServerErrorHttpException($e->getMessage());
+        } else {
+            Yii::$app->session->addFlash('update-impossible', true);
         }
+        $package->load();
 
-        return $this->render('search', ['package' => $package, 'query' => $query]);
+        return $this->renderPartial('package-details', ['package' => $package]);
     }
 }

Diff for: src/models/AssetPackage.php

@@ -16,16 +16,29 @@
 use Composer\IO\NullIO;
 use Exception;
 use Fxp\Composer\AssetPlugin\Repository\AssetVcsRepository;
+use hiqdev\assetpackagist\components\Storage;
+use hiqdev\assetpackagist\registry\BowerRegistry;
+use hiqdev\assetpackagist\registry\NpmRegistry;
 use hiqdev\assetpackagist\registry\RegistryFactory;
 use Yii;
+use yii\base\Object;
 
-class AssetPackage
+class AssetPackage extends Object
 {
     protected $_type;
     protected $_name;
     protected $_hash;
     protected $_releases = [];
     protected $_saved;
+    /**
+     * @var AssetVcsRepository|BowerRegistry|NpmRegistry
+     */
+    protected $_registry;
+
+    /**
+     * @var integer UNIX Epoch timestamp of the latest package update
+     */
+    protected $_updateTime;
 
     /**
      * @var NullIO
@@ -35,17 +48,15 @@ class AssetPackage
      * @var Composer
      */
     protected $_composer;
-    /**
-     * @var Storage
-     */
-    protected $_storage;
     /**
      * @var Composer
      */
     protected static $_commonComposer;
 
-    public function __construct($type, $name)
+    public function __construct($type, $name, $config = [])
     {
+        parent::__construct($config);
+
         if (!$this->checkType($type)) {
             throw new Exception('wrong type');
         }
@@ -56,6 +67,14 @@ public function __construct($type, $name)
         $this->_name = $name;
     }
 
+    public function getRegistry() {
+        if ($this->_registry === null) {
+            $this->_registry = RegistryFactory::getRegistry($this->getType(), $this->getComposer()->getRepositoryManager());
+        }
+
+        return $this->_registry;
+    }
+
     public function checkType($type)
     {
         return $type === 'bower' || $type === 'npm';
@@ -79,7 +98,7 @@ public static function buildFullName($type, $name)
     public static function splitFullName($full)
     {
         list($temp, $name) = explode('/', $full);
-        list($type, $temp) = explode('-', $temp);
+        list($type,) = explode('-', $temp);
 
         return [$type, $name];
     }
@@ -160,14 +179,16 @@ public static function findOne($type, $name)
     public function load()
     {
         $data = $this->getStorage()->readPackage($this);
-        $this->_hash = $data['hash'];
-        $this->_releases = $data['releases'];
+        if ($data !== null) {
+            $this->_hash = $data['hash'];
+            $this->_releases = $data['releases'];
+            $this->_updateTime = $data['updateTime'];
+        }
     }
 
     public function update()
     {
-        $registry = RegistryFactory::getRegistry($this->getType(), $this->getComposer()->getRepositoryManager());
-        $repo = $registry->buildVcsRepository($this->getName());
+        $repo = $this->getRegistry()->buildVcsRepository($this->getName());
         $this->_releases = $this->prepareReleases($repo);
         $this->_hash = $this->getStorage()->writePackage($this);
     }
@@ -234,12 +255,38 @@ public function getSaved()
         return $this->_saved;
     }
 
+    /**
+     * @return Storage
+     */
     public function getStorage()
     {
-        if ($this->_storage === null) {
-            $this->_storage = Storage::getInstance();
-        }
+        return Yii::$app->get('packageStorage');
+    }
+
+    /**
+     * Returns the latest update time (UNIX Epoch)
+     * @return int|null
+     */
+    public function getUpdateTime()
+    {
+        return $this->_updateTime;
+    }
 
-        return $this->_storage;
+    /**
+     * Package can be updated not more often than once in 10 min
+     * @return bool
+     */
+    public function canBeUpdated()
+    {
+        return time() - $this->getUpdateTime() > 60*10; // 10 min
+    }
+
+    /**
+     * Whether tha package should be auth-updated (if it is older than 1 day)
+     * @return bool
+     */
+    public function canAutoUpdate()
+    {
+        return time() - $this->getUpdateTime() > 60*60*24; // 1 day
     }
 }

Diff for: src/registry/BowerRegistry.php

@@ -14,4 +14,6 @@
 class BowerRegistry extends \Fxp\Composer\AssetPlugin\Repository\BowerRepository
 {
     use RegistryTrait;
+
+    public $siteUrl = 'http://bower.io';
 }

Diff for: src/registry/RegistryTrait.php

@@ -28,11 +28,20 @@ public function fetchPackageData($name)
         return $this->fetchFile($packageUrl, $cacheName);
     }
 
+    /**
+     * @param $name
+     * @return \Composer\Repository\RepositoryInterface
+     */
     public function buildVcsRepository($name)
     {
         $data = $this->fetchPackageData($name);
         $conf = $this->createVcsRepositoryConfig($data, $name);
 
         return $this->rm->createRepository($conf['type'], $conf);
     }
+
+    public function getPackageSearchUrl($name)
+    {
+        return $this->siteUrl . '/search/?q=' . $name;
+    }
 }