style: add StylesPart.styles

Steve Canny · Steve Canny · commit f1ad6483fbee · 2015-02-07T23:59:26.000-08:00
Remove legacy _Styles class and tests
diff --git a/docx/parts/styles.py b/docx/parts/styles.py
@@ -9,7 +9,7 @@
 )
 
 from ..opc.part import XmlPart
-from ..shared import lazyproperty
+from ..styles.styles import Styles
 
 
 class StylesPart(XmlPart):
@@ -33,23 +33,10 @@ def new(cls):
         """
         raise NotImplementedError
 
-    @lazyproperty
+    @property
     def styles(self):
         """
         The |_Styles| instance containing the styles (<w:style> element
         proxies) for this styles part.
         """
-        return _Styles(self._element)
-
-
-class _Styles(object):
-    """
-    Collection of |_Style| instances corresponding to the ``<w:style>``
-    elements in a styles part.
-    """
-    def __init__(self, styles_elm):
-        super(_Styles, self).__init__()
-        self._styles_elm = styles_elm
-
-    def __len__(self):
-        return len(self._styles_elm.style_lst)
+        return Styles(self.element)
diff --git a/docx/styles/styles.py b/docx/styles/styles.py
@@ -8,10 +8,14 @@
     absolute_import, division, print_function, unicode_literals
 )
 
+from ..shared import ElementProxy
 
-class Styles(object):
+
+class Styles(ElementProxy):
     """
     A collection of |Style| objects defined in a document. Supports
     ``len()``, iteration, and dictionary-style access by style id and style
     UI name.
     """
+
+    __slots__ = ()
diff --git a/features/sty-get-styles-part.feature b/features/sty-get-styles-part.feature
@@ -3,6 +3,7 @@ Feature: Get the document styles part
   As a programmer using the advanced python-docx API
   I need access to the styles part of the document
 
+  @wip
   Scenario: Get an existing styles part from document
     Given a document having a styles part
      When I get the styles part from the document
diff --git a/tests/parts/test_styles.py b/tests/parts/test_styles.py
@@ -9,58 +9,39 @@
 import pytest
 
 from docx.oxml.parts.styles import CT_Styles
-from docx.parts.styles import StylesPart, _Styles
+from docx.parts.styles import StylesPart
+from docx.styles.styles import Styles
 
-from ..oxml.unitdata.styles import a_style, a_styles
 from ..unitutil.mock import class_mock, instance_mock
 
 
 class DescribeStylesPart(object):
 
-    def it_provides_access_to_the_styles(self, styles_fixture):
-        styles_part, _Styles_, styles_elm_, styles_ = styles_fixture
+    def it_provides_access_to_its_styles(self, styles_fixture):
+        styles_part, Styles_, styles_ = styles_fixture
         styles = styles_part.styles
-        _Styles_.assert_called_once_with(styles_elm_)
+        Styles_.assert_called_once_with(styles_part.element)
         assert styles is styles_
 
     # fixtures -------------------------------------------------------
 
     @pytest.fixture
-    def styles_fixture(self, _Styles_, styles_elm_, styles_):
+    def styles_fixture(self, Styles_, styles_elm_, styles_):
         styles_part = StylesPart(None, None, styles_elm_, None)
-        return styles_part, _Styles_, styles_elm_, styles_
+        return styles_part, Styles_, styles_
 
     # fixture components ---------------------------------------------
 
     @pytest.fixture
-    def _Styles_(self, request, styles_):
+    def Styles_(self, request, styles_):
         return class_mock(
-            request, 'docx.parts.styles._Styles', return_value=styles_
+            request, 'docx.parts.styles.Styles', return_value=styles_
         )
 
     @pytest.fixture
     def styles_(self, request):
-        return instance_mock(request, _Styles)
+        return instance_mock(request, Styles)
 
     @pytest.fixture
     def styles_elm_(self, request):
         return instance_mock(request, CT_Styles)
-
-
-class Describe_Styles(object):
-
-    def it_knows_how_many_styles_it_contains(self, len_fixture):
-        styles, style_count = len_fixture
-        assert len(styles) == style_count
-
-    # fixtures -------------------------------------------------------
-
-    @pytest.fixture(params=[0, 1, 2, 3])
-    def len_fixture(self, request):
-        style_count = request.param
-        styles_bldr = a_styles().with_nsdecls()
-        for idx in range(style_count):
-            styles_bldr.with_child(a_style())
-        styles_elm = styles_bldr.element
-        styles = _Styles(styles_elm)
-        return styles, style_count
