feat: use href for asset href (#752)

Author: gadomski

crates/core/CHANGELOG.md

@@ -21,6 +21,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Default to snappy compression for geoparquet ([#673](https://github.com/stac-utils/rustac/pull/673))
 - Ensure geoparquet->json provides valid datetime strings (UTC) ([#711](https://github.com/stac-utils/rustac/pull/711)])
 - Some `Href` method names ([#747](https://github.com/stac-utils/rustac/pull/747))
+- Use `Href` for `Asset.href` 🙈 ([#752](https://github.com/stac-utils/rustac/pull/752))
 
 ### Fixed
 

crates/core/src/asset.rs

@@ -1,4 +1,4 @@
-use crate::{Band, DataType, Statistics};
+use crate::{Band, DataType, Href, Statistics};
 use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
 use serde_json::{Map, Value};
@@ -10,7 +10,7 @@ pub struct Asset {
     /// URI to the asset object.
     ///
     /// Relative and absolute URIs are both allowed.
-    pub href: String,
+    pub href: Href,
 
     /// The displayed title for clients and users.
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -124,9 +124,9 @@ impl Asset {
     /// let asset = Asset::new("an-href");
     /// assert_eq!(asset.href, "an-href");
     /// ```
-    pub fn new(href: impl ToString) -> Asset {
+    pub fn new(href: impl Into<Href>) -> Asset {
         Asset {
-            href: href.to_string(),
+            href: href.into(),
             title: None,
             description: None,
             r#type: None,

crates/core/src/item.rs

@@ -8,7 +8,6 @@ use serde::{Deserialize, Deserializer, Serialize};
 use serde_json::{Map, Value};
 use stac_derive::{Links, Migrate, SelfHref};
 use std::path::Path;
-use url::Url;
 
 const TOP_LEVEL_ATTRIBUTES: [&str; 8] = [
     "type",
@@ -311,11 +310,11 @@ impl Builder {
     pub fn build(self) -> Result<Item> {
         let mut item = Item::new(self.id);
         for (key, mut asset) in self.assets {
-            if Url::parse(&asset.href).is_err() && self.canonicalize_paths {
-                asset.href = Path::new(&asset.href)
-                    .canonicalize()?
-                    .to_string_lossy()
-                    .into_owned();
+            if let Href::String(ref s) = asset.href {
+                if self.canonicalize_paths {
+                    asset.href =
+                        Href::String(Path::new(s).canonicalize()?.to_string_lossy().into_owned());
+                }
             }
             let _ = item.assets.insert(key, asset);
         }
@@ -841,6 +840,7 @@ mod tests {
         assert!(
             asset
                 .href
+                .to_string()
                 .ends_with(&format!("assets{}dataset.tif", std::path::MAIN_SEPARATOR))
         );
     }