From 94a447ef4928ebc8dec5c187ecb5bf1e876dcc34 Mon Sep 17 00:00:00 2001
From: Harald Eilertsen <haraldei@anduin.net>
Date: Sat, 23 Feb 2019 16:28:01 +0100
Subject: Move Api to api module.

---
 src/api.rs | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 src/lib.rs | 32 ++------------------------------
 2 files changed, 50 insertions(+), 30 deletions(-)
 create mode 100644 src/api.rs

(limited to 'src')

diff --git a/src/api.rs b/src/api.rs
new file mode 100644
index 0000000..f67408d
--- /dev/null
+++ b/src/api.rs
@@ -0,0 +1,48 @@
+/*
+    oslobike - find free bikes in Oslo.
+    Copyright (C) 2019  Harald Eilertsen <haraldei@anduin.net>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+*/
+
+use reqwest;
+
+const API_BASE: &'static str = "https://oslobysykkel.no/api/v1";
+
+fn url_for(endpoint: &str) -> String {
+    [API_BASE, endpoint].join("/")
+}
+
+pub struct Api {
+    client: reqwest::Client,
+}
+
+impl Api {
+    pub fn new(api_key: String) -> Api {
+        let mut hdrs = reqwest::header::HeaderMap::new();
+        hdrs.insert("client-identifier", reqwest::header::HeaderValue::from_str(&api_key).unwrap());
+
+        let client = reqwest::Client::builder()
+            .default_headers(hdrs)
+            .build().unwrap();
+
+        Api { client }
+    }
+
+    pub fn stations(&self) -> String {
+        self.client.get(&url_for("stations"))
+            .send().unwrap()
+            .text().unwrap()
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
index f67408d..e46d0b0 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -16,33 +16,5 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-use reqwest;
-
-const API_BASE: &'static str = "https://oslobysykkel.no/api/v1";
-
-fn url_for(endpoint: &str) -> String {
-    [API_BASE, endpoint].join("/")
-}
-
-pub struct Api {
-    client: reqwest::Client,
-}
-
-impl Api {
-    pub fn new(api_key: String) -> Api {
-        let mut hdrs = reqwest::header::HeaderMap::new();
-        hdrs.insert("client-identifier", reqwest::header::HeaderValue::from_str(&api_key).unwrap());
-
-        let client = reqwest::Client::builder()
-            .default_headers(hdrs)
-            .build().unwrap();
-
-        Api { client }
-    }
-
-    pub fn stations(&self) -> String {
-        self.client.get(&url_for("stations"))
-            .send().unwrap()
-            .text().unwrap()
-    }
-}
+mod api;
+pub use api::Api;
-- 
cgit v1.2.3