Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat-328/add ExtensionMatcher struct #346

Merged
merged 2 commits into from
Oct 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
136 changes: 136 additions & 0 deletions rama-core/src/matcher/ext.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
use crate::{
matcher::{Extensions, Matcher},
Context,
};

use std::marker::PhantomData;
/// A matcher which allows you to match based on an extension,
/// either by comparing with an extension ([`ExtensionMatcher::with_const`]),
/// or using a custom predicate ([`ExtensionMatcher::with_fn`]).
pub struct ExtensionMatcher<P, T> {
predicate: P,
_marker: PhantomData<fn() -> T>,
}

impl<F, T> ExtensionMatcher<private::PredicateFn<F, T>, T>
where
F: Fn(&T) -> bool + Send + Sync + 'static,
T: Clone + Eq + Send + Sync + 'static,
{
/// Create a new [`ExtensionMatcher`] with a predicate `F`,
/// that will be called using the found `T` (if one is present),
/// to let it decide whether or not the extension value is a match or not.
pub fn with_fn(predicate: F) -> Self {
Self {
predicate: private::PredicateFn(predicate, PhantomData),
_marker: PhantomData,
}
}
}

impl<T> ExtensionMatcher<private::PredicateConst<T>, T>
where
T: Clone + Eq + Send + Sync + 'static,
{
/// Create a new [`ExtensionMatcher`] with a const value `T`,
/// that will be [`Eq`]-checked to find a match.
pub fn with_const(value: T) -> Self {
Self {
predicate: private::PredicateConst(value),
_marker: PhantomData,
}
}
}

impl<State, Request, P, T> Matcher<State, Request> for ExtensionMatcher<P, T>
where
State: Clone + Send + Sync + 'static,
Request: Send + 'static,
T: Clone + Send + Sync + 'static,
P: private::ExtensionPredicate<T>,
{
fn matches(&self, _ext: Option<&mut Extensions>, ctx: &Context<State>, _req: &Request) -> bool {
ctx.get::<T>()
.map(|v| self.predicate.call(v))
.unwrap_or_default()
}
}

mod private {
use std::marker::PhantomData;

pub(super) trait ExtensionPredicate<T>: Send + Sync + 'static {
fn call(&self, value: &T) -> bool;
}

pub(super) struct PredicateConst<T>(pub(super) T);

impl<T> ExtensionPredicate<T> for PredicateConst<T>
where
T: Clone + Eq + Send + Sync + 'static,
{
#[inline]
fn call(&self, value: &T) -> bool {
self.0.eq(value)
}
}

pub(super) struct PredicateFn<F, T>(pub(super) F, pub(super) PhantomData<fn() -> T>);

impl<F, T> ExtensionPredicate<T> for PredicateFn<F, T>
where
F: Fn(&T) -> bool + Send + Sync + 'static,
T: Clone + Eq + Send + Sync + 'static,
{
#[inline]
fn call(&self, value: &T) -> bool {
self.0(value)
}
}
}

#[cfg(test)]
#[cfg(test)]
mod test {
GlenDC marked this conversation as resolved.
Show resolved Hide resolved
use super::*;

#[derive(Debug, Clone, PartialEq, Eq)]
struct MyMarker(i32);

#[derive(Debug, Clone, PartialEq, Eq)]
struct MyOtherMarker(i32);

#[test]
fn test_extension_matcher() {
let matcher = ExtensionMatcher::with_const(MyMarker(10));
let mut ctx = Context::default();

assert!(!matcher.matches(None, &ctx, &()));

ctx.insert(MyMarker(20));
assert!(!matcher.matches(None, &ctx, &()));

ctx.insert(MyOtherMarker(10));
assert!(!matcher.matches(None, &ctx, &()));

ctx.insert(MyMarker(10));
assert!(matcher.matches(None, &ctx, &()));
}

#[test]
fn test_fn_extension_matcher() {
let matcher = ExtensionMatcher::with_fn(|v: &MyMarker| v.0 % 2 == 0);
let mut ctx = Context::default();

assert!(!matcher.matches(None, &ctx, &()));

ctx.insert(MyMarker(4));
assert!(matcher.matches(None, &ctx, &()));

ctx.insert(MyMarker(5));
assert!(!matcher.matches(None, &ctx, &()));

ctx.insert(MyOtherMarker(4));
assert!(!matcher.matches(None, &ctx, &()));
}
}
4 changes: 4 additions & 0 deletions rama-core/src/matcher/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ mod iter;
#[doc(inline)]
pub use iter::IteratorMatcherExt;

mod ext;
#[doc(inline)]
pub use ext::ExtensionMatcher;

/// A condition to decide whether `Request` within the given [`Context`] matches for
/// router or other middleware purposes.
pub trait Matcher<State, Request>: Send + Sync + 'static {
Expand Down