Tests, docs and ideas

Author: Kixiron

src/lib.rs

@@ -20,14 +20,13 @@ mod web;
 use web::page::GlobalAlert;
 
 // Warning message shown in the navigation bar of every page. Set to `None` to hide it.
-// pub(crate) static GLOBAL_ALERT: Option<GlobalAlert> = None;
-
-pub(crate) static GLOBAL_ALERT: Option<GlobalAlert> = Some(GlobalAlert {
-    url: "https://blog.rust-lang.org/2019/09/18/upcoming-docsrs-changes.html",
-    text: "Upcoming docs.rs breaking changes!",
-    css_class: "error",
-    fa_icon: "warning",
-});
+pub(crate) static GLOBAL_ALERT: Option<GlobalAlert> = None;
+// pub(crate) static GLOBAL_ALERT: Option<GlobalAlert> = Some(GlobalAlert {
+//     url: "https://blog.rust-lang.org/2019/09/18/upcoming-docsrs-changes.html",
+//     text: "Upcoming docs.rs breaking changes!",
+//     css_class: "error",
+//     fa_icon: "warning",
+// });
 
 /// Version string generated at build time contains last git
 /// commit hash and build date

src/web/page/models.rs

@@ -218,6 +218,10 @@ impl WebPage for Error {
     fn template() -> &'static str {
         "error.html"
     }
+
+    fn get_status(&self) -> Status {
+        self.status
+    }
 }
 
 #[derive(Debug, Clone, PartialEq, Serialize)]
@@ -239,6 +243,10 @@ impl WebPage for Search {
     fn template() -> &'static str {
         "releases/releases.html"
     }
+
+    fn get_status(&self) -> Status {
+        self.status
+    }
 }
 
 impl Default for Search {

src/web/releases.rs

@@ -485,7 +485,7 @@ pub fn author_handler(req: &mut Request) -> IronResult<Response> {
         show_next_page,
         show_previous_page,
         page_number,
-        author: Some(author_name.to_owned()),
+        author: Some(author_name),
     }
     .into_response()
 }
@@ -587,7 +587,7 @@ pub fn search_handler(req: &mut Request) -> IronResult<Response> {
 
         // FIXME: There is no pagination
         Search {
-            title: title,
+            title,
             results,
             search_query: Some(query.to_owned()),
             ..Default::default()
@@ -1004,8 +1004,7 @@ mod tests {
             "description": "serde makes things other things",
             "target_name": "x86_64-pc-windows-msvc",
             "rustdoc_status": true,
-            "release_time": super::super::duration_to_str(now),
-            "release_time_rfc3339": time::at(now).rfc3339().to_string(),
+            "release_time": time::at(now).rfc3339().to_string(),
             "stars": 100
         });
 
@@ -1018,8 +1017,7 @@ mod tests {
             "description": "serde makes things other things",
             "target_name": null,
             "rustdoc_status": true,
-            "release_time": super::super::duration_to_str(now),
-            "release_time_rfc3339": time::at(now).rfc3339().to_string(),
+            "release_time": time::at(now).rfc3339().to_string(),
             "stars": 100
         });
 
@@ -1032,8 +1030,7 @@ mod tests {
             "description": null,
             "target_name": null,
             "rustdoc_status": true,
-            "release_time": super::super::duration_to_str(now),
-            "release_time_rfc3339": time::at(now).rfc3339().to_string(),
+            "release_time": time::at(now).rfc3339().to_string(),
             "stars": 100
         });
 

src/web/rustdoc.rs

