1
=== modified file 'NEWS.rst'
2
--- NEWS.rst	2021-05-18 16:49:19 +0000
3
+++ NEWS.rst	2021-05-20 14:25:47 +0000
4
@@ -15,6 +15,8 @@
5
15
Stabilize ETags of entries containing collections of strings between Python
15
Stabilize ETags of entries containing collections of strings between Python
6
16
2 and 3 (bug 1928474).
16
2 and 3 (bug 1928474).
7
17
17
8
18
Add an ``IJSONPublishable`` adapter for ``date`` and ``datetime``.
9
19
10
18
1.0.2 (2021-05-14)
20
1.0.2 (2021-05-14)
11
19
==================
21
==================
12
20
22
13
21
23
14
=== modified file 'src/lazr/restful/_resource.py'
15
--- src/lazr/restful/_resource.py	2021-05-18 16:49:19 +0000
16
+++ src/lazr/restful/_resource.py	2021-05-20 14:25:47 +0000
17
@@ -17,6 +17,7 @@
18
17
    'EntryHTMLView',
17
    'EntryHTMLView',
19
18
    'EntryResource',
18
    'EntryResource',
20
19
    'HTTPResource',
19
    'HTTPResource',
21
20
    'JSONDate',
22
20
    'JSONItem',
21
    'JSONItem',
23
21
    'ReadOnlyResource',
22
    'ReadOnlyResource',
24
22
    'RedirectResource',
23
    'RedirectResource',
25
@@ -71,6 +72,7 @@
26
71
    providedBy,
72
    providedBy,
27
72
    Interface,
73
    Interface,
28
73
    )
74
    )
29
75
from zope.interface.common.idatetime import IDate
30
74
from zope.interface.common.sequence import IFiniteSequence
76
from zope.interface.common.sequence import IFiniteSequence
31
75
from zope.interface.interfaces import (
77
from zope.interface.interfaces import (
32
76
    ComponentLookupError,
78
    ComponentLookupError,
33
@@ -160,7 +162,7 @@
34
160
    elif isinstance(value, bytes):
162
    elif isinstance(value, bytes):
35
161
        return value.decode("utf-8")
163
        return value.decode("utf-8")
36
162
    else:
164
    else:
38
163
        return simplejson.dumps(value)
165
        return simplejson.dumps(value, cls=ResourceJSONEncoder)
39
164
166
40
165
167
41
166
def _default_html_renderer(value):
168
def _default_html_renderer(value):
42
@@ -242,6 +244,19 @@
43
242
        return str(self.context.title)
244
        return str(self.context.title)
44
243
245
45
244
246
46
247
@implementer(IJSONPublishable)
47
248
@adapter(IDate)
48
249
class JSONDate:
49
250
    """JSONPublishable adapter for date/datetime."""
50
251
51
252
    def __init__(self, context):
52
253
        self.context = context
53
254
54
255
    def toDataForJSON(self, media_type):
55
256
        """See `IJSONPublishable`."""
56
257
        return self.context.isoformat()
57
258
58
259
59
245
@implementer(IHTTPResource)
260
@implementer(IHTTPResource)
60
246
class RedirectResource(URLDereferencingMixin):
261
class RedirectResource(URLDereferencingMixin):
61
247
    """A resource that redirects to another URL."""
262
    """A resource that redirects to another URL."""
62
248
263
63
=== modified file 'src/lazr/restful/configure.zcml'
64
--- src/lazr/restful/configure.zcml	2012-03-13 02:03:47 +0000
65
+++ src/lazr/restful/configure.zcml	2021-05-20 14:25:47 +0000
66
@@ -136,6 +136,7 @@
67
136
    <adapter factory="lazr.restful.ScopedCollection" />
136
    <adapter factory="lazr.restful.ScopedCollection" />
68
137
137
69
138
    <adapter factory="lazr.restful.JSONItem" />
138
    <adapter factory="lazr.restful.JSONItem" />
70
139
    <adapter factory="lazr.restful.JSONDate" />
71
139
140
72
140
    <!-- Adapter for URL generation -->
141
    <!-- Adapter for URL generation -->
73
141
    <adapter
142
    <adapter
74
142
143
75
=== modified file 'src/lazr/restful/tests/test_etag.py'
76
--- src/lazr/restful/tests/test_etag.py	2021-05-18 16:49:19 +0000
77
+++ src/lazr/restful/tests/test_etag.py	2021-05-20 14:25:47 +0000
78
@@ -6,8 +6,16 @@
79
6
__metaclass__ = type
6
__metaclass__ = type
80
7
7
81
8
from collections import OrderedDict
8
from collections import OrderedDict
82
9
from datetime import (
83
10
    date,
84
11
    datetime,
85
12
    )
86
13
import os.path
87
9
import unittest
14
import unittest
88
10
15
89
16
from pkg_resources import resource_filename
90
17
import pytz
91
18
from van.testing.layer import zcml_layer
92
11
from zope.component import provideUtility
19
from zope.component import provideUtility
93
12
20
94
13
from lazr.restful.interfaces import IWebServiceConfiguration
21
from lazr.restful.interfaces import IWebServiceConfiguration
95
@@ -21,12 +29,22 @@
96
21
    )
29
    )
