Merge pull request #41 from Bernardo-MG/merge_master

Merge master

cwr/__init__.py

@@ -7,5 +7,5 @@
     :license: MIT, see LICENSE for more details.
 """
 
-__version__ = '0.0.9'
+__version__ = '0.0.13'
 __license__ = 'MIT'

cwr/grammar/factory/decorator.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-from abc import ABCMeta, abstractmethod
+from abc import abstractmethod
 
 import pyparsing as pp
 
@@ -132,6 +132,7 @@ def __init__(self):
         self._decoders = {}
         # TODO: Do this somewhere else
         self._decoders['transmission'] = TransmissionDictionaryDecoder()
+        self._decoders['group_info'] = GroupDictionaryDecoder()
 
     def decorate(self, rule, data):
         id = data['id']

cwr/other.py

@@ -179,6 +179,9 @@ def version(self):
         """
         return self._version
 
+    def __str__(self):
+        return '%s %s %s %s' % (self._version, self._isan, self._episode, self._check_digit)
+
 
 class AVIKey(object):
     """
@@ -203,4 +206,7 @@ def society_code(self):
         Returns the society code.
         :return: the society code
         """
-        return self._society_code
+        return self._society_code
+
+    def __str__(self):
+        return '%s %s' % (self._av_number, self._society_code)

cwr/parser/cwrjson.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+
+import json
+
+from cwr.parser.dictionary import CWRDictionaryEncoder
+from cwr.parser.common import Encoder
+
+
+"""
+Offers classes to parse CWR objects from and into JSON structures.
+"""
+
+__author__ = 'Bernardo Martínez Garrido'
+__license__ = 'MIT'
+__status__ = 'Development'
+
+
+class JSONEncoder(Encoder):
+    def __init__(self):
+        super(JSONEncoder, self).__init__()
+        self._dict_encoder = CWRDictionaryEncoder()
+
+    def encode(self, object):
+        encoded = self._dict_encoder.encode(object)
+
+        return json.dumps(encoded, default=_date_handler)
+
+
+def _date_handler(obj):
+    if hasattr(obj, 'isoformat'):
+        result = obj.isoformat()
+    else:
+        raise TypeError("Unserializable object {} of type {}".format(obj,
+                                                                     type(obj)))
+
+    return result