Merge pull request #28 from MindFlavor/candidate

Implemented query document (as JSON and as DeserializeOwned)

Author: MindFlavor

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name           = "azure_sdk_for_rust"
-version        = "0.4.3"
+version        = "0.4.4"
 description    = "Rust wrappers around Microsoft Azure REST APIs"
 readme         = "README.md"
 authors        = ["Francesco Cogno <[email protected]>", "Dong Liu <[email protected]>"]
@@ -11,10 +11,6 @@ documentation  = "http://mindflavor.github.io/AzureSDKForRust/azure_sdk_for_rust
 keywords       = ["sdk", "azure", "rest", "iot", "cloud"]
 categories     = ["api-bindings"]
 
-[[bin]]
-name           = "main"
-doc            = false
-
 [dependencies]
 RustyXML       = "0.1.1"
 base64         = "0.6.0"
@@ -28,8 +24,8 @@ mime           = "0.3.2"
 native-tls     = "0.1.4"
 quick-error    = "1.2.0"
 rust-crypto    = "0.2.36"
-serde          = "1.0.9"
-serde_derive   = "1.0.9"
+serde          = "1.0.10"
+serde_derive   = "1.0.10"
 serde_json     = "1.0.2"
 time           = "0.1.38"
 tokio          = "0.0.0"

Cargo.toml

