Revert "Rename gitlab to git-lab"

Author: sgrif

app/templates/components/badge-git-lab.hbs renamed to app/templates/components/badge-gitlab.hbs

@@ -76,7 +76,7 @@ export default [{
                 "branch": "master",
                 "repository": "huonw/external_mixin"
             },
-            "badge_type": "git-lab"
+            "badge_type": "gitlab"
         },
         {
             "attributes": {

migrations/20170708175501_rename_badge_gitlab_to_git-lab/down.sql

@@ -19,6 +19,7 @@ pub enum Badge {
         branch: Option<String>,
         service: Option<String>,
     },
+    #[serde(rename = "gitlab")]
     GitLab {
         repository: String,
         branch: Option<String>,
@@ -57,6 +58,18 @@ impl Badge {
         serde_json::from_value(serde_json::to_value(self).unwrap()).unwrap()
     }
 
+    pub fn badge_type(&self) -> &'static str {
+        match *self {
+            Badge::TravisCi { .. } => "travis-ci",
+            Badge::Appveyor { .. } => "appveyor",
+            Badge::GitLab { .. } => "gitlab",
+            Badge::IsItMaintainedIssueResolution { .. } => "is-it-maintained-issue-resolution",
+            Badge::IsItMaintainedOpenIssues { .. } => "is-it-maintained-open-issues",
+            Badge::Codecov { .. } => "codecov",
+            Badge::Coveralls { .. } => "coveralls",
+        }
+    }
+
     pub fn update_crate<'a>(
         conn: &PgConnection,
         krate: &Crate,

migrations/20170708175501_rename_badge_gitlab_to_git-lab/up.sql

@@ -158,7 +158,7 @@ fn update_add_gitlab() {
     let conn = app.diesel_database.get().unwrap();
 
     let mut badges = HashMap::new();
-    badges.insert(String::from("git-lab"), test_badges.gitlab_attributes);
+    badges.insert(String::from("gitlab"), test_badges.gitlab_attributes);
     Badge::update_crate(&conn, &krate, Some(&badges)).unwrap();
     assert_eq!(krate.badges(&conn).unwrap(), vec![test_badges.gitlab]);
 }
@@ -231,7 +231,7 @@ fn replace_badge() {
 
     // Add a badge
     let mut badges = HashMap::new();
-    badges.insert(String::from("git-lab"), test_badges.gitlab_attributes);
+    badges.insert(String::from("gitlab"), test_badges.gitlab_attributes);
     Badge::update_crate(&conn, &krate, Some(&badges)).unwrap();
     assert_eq!(krate.badges(&conn).unwrap(), vec![test_badges.gitlab]);
 
@@ -288,7 +288,7 @@ fn clear_badges() {
     // Adding 3 badges
     badges.insert(String::from("appveyor"), test_badges.appveyor_attributes);
     badges.insert(String::from("travis-ci"), test_badges.travis_ci_attributes);
-    badges.insert(String::from("git-lab"), test_badges.gitlab_attributes);
+    badges.insert(String::from("gitlab"), test_badges.gitlab_attributes);
     Badge::update_crate(&conn, &krate, Some(&badges)).unwrap();
 
     let current_badges = krate.badges(&conn).unwrap();
@@ -348,11 +348,11 @@ fn gitlab_required_keys() {
 
     // Repository is a required key
     test_badges.gitlab_attributes.remove("repository");
-    badges.insert(String::from("git-lab"), test_badges.gitlab_attributes);
+    badges.insert(String::from("gitlab"), test_badges.gitlab_attributes);
 
     let invalid_badges = Badge::update_crate(&conn, &krate, Some(&badges)).unwrap();
     assert_eq!(invalid_badges.len(), 1);
-    assert!(invalid_badges.contains(&"git-lab"));
+    assert!(invalid_badges.contains(&"gitlab"));
     assert_eq!(krate.badges(&conn).unwrap(), vec![]);
 }