Skip to content

Remove duplicated deserialization logic for Badge #598

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.

Sign up for GitHub

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 1 commit into from
Mar 8, 2017
Merged

Remove duplicated deserialization logic for Badge #598

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
64 changes: 8 additions & 56 deletions src/badge.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ use Model;
use std::collections::HashMap;
use pg::GenericConnection;
use pg::rows::Row;
use rustc_serialize::json::Json;
use rustc_serialize::Decodable;
use rustc_serialize::json::{Json, Decoder};

#[derive(Debug, PartialEq, Clone)]
pub enum Badge {
Expand All @@ -29,61 +30,12 @@ pub struct EncodableBadge {
impl Model for Badge {
fn from_row(row: &Row) -> Badge {
let attributes: Json = row.get("attributes");
if let Json::Object(attributes) = attributes {
let badge_type: String = row.get("badge_type");
match badge_type.as_str() {
"travis-ci" => {
Badge::TravisCi {
branch: attributes.get("branch")
.and_then(Json::as_string)
.map(str::to_string),
repository: attributes.get("repository")
.and_then(Json::as_string)
.map(str::to_string)
.expect("Invalid TravisCi badge \
without repository in the \
database"),
}
},
"appveyor" => {
Badge::Appveyor {
service: attributes.get("service")
.and_then(Json::as_string)
.map(str::to_string),
branch: attributes.get("branch")
.and_then(Json::as_string)
.map(str::to_string),
repository: attributes.get("repository")
.and_then(Json::as_string)
.map(str::to_string)
.expect("Invalid Appveyor badge \
without repository in the \
database"),
}
},
"gitlab" => {
Badge::GitLab {
branch: attributes.get("branch")
.and_then(Json::as_string)
.map(str::to_string),
repository: attributes.get("repository")
.and_then(Json::as_string)
.map(str::to_string)
.expect("Invalid GitLab badge \
without repository in the \
database"),
}
},
_ => {
panic!("Unknown badge type {} in the database", badge_type);
},
}
} else {
panic!(
"badge attributes {:?} in the database was not a JSON object",
attributes
);
}
let badge_type: String = row.get("badge_type");
let mut decoder = Decoder::new(attributes);
let attributes = HashMap::<String, String>::decode(&mut decoder)
.expect("Attributes was not a json object");
Self::from_attributes(&badge_type, &attributes)
.expect("Invalid CI badge in the database")
}
fn table_name(_: Option<Badge>) -> &'static str { "badges" }
}
Expand Down