Skip to content

Fixed details dropdown #890

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/web/badge/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
//! Simple badge generator

use base64::display::Base64Display;
use rusttype::{point, Font, Point, PositionedGlyph, Scale};
use once_cell::sync::Lazy;
use rusttype::{point, Font, Point, PositionedGlyph, Scale};

const FONT_DATA: &[u8] = include_bytes!(concat!(env!("CARGO_MANIFEST_DIR"), "/DejaVuSans.ttf"));
const FONT_SIZE: f32 = 11.0;
Expand Down Expand Up @@ -35,9 +35,8 @@ pub struct Badge {

impl Badge {
pub fn new(options: BadgeOptions) -> Result<Badge, String> {
static FONT: Lazy<Font> = Lazy::new(|| {
Font::try_from_bytes(FONT_DATA).expect("Failed to parse FONT_DATA")
});
static FONT: Lazy<Font> =
Lazy::new(|| Font::try_from_bytes(FONT_DATA).expect("Failed to parse FONT_DATA"));

let font = &*FONT;
let scale = Scale {
Expand Down
100 changes: 79 additions & 21 deletions src/web/crate_details.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ pub struct Release {
pub version: String,
pub build_status: bool,
pub yanked: bool,
pub is_library: bool,
}

impl CrateDetails {
Expand Down Expand Up @@ -243,23 +244,29 @@ impl CrateDetails {
fn map_to_release(conn: &Connection, crate_id: i32, version: String) -> Release {
let rows = conn
.query(
"SELECT build_status, yanked
"SELECT build_status,
yanked,
is_library
FROM releases
WHERE releases.crate_id = $1 and releases.version = $2;",
&[&crate_id, &version],
)
.unwrap();

let (build_status, yanked) = if !rows.is_empty() {
(rows.get(0).get(0), rows.get(0).get(1))
} else {
Default::default()
};
let (build_status, yanked, is_library) =
rows.iter().next().map_or_else(Default::default, |row| {
(
row.get("build_status"),
row.get("yanked"),
row.get("is_library"),
)
});

Release {
version,
build_status,
yanked,
is_library,
}
}

Expand Down Expand Up @@ -308,8 +315,9 @@ pub fn crate_details_handler(req: &mut Request) -> IronResult<Response> {
#[cfg(test)]
mod tests {
use super::*;
use crate::test::TestDatabase;
use crate::test::{wrapper, TestDatabase};
use failure::Error;
use kuchiki::traits::TendrilSink;

fn assert_last_successful_build_equals(
db: &TestDatabase,
Expand All @@ -329,7 +337,7 @@ mod tests {

#[test]
fn test_last_successful_build_when_last_releases_failed_or_yanked() {
crate::test::wrapper(|env| {
wrapper(|env| {
let db = env.db();

db.fake_release().name("foo").version("0.0.1").create()?;
Expand Down Expand Up @@ -362,7 +370,7 @@ mod tests {

#[test]
fn test_last_successful_build_when_all_releases_failed_or_yanked() {
crate::test::wrapper(|env| {
wrapper(|env| {
let db = env.db();

db.fake_release()
Expand Down Expand Up @@ -390,7 +398,7 @@ mod tests {

#[test]
fn test_last_successful_build_with_intermittent_releases_failed_or_yanked() {
crate::test::wrapper(|env| {
wrapper(|env| {
let db = env.db();

db.fake_release().name("foo").version("0.0.1").create()?;
Expand All @@ -416,7 +424,7 @@ mod tests {

#[test]
fn test_releases_should_be_sorted() {
crate::test::wrapper(|env| {
wrapper(|env| {
let db = env.db();

// Add new releases of 'foo' out-of-order since CrateDetails should sort them descending
Expand All @@ -438,6 +446,12 @@ mod tests {
.name("foo")
.version("0.2.0-alpha")
.create()?;
db.fake_release()
.name("foo")
.version("0.0.1")
.build_result_successful(false)
.binary(true)
.create()?;

let details = CrateDetails::new(&db.conn(), "foo", "0.2.0").unwrap();
assert_eq!(
Expand All @@ -446,37 +460,50 @@ mod tests {
Release {
version: "1.0.0".to_string(),
build_status: true,
yanked: false
yanked: false,
is_library: true,
},
Release {
version: "0.12.0".to_string(),
build_status: true,
yanked: false
yanked: false,
is_library: true,
},
Release {
version: "0.3.0".to_string(),
build_status: false,
yanked: false
yanked: false,
is_library: true,
},
Release {
version: "0.2.0".to_string(),
build_status: true,
yanked: true
yanked: true,
is_library: true,
},
Release {
version: "0.2.0-alpha".to_string(),
build_status: true,
yanked: false
yanked: false,
is_library: true,
},
Release {
version: "0.1.1".to_string(),
build_status: true,
yanked: false
yanked: false,
is_library: true,
},
Release {
version: "0.1.0".to_string(),
build_status: true,
yanked: false
yanked: false,
is_library: true,
},
Release {
version: "0.0.1".to_string(),
build_status: false,
yanked: false,
is_library: false,
},
]
);
Expand All @@ -487,7 +514,7 @@ mod tests {

#[test]
fn test_latest_version() {
crate::test::wrapper(|env| {
wrapper(|env| {
let db = env.db();

db.fake_release().name("foo").version("0.0.1").create()?;
Expand All @@ -505,7 +532,7 @@ mod tests {

#[test]
fn test_latest_version_ignores_yanked() {
crate::test::wrapper(|env| {
wrapper(|env| {
let db = env.db();

db.fake_release().name("foo").version("0.0.1").create()?;
Expand All @@ -527,7 +554,7 @@ mod tests {

#[test]
fn test_latest_version_only_yanked() {
crate::test::wrapper(|env| {
wrapper(|env| {
let db = env.db();

db.fake_release()
Expand All @@ -554,4 +581,35 @@ mod tests {
Ok(())
})
}

#[test]
fn releases_dropdowns_is_correct() {
wrapper(|env| {
let db = env.db();

db.fake_release()
.name("binary")
.version("0.1.0")
.binary(true)
.create()?;

let page = kuchiki::parse_html()
.one(env.frontend().get("/crate/binary/0.1.0").send()?.text()?);
let warning = page.select_first("a.pure-menu-link.warn").unwrap();

assert_eq!(
warning
.as_node()
.as_element()
.unwrap()
.attributes
.borrow()
.get("title")
.unwrap(),
"binary-0.1.0 is not a library"
);

Ok(())
});
}
}
13 changes: 10 additions & 3 deletions templates/macros.html
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
* `version` A string of the release's version
* `yanked` A boolean of the release's yanked status
* `build_status` A boolean of the crate's build status (true for built, false for failed build)
* `is_library` A boolean that's true if the crate is a library and false if it's a binary
#}
{% macro releases_list(name, releases) %}
{%- for release in releases -%}
Expand All @@ -92,8 +93,14 @@
{%- set release_name = name ~ "-" ~ release.version -%}

<li class="pure-menu-item">
{# If the release is yanked but built, display an warning #}
{%- if release.yanked and release.build_status -%}
{# If the release isn't a library, then display that warning #}
{% if not release.is_library -%}
<a href="{{ release_url }}" class="pure-menu-link warn" title="{{ release_name }} is not a library">
<i class="fa fa-fw fa-warning"></i> {{ release.version }}
</a>

{# If the release has been yanked and failed to build, display a warning #}
{%- elif release.yanked and release.build_status -%}
<a href="{{ release_url }}" class="pure-menu-link warn" title="{{ release_name }} is yanked">
<i class="fa fa-fw fa-warning"></i> {{ release.version }}
</a>
Expand All @@ -116,7 +123,7 @@
<a href="{{ release_url }}" class="pure-menu-link">
{{ release.version }}
</a>
{%- endif -%}
{%- endif %}
</li>
{%- endfor -%}
{% endmacro releases_list %}