diff --git a/CHANGES.md b/CHANGES.md index c03ff8c..ea8b41c 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -6,6 +6,13 @@ Version 0.5.0 To be released. +### Language + + - The `uri` type has completly gone; use `url` instead. [[#126], [#281] by Jonghun Park] + +[#126]: https://github.com/spoqa/nirum/issues/126 +[#281]: https://github.com/spoqa/nirum/pull/281 + Version 0.4.0 ------------- diff --git a/src/Nirum/Constructs/Module.hs b/src/Nirum/Constructs/Module.hs index c23c57d..19924b2 100644 --- a/src/Nirum/Constructs/Module.hs +++ b/src/Nirum/Constructs/Module.hs @@ -113,8 +113,6 @@ coreTypes = , decl' "bool" Bool Boolean , decl' "uuid" Uuid String , decl' "url" Url String - -- FIXME: deprecated - , decl' "uri" Url String ] where decl' name prim json = diff --git a/test/nirum_fixture/fixture/foo.nrm b/test/nirum_fixture/fixture/foo.nrm index 645fed5..ebf7460 100644 --- a/test/nirum_fixture/fixture/foo.nrm +++ b/test/nirum_fixture/fixture/foo.nrm @@ -144,5 +144,3 @@ record name-shadowing-field-record ( union optional-union = foo ( int32? bar ) | baz ( int32 qux ) ; - -unboxed website (uri); diff --git a/test/python/primitive_test.py b/test/python/primitive_test.py index a1bb2f2..1057010 100644 --- a/test/python/primitive_test.py +++ b/test/python/primitive_test.py @@ -15,7 +15,7 @@ Point1, Point2, Point3d, Pop, PingService, Product, RecordWithMap, RecordWithOptionalRecordField, Rnb, RpcError, Run, Song, Status, Stop, Way, - Website, WesternName) + WesternName) from fixture.foo.bar import PathUnbox, IntUnbox, Point from fixture.qux import Path, Name from fixture.reserved_keyword_enum import ReservedKeywordEnum @@ -538,15 +538,3 @@ def test_name_shadowing_field(): assert "bytes must be a value of {0}, not ['invalid']".format( 'bytes' if PY3 else 'str' ) == str(ei.value) - - -def test_uri(): - """ Deprecated - """ - assert isinstance(Website, type) - website = Website(u'https://nirum.org') - assert website.value == u'https://nirum.org' - assert website.__nirum_serialize__() == u'https://nirum.org' - assert Website.__nirum_deserialize__(u'https://nirum.org') == website - with raises(ValueError): - Website(u'https://nirum.org\n') diff --git a/test/python/validation_test.py b/test/python/validation_test.py index f159509..ec0a2ef 100644 --- a/test/python/validation_test.py +++ b/test/python/validation_test.py @@ -43,9 +43,9 @@ def test_datetime_value_error(): DatetimeUnboxed(datetime.datetime(2018, 3, 11, 5, 27)) -def test_uri_value_error(): +def test_url_value_error(): Product(name=u'', sale=True, url=None) # url field is optional here Product(name=u'', sale=True, url='http://example.com/') with raises(ValueError): - # URI cannot contain new lines + # URL cannot contain new lines Product(name=u'', sale=True, url='http://example.com/\n')