Merge pull request #6 from MindFlavor/candidate

Implemented put_block and exported options

Author: MindFlavor

CHANGELOG.md

@@ -1,17 +1,40 @@
 # Change Log
 
+
+## [0.0.7](https://github.com/MindFlavor/AzureSDKForRust/releases/tag/0.0.7) (2015-01-14)
+
+**Implemented features:**
+* Added support for ```put_block``` in ```Blob```.
+* Added support for ```filter```  in ```Blob::list```. Now you can filter the blobs to find specifying the starting string.
+* Added support for ```timeout``` in ```Blob::list```.
+* Added support for ```timeout```, ```prefix``` and ```max_results```  in ```Container::list```.
+* Added support for ```max_results``` in ```Container::list```. Now you can limit how many containers could be returned by a single call.
+* Added support for ```next_marker``` in ```Container::list```. Now you can continue enumerating your containers in subsequent calls.
+
+**Refactoring:**
+* Moved ```Container::list``` options in a separate structure (```azure::storage::container::ListContainerOptions```).
+* Moved ```Blob::put_page``` options in a separate structure (```azure::storage::blob::PutPageOptions```).
+
+**Bugfixes:**
+* Corrected the format bug in ```azure::core::range::Range``` and ```azure::core::range::ba512_range::BA512Range```. Previously the string returned was
+formatted as ```{}/{}``` which is invalid for the ```x-ms-range``` header. Now the format is ```bytes={}-{}``` as expected. I still need to figure out if
+  I need to change the ```FromStr``` trait too to match the change.
+
+**Removed methods:**
+* Removed ```ListBlobOptions::new``` as it was just useless boilerplate.
+
 ## [0.0.6](https://github.com/MindFlavor/AzureSDKForRust/releases/tag/0.0.6) (2016-01-12)
 
 **Implemented features:**
-* Added support for max_results in list_blobs. Now you can limit how many blobs could be returned by a single call.
-* Added support for next_marker in list_blobs. Now you can continue enumerating your blobs in subsequent calls.
-* Added put page for page blobs.
-* Added clear page for page blobs.
+* Added support for max_results in ```Blob::list```. Now you can limit how many blobs could be returned by a single call.
+* Added support for next_marker in ```Blob::list```. Now you can continue enumerating your blobs in subsequent calls.
+* Added ```put page``` for page blobs.
+* Added ```clear page``` for page blobs.
 
 **Refactoring:**
 * Added page constraints (512-bytes aligned).
-* Most methods moved from storage::Client to correct structs (ie storage::container::Container and storage::blob::Blob).
-* Moved list_blobs options in a separate structure (```azure::storage::blob::ListBlobOptions```).
+* Most methods moved from ```storage::Client``` to correct structs (ie ```storage::container::Container``` and ```storage::blob::Blob```).
+* Moved ```Blob::list``` options in a separate structure (```azure::storage::blob::ListBlobOptions```).
 
 ## [0.0.5](https://github.com/MindFlavor/AzureSDKForRust/releases/tag/0.0.5) (2016-01-05)
 

Cargo.lock

@@ -9,6 +9,8 @@ rust-crypto = "^0.2"
 rustc-serialize = "*"
 RustyXML = "*"
 mime = "*"
+log = "0.3"
+env_logger = "0.3"
 
 [dependencies.hyper]
 version = "*"

Cargo.toml

@@ -24,7 +24,7 @@ extern crate mime;
 use azure::storage::{LeaseState, LeaseStatus};
 use azure::storage::client::Client;
 use azure::storage::blob::{Blob, BlobType};
-use azure::storage::container::{Container, PublicAccess};
+use azure::storage::container::{Container, PublicAccess, LIST_CONTAINER_OPTIONS_DEFAULT};
 
 use chrono::UTC;
 
