style: add _CharacterStyle.font

Steve Canny · Steve Canny · commit 6186c6a56d0d · 2015-02-08T00:01:40.000-08:00
diff --git a/docx/styles/style.py b/docx/styles/style.py
@@ -10,6 +10,7 @@
 
 from ..enum.style import WD_STYLE_TYPE
 from ..shared import ElementProxy
+from ..text.run import Font
 
 
 def StyleFactory(style_elm):
@@ -134,6 +135,14 @@ def base_style(self, style):
         style_id = style.style_id if style is not None else None
         self._element.basedOn_val = style_id
 
+    @property
+    def font(self):
+        """
+        The |Font| object providing access to the character formatting
+        properties for this style, such as font name and size.
+        """
+        return Font(self._element)
+
 
 class _ParagraphStyle(_CharacterStyle):
     """
diff --git a/features/sty-access-font.feature b/features/sty-access-font.feature
@@ -4,7 +4,6 @@ Feature: Access style font
   I need access to the font of a style
 
 
-  @wip
   Scenario Outline: Get style font
     Given a style of type <style-type>
      Then style.font is the Font object for the style
diff --git a/tests/styles/test_style.py b/tests/styles/test_style.py
@@ -15,6 +15,7 @@
     BaseStyle, _CharacterStyle, _ParagraphStyle, _NumberingStyle,
     StyleFactory, _TableStyle
 )
+from docx.text.run import Font
 
 from ..unitutil.cxml import element, xml
 from ..unitutil.mock import call, class_mock, function_mock, instance_mock
@@ -216,6 +217,12 @@ def it_can_change_its_base_style(self, base_set_fixture):
         style.base_style = value
         assert style._element.xml == expected_xml
 
+    def it_provides_access_to_its_font(self, font_fixture):
+        style, Font_, font_ = font_fixture
+        font = style.font
+        Font_.assert_called_once_with(style._element)
+        assert font is font_
+
     # fixture --------------------------------------------------------
 
     @pytest.fixture(params=[
@@ -255,8 +262,23 @@ def base_set_fixture(self, request, style_):
         expected_xml = xml(expected_style_cxml)
         return style, base_style, expected_xml
 
+    @pytest.fixture
+    def font_fixture(self, Font_, font_):
+        style = _CharacterStyle(element('w:style'))
+        return style, Font_, font_
+
     # fixture components ---------------------------------------------
 
+    @pytest.fixture
+    def Font_(self, request, font_):
+        return class_mock(
+            request, 'docx.styles.style.Font', return_value=font_
+        )
+
+    @pytest.fixture
+    def font_(self, request):
+        return instance_mock(request, Font)
+
     @pytest.fixture
     def style_(self, request):
         return instance_mock(request, BaseStyle)