@@ -813,8 +813,8 @@ mod test {
                 .create()?;
 
             let web = env.frontend();
-            let redirect = latest_version_redirect("/dummy/0.1.0/dummy/", web)?;
-            assert_eq!(redirect, "/dummy/0.2.1/dummy/index.html");
+            let redirect = dbg!(latest_version_redirect("/dummy/0.1.0/dummy/", web))?;
+            assert_eq!(dbg!(redirect), "/dummy/0.2.1/dummy/index.html");
 
             let redirect = latest_version_redirect("/dummy/0.2.0/dummy/", web)?;
             assert_eq!(redirect, "/dummy/0.2.1/dummy/index.html");

templates/base.html

@@ -1,5 +1,5 @@
-{% import "macros.html" as macros -%}
-{% import "header/package_navigation.html" as navigation %}
+{%- import "macros.html" as macros -%}
+{%- import "header/package_navigation.html" as navigation -%}
 
 <!DOCTYPE html>
 <html lang="en">
@@ -8,7 +8,7 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta name="generator" content="docs.rs {{ docsrs_version() }}">
-        {% block meta -%}{% endblock meta -%}
+        {%- block meta -%}{%- endblock meta -%}
 
         <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/pure/0.6.0/pure-min.css" type="text/css"
             media="all" />
@@ -20,23 +20,24 @@
         <link rel="stylesheet" href="/rustdoc-{{ rustc_resource_suffix() }}.css" type="text/css" media="all" />
         <link rel="stylesheet" href="/light-{{ rustc_resource_suffix() }}.css" type="text/css" media="all" />
         <link rel="stylesheet" href="/style.css?{{ docsrs_version() | slugify }}" type="text/css" media="all" />
-        {% block css -%}{% endblock css -%}
+        {%- block css -%}{%- endblock css -%}
 
         <link rel="search" href="/opensearch.xml" type="application/opensearchdescription+xml" title="Docs.rs">
 
-        <title>{% block title %} Docs.rs {% endblock title -%}</title>
+        <title>{%- block title -%} Docs.rs {%- endblock title -%}</title>
     </head>
 
     <body>
-        {% include "header/topbar.html" -%}
-        {% block header %}{% endblock header -%}
+        {%- include "header/topbar.html" -%}
 
-        {% block body %}{% endblock body -%}
+        {%- block header %}{% endblock header -%}
+
+        {%- block body -%}{%- endblock body -%}
     </body>
 
     <script type="text/javascript" src="/menu.js?{{ docsrs_version() | slugify }}"></script>
     <script type="text/javascript" src="/index.js?{{ docsrs_version() | slugify }}"></script>
 
-    {% block javascript -%}{% endblock javascript -%}
+    {%- block javascript -%}{%- endblock javascript -%}
 
 </html>

templates/crate/builds.html

@@ -1,24 +1,24 @@
-{% extends "base.html" -%}
+{%- extends "base.html" -%}
 
-{% block title %}
+{%- block title -%}
     {{ macros::doc_title(name=metadata.name, version=metadata.version) }}
-{% endblock title %}
+{%- endblock title -%}
 
-{% block header -%}
+{%- block header -%}
     {{ navigation::package_navigation(metadata=metadata, active_tab="builds") }}
-{% endblock header -%}
+{%- endblock header -%}
 
-{% block body -%}
+{%- block body -%}
     <div class="container">
         <div class="recent-releases-container">
             {# If there is a build log then show it #}
             {# TODO: When viewing a build log, show a back button or a hide button #}
-            {% if build_log -%}
+            {%- if build_log -%}
                 <div class="release">
                     <strong>Build #{{ build_log.id }} {{ build_log.build_time | date(format="%+") }}</strong>
                 </div>
 
-                {% filter dedent %}
+                {%- filter dedent -%}
                     <pre>
                         $ rustc --version
                         {{ build_log.rustc_version }}
@@ -27,24 +27,24 @@
                         $ docsrs ...
                         {{ build_log.output }}
                     </pre>
-                {% endfilter %}
-            {% endif -%}
+                {%- endfilter -%}
+            {%- endif -%}
 
             <div class="release">
                 <strong>Builds</strong>
             </div>
 
             <ul>
-                {% for build in builds -%}
+                {%- for build in builds -%}
                     <li>
                         <a href="/crate/{{ metadata.name }}/{{ metadata.version }}/builds/{{ build.id }}" class="release">
                             <div class="pure-g">
                                 <div class="pure-u-1 pure-u-sm-1-24 build">
-                                    {% if build.build_status -%}
-                                        {% set build_icon = "check" -%}
-                                    {% else -%}
-                                        {% set build_icon = "close" -%}
-                                    {% endif -%}
+                                    {%- if build.build_status -%}
+                                        {%- set build_icon = "check" -%}
+                                    {%- else -%}
+                                        {%- set build_icon = "close" -%}
+                                    {%- endif -%}
                                     <i class="fa fa-{{ build_icon }}"></i>
                                 </div>
                                 <div class="pure-u-1 pure-u-sm-10-24">{{ build.rustc_version }}</div>
@@ -53,16 +53,16 @@
                             </div>
                         </a>
                     </li>
-                {% endfor -%}
+                {%- endfor -%}
             </ul>
 
             <div class="about">
                 {# BuildsPage.metadata is an `Option<MetaData>`, so accessing it can fail #}
-                {% if metadata -%}
+                {%- if metadata -%}
                     <h4>{{ metadata.name }}'s sandbox limits</h4>
-                {% else -%}
+                {%- else -%}
                     <h4>Sandbox limits</h4>
-                {% endif -%}
+                {%- endif -%}
 
                 <p>
                     All the builds on docs.rs are executed inside a sandbox with limited
@@ -79,4 +79,4 @@ <h4>Sandbox limits</h4>
             </div>
         </div>
     </div>
-{% endblock body -%}
+{%- endblock body -%}