Move `find_upcoming_events` and `parse_json` to `Client`

We'll call `find_upcoming_events` on `Client` to give us access to the
token it holds.

2 files changed, 84 insertions, 79 deletions

diff --git a/meetup/src/client.rs b/meetup/src/client.rs
index 4510eb3..f47c439 100644
--- a/meetup/src/client.rs
+++ b/meetup/src/client.rs
@@ -1,3 +1,12 @@
+use reqwest;
+use serde_json;
+
+use std::error::Error;
+
+use event::Event;
+
+const MEETUP_BASE_URL: &'static str = "https://api.meetup.com";
+
 pub struct Client {
     pub token: String,
 }
@@ -6,4 +15,79 @@ impl Client {
     pub fn new(token: String) -> Client {
         Client { token: token }
     }
+
+    pub fn find_upcoming_events(
+        &self,
+        latitude: String,
+        longitude: String,
+        end_date_range: String,
+        radius: Option<String>,
+        page: Option<String>,
+    ) -> Result<Vec<Event>, Box<Error>> {
+        let json = include_str!("../testdata/meetup--find-upcoming_events.json").to_owned();
+
+        let mut params = vec![
+            ("lat", latitude),
+            ("lon", longitude),
+            ("end_date_range", end_date_range),
+            ("order", "time".to_owned()),
+        ];
+
+        if let Some(r) = radius {
+            params.push(("radius", r))
+        }
+
+        if let Some(p) = page {
+            params.push(("page", p))
+        }
+
+        let client = reqwest::Client::new();
+        client.get(&format!("{}{}", MEETUP_BASE_URL, "/find/upcoming_events"))
+            .query(&params)
+            .send()?;
+
+        Ok(parse_json(json)?)
+    }
+}
+
+
+fn parse_json(json: String) -> Result<Vec<Event>, serde_json::Error> {
+    let parsed: serde_json::Value = serde_json::from_str(json.as_ref())?;
+    let events: Vec<Event> = serde_json::from_value(parsed["events"].clone())?;
+
+    Ok(events)
+}
+
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_parse_json_parses_event_json() {
+        let events = parse_json(
+            include_str!("../testdata/meetup--find-upcoming_events.json")
+                .to_owned()
+        ).unwrap();
+
+        assert_eq!(
+            events,
+            vec![
+                Event {
+                    name: "Hackspace Project Night - Open to Everyone!".to_owned(),
+                    description: "<p>Spend some time on your project by bringing it along to our weekly project night, an evening designed around you and what you're working on.</p> <p>This weekly event is about finding time to tinker, being creative, and meeting other members of the community. You'll get the chance to see what others are working on, share your projects, and to get inspiration and feedback from fellow tinkerers.</p> <p>On any given Tuesday night you have people working on electronics, knitting, writing code, wood-working, or just their plans for world domination. Beer is also consumed.</p> <p>We’ll provide: space to work, basic tools, power, a room full of like minded people.</p> <p>You’ll provide: your project, ideas and beer (optional). A laptop would probably be useful too.</p> <p>Sometimes we work on group projects together, which are usually set up as separate meetup events. Keep an eye on our events page to see what we’re working on next.</p> <p>Note: We usually have around 10 or 20 people at these events, many of our members come along but aren't counted as they don't respond on meetup.</p> <p><img src=\"http://photos3.meetupstatic.com/photos/event/b/3/b/2/600_459406002.jpeg\" /></p> ".to_owned(),
+                    link: "https://www.meetup.com/Cambridge-Hackspace/events/249620800/".to_owned(),
+                    local_date: "2018-04-17".to_owned(),
+                    local_time: "18:30".to_owned(),
+                },
+                Event {
+                    name: "PyCon Rehearsal Night #1".to_owned(),
+                    description: "<p>.</p> ".to_owned(),
+                    link: "https://www.meetup.com/bostonpython/events/247552529/".to_owned(),
+                    local_date: "2018-04-25".to_owned(),
+                    local_time: "19:00".to_owned(),
+                },
+            ]
+        );
+    }
 }
