Code review

CHANGES.rst

@@ -10,13 +10,13 @@ Changelog
     Esta versão também remove a dependência no collective.portlet.calendar.
     Remova manualmente todos os portlets de calendario estendido e desinstale o pacote antes de atualizar.
 
+- Corrige funcionamento da view padrão do tipo de conteúdo ``AgendaDiaria`` para evitar `problemas com proxies intermediárias <https://community.plone.org/t/6658>`_.
+  [rodfersou]
+
 - Remove dependência no collective.portlet.calendar;
   o layout do IDG 2.x não faz uso de portlets.
   [hvelarde]
 
-- Remove restapi para evitar problemas com `proxies intermediárias <https://community.plone.org/t/6658>`_.
-  [rodfersou]
-
 - Remove upgrade steps do branch 1.x.
   [hvelarde]
 

buildout.cfg

@@ -7,6 +7,7 @@ extends =
 package-name = brasil.gov.agenda
 package-extras = [test]
 eggs +=
+    cssselect  # XXX: needed by plone.protect
     z3c.unconfigure
 
 parts +=

setup.py

@@ -42,7 +42,6 @@
     install_requires=[
         'Acquisition',
         'collective.cover',
-        'cssselect',
         'plone.api',
         'plone.app.content',
         'plone.app.contenttypes',

src/brasil/gov/agenda/browser/agenda.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+from six.moves import range  # noqa: I001
 from brasil.gov.agenda import _
 from brasil.gov.agenda.config import AGENDADIARIAFMT
 from brasil.gov.agenda.interfaces import ICompromisso
@@ -9,7 +10,7 @@
 from dateutil.tz import tzlocal
 from plone import api
 from Products.Five.browser import BrowserView
-from six.moves import range  # noqa: I001
+from zExceptions import NotFound
 from zope.component import getMultiAdapter
 from zope.i18nmessageid import Message
 from zope.interface import implementer
@@ -104,20 +105,21 @@ def imagem(self):
 
 @implementer(IPublishTraverse)
 class AgendaJSONView(BrowserView, AgendaMixin):
-    """Visao padrao da agenda."""
-
-    def setup(self):
-        self._ts = api.portal.get_tool('translation_service')
+    """JSON view."""
 
     def publishTraverse(self, request, date):
-        """Pega a data da agenda diaria."""
-        # this raises ValueError if date is invalid date
-        datetime.strptime(date, AGENDADIARIAFMT)
+        """Get the selected date."""
+        try:
+            datetime.strptime(date, AGENDADIARIAFMT)
+        except ValueError:  # invalid date format
+            raise NotFound
+
         self.date = date
         return self
 
     def weekday(self, date):
-        return self._translate(self._ts.day_msgid(date.strftime('%w')))
+        ts = api.portal.get_tool('translation_service')
+        return self._translate(ts.day_msgid(date.strftime('%w')))
 
     def extract_data(self):
         data = []
@@ -160,7 +162,6 @@ def extract_data(self):
         return data
 
     def __call__(self):
-        self.setup()
         response = self.request.response
         response.setHeader('content-type', 'application/json')
         return response.setBody(json.dumps(self.extract_data()))

src/brasil/gov/agenda/profiles/default/metadata.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>4101</version>
+  <version>4100</version>
   <dependencies>
     <dependency>profile-collective.cover:default</dependency>
     <dependency>profile-plone.app.dexterity:default</dependency>

src/brasil/gov/agenda/tests/test_setup.py

@@ -40,7 +40,7 @@ def test_installed(self):
 
     def test_version(self):
         self.assertEqual(
-            self.st.getLastVersionForProfile(self.profile), (u'4101',))
+            self.st.getLastVersionForProfile(self.profile), (u'4100',))
 
     def test_css_registered(self):
         cssreg = getattr(self.portal, 'portal_css')

src/brasil/gov/agenda/tests/test_upgrades.py

@@ -93,14 +93,3 @@ def test_fix_resources_references(self):
         ids = js_tool.getResourceIds()
         self.assertEqual(SWIPER_JS, ids[0])
         self.assertIn(NEW_JS, ids)
-
-
-class to4101TestCase(UpgradeTestCaseBase):
-
-    def setUp(self):
-        UpgradeTestCaseBase.setUp(self, u'*', u'4101')
-
-    def test_registrations(self):
-        version = self.setup.getLastVersionForProfile(self.profile_id)[0]
-        self.assertGreaterEqual(int(version), int(self.to_version))
-        self.assertEqual(self.total_steps, 2)

src/brasil/gov/agenda/upgrades/configure.zcml

@@ -1,4 +1,3 @@
 <configure xmlns="http://namespaces.zope.org/zope">
   <include package=".v4100" />
-  <include package=".v4101" />
 </configure>