Merge pull request #34 from fabiobatalha/tk33

fix #33

ratchet/controller.py

@@ -213,8 +213,8 @@ def issues(self, collection=None, limit=LIMIT, offset=0):
         meta['limit'] = limit
         meta['offset'] = offset
         meta['total'] = total
-        meta['next'] = get_next_endpoint('journals', meta['total'], limit, int(meta['offset']))
-        meta['previous'] = get_previous_endpoint('journals', meta['total'], limit, int(meta['offset']))
+        meta['next'] = get_next_endpoint('issues', meta['total'], limit, int(meta['offset']))
+        meta['previous'] = get_previous_endpoint('issues', meta['total'], limit, int(meta['offset']))
 
         records = self._db.find(
             query,
@@ -250,8 +250,8 @@ def articles(self, collection=None, limit=LIMIT, offset=0):
         meta['limit'] = limit
         meta['offset'] = offset
         meta['total'] = total
-        meta['next'] = get_next_endpoint('journals', meta['total'], limit, int(meta['offset']))
-        meta['previous'] = get_previous_endpoint('journals', meta['total'], limit, int(meta['offset']))
+        meta['next'] = get_next_endpoint('articles', meta['total'], limit, int(meta['offset']))
+        meta['previous'] = get_previous_endpoint('articles', meta['total'], limit, int(meta['offset']))
 
         records = self._db.find(
             query,

ratchet/utils.py

@@ -60,5 +60,5 @@ def __getattr__(self, attr):
     def items(self):
         """Settings as key-value pair.
         """
-        return [(section, dict(self.conf.items(section))) for \
+        return [(section, dict(self.conf.items(section, raw=True))) for \
             section in [section for section in self.conf.sections()]]

requirements.txt

@@ -5,4 +5,4 @@ pymongo==2.7.2
 thriftpy==0.2.0
 chaussette==1.2
 gevent==1.0.1
--e git+https://github.com/scieloorg/[email protected].2#egg=ratchet
+-e git+https://github.com/scieloorg/[email protected].3#egg=ratchet

setup.py

@@ -19,7 +19,7 @@
 tests_requires = requires+[]
 
 setup(name='ratchet',
-      version='2.0.2',
+      version='2.0.3',
       description='ratchet',
       long_description=README + '\n\n' + CHANGES,
       classifiers=[