@@ -41,7 +41,7 @@ fn main() {
 
 
   // This call will list your containers.
-  let containers = Container::list(&client).unwrap();
+  let containers = Container::list(&client, &LIST_CONTAINER_OPTIONS_DEFAULT).unwrap();
   println!("{:?}", ret);
 
   // This call will create a new Azure Container called "wow"
@@ -128,5 +128,7 @@ If you want to contribute please do! No formality required! :wink:
 |Put blob|[https://msdn.microsoft.com/en-us/library/azure/dd179451.aspx](https://msdn.microsoft.com/en-us/library/azure/dd179451.aspx)|
 |Put blob page|[https://msdn.microsoft.com/en-us/library/azure/dd179451.aspx](https://msdn.microsoft.com/en-us/library/azure/dd179451.aspx)|
 |Clear blob page|[https://msdn.microsoft.com/en-us/library/azure/dd179451.aspx](https://msdn.microsoft.com/en-us/library/azure/dd179451.aspx)|
+|Put block|[https://msdn.microsoft.com/en-us/library/azure/dd135726.aspx](https://msdn.microsoft.com/en-us/library/azure/dd135726.aspx)|
+
 ## License
 This project is published under [The MIT License (MIT)](LICENSE).

README.md

@@ -31,6 +31,11 @@ impl BA512Range {
             end: end,
         })
     }
+
+    #[inline]
+    pub fn len(&self) -> u64 {
+        self.end - self.start + 1
+    }
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -86,7 +91,7 @@ impl FromStr for BA512Range {
 
 impl fmt::Display for BA512Range {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}/{}", self.start, self.end)
+        write!(f, "bytes={}-{}", self.start, self.end)
     }
 }
 
@@ -135,6 +140,6 @@ mod test {
 
         let txt = format!("{}", range);
 
-        assert_eq!(txt, "0/511");
+        assert_eq!(txt, "bytes=0-511");
     }
 }

src/azure/core/ba512_range.rs

@@ -57,7 +57,7 @@ header! { (XMSLeaseState, "x-ms-lease-state") => [LeaseState] }
 header! { (XMSLeaseDuration, "x-ms-lease-duration") => [LeaseDuration] }
 header! { (ETag, "ETag") => [String] }
 header! { (XMSRangeGetContentMD5, "x-ms-range-get-content-md5") => [bool] }
-
+header! { (XMSClientRequestId, "x-ms-client-request-id") => [String] }
 
 pub fn generate_authorization(h: &Headers,
                               u: &url::Url,

src/azure/core/mod.rs

@@ -51,7 +51,7 @@ impl FromStr for Range {
 
 impl fmt::Display for Range {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "{}/{}", self.start, self.end)
+        write!(f, "bytes={}-{}", self.start, self.end)
     }
 }
 
@@ -88,6 +88,6 @@ mod test {
 
         let txt = format!("{}", range);
 
-        assert_eq!(txt, "100/500");
+        assert_eq!(txt, "bytes=100-500");
     }
 }

src/azure/core/range.rs

@@ -6,6 +6,8 @@ pub struct ListBlobOptions {
     pub include_uncommittedblobs: bool,
     pub include_copy: bool,
     pub next_marker: Option<String>,
+    pub prefix: Option<String>,
+    pub timeout: Option<u64>,
 }
 
 pub const LIST_BLOB_OPTIONS_DEFAULT: ListBlobOptions = ListBlobOptions {
@@ -15,29 +17,8 @@ pub const LIST_BLOB_OPTIONS_DEFAULT: ListBlobOptions = ListBlobOptions {
     include_uncommittedblobs: false,
     include_copy: false,
     next_marker: None,
+    prefix: None,
+    timeout: None,
 };
 
-impl ListBlobOptions {
-    pub fn new(max_results: u32,
-               include_snapshots: bool,
-               include_metadata: bool,
-               include_uncommittedblobs: bool,
-               include_copy: bool,
-               next_marker: Option<&str>)
-               -> ListBlobOptions {
-
-        let nm = match next_marker {
-            Some(s) => Some(s.to_owned()),
-            None => None,
-        };
-
-        ListBlobOptions {
-            max_results: max_results,
-            include_snapshots: include_snapshots,
-            include_metadata: include_metadata,
-            include_uncommittedblobs: include_uncommittedblobs,
-            include_copy: include_copy,
-            next_marker: nm,
-        }
-    }
-}
+impl ListBlobOptions {}