Cleanup macro registration.

Author: rnixx

HISTORY.rst

@@ -2,6 +2,12 @@
 History
 =======
 
+1.2.1 (unreleased)
+------------------
+
+- Cleanup macro registration.
+  [rnix]
+
 1.2 (2015-01-23)
 ----------------
 

setup.py

@@ -3,7 +3,7 @@
 import os
 
 
-version = '1.2'
+version = '1.2.1.dev0'
 shortdesc = 'Bootstrap Styles for YAFOWIL'
 longdesc = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()
 longdesc += open(os.path.join(os.path.dirname(__file__), 'HISTORY.rst')).read()

src/yafowil/bootstrap/common.py

@@ -74,44 +74,26 @@ def configure_factory():
 
 
 def register_macros():
-    macros = dict()
-    macros['form'] = {
-        'chain': 'form',
-        'props': {
-            'form.class': 'form-horizontal',
-        }
-    }
-    macros['field'] = {
-        'chain': 'field:label:div:help:error',
-        'props': {
-            'label.class_add': 'col-sm-2',
-            'div.class_add': 'col-sm-10',
-        }
-    }
-    macros['button'] = {
-        'chain': 'submit',
-        'props': {
-            'submit.class': 'btn',
-            'submit.class_add': 'btn-default',
-        }
-    }
+    # common
+    factory.register_macro('form', 'form', {
+        'form.class': 'form-horizontal',
+    })
+    factory.register_macro('field', 'field:label:div:help:error', {
+        'label.class_add': 'col-sm-2',
+        'div.class_add': 'col-sm-10',
+    })
+    factory.register_macro('button', 'submit', {
+        'submit.class': 'btn',
+        'submit.class_add': 'btn-default',
+    })
 
     # yafowil.widget.array
-    macros['array'] = {
-        'chain': 'field:label:help:error:array',
-        'props': {
-            'array.label': ' ',
-            'field.class': 'form-group',
-            'label.class_add': 'col-sm-2',
-            'array.class_add': 'col-sm-10',
-            'help.class_add': 'col-sm-offset-2 col-sm-10',
-            'error.class_add': 'col-sm-offset-2 col-sm-10',
-        }
-    }
-    macros['arrayfield'] = {
-        'chain': 'field:label:help:error',
-        'props': {}
-    }
-
-    for name, value in macros.items():
-        factory.register_macro(name, value['chain'], value['props'])
+    factory.register_macro('array', 'field:label:help:error:array', {
+        'array.label': ' ',
+        'field.class': 'form-group',
+        'label.class_add': 'col-sm-2',
+        'array.class_add': 'col-sm-10',
+        'help.class_add': 'col-sm-offset-2 col-sm-10',
+        'error.class_add': 'col-sm-offset-2 col-sm-10',
+    })
+    factory.register_macro('arrayfield', 'field:label:help:error', {})