Merge pull request #3 from MorphoSource/fileset-bug

MR-1639: Return an empty array instead of [nil]

lib/iiif_manifest/file_set_manager.rb

@@ -3,6 +3,13 @@ class FileSetManager
 
       attr_reader :work
 
+      PRESENTER_TYPES = {
+        'Mesh' => 'mesh',
+        'CTImageSeries' => 'volume',
+        'Image' => 'image',
+        'Video' => 'video'
+      }
+
       def initialize(work)
         @work = work
       end
@@ -12,22 +19,18 @@ def file_set_presenters
       end
 
       def results
-        # Return first file set presenter of matching mime types
-        return first_presenter(:mesh?) if media_type_is?('Mesh')
-        return first_presenter(:volume?) if media_type_is?('CTImageSeries')
-        return first_presenter(:image?) if media_type_is?('Image')
-        return first_presenter(:video?) if media_type_is?('Video')
-
-        # Don't return any presenters if media type is photogrammetry or other
-        []
+        return [] unless media_type = @work.media_type&.first
+
+        type = "#{PRESENTER_TYPES[media_type]}?".to_sym # convert 'mesh' to :mesh?
+        first_presenter(type).compact
       end
 
       def first_presenter(type)
-        [file_set_presenters.find{ |presenter| presenter.send(type) }]
+        [file_set_presenters.find{ |presenter| presenter.try(type) }]
       end
 
       def all_presenters(type)
-        file_set_presenters.select{ |presenter| presenter.send(type) }
+        file_set_presenters.select{ |presenter| presenter.try(type) }
       end
 
       def media_type_is?(type)