From 9380c3b35c58362e9009d9017b5bbe0efbd7e917 Mon Sep 17 00:00:00 2001 From: Konsta Vesterinen Date: Mon, 15 Apr 2013 10:14:49 +0300 Subject: [PATCH] Renamed ScalarList and Email types --- CHANGES.rst | 6 ++++++ setup.py | 2 +- sqlalchemy_utils/__init__.py | 8 ++++---- sqlalchemy_utils/types.py | 4 ++-- tests/test_case_insensitive_comparator.py | 4 ++-- tests/test_email.py | 4 ++-- tests/test_number_range.py | 6 ++++++ tests/test_scalar_list.py | 6 +++--- 8 files changed, 26 insertions(+), 14 deletions(-) diff --git a/CHANGES.rst b/CHANGES.rst index f1abdcc..8ea3dd6 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -4,6 +4,12 @@ Changelog Here you can see the full list of changes between each SQLAlchemy-Utils release. +0.9.1 (2013-04-15) +^^^^^^^^^^^^^^^^^^ + +- Renamed Email to EmailType and ScalarList to ScalarListType (unified type class naming convention) + + 0.9.0 (2013-04-11) ^^^^^^^^^^^^^^^^^^ diff --git a/setup.py b/setup.py index f8c4de3..efd90b3 100644 --- a/setup.py +++ b/setup.py @@ -24,7 +24,7 @@ class PyTest(Command): setup( name='SQLAlchemy-Utils', - version='0.9', + version='0.9.1', url='https://github.com/kvesteri/sqlalchemy-utils', license='BSD', author='Konsta Vesterinen', diff --git a/sqlalchemy_utils/__init__.py b/sqlalchemy_utils/__init__.py index e2d5d61..52b1d80 100644 --- a/sqlalchemy_utils/__init__.py +++ b/sqlalchemy_utils/__init__.py @@ -1,7 +1,7 @@ from .functions import sort_query, defer_except, escape_like from .merge import merge, Merger from .types import ( - Email, + EmailType, instrumented_list, InstrumentedList, PhoneNumber, @@ -10,7 +10,7 @@ from .types import ( NumberRangeException, NumberRangeRawType, NumberRangeType, - ScalarList, + ScalarListType, ScalarListException, ) @@ -21,7 +21,7 @@ __all__ = ( escape_like, instrumented_list, merge, - Email, + EmailType, InstrumentedList, Merger, NumberRange, @@ -30,6 +30,6 @@ __all__ = ( NumberRangeType, PhoneNumber, PhoneNumberType, - ScalarList, + ScalarListType, ScalarListException, ) diff --git a/sqlalchemy_utils/types.py b/sqlalchemy_utils/types.py index 1e2790e..e7180ca 100644 --- a/sqlalchemy_utils/types.py +++ b/sqlalchemy_utils/types.py @@ -88,7 +88,7 @@ class ScalarListException(Exception): pass -class ScalarList(types.TypeDecorator): +class ScalarListType(types.TypeDecorator): impl = sa.UnicodeText() def __init__(self, coerce_func=unicode, separator=u','): @@ -119,7 +119,7 @@ class ScalarList(types.TypeDecorator): ) -class Email(sa.types.TypeDecorator): +class EmailType(sa.types.TypeDecorator): impl = sa.Unicode(255) comparator_factory = CaseInsensitiveComparator diff --git a/tests/test_case_insensitive_comparator.py b/tests/test_case_insensitive_comparator.py index 6a15dbc..aa488da 100644 --- a/tests/test_case_insensitive_comparator.py +++ b/tests/test_case_insensitive_comparator.py @@ -1,5 +1,5 @@ import sqlalchemy as sa -from sqlalchemy_utils import Email +from sqlalchemy_utils import EmailType from tests import DatabaseTestCase @@ -8,7 +8,7 @@ class TestCaseInsensitiveComparator(DatabaseTestCase): class User(self.Base): __tablename__ = 'user' id = sa.Column(sa.Integer, primary_key=True) - email = sa.Column(Email) + email = sa.Column(EmailType) def __repr__(self): return 'Building(%r)' % self.id diff --git a/tests/test_email.py b/tests/test_email.py index 161eaf6..16c98cf 100644 --- a/tests/test_email.py +++ b/tests/test_email.py @@ -1,5 +1,5 @@ import sqlalchemy as sa -from sqlalchemy_utils import Email +from sqlalchemy_utils import EmailType from tests import DatabaseTestCase @@ -8,7 +8,7 @@ class TestEmailType(DatabaseTestCase): class User(self.Base): __tablename__ = 'user' id = sa.Column(sa.Integer, primary_key=True) - email = sa.Column(Email) + email = sa.Column(EmailType) def __repr__(self): return 'Building(%r)' % self.id diff --git a/tests/test_number_range.py b/tests/test_number_range.py index c97e7b6..6fd1f75 100644 --- a/tests/test_number_range.py +++ b/tests/test_number_range.py @@ -69,3 +69,9 @@ class TestNumberRange(object): assert str(NumberRange.from_normalized_str('[1,2]')) == '1 - 2' assert str(NumberRange.from_normalized_str('[1,3)')) == '1 - 2' assert str(NumberRange.from_normalized_str('(1,3)')) == '2' + + def test_add_operator(self): + assert NumberRange(1, 2) + NumberRange(1, 2) == NumberRange(2, 4) + + def test_sub_operator(self): + assert NumberRange(1, 3) - NumberRange(1, 2) == NumberRange(0, 1) diff --git a/tests/test_scalar_list.py b/tests/test_scalar_list.py index 235d641..f0e08e7 100644 --- a/tests/test_scalar_list.py +++ b/tests/test_scalar_list.py @@ -1,5 +1,5 @@ import sqlalchemy as sa -from sqlalchemy_utils import ScalarList +from sqlalchemy_utils import ScalarListType from pytest import raises from tests import DatabaseTestCase @@ -9,7 +9,7 @@ class TestScalarIntegerList(DatabaseTestCase): class User(self.Base): __tablename__ = 'user' id = sa.Column(sa.Integer, primary_key=True) - some_list = sa.Column(ScalarList(int)) + some_list = sa.Column(ScalarListType(int)) def __repr__(self): return 'User(%r)' % self.id @@ -33,7 +33,7 @@ class TestScalarUnicodeList(DatabaseTestCase): class User(self.Base): __tablename__ = 'user' id = sa.Column(sa.Integer, primary_key=True) - some_list = sa.Column(ScalarList(unicode)) + some_list = sa.Column(ScalarListType(unicode)) def __repr__(self): return 'User(%r)' % self.id