Moved classes Details(), Dialog() and Div() from html/construct.py to…

… html/tags

docs/api.rst

@@ -66,15 +66,15 @@ API Reference
     :members:
 
 
-.. autoclass:: korona.html.construct.Details
+.. autoclass:: korona.html.tags.Details
     :members:
 
 
-.. autoclass:: korona.html.construct.Dialog
+.. autoclass:: korona.html.tags.Dialog
     :members:
 
 
-.. autoclass:: korona.html.construct.Div
+.. autoclass:: korona.html.tags.Div
     :members:
 
 

docs/guide.rst

@@ -441,7 +441,7 @@ Korona supports ``open`` attribute for ``<details>`` tag. Korona can help you bu
 
 .. code-block:: python
 
-    from korona.html.construct import Details
+    from korona.html.tags import Details
 
     attributes = {'open': True, 'text': 'abcd'}
 
@@ -463,7 +463,7 @@ Korona supports ``open`` attribute for ``<dialog>`` tag. Korona can help you bui
 
 .. code-block:: python
 
-    from korona.html.construct import Dialog
+    from korona.html.tags import Dialog
 
     attributes = {'open': True, 'text': 'abcd'}
 
@@ -485,7 +485,7 @@ Korona supports ``align`` attribute for ``<div>`` tag. Korona can help you build
 
 .. code-block:: python
 
-    from korona.html.construct import Div
+    from korona.html.tags import Div
 
     attributes = {'align': 'left', 'text': 'abcd'}
 

korona/html/construct.py

@@ -33,68 +33,6 @@
 CIRCLE_SHAPE_COORDINATES = 3
 
 
-class Details(object):
-    """Class for constructing details tag.
-
-    Args:
-        open (bool): Specifies that the details should be visible (open) to
-            the user.
-        text (str): Specifies the details text. (As in
-            <details>{text}</details>)
-
-    .. versionadded:: 0.2.0
-    """
-    def __init__(self, open=False, text=None):
-        self.tag = 'details'
-        self.values = {'open': open, 'text': text}
-
-    def construct(self):
-        """Returns the constructed details tag <details></details>."""
-        return details_tag.render(self.values)
-
-
-class Dialog(object):
-    """Class for constructing dialog tag.
-
-    Args:
-        open (bool): Specifies that the dialog element is active and that the
-            user can interact with it.
-        text (str): Specifies the dialog text. (As in
-            <dialog>{text}</dialog>)
-
-    .. versionadded:: 0.2.0
-    """
-    def __init__(self, open=False, text=None):
-        self.tag = 'dialog'
-        self.values = {'open': open, 'text': text}
-
-    def construct(self):
-        """Returns the constructed dialog tag <dialog></dialog>."""
-        return dialog_tag.render(self.values)
-
-
-class Div(object):
-    """Class for constructing div tag.
-
-    Args:
-        align (str): Specifies the alignment of the content inside a <div>
-            element.
-        text (str): Specifies the div text. (As in <div>{text}</div>)
-
-    .. versionadded:: 0.2.0
-    """
-    def __init__(self, align=None, text=None):
-        self.tag = 'div'
-        validate_attribute_values(tag=self.tag,
-                                  attribute_name='align',
-                                  value=align)
-        self.values = {'align': align, 'text': text}
-
-    def construct(self):
-        """Returns the constructed div tag <div></div>."""
-        return div_tag.render(self.values)
-
-
 class Embed(object):
     """Class for constructing embed tag.
 

korona/html/tags/__init__.py

@@ -19,5 +19,8 @@
 
 from .description import DD, DL, DT
 from .delete import Del
+from .details import Details
+from .dialog import Dialog
+from .div import Div
 
 from .heading import H1, H2, H3, H4, H5, H6

korona/html/tags/details.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+"""Module for constructing <details> tag."""
+
+from ...templates.html.tags import details_tag
+
+
+class Details(object):
+    """Class for constructing details tag.
+
+    Args:
+        open (bool): Specifies that the details should be visible (open) to
+            the user.
+        text (str): Specifies the details text. (As in
+            <details>{text}</details>)
+
+    .. versionadded:: 0.2.0
+    """
+    def __init__(self, open=False, text=None):
+        self.tag = 'details'
+        self.values = {'open': open, 'text': text}
+
+    def construct(self):
+        """Returns the constructed details tag <details></details>."""
+        return details_tag.render(self.values)

korona/html/tags/dialog.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+"""Module for constructing <dialog> tag."""
+
+from ...templates.html.tags import dialog_tag
+
+
+class Dialog(object):
+    """Class for constructing dialog tag.
+
+    Args:
+        open (bool): Specifies that the dialog element is active and that the
+            user can interact with it.
+        text (str): Specifies the dialog text. (As in
+            <dialog>{text}</dialog>)
+
+    .. versionadded:: 0.2.0
+    """
+    def __init__(self, open=False, text=None):
+        self.tag = 'dialog'
+        self.values = {'open': open, 'text': text}
+
+    def construct(self):
+        """Returns the constructed dialog tag <dialog></dialog>."""
+        return dialog_tag.render(self.values)

korona/html/tags/div.py

@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+"""Module for constructing <div> tag."""
+
+from ...lib.utils import validate_attribute_values
+from ...templates.html.tags import div_tag
+
+
+class Div(object):
+    """Class for constructing div tag.
+
+    Args:
+        align (str): Specifies the alignment of the content inside a <div>
+            element.
+        text (str): Specifies the div text. (As in <div>{text}</div>)
+
+    .. versionadded:: 0.2.0
+    """
+    def __init__(self, align=None, text=None):
+        self.tag = 'div'
+        validate_attribute_values(tag=self.tag,
+                                  attribute_name='align',
+                                  value=align)
+        self.values = {'align': align, 'text': text}
+
+    def construct(self):
+        """Returns the constructed div tag <div></div>."""
+        return div_tag.render(self.values)

tests/test_html_tags/test_details_tag.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+from ..fixtures import parametrize
+
+from korona.html.tags import Details
+from korona.templates.html.tags import details_tag
+
+
+@parametrize('attributes', [
+    ({'open': True}),
+    ({'text': 'abcd'}),
+    ({'open': True, 'text': 'abcd'})
+])
+def test_construct_details_tag(attributes):
+    """Test for validating whether the details tag is constructed correctly or
+    not.
+    """
+    details = Details(**attributes)
+    assert details.construct() == details_tag.render(attributes)

tests/test_html_tags/test_dialog_tag.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+from ..fixtures import parametrize
+
+from korona.html.tags import Dialog
+from korona.templates.html.tags import dialog_tag
+
+
+@parametrize('attributes', [
+    ({'open': True}),
+    ({'text': 'abcd'}),
+    ({'open': True, 'text': 'abcd'})
+])
+def test_construct_dialog_tag(attributes):
+    """Test for validating whether the dialog tag is constructed correctly or
+    not.
+    """
+    dialog = Dialog(**attributes)
+    assert dialog.construct() == dialog_tag.render(attributes)

tests/test_html_tags/test_div_tag.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+import pytest
+
+from ..fixtures import parametrize
+
+from korona.html.tags import Div
+from korona.templates.html.tags import div_tag
+
+
+@parametrize('attributes', [
+    ({'align': 'left'}),
+    ({'text': 'abcd'}),
+    ({'align': 'right', 'text': 'abcd'})
+])
+def test_construct_div_tag(attributes):
+    """Test for validating whether the div tag is constructed correctly or not.
+    """
+    div = Div(**attributes)
+    assert div.construct() == div_tag.render(attributes)
+
+
+@parametrize('attributes,exception,error_msg', [
+    ({'align': 'abcd'},
+     AttributeError,
+     'attribute values should be one of these')
+])
+def test_construct_div_tag_error(attributes, exception, error_msg):
+    """Test for validating div tag's attributes."""
+    with pytest.raises(exception) as exc:
+        Div(**attributes)
+
+    assert error_msg in str(exc)

