refactor!: remove Href (#760)

It was an abstraction we didn't need, it turns out.

Author: gadomski

crates/api/src/collections.rs

@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 use serde_json::{Map, Value};
-use stac::{Collection, Href, Link};
+use stac::{Collection, Link};
 use stac_derive::{Links, SelfHref};
 
 /// Object containing an array of collections and an array of links.
@@ -17,7 +17,7 @@ pub struct Collections {
     pub additional_fields: Map<String, Value>,
 
     #[serde(skip)]
-    self_href: Option<Href>,
+    self_href: Option<String>,
 }
 
 impl From<Vec<Collection>> for Collections {

crates/api/src/item_collection.rs

@@ -1,7 +1,7 @@
 use crate::{Item, Result};
 use serde::{Deserialize, Deserializer, Serialize};
 use serde_json::{Map, Value};
-use stac::{Href, Link};
+use stac::Link;
 use stac_derive::{Links, SelfHref};
 
 const ITEM_COLLECTION_TYPE: &str = "FeatureCollection";
@@ -95,7 +95,7 @@ pub struct ItemCollection {
     pub last: Option<Map<String, Value>>,
 
     #[serde(skip)]
-    self_href: Option<Href>,
+    self_href: Option<String>,
 }
 
 /// The search-related metadata for the [ItemCollection].

crates/cli/src/lib.rs

@@ -7,7 +7,7 @@ use async_stream::try_stream;
 use clap::{Parser, Subcommand};
 use futures_core::TryStream;
 use futures_util::{TryStreamExt, pin_mut};
-use stac::{Assets, Collection, Href, Item, Links, Migrate, SelfHref, geoparquet::Compression};
+use stac::{Assets, Collection, Item, Links, Migrate, SelfHref, geoparquet::Compression};
 use stac_api::{GetItems, GetSearch, Search};
 use stac_io::{Format, StacStore, Validate};
 use stac_server::Backend;
@@ -527,7 +527,7 @@ impl Rustac {
         let href = href.and_then(|s| if s == "-" { None } else { Some(s) });
         let format = self.input_format(href);
         if let Some(href) = href {
-            let (store, path) = stac_io::parse_href_opts(Href::from(href), self.opts())?;
+            let (store, path) = stac_io::parse_href_opts(href, self.opts())?;
             let value: stac::Value = store.get_format(path, format).await?;
             Ok(value)
         } else {
@@ -542,7 +542,7 @@ impl Rustac {
         let href = href.and_then(|s| if s == "-" { None } else { Some(s) });
         let format = self.output_format(href);
         if let Some(href) = href {
-            let (store, path) = stac_io::parse_href_opts(Href::from(href), self.opts())?;
+            let (store, path) = stac_io::parse_href_opts(href, self.opts())?;
             let _ = match value {
                 Value::Json(json) => store.put_format(path, json, format).await?,
                 Value::Stac(stac) => store.put_format(path, stac, format).await?,
@@ -742,7 +742,7 @@ async fn crawl(value: stac::Value, store: StacStore) -> impl TryStream<Item = Re
                         .cloned()
                     {
                         let store = store.clone();
-                        let url = Url::try_from(link.href)?;
+                        let url = Url::parse(&link.href)?;
                         join_set.spawn(async move {
                             let value: stac::Value = store.get(url.path()).await?;
                             Ok(value)
@@ -754,15 +754,17 @@ async fn crawl(value: stac::Value, store: StacStore) -> impl TryStream<Item = Re
                     }
                 }
                 Item(mut item) => {
-                    if let Some(self_href) = item.self_href().cloned() {
-                        item.make_assets_absolute(self_href)?;
+                    if let Some(self_href) = item.self_href() {
+                        let self_href=  self_href.to_string();
+                        item.make_assets_absolute(&self_href)?;
                     }
                     yield item;
                 }
                 ItemCollection(item_collection) => {
                     for mut item in item_collection.items {
-                        if let Some(self_href) = item.self_href().cloned() {
-                            item.make_assets_absolute(self_href)?;
+                        if let Some(self_href) = item.self_href() {
+                            let self_href = self_href.to_string();
+                            item.make_assets_absolute(&self_href)?;
                         }
                         yield item;
                     }

crates/core/CHANGELOG.md

@@ -21,8 +21,6 @@ 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))
 - `href::make_absolute` is now public ([#757](https://github.com/stac-utils/rustac/pull/757))
 
 ### Fixed
@@ -32,6 +30,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Removed
 
 - IO (moved to **stac-io**) ([#739](https://github.com/stac-utils/rustac/pull/739))
+- `Href` ([#760](https://github.com/stac-utils/rustac/pull/760))
 
 ## [0.12.0] - 2025-01-31
 

crates/core/src/asset.rs

@@ -1,4 +1,4 @@
-use crate::{Band, DataType, Href, Result, Statistics};
+use crate::{Band, DataType, Result, 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: Href,
+    pub href: String,
 
     /// The displayed title for clients and users.
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -114,9 +114,9 @@ pub trait Assets {
     fn assets_mut(&mut self) -> &mut IndexMap<String, Asset>;
 
     /// Makes all asset hrefs absolute.
-    fn make_assets_absolute(&mut self, base: impl AsRef<Href>) -> Result<()> {
+    fn make_assets_absolute(&mut self, base: &str) -> Result<()> {
         for asset in self.assets_mut().values_mut() {
-            asset.href = asset.href.into_absolute(&base)?;
+            asset.href = crate::href::make_absolute(&asset.href, base)?.into();
         }
         Ok(())
     }
@@ -132,9 +132,9 @@ impl Asset {
     /// let asset = Asset::new("an-href");
     /// assert_eq!(asset.href, "an-href");
     /// ```
-    pub fn new(href: impl Into<Href>) -> Asset {
+    pub fn new(href: impl ToString) -> Asset {
         Asset {
-            href: href.into(),
+            href: href.to_string(),
             title: None,
             description: None,
             r#type: None,
@@ -183,7 +183,7 @@ impl<'a> From<&'a str> for Asset {
 #[cfg(test)]
 mod tests {
     use super::{Asset, Assets};
-    use crate::{Href, Item};
+    use crate::Item;
 
     #[test]
     fn new() {
@@ -210,8 +210,7 @@ mod tests {
         let asset = Asset::new("an-href");
         let mut item = Item::new("an-item");
         let _ = item.assets.insert("data".into(), asset);
-        item.make_assets_absolute(Href::from("http://rustac.test"))
-            .unwrap();
+        item.make_assets_absolute("http://rustac.test").unwrap();
         assert_eq!(item.assets["data"].href, "http://rustac.test/an-href");
     }
 }

crates/core/src/catalog.rs

@@ -1,4 +1,4 @@
-use crate::{Error, Href, Link, Result, STAC_VERSION, Version};
+use crate::{Error, Link, Result, STAC_VERSION, Version};
 use serde::{Deserialize, Deserializer, Serialize};
 use serde_json::{Map, Value};
 use stac_derive::{Fields, Links, Migrate, SelfHref};
@@ -77,7 +77,7 @@ pub struct Catalog {
     pub additional_fields: Map<String, Value>,
 
     #[serde(skip)]
-    self_href: Option<Href>,
+    self_href: Option<String>,
 }
 
 impl Catalog {

crates/core/src/collection.rs

@@ -1,5 +1,5 @@
 use crate::{
-    Asset, Assets, Bbox, Error, Href, Item, ItemAsset, Link, Links, Migrate, Result, STAC_VERSION,
+    Asset, Assets, Bbox, Error, Item, ItemAsset, Link, Links, Migrate, Result, STAC_VERSION,
     SelfHref, Version,
 };
 use chrono::{DateTime, Utc};
@@ -119,7 +119,7 @@ pub struct Collection {
     pub additional_fields: Map<String, Value>,
 
     #[serde(skip)]
-    self_href: Option<Href>,
+    self_href: Option<String>,
 }
 
 /// This object provides information about a provider.
@@ -246,7 +246,7 @@ impl Collection {
 
     /// Creates a new collection with its extents set to match the item's.
     ///
-    /// Also, adds an `item` link if the item has a [Href] or a `item`.
+    /// Also, adds an `item` link if the item has a href or a `item`.
     ///
     /// # Examples
     ///
@@ -276,8 +276,11 @@ impl Collection {
     }
 
     fn maybe_add_item_link(&mut self, item: &Item) -> Option<&Link> {
-        if let Some(href) = item.self_href().or(item.self_link().map(|link| &link.href)) {
-            self.links.push(Link::item(href.clone()));
+        if let Some(href) = item
+            .self_href()
+            .or(item.self_link().map(|link| link.href.as_str()))
+        {
+            self.links.push(Link::item(href));
             self.links.last()
         } else {
             None
@@ -289,7 +292,7 @@ impl Collection {
     /// This method does a couple of things:
     ///
     /// 1. Updates this collection's extents to contain the item's spatial and temporal bounds
-    /// 2. If the item has a [Href] or a `self` link, adds a `item` link
+    /// 2. If the item has a href or a `self` link, adds a `item` link
     ///
     /// Note that collections are created, by default, with global bounds and no
     /// temporal extent, so you'll want to set those (e.g. with