Merge pull request #30 from MindFlavor/candidate

Removed Azure attributes from query_document_json returned JSON

Author: MindFlavor

CHANGELOG.md

@@ -1,3 +1,15 @@
+## [0.4.5](https://github.com/MindFlavor/AzureSDKForRust/releases/tag/0.4.5) (2017-07-22)
+
+**Breaking changes:**
+
+* Removed Azure attributes from returned JSON (field  ```QueryDocumentResponse<String>.results```). 
+
+The removed attributes are in this slice (from [src/azure/cosmos/client.rs](src/azure/cosmos/client.rs)): 
+
+```rust
+const AZURE_KEYS: [&'static str; 5] = ["_attachments", "_etag", "_rid", "_self", "_ts"];
+```
+
 ## [0.4.4](https://github.com/MindFlavor/AzureSDKForRust/releases/tag/0.4.4) (2017-07-20)
 
 **Implemented features:**

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name           = "azure_sdk_for_rust"
-version        = "0.4.4"
+version        = "0.4.5"
 description    = "Rust wrappers around Microsoft Azure REST APIs"
 readme         = "README.md"
 authors        = ["Francesco Cogno <francesco.cogno@outlook.com>", "Dong Liu <doliu@microsoft.com>"]

Cargo.toml

@@ -4,9 +4,9 @@
 
 [![Crate](https://img.shields.io/crates/v/azure_sdk_for_rust.svg)](https://crates.io/crates/azure_sdk_for_rust) [![legal](https://img.shields.io/crates/l/azure_sdk_for_rust.svg)](LICENSE) [![cratedown](https://img.shields.io/crates/d/azure_sdk_for_rust.svg)](https://crates.io/crates/azure_sdk_for_rust) [![cratelastdown](https://img.shields.io/crates/dv/azure_sdk_for_rust.svg)](https://crates.io/crates/azure_sdk_for_rust)
 
-[![tag](https://img.shields.io/github/tag/mindflavor/AzureSDKForRust.svg)](https://github.com/MindFlavor/AzureSDKForRust/tree/0.4.4)
-[![release](https://img.shields.io/github/release/mindflavor/AzureSDKForRust.svg)](https://github.com/MindFlavor/AzureSDKForRust/tree/0.4.4)
-[![commitssince](https://img.shields.io/github/commits-since/mindflavor/AzureSDKForRust/0.4.4.svg)](https://img.shields.io/github/commits-since/mindflavor/AzureSDKForRust/0.4.4.svg)
+[![tag](https://img.shields.io/github/tag/mindflavor/AzureSDKForRust.svg)](https://github.com/MindFlavor/AzureSDKForRust/tree/0.4.5)
+[![release](https://img.shields.io/github/release/mindflavor/AzureSDKForRust.svg)](https://github.com/MindFlavor/AzureSDKForRust/tree/0.4.5)
+[![commitssince](https://img.shields.io/github/commits-since/mindflavor/AzureSDKForRust/0.4.5.svg)](https://img.shields.io/github/commits-since/mindflavor/AzureSDKForRust/0.4.5.svg)
 
 ## Introduction
 Microsoft Azure expose its technologies via REST API. These APIs are easily consumable from any language (good) but are weakly typed. With this library and its related [crate](https://crates.io/crates/azure_sdk_for_rust/) you can exploit the power of Microsoft Azure from Rust in a idiomatic way.

README.md

@@ -81,7 +81,7 @@ fn code() -> Result<(), Box<Error>> {
     println!("\nAs entities:\n{:?}", ret);
 
     for doc in ret.results.into_iter() {
-        println!("{:?}", doc.result);
+        println!("{:?}", doc);
     }
 
     // test continuation token

examples/query_document00.rs

@@ -30,6 +30,7 @@ use std::str::{FromStr, from_utf8};
 
 use serde::Serialize;
 use serde_json::Value;
+use serde_json::map::Map;
 use serde::de::DeserializeOwned;
 
 use crypto::hmac::Hmac;
@@ -77,6 +78,9 @@ header! { (DocumentDBIsQuery, "x-ms-documentdb-isquery") => [bool] }
 header! { (DocumentDBQueryEnableCrossPartition,
     "x-ms-documentdb-query-enablecrosspartition") => [bool] }
 
+const AZURE_KEYS: [&'static str; 5] = ["_attachments", "_etag", "_rid", "_self", "_ts"];
+
+
 #[derive(Clone, Copy)]
 pub enum ResourceType {
     Databases,
@@ -1028,21 +1032,38 @@ fn query_documents_extract_result_json(
 
     let mut v_docs = Vec::new();
 
-    for doc in d.as_array().unwrap().iter() {
+    for doc in d.as_array().unwrap().into_iter() {
         // We could either have a Document or a plain entry.
         // We will find out here.
-        let doc_json = doc.to_string();
 
-        let document_attributes = match serde_json::from_str::<DocumentAttributes>(&doc_json) {
+        let document_attributes = match serde_json::from_value::<DocumentAttributes>(doc.clone()) {
             Ok(document_attributes) => Some(document_attributes),
             Err(_) => None,
         };
 
         debug!("\ndocument_attributes == {:?}", document_attributes);
 
+        // Now we are about to create a new Value::Object
+        // without the extra Azure fields.
+        // This involves a lot a copying (unfortunately).
+        let o_new = {
+            let mut o_new = Value::Object(Map::new());
+            {
+                let mut m_new = o_new.as_object_mut().unwrap();
+
+                for (key, val) in doc.as_object().unwrap() {
+                    if AZURE_KEYS.binary_search(&(&key as &str)).is_err() {
+                        m_new.insert(key.clone(), val.clone());
+                    }
+                }
+            }
+
+            o_new
+        };
+
         v_docs.push(QueryResult {
             document_attributes: document_attributes,
-            result: doc_json,
+            result: o_new.to_string(),
         });
     }