Remove narrow mime type

Author: oliverguenther

app/models/exports/pdf/components/page.rb

@@ -99,7 +99,7 @@ def custom_footer_image
                   CustomStyle.current.export_footer.present? && CustomStyle.current.export_footer.local_file.present?
 
     image_file = CustomStyle.current.export_footer.local_file.path
-    content_type = OpenProject::ContentTypeDetector.new(image_file).detect
+    content_type = OpenProject::ContentTypeDetector.detect(image_file)
     return unless pdf_embeddable?(content_type)
 
     image_file

lib/open_project/content_type_detector.rb

@@ -83,6 +83,11 @@ class ContentTypeDetector
     SENSIBLE_DEFAULT = "application/binary"
     EMPTY_TYPE = "inode/x-empty"
 
+    # Returns a String describing the file's content type
+    def self.detect(filename)
+      new(filename).detect
+    end
+
     def initialize(filename)
       @filename = filename
     end

lib/open_project/mime_type.rb

@@ -130,9 +130,5 @@ def self.is_type?(type, name)
       main_mimetype = main_mimetype_of(name)
       type.to_s == main_mimetype
     end
-
-    def self.narrow_type(name, content_type)
-      content_type.split("/").first == main_mimetype_of(name) ? of(name) : content_type
-    end
   end
 end

spec/lib/open_project/mime_type_spec.rb

@@ -74,12 +74,4 @@
       end
     end
   end
-
-  it "equals the main type for the narrow type" do
-    expect(described_class.narrow_type("rubyfile.rb", "text/plain")).to eq "text/x-ruby"
-  end
-
-  it "uses original type if main type differs" do
-    expect(described_class.narrow_type("rubyfile.rb", "application/zip")).to eq "application/zip"
-  end
 end