Merge branch 'master' into ordinal-next-prev

src/index.rs

@@ -251,7 +251,7 @@ impl Index {
     let height_to_hash = rtx.0.open_table(HEIGHT_TO_HASH)?;
 
     let mut cursor = height_to_hash
-      .range(height.saturating_sub(take)..=height)?
+      .range(height.saturating_sub(take.saturating_sub(1))..=height)?
       .rev();
 
     while let Some(next) = cursor.next() {

src/subcommand/server.rs

@@ -4,7 +4,7 @@ use {
   self::{
     deserialize_ordinal_from_str::DeserializeOrdinalFromStr,
     templates::{
-      block::BlockHtml, ordinal::OrdinalHtml, output::OutputHtml, root::RootHtml,
+      block::BlockHtml, ordinal::OrdinalHtml, output::OutputHtml, range::RangeHtml, root::RootHtml,
       transaction::TransactionHtml, Content,
     },
     tls_acceptor::TlsAcceptor,
@@ -16,6 +16,7 @@ use {
     AcmeConfig,
   },
   serde::{de, Deserializer},
+  std::cmp::Ordering,
   tokio_stream::StreamExt,
 };
 
@@ -203,21 +204,15 @@ impl Server {
       (DeserializeOrdinalFromStr, DeserializeOrdinalFromStr),
     >,
   ) -> impl IntoResponse {
-    if start == end {
-      return (StatusCode::BAD_REQUEST, Html("Empty Range".to_string()));
-    }
-
-    if start > end {
-      return (
+    match start.cmp(&end) {
+      Ordering::Equal => (StatusCode::BAD_REQUEST, Html("Empty Range".to_string())).into_response(),
+      Ordering::Greater => (
         StatusCode::BAD_REQUEST,
         Html("Range Start Greater Than Range End".to_string()),
-      );
+      )
+        .into_response(),
+      Ordering::Less => RangeHtml { start, end }.page().into_response(),
     }
-
-    (
-      StatusCode::OK,
-      Html(format!("<a href='/ordinal/{start}'>first</a>")),
-    )
   }
 
   async fn root(index: extract::Extension<Arc<Index>>) -> impl IntoResponse {

src/subcommand/server/templates.rs

@@ -3,6 +3,7 @@ use {super::*, boilerplate::Display};
 pub(crate) mod block;
 pub(crate) mod ordinal;
 pub(crate) mod output;
+pub(crate) mod range;
 pub(crate) mod root;
 pub(crate) mod transaction;
 

src/subcommand/server/templates/range.rs

@@ -0,0 +1,62 @@
+use super::*;
+
+#[derive(Display)]
+pub(crate) struct RangeHtml {
+  pub(crate) start: Ordinal,
+  pub(crate) end: Ordinal,
+}
+
+impl Content for RangeHtml {
+  fn title(&self) -> String {
+    format!("Ordinal range [{},{})", self.start, self.end)
+  }
+
+  fn page(self) -> PageHtml {
+    PageHtml {
+      content: Box::new(self),
+    }
+  }
+}
+
+#[cfg(test)]
+mod tests {
+  use {super::*, pretty_assertions::assert_eq, unindent::Unindent};
+
+  #[test]
+  fn ordinal_html() {
+    assert_eq!(
+      RangeHtml {
+        start: Ordinal(0),
+        end: Ordinal(1),
+      }
+      .to_string(),
+      "
+        <h1>Ordinal range [0,1)</h1>
+        <dl>
+          <dt>size</dt><dd>1</dd>
+          <dt>first</dt><dd><a href=/ordinal/0>0</a></dd>
+        </dl>
+      "
+      .unindent()
+    );
+  }
+
+  #[test]
+  fn bugfix_broken_link() {
+    assert_eq!(
+      RangeHtml {
+        start: Ordinal(1),
+        end: Ordinal(10),
+      }
+      .to_string(),
+      "
+        <h1>Ordinal range [1,10)</h1>
+        <dl>
+          <dt>size</dt><dd>9</dd>
+          <dt>first</dt><dd><a href=/ordinal/1>1</a></dd>
+        </dl>
+      "
+      .unindent()
+    );
+  }
+}

templates/range.html

@@ -0,0 +1,5 @@
+<h1>Ordinal range [{{self.start}},{{self.end}})</h1>
+<dl>
+  <dt>size</dt><dd>{{self.end.n() - self.start.n()}}</dd>
+  <dt>first</dt><dd><a href=/ordinal/{{self.start.n()}}>{{self.start.n()}}</a></dd>
+</dl>

tests/server.rs

@@ -62,8 +62,16 @@ fn empty_range_returns_400() {
 }
 
 #[test]
-fn range_links_to_first() {
-  State::new().request("range/0/1", 200, "<a href='/ordinal/0'>first</a>");
+fn range() {
+  State::new().request_regex(
+    "range/0/1",
+    200,
+    r".*<title>Ordinal range \[0,1\)</title>.*<h1>Ordinal range \[0,1\)</h1>
+<dl>
+  <dt>size</dt><dd>1</dd>
+  <dt>first</dt><dd><a href=/ordinal/0>0</a></dd>
+</dl>.*",
+  );
 }
 
 #[test]
@@ -162,7 +170,7 @@ fn root_block_limit() {
   state.request_regex(
     "/",
     200,
-    ".*<ul>\n(  <li>[[:digit:]]{3} - <a href=/block/[[:xdigit:]]{64}>[[:xdigit:]]{64}</a></li>\n){101}</ul>.*"
+    ".*<ul>\n(  <li>[[:digit:]]{3} - <a href=/block/[[:xdigit:]]{64}>[[:xdigit:]]{64}</a></li>\n){100}</ul>.*"
   );
 }