Merge pull request #17 from LukasKalbertodt/dev

Version 0.3.0

Author: LukasKalbertodt

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "telegram-bot"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Lukas Kalbertodt <[email protected]>"]
 
 description = "A library for creating Telegram bots."
@@ -18,3 +18,4 @@ exclude = ["deploy.sh"]
 hyper = "*"
 rustc-serialize = "*"
 url = "*"
+multipart = "*"

README.md

@@ -18,7 +18,7 @@ use telegram_bot::*;
 
 fn main() {
     // Create bot, test simple API call and print bot information
-    let mut api = Api::from_env("TELEGRAM_BOT_TOKEN").unwrap();
+    let api = Api::from_env("TELEGRAM_BOT_TOKEN").unwrap();
     println!("getMe: {:?}", api.get_me());
     let mut listener = api.listener(ListeningMethod::LongPoll(None));
 
@@ -83,6 +83,6 @@ Please submit pull request against the `dev` branch, unless all changes are just
   - [x] "getUserProfilePhotos"
 - [x] "getUpdates" and `long_poll`
 - [ ] "setWebhook" and `listen`
-- [ ] sending files ("sendAudio", "sendDocument", ...)
+- [x] sending files ("sendAudio", "sendDocument", ...)
 - [x] More good documentation and examples
 - [x] Maybe think about multithreading stuff

examples/features.rs

@@ -6,7 +6,7 @@ use rustc_serialize::json;
 
 fn main() {
     // Create bot, test simple API call and print bot information
-    let mut api = Api::from_env("TELEGRAM_BOT_TOKEN").unwrap();
+    let api = Api::from_env("TELEGRAM_BOT_TOKEN").unwrap();
     println!("getMe: {:?}", api.get_me());
     let mut listener = api.listener(ListeningMethod::LongPoll(None));
 

examples/simple.rs

@@ -4,7 +4,7 @@ use telegram_bot::*;
 
 fn main() {
     // Create bot, test simple API call and print bot information
-    let mut api = Api::from_env("TELEGRAM_BOT_TOKEN").unwrap();
+    let api = Api::from_env("TELEGRAM_BOT_TOKEN").unwrap();
     println!("getMe: {:?}", api.get_me());
     let mut listener = api.listener(ListeningMethod::LongPoll(None));
 

src/error.rs

@@ -25,6 +25,8 @@ pub enum Error {
     InvalidTokenFormat(::url::ParseError),
     /// The given environment variable could not be fetched.
     InvalidEnvironmentVar(env::VarError),
+    /// The given path is not valid.
+    InvalidPath(String),
 }
 
 impl ::std::error::Error for Error {
@@ -38,6 +40,7 @@ impl ::std::error::Error for Error {
             Error::InvalidState(ref s) => &s,
             Error::InvalidTokenFormat(ref e) => e.description(),
             Error::InvalidEnvironmentVar(ref e) => e.description(),
+            Error::InvalidPath(ref s) => &s,
         }
     }
 }
@@ -53,6 +56,7 @@ impl fmt::Display for Error {
             Error::InvalidState(ref s) => s.fmt(f),
             Error::InvalidTokenFormat(ref e) => e.fmt(f),
             Error::InvalidEnvironmentVar(ref e) => e.fmt(f),
+            Error::InvalidPath(ref s) => s.fmt(f),
         }
     }
 }