@@ -15,8 +15,8 @@ use azure_sdk_for_rust::azure::cosmos::authorization_token::{AuthorizationToken,
 use azure_sdk_for_rust::azure::cosmos::client::Client;
 use azure_sdk_for_rust::azure::cosmos::list_documents::LIST_DOCUMENTS_OPTIONS_DEFAULT;
 use azure_sdk_for_rust::azure::cosmos::get_document::GET_DOCUMENT_OPTIONS_DEFAULT;
-use azure_sdk_for_rust::azure::cosmos::request_response::{ListDocumentsResponse,
-                                                          GetDocumentResponse};
+use azure_sdk_for_rust::azure::cosmos::request_response::{GetDocumentResponse,
+                                                          ListDocumentsResponse};
 
 #[macro_use]
 extern crate serde_derive;
@@ -66,7 +66,7 @@ fn code() -> Result<(), Box<Error>> {
 
     let client = Client::new(&core.handle(), authorization_token)?;
 
-    for i in 0..5 {
+    for i in 0..50 {
         let doc = MySampleStruct {
             id: &format!("unique_id{}", i),
             a_string: "Something here",
@@ -115,10 +115,10 @@ fn code() -> Result<(), Box<Error>> {
             client.list_documents(&database_name, &collection_name, &ldo),
         ).unwrap();
 
-        assert_eq!(response.documents.len(), 2);
+        assert_eq!(response.documents.len(), 47);
         println!("response == {:?}", response);
 
-        // we got the last 2 entries. Now continuation_token
+        // we got the last 47 entries. Now continuation_token
         // must be absent
         assert_eq!(
             response.additional_headers.continuation_token.is_some(),

examples/document_entries00.rs

@@ -14,10 +14,9 @@ use futures::future::*;
 use tokio_core::reactor::Core;
 
 use azure_sdk_for_rust::azure::storage::client::Client;
-use azure_sdk_for_rust::azure::storage::blob::{BlobType, Blob, PUT_OPTIONS_DEFAULT,
-                                               LEASE_BLOB_OPTIONS_DEFAULT,
-                                               LIST_BLOB_OPTIONS_DEFAULT};
-use azure_sdk_for_rust::azure::core::lease::{LeaseState, LeaseStatus, LeaseAction};
+use azure_sdk_for_rust::azure::storage::blob::{Blob, BlobType, LEASE_BLOB_OPTIONS_DEFAULT,
+                                               LIST_BLOB_OPTIONS_DEFAULT, PUT_OPTIONS_DEFAULT};
+use azure_sdk_for_rust::azure::core::lease::{LeaseAction, LeaseState, LeaseStatus};
 
 use azure_sdk_for_rust::azure::core::errors::AzureError;
 

examples/put_blob.rs

@@ -0,0 +1,130 @@
+extern crate azure_sdk_for_rust;
+
+extern crate futures;
+extern crate tokio_core;
+extern crate tokio;
+extern crate hyper;
+extern crate hyper_tls;
+extern crate chrono;
+
+use std::error::Error;
+
+use tokio_core::reactor::Core;
+
+use azure_sdk_for_rust::azure::cosmos::authorization_token::{AuthorizationToken, TokenType};
+use azure_sdk_for_rust::azure::cosmos::client::Client;
+use azure_sdk_for_rust::azure::cosmos::query_document::QueryDocumentOptions;
+use azure_sdk_for_rust::azure::cosmos::query::Query;
+
+#[macro_use]
+extern crate serde_derive;
+
+#[derive(Serialize, Deserialize, Debug)]
+struct MySampleStructOwned {
+    id: String,
+    a_string: String,
+    a_number: u64,
+    a_timestamp: i64,
+}
+
+fn main() {
+    code().unwrap();
+}
+
+fn code() -> Result<(), Box<Error>> {
+    let database_name = std::env::args().nth(1).expect(
+        "please specify database name as first command line parameter",
+    );
+    let collection_name = std::env::args().nth(2).expect(
+        "please specify collection name as second command line parameter",
+    );
+    let query = std::env::args()
+        .nth(3)
+        .expect("please specify requested query");
+
+    let account = std::env::var("COSMOS_ACCOUNT").expect("Set env variable COSMOS_ACCOUNT first!");
+    let master_key =
+        std::env::var("COSMOS_MASTER_KEY").expect("Set env variable COSMOS_MASTER_KEY first!");
+
+    let authorization_token = AuthorizationToken::new(account, TokenType::Master, master_key)?;
+
+    let mut core = Core::new()?;
+
+    let client = Client::new(&core.handle(), authorization_token)?;
+
+    let options = QueryDocumentOptions::new();
+
+    let future = client.query_document_json(
+        &database_name,
+        &collection_name,
+        &Query::from(&query as &str),
+        &options,
+    );
+
+    let ret = core.run(future)?;
+
+    println!("As JSON:\n{:?}", ret);
+
+    for doc in ret.results.into_iter() {
+        println!("{}", doc.result);
+    }
+
+    let future = client.query_document::<_, _, MySampleStructOwned>(
+        &database_name,
+        &collection_name,
+        &Query::from(&query as &str),
+        &options,
+    );
+
+    let ret = core.run(future)?;
+
+    println!("\nAs entities:\n{:?}", ret);
+
+    for doc in ret.results.into_iter() {
+        println!("{:?}", doc.result);
+    }
+
+    // test continuation token
+    // only if we have more than 2 records
+    let mut options = QueryDocumentOptions::new();
+    options.max_item_count = Some(2);
+
+    let future = client.query_document::<_, _, MySampleStructOwned>(
+        &database_name,
+        &collection_name,
+        &Query::from(&query as &str),
+        &options,
+    );
+
+    let ret = core.run(future)?;
+
+    println!(
+        "Received {} entries. Continuation token is == {:?}",
+        ret.results.len(),
+        ret.additional_headers.continuation_token
+    );
+
+    if let Some(ct) = ret.additional_headers.continuation_token {
+        let ret = {
+            // if we have more, let's get them
+            let mut options = QueryDocumentOptions::new();
+            options.max_item_count = None;
+            options.continuation_token = Some(&ct);
+
+            let future = client.query_document::<_, _, MySampleStructOwned>(
+                &database_name,
+                &collection_name,
+                &Query::from(&query as &str),
+                &options,
+            );
+            core.run(future)?
+        };
+        println!(
+            "Received {} entries. Continuation token is == {:?}",
+            ret.results.len(),
+            ret.additional_headers.continuation_token
+        );
+    }
+
+    Ok(())
+}

examples/query_document00.rs

@@ -1,5 +1,5 @@
 use xml::Element;
-use xml::Xml::{ElementNode, CharacterNode};
+use xml::Xml::{CharacterNode, ElementNode};
 use azure::core::errors::TraversingError;
 use chrono;
 
@@ -152,12 +152,10 @@ where
     T: FromStringOptional<T>,
 {
     match try!(traverse_single_optional(node, path)) {
-        Some(e) => {
-            match inner_text(e) {
-                Ok(txt) => Ok(Some(try!(T::from_str_optional(txt)))),
-                Err(_) => Ok(None),
-            }
-        }
+        Some(e) => match inner_text(e) {
+            Ok(txt) => Ok(Some(try!(T::from_str_optional(txt)))),
+            Err(_) => Ok(None),
+        },
         None => Ok(None),
     }
 }

src/azure/core/parsing.rs

@@ -1,6 +1,6 @@
 use base64;
 
-use std::fmt::{Debug, Formatter, Error};
+use std::fmt::{Debug, Error, Formatter};
 
 #[derive(Copy, Clone, Debug)]
 pub enum TokenType {