Merge pull request #1138 from NatLibFi/issue1116-generator-meta-tag

Add generator meta tag with Skosmos version
NatLibFi · Mar 16, 2021 · e213096 · e213096
2 parents 20d994b + 7ca6765
commit e213096
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 4 deletions.
diff --git a/controller/WebController.php b/controller/WebController.php
@@ -305,12 +305,10 @@ public function invokeAboutPage($request)
         $template = $this->twig->loadTemplate('about.twig');
         $this->setLanguageProperties($request->getLang());
         $url = $request->getServerConstant('HTTP_HOST');
-        $version = $this->model->getVersion();
 
         echo $template->render(
             array(
                 'languages' => $this->languages,
-                'version' => $version,
                 'server_instance' => $url,
                 'request' => $request,
             ));

diff --git a/model/Model.php b/model/Model.php
@@ -74,11 +74,11 @@ public function getLogger() {
      * it cannot be determined. The version information is based on Git tags.
      * @return string version
      */
-    public function getVersion()
+    public function getVersion() : string
     {
         $ver = null;
         if (file_exists('.git')) {
-            $ver = shell_exec('git describe --tags --always');
+            $ver = rtrim(shell_exec('git describe --tags --always'));
         }
 
         if ($ver === null) {

diff --git a/model/Request.php b/model/Request.php
@@ -266,4 +266,14 @@ public function getPlugins() {
         }
         return new PluginRegister($this->model->getConfig()->getGlobalPlugins());
     }
+
+    /**
+     * Return the version of this Skosmos installation, or "unknown" if
+     * it cannot be determined. The version information is based on Git tags.
+     * @return string version
+     */
+    public function getVersion() : string
+    {
+        return $this->model->getVersion();
+    }
 }
diff --git a/tests/RequestTest.php b/tests/RequestTest.php
@@ -158,4 +158,11 @@ public function testSetAndGetPage() {
     $this->assertEquals('index', $this->request->getPage());
   }
 
+  /**
+   * @covers Request::getVersion
+   */
+  public function testGetVersion() {
+    $version = $this->request->getVersion();
+    $this->assertNotEmpty($version);
+  }
 }
diff --git a/view/about.twig b/view/about.twig
@@ -15,6 +15,7 @@
     <p>{% if ServiceName != 'SERVICE_NAME' %}{{ ServiceName }}{% else %}Skosmos{% endif %} {% trans "layout designed by Hahmo" %}</p>
   </div>
   <div class="version">
+    {% set version = request.version %}
     <p>{% trans %}Skosmos version {{ version }}{% endtrans %}</p>
   </div>
 </div>

diff --git a/view/meta.twig b/view/meta.twig
@@ -2,3 +2,4 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1.0">
 <meta name="format-detection" content="telephone=no">
+<meta name="generator" content="Skosmos {{ request.version }}" />