tests/test_tags.py

@@ -3,9 +3,6 @@
 import pytest
 
 from korona.html.construct import (
-    Details,
-    Dialog,
-    Div,
     Embed,
     FieldSet,
     Figure,
@@ -22,9 +19,6 @@
     Img
 )
 from korona.templates.html import (
-    details_tag,
-    dialog_tag,
-    div_tag,
     embed_tag,
     fieldset_tag,
     figure_tag,
@@ -57,57 +51,6 @@ def test_validate_invalid_tags(tag, error, error_msg):
     assert error_msg in str(exc)
 
 
-@parametrize('attributes', [
-    ({'open': True}),
-    ({'text': 'abcd'}),
-    ({'open': True, 'text': 'abcd'})
-])
-def test_construct_details_tag(attributes):
-    """Test for validating whether the details tag is constructed correctly or
-    not.
-    """
-    details = Details(**attributes)
-    assert details.construct() == details_tag.render(attributes)
-
-
-@parametrize('attributes', [
-    ({'open': True}),
-    ({'text': 'abcd'}),
-    ({'open': True, 'text': 'abcd'})
-])
-def test_construct_dialog_tag(attributes):
-    """Test for validating whether the dialog tag is constructed correctly or
-    not.
-    """
-    dialog = Dialog(**attributes)
-    assert dialog.construct() == dialog_tag.render(attributes)
-
-
-@parametrize('attributes', [
-    ({'align': 'left'}),
-    ({'text': 'abcd'}),
-    ({'align': 'right', 'text': 'abcd'})
-])
-def test_construct_div_tag(attributes):
-    """Test for validating whether the div tag is constructed correctly or not.
-    """
-    div = Div(**attributes)
-    assert div.construct() == div_tag.render(attributes)
-
-
-@parametrize('attributes,exception,error_msg', [
-    ({'align': 'abcd'},
-     AttributeError,
-     'attribute values should be one of these')
-])
-def test_construct_div_tag_error(attributes, exception, error_msg):
-    """Test for validating div tag's attributes."""
-    with pytest.raises(exception) as exc:
-        Div(**attributes)
-
-    assert error_msg in str(exc)
-
-
 @parametrize('attributes', [
     ({'height': '200'}),
     ({'height': '200', 'width': '100'}),