97
22
30
98
23
31
99
32
class FunctionalLayer:
100
33
    allow_teardown = False
101
34
    zcml = os.path.abspath(resource_filename('lazr.restful', 'ftesting.zcml'))
102
35
103
36
104
37
zcml_layer(FunctionalLayer)
105
38
106
39
107
24
class TestEntryResourceETags(unittest.TestCase):
40
class TestEntryResourceETags(unittest.TestCase):
108
25
    # The EntryResource uses the field values that can be written or might
41
    # The EntryResource uses the field values that can be written or might
109
26
    # othwerise change as the basis for its ETags.  The make_entry_etag_cores
42
    # othwerise change as the basis for its ETags.  The make_entry_etag_cores
110
27
    # function is passed the data about the fields and returns the read and
43
    # function is passed the data about the fields and returns the read and
111
28
    # write cores.
44
    # write cores.
112
29
45
113
46
    layer = FunctionalLayer
114
47
115
30
    def test_no_field_details(self):
48
    def test_no_field_details(self):
116
31
        # If make_entry_etag_cores is given no field details (because no
49
        # If make_entry_etag_cores is given no field details (because no
117
32
        # fields exist), the resulting cores empty strings.
50
        # fields exist), the resulting cores empty strings.
118
@@ -91,10 +109,17 @@
119
91
            ('dict_field',
109
            ('dict_field',
120
92
             {'writable': False,
110
             {'writable': False,
121
93
              'value': OrderedDict((('first', 'one'), ('second', 'two')))}),
111
              'value': OrderedDict((('first', 'one'), ('second', 'two')))}),
122
112
            ('date_field',
123
113
             {'writable': False,
124
114
              'value': date(2009, 7, 7)}),
125
115
            ('datetime_field',
126
116
             {'writable': False,
127
117
              'value': datetime(2009, 7, 7, 13, 45, 0, tzinfo=pytz.utc)}),
128
94
            ]
118
            ]
129
95
        self.assertEqual(
119
        self.assertEqual(
130
96
            make_entry_etag_cores(field_details),
120
            make_entry_etag_cores(field_details),
132
97
            [b'["first", "second"]\0{"first": "one", "second": "two"}', b''])
121
            [b'["first", "second"]\x00{"first": "one", "second": "two"}\x00'
133
122
             b'"2009-07-07"\x00"2009-07-07T13:45:00+00:00"', b''])
134
98
123
135
99
124
136
100
class TestHTTPResourceETags(unittest.TestCase):
125
class TestHTTPResourceETags(unittest.TestCase):
Status:	Merged
Merged at revision:	300
Proposed branch:	lp:~cjwatson/lazr.restful/json-publishable-date
Merge into:	lp:lazr.restful
Diff against target:	136 lines (+45/-2) 4 files modified NEWS.rst (+2/-0) src/lazr/restful/_resource.py (+16/-1) src/lazr/restful/configure.zcml (+1/-0) src/lazr/restful/tests/test_etag.py (+26/-1)
To merge this branch:	bzr merge lp:~cjwatson/lazr.restful/json-publishable-date
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Thiago F. Pappacena (community)		2021-05-20	Approve on 2021-05-20
Review via email: mp+403064@code.launchpad.net