diff --git a/meetup/src/event.rs b/meetup/src/event.rs
index 615403e..1f90429 100644
--- a/meetup/src/event.rs
+++ b/meetup/src/event.rs
@@ -1,9 +1,3 @@
-use reqwest;
-use serde_json;
-
-use std::error::Error;
-
-
 #[derive(Debug, Deserialize, PartialEq)]
 pub struct Event {
     pub name: String,
@@ -15,7 +9,6 @@ pub struct Event {
 }
 
 
-const MEETUP_BASE_URL: &'static str = "https://api.meetup.com";
 
 // lat
 // lon
@@ -23,76 +16,4 @@ const MEETUP_BASE_URL: &'static str = "https://api.meetup.com";
 // [radius]
 // end_date_range
 // [page]
-pub fn find_upcoming_events(
-    latitude: String,
-    longitude: String,
-    end_date_range: String,
-    radius: Option<String>,
-    page: Option<String>,
-) -> Result<Vec<Event>, Box<Error>> {
-    let json = include_str!("../testdata/meetup--find-upcoming_events.json").to_owned();
-
-    let mut params = vec![
-        ("lat", latitude),
-        ("lon", longitude),
-        ("end_date_range", end_date_range),
-        ("order", "time".to_owned()),
-    ];
-
-    if let Some(r) = radius {
-        params.push(("radius", r))
-    }
-
-    if let Some(p) = page {
-        params.push(("page", p))
-    }
-
-    let client = reqwest::Client::new();
-    client.get(&format!("{}{}", MEETUP_BASE_URL, "/find/upcoming_events"))
-        .query(&params)
-        .send()?;
-
-    Ok(parse_json(json)?)
-}
 
-
-fn parse_json(json: String) -> Result<Vec<Event>, serde_json::Error> {
-    let parsed: serde_json::Value = serde_json::from_str(json.as_ref())?;
-    let events: Vec<Event> = serde_json::from_value(parsed["events"].clone())?;
-
-    Ok(events)
-}
-
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[test]
-    fn test_parse_json_parses_event_json() {
-        let events = parse_json(
-            include_str!("../testdata/meetup--find-upcoming_events.json")
-                .to_owned()
-        ).unwrap();
-
-        assert_eq!(
-            events,
-            vec![
-                Event {
-                    name: "Hackspace Project Night - Open to Everyone!".to_owned(),
-                    description: "<p>Spend some time on your project by bringing it along to our weekly project night, an evening designed around you and what you're working on.</p> <p>This weekly event is about finding time to tinker, being creative, and meeting other members of the community. You'll get the chance to see what others are working on, share your projects, and to get inspiration and feedback from fellow tinkerers.</p> <p>On any given Tuesday night you have people working on electronics, knitting, writing code, wood-working, or just their plans for world domination. Beer is also consumed.</p> <p>We’ll provide: space to work, basic tools, power, a room full of like minded people.</p> <p>You’ll provide: your project, ideas and beer (optional). A laptop would probably be useful too.</p> <p>Sometimes we work on group projects together, which are usually set up as separate meetup events. Keep an eye on our events page to see what we’re working on next.</p> <p>Note: We usually have around 10 or 20 people at these events, many of our members come along but aren't counted as they don't respond on meetup.</p> <p><img src=\"http://photos3.meetupstatic.com/photos/event/b/3/b/2/600_459406002.jpeg\" /></p> ".to_owned(),
-                    link: "https://www.meetup.com/Cambridge-Hackspace/events/249620800/".to_owned(),
-                    local_date: "2018-04-17".to_owned(),
-                    local_time: "18:30".to_owned(),
-                },
-                Event {
-                    name: "PyCon Rehearsal Night #1".to_owned(),
-                    description: "<p>.</p> ".to_owned(),
-                    link: "https://www.meetup.com/bostonpython/events/247552529/".to_owned(),
-                    local_date: "2018-04-25".to_owned(),
-                    local_time: "19:00".to_owned(),
-                },
-            ]
-        );
-    }
-}