img: add Jpeg.content_type

Steve Canny · Steve Canny · commit 47a72f350e96 · 2014-02-27T12:08:35.000-08:00
diff --git a/docx/image/constants.py b/docx/image/constants.py
@@ -97,6 +97,7 @@ class MIME_TYPE(object):
     """
     Image content types.
     """
+    JPEG = 'image/jpeg'
     PNG = 'image/png'
 
 
diff --git a/docx/image/jpeg.py b/docx/image/jpeg.py
@@ -7,7 +7,7 @@
 
 from __future__ import absolute_import, division, print_function
 
-from .constants import JPEG_MARKER_CODE
+from .constants import JPEG_MARKER_CODE, MIME_TYPE
 from .helpers import BIG_ENDIAN, StreamReader
 from .image import Image
 
@@ -16,6 +16,13 @@ class Jpeg(Image):
     """
     Base class for JFIF and EXIF subclasses.
     """
+    @property
+    def content_type(self):
+        """
+        MIME content type for this image, unconditionally `image/jpeg` for
+        JPEG images.
+        """
+        return MIME_TYPE.JPEG
 
 
 class Exif(Jpeg):
diff --git a/features/img-characterize-image.feature b/features/img-characterize-image.feature
@@ -3,7 +3,6 @@ Feature: Characterize an image file
   As a programmer using the advanced python-docx API
   I need a way to determine the image content type and size
 
-  @wip
   Scenario Outline: Characterize an image file
     Given the image file '<filename>'
      When I construct an image using the image path
@@ -18,3 +17,4 @@ Feature: Characterize an image file
      | test.png         | image/png  |  901 | 1350 |   150    |   150    |
      | monty-truth.png  | image/png  |  150 |  214 |    72    |    72    |
      | jfif-300-dpi.jpg | image/jpeg | 1504 | 1936 |   300    |   300    |
+     | lena_std.jpg     | image/jpeg |  512 |  512 |    72    |    72    |
diff --git a/features/steps/test_files/lena_std.jpg b/features/steps/test_files/lena_std.jpg
diff --git a/tests/image/test_jpeg.py b/tests/image/test_jpeg.py
@@ -11,16 +11,23 @@
 from mock import call
 
 from docx.compat import BytesIO
-from docx.image.constants import JPEG_MARKER_CODE
+from docx.image.constants import JPEG_MARKER_CODE, MIME_TYPE
 from docx.image.helpers import BIG_ENDIAN, StreamReader
 from docx.image.jpeg import (
-    _App0Marker, Jfif, _JfifMarkers, _Marker, _MarkerFactory, _MarkerFinder,
-    _MarkerParser, _SofMarker
+    _App0Marker, Jfif, _JfifMarkers, Jpeg, _Marker, _MarkerFactory,
+    _MarkerFinder, _MarkerParser, _SofMarker
 )
 
 from ..unitutil import class_mock, initializer_mock, instance_mock
 
 
+class DescribeJpeg(object):
+
+    def it_knows_its_content_type(self):
+        jpeg = Jpeg(None, None, None, None, None)
+        assert jpeg.content_type == MIME_TYPE.JPEG
+
+
 class DescribeJfif(object):
 
     def it_can_construct_from_a_jfif_stream(self, from_stream_fixture):
