#14 match a path in respect of serialier extensions

khrt · Jun 10, 2015 · 15599b7 · 15599b7
1 parent 126cb5f
commit 15599b7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/Raisin/Routes/Endpoint.pm b/lib/Raisin/Routes/Endpoint.pm
@@ -51,7 +51,8 @@ sub _build_regex {
             "(?<format>\.${ \$self->api_format })?";
         }
         else {
-            '(?<format>\.\w+)?';
+            my $se = join '|', Raisin::Util::valid_extensions();
+            "(?<format>(?:\.(?:$se))?)?";
         }
     };
 
@@ -65,7 +66,7 @@ sub _rep_regex {
 
     for ($switch) {
         if ($_ eq ':' || $_ eq '?') {
-            $r = $a . ($self->check->{$token} // '[^/.]+') . $b;
+            $r = $a . ($self->check->{$token} // '[^/]+?') . $b;
         }
         if ($_ eq '*') {
             $r = $a . '.+' . $b;

diff --git a/lib/Raisin/Util.pm b/lib/Raisin/Util.pm
@@ -14,9 +14,14 @@ my %SERIALIZERS = (
 
     text     => 'text',
     txt      => 'text',
+
     plain    => 'text',
 );
 
+sub valid_extensions {
+    keys %SERIALIZERS;
+}
+
 sub detect_serializer {
     my $type = shift;
     return unless $type;