Allow hyphens in media filenames (since we added '\w' for allowing pe…

…riods in filenames).
sul-dlss · Apr 28, 2016 · 80477a3 · 80477a3
1 parent 427196d
commit 80477a3
Show file tree

Hide file tree

Showing 3 changed files with 114 additions and 2 deletions.
diff --git a/config/routes.rb b/config/routes.rb
@@ -5,13 +5,13 @@
     get '/file/auth/:id/:file_name' => 'webauth#login_file', as: :auth_file
   end
 
-  constraints file_name: %r{[^/][\w]+} do
+  constraints file_name: %r{[^/][\w-]+} do
     get '/media/:id/:file_name' => 'media#download', as: :media
     get '/media/auth/:id/:file_name' => 'webauth#login_media_download', as: :auth_media_download
   end
 
   # stream file_name must include format extension, eg .../oo000oo0000.mp4/stream
-  constraints file_name: %r{[^/][\w\.]+} do
+  constraints file_name: %r{[^/][\w\.-]+} do
     get '/media/:id/:file_name/stream' => 'media#stream', as: :media_stream
     get '/media/auth/:id/:file_name/stream' => 'webauth#login_media_stream', as: :auth_media_stream
   end

diff --git a/...oller/_stream/redirects_m3u8_format_to_streaming_server_mp4_prefix_with_playlist_m3u8.yml b/...oller/_stream/redirects_m3u8_format_to_streaming_server_mp4_prefix_with_playlist_m3u8.yml
diff --git a/spec/routing/media_routing_spec.rb b/spec/routing/media_routing_spec.rb
@@ -5,6 +5,12 @@
     expect(get: '/media/oo000oo0000/aa666aa1234.mp4').to route_to(
       'media#download', id: 'oo000oo0000', file_name: 'aa666aa1234', format: 'mp4')
   end
+
+  it 'download: filename with hyphen' do
+    expect(get: '/media/oo000oo0000/aa666aa1234-a.mp4').to route_to(
+      'media#download', id: 'oo000oo0000', file_name: 'aa666aa1234-a', format: 'mp4')
+  end
+
   it 'stream: filename with format suffix' do
     expect(get: '/media/oo000oo0000/aa666aa1234.mp4/stream.m3u8').to route_to(
       'media#stream', id: 'oo000oo0000', file_name: 'aa666aa1234.mp4', format: 'm3u8')
@@ -14,6 +20,11 @@
       'media#stream', id: 'oo000oo0000', file_name: 'aa666aa1234.mov', format: 'm3u8')
   end
 
+  it 'stream: filename with hyphen' do
+    expect(get: '/media/oo000oo0000/aa666aa1234-a.mp4/stream.m3u8').to route_to(
+      'media#stream', id: 'oo000oo0000', file_name: 'aa666aa1234-a.mp4', format: 'm3u8')
+  end
+
   describe 'authorization' do
     it 'download routes to #login_media_download' do
       expect(get: '/media/auth/id/filename.mp4').to route_to(