Fix loop cycles

.gitignore

@@ -1,2 +1,5 @@
 .coverage
 docs/build
+**/__pycache__/*
+*.pyc
+*.egg-info*

README.rst

@@ -73,7 +73,7 @@ License
 .. _Jinja2: http://jinja.pocoo.org/docs/
 .. _Demo: http://jinja2schema.aromanovich.ru/
 .. _demo page: http://jinja2schema.aromanovich.ru/
-.. _Documentation: http://jinja2schema.rtfd.org/
+.. _Documentation: https://jinja2schema.readthedocs.io/
 .. _GitHub: https://github.com/aromanovich/jinja2schema
 .. _PyPI: https://pypi.python.org/pypi/jinja2schema
 .. _BSD license: https://github.com/aromanovich/jinja2schema/blob/master/LICENSE

jinja2schema/__init__.py

@@ -6,18 +6,18 @@
 
 Type inference for Jinja2 templates.
 
-See http://jinja2schema.rtfd.org/ for documentation.
+See https://jinja2schema.readthedocs.io/ for documentation.
 
-:copyright: (c) 2014 Anton Romanovich
+:copyright: (c) 2017 Anton Romanovich
 :license: BSD
 
 """
 
 __title__ = 'jinja2schema'
 __author__ = 'Anton Romanovich'
 __license__ = 'BSD'
-__copyright__ = 'Copyright 2014 Anton Romanovich'
-__version__ = '0.1.1'
+__copyright__ = 'Copyright 2017 Anton Romanovich'
+__version__ = '0.1.4'
 __version_info__ = tuple(int(i) for i in __version__.split('.'))
 
 

jinja2schema/config.py

@@ -3,6 +3,7 @@
 jinja2schema.config
 ~~~~~~~~~~~~~~~~~~~
 """
+from .order_number import OrderNumber
 
 
 class Config(object):
@@ -47,12 +48,26 @@ class Config(object):
     this configuration is not needed.
     """
 
+    ORDER_NUMBER = False
+    """Add a order number to each node
+
+    Add a order number to make schema sortable.
+    """
+
+    ORDER_NUMBER_SUB_COUNTER = True
+    """Independent subsection order numbers
+
+    Use a separate counter in subsections as order number creator.
+    """
+
     def __init__(self,
                  TYPE_OF_VARIABLE_INDEXED_WITH_VARIABLE_TYPE='dictionary',
                  TYPE_OF_VARIABLE_INDEXED_WITH_INTEGER_TYPE='list',
                  BOOLEAN_CONDITIONS=False,
                  PACKAGE_NAME='',
-                 TEMPLATE_DIR='templates'):
+                 TEMPLATE_DIR='templates',
+                 ORDER_NUMBER=False,
+                 ORDER_NUMBER_SUB_COUNTER=True):
         if TYPE_OF_VARIABLE_INDEXED_WITH_VARIABLE_TYPE not in ('dictionary', 'list'):
             raise ValueError('TYPE_OF_VARIABLE_INDEXED_WITH_VARIABLE_TYPE must be'
                              'either "dictionary" or "list"')
@@ -64,6 +79,9 @@ def __init__(self,
         self.BOOLEAN_CONDITIONS = BOOLEAN_CONDITIONS
         self.PACKAGE_NAME = PACKAGE_NAME
         self.TEMPLATE_DIR = TEMPLATE_DIR
+        self.ORDER_NUMBER = ORDER_NUMBER
+        self.ORDER_OBJECT = OrderNumber(number=1, enabled=self.ORDER_NUMBER,
+                                        sub_counter_enabled=ORDER_NUMBER_SUB_COUNTER)
 
 
 default_config = Config()

jinja2schema/core.py

@@ -76,6 +76,10 @@ def encode_common_attrs(self, var):
         rv = {}
         if var.label:
             rv['title'] = var.label
+        if var.value and var.used_with_default:
+            rv['default'] = var.value
+        if var.order_nr:
+            rv['order_number'] = var.order_nr
         return rv
 
     def encode(self, var):

jinja2schema/mergers.py

@@ -71,6 +71,9 @@ def merge(fst, snd, custom_merger=None):
     result.used_with_default = fst.used_with_default and snd.used_with_default
     result.checked_as_defined = fst.checked_as_defined and snd.checked_as_defined
     result.checked_as_undefined = fst.checked_as_undefined and snd.checked_as_undefined
+    if fst.value == snd.value:
+        result.value = fst.value
+    result.order_nr = fst.order_nr
     if callable(custom_merger):
         result = custom_merger(fst, snd, result)
     return result

jinja2schema/model.py

@@ -47,17 +47,24 @@ class Variable(object):
 
         Is true if the variable occurs within ``{% if %}`` block which condition checks
         if the variable is defined.
+
+    .. attribute:: value
+
+        Value of the variable in template. Set by default filter or assignment.
     """
     def __init__(self, label=None, linenos=None, constant=False,
                  may_be_defined=False, used_with_default=False,
-                 checked_as_undefined=False, checked_as_defined=False):
+                 checked_as_undefined=False, checked_as_defined=False,
+                 value=None, order_nr=None):
         self.label = label
         self.linenos = linenos if linenos is not None else []
         self.constant = constant
         self.may_be_defined = may_be_defined
         self.used_with_default = used_with_default
         self.checked_as_undefined = checked_as_undefined
         self.checked_as_defined = checked_as_defined
+        self.value = value
+        self.order_nr = order_nr
 
     def clone(self):
         cls = type(self)
@@ -68,6 +75,7 @@ def _get_kwargs_from_ast(cls, ast):
         return {
             'linenos': [ast.lineno],
             'label': ast.name if isinstance(ast, nodes.Name) else None,
+            'value': ast.value if hasattr(ast, 'value') else None,
         }
 
     @classmethod
@@ -77,7 +85,7 @@ def from_ast(cls, ast, **kwargs):
         :param ast: AST node
         :type ast: :class:`jinja2.nodes.Node`
         """
-        for k, v in kwargs.items():
+        for k, v in list(kwargs.items()):
             if v is None:
                 del kwargs[k]
         kwargs = dict(cls._get_kwargs_from_ast(ast), **kwargs)
@@ -97,7 +105,8 @@ def __eq__(self, other):
             self.used_with_default == other.used_with_default and
             self.checked_as_undefined == other.checked_as_undefined and
             self.checked_as_defined == other.checked_as_defined and
-            self.required == other.required
+            self.required == other.required and
+            self.value == other.value
         )
 
     def __ne__(self, other):

jinja2schema/order_number.py

@@ -0,0 +1,42 @@
+# coding: utf-8
+"""
+jinja2schema.order_number
+~~~~~~~~~~~~~~~~~~
+"""
+from contextlib import contextmanager
+
+
+class OrderNumber(object):
+    """A base Order Number class.
+
+    .. attribute:: number
+
+        Initial counter value.
+
+    .. attribute:: enabled
+
+        Counter enabled or return None.
+
+    """
+
+    def __init__(self, number=0, enabled=False, sub_counter_enabled=True):
+        self.start = number
+        self.number = self.start
+        self.order_enabled = enabled
+        self.sub_counter_enabled = sub_counter_enabled
+
+    def get_next(self):
+        if self.order_enabled:
+            self.number += 1
+            return self.number
+        return None
+
+    @contextmanager
+    def sub_counter(self):
+        if self.sub_counter_enabled:
+            counter = self.number
+            self.number = self.start
+            yield
+            self.number = counter
+            return
+        yield