Cleanup (#56)

* Remove unneeded TryFrom imports

* Fixup README

* Split multipart into separate modules

* Split out resumable to module

Also adds a newtype wrapper around the resumable session so that we have
a bit of type safety.

* Add tests

* Update CHANGELOG

CHANGELOG.md

@@ -8,6 +8,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- next-header -->
 ## [Unreleased] - ReleaseDate
+### Added
+- [PR#54](https://github.com/EmbarkStudios/tame-gcs/pull/54) added support for [resumable uploads](https://cloud.google.com/storage/docs/resumable-uploads). Thanks [@yottabytt](https://github.com/yottabytt)!
+
 ## [0.11.2] - 2022-02-09
 ### Fixed
 - [PR#55](https://github.com/EmbarkStudios/tame-gcs/pull/55) fixed a bug in signed url creation caused by a stray character in the timestamp string.

README.md

@@ -1,4 +1,6 @@
-# 📂 tame-gcs
+<div align="center">
+
+# `📂 tame-gcs`
 
 [![Embark](https://img.shields.io/badge/embark-open%20source-blueviolet.svg)](https://embark.dev)
 [![Embark](https://img.shields.io/badge/discord-ark-%237289da.svg?logo=discord)](https://discord.gg/dAuKfZS)
@@ -9,10 +11,12 @@
 
 `tame-gcs` is a crate with a limited set of [Google Cloud Storage(GCS)](https://cloud.google.com/storage/) operations that follows the [sans-io](https://sans-io.readthedocs.io/) approach.
 
+</div>
+
 ## Why?
 
 * You want to control how you actually make HTTP requests against GCS.
-* You want to have more control over your dependencies, and not be bottlenecked for sticking to a particular version, or quickly upgrading, your HTTP related crates.
+* You want to have more control over your dependencies, and not be bottlenecked by sticking to a particular version, or quickly upgrading, your HTTP related crates.
 
 ## Why not?
 
@@ -26,7 +30,7 @@ For example usage, see the [gsutil](https://github.com/EmbarkStudios/gsutil) cra
 
 ## Contributing
 
-[![Contributor Covenant](https://img.shields.io/badge/contributor%20covenant-v1.4-ff69b4.svg)](../CODE_OF_CONDUCT.md)
+[![Contributor Covenant](https://img.shields.io/badge/contributor%20covenant-v1.4-ff69b4.svg)](CODE_OF_CONDUCT.md)
 
 We welcome community contributions to this project.
 
@@ -36,8 +40,8 @@ Please read our [Contributor Guide](CONTRIBUTING.md) for more information on how
 
 Licensed under either of
 
-* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
-* MIT license ([LICENSE-MIT](LICENSE-MIT) or http://opensource.org/licenses/MIT)
+* Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or <http://www.apache.org/licenses/LICENSE-2.0>)
+* MIT license ([LICENSE-MIT](LICENSE-MIT) or <http://opensource.org/licenses/MIT>)
 
 at your option.
 

src/error.rs

@@ -15,6 +15,8 @@ pub enum Error {
     InvalidPrefix(&'static str),
     #[error("Sequence {0} is not allowed")]
     InvalidSequence(&'static str),
+    #[error("Failed to parse URI")]
+    InvalidUri(UriError),
     #[error("HTTP error")]
     Http(#[source] HttpError),
     #[error("HTTP status")]
@@ -136,6 +138,29 @@ impl From<serde_urlencoded::ser::Error> for Error {
     }
 }
 
+#[derive(Debug, thiserror::Error)]
+pub struct UriError(#[source] http::uri::InvalidUri);
+
+impl fmt::Display for UriError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl PartialEq for UriError {
+    fn eq(&self, other: &Self) -> bool {
+        // This is **TERRIBLE** but all of the error details are unnecessarily
+        // private and it doesn't implement PartialEq ARGH
+        self.0.to_string() == other.0.to_string()
+    }
+}
+
+impl From<http::uri::InvalidUri> for Error {
+    fn from(e: http::uri::InvalidUri) -> Self {
+        Error::InvalidUri(UriError(e))
+    }
+}
+
 #[derive(Debug, PartialEq, Deserialize)]
 pub struct ApiErrorInner {
     pub domain: Option<String>,

src/response.rs

@@ -1,5 +1,4 @@
 use crate::error::{self, Error};
-use std::convert::TryFrom;
 
 pub trait ApiResponse<B>: Sized + TryFrom<http::Response<B>, Error = Error>
 where

src/types.rs

@@ -1,7 +1,7 @@
 //! Helper types for working with GCS
 
 use crate::error::Error;
-use std::{borrow::Cow, convert::TryFrom};
+use std::borrow::Cow;
 
 /// A wrapper around strings meant to be used as bucket names,
 /// to validate they conform to [Bucket Name Requirements](https://cloud.google.com/storage/docs/naming#requirements)

src/v1/objects/delete.rs

@@ -4,7 +4,6 @@ use crate::{
     response::ApiResponse,
     types::ObjectIdentifier,
 };
-use std::convert::TryFrom;
 
 #[derive(Default, Serialize)]
 #[serde(rename_all = "camelCase")]

src/v1/objects/download.rs

@@ -4,7 +4,7 @@ use crate::{
     response::ApiResponse,
     types::ObjectIdentifier,
 };
-use std::{convert::TryFrom, io};
+use std::io;
 
 #[derive(Default, Serialize)]
 #[serde(rename_all = "camelCase")]

src/v1/objects/get.rs

@@ -4,7 +4,6 @@ use crate::{
     response::ApiResponse,
     types::ObjectIdentifier,
 };
-use std::convert::TryFrom;
 
 #[derive(Default, Serialize)]
 #[serde(rename_all = "camelCase")]