PyPaf 1.0.1__tar.gz → 1.0.2__tar.gz

{pypaf-1.0.1/src/PyPaf.egg-info → pypaf-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyPaf
-Version: 1.0.1
+Version: 1.0.2
 Summary: Formats the elements of a Royal Mail Postcode Address File entry
 Author-email: John Bard <johnbard@globalnet.co.uk>
 License: MIT

{pypaf-1.0.1 → pypaf-1.0.2/src/PyPaf.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: PyPaf
-Version: 1.0.1
+Version: 1.0.2
 Summary: Formats the elements of a Royal Mail Postcode Address File entry
 Author-email: John Bard <johnbard@globalnet.co.uk>
 License: MIT

{pypaf-1.0.1 → pypaf-1.0.2}/src/paf/premises/__init__.py

@@ -94,6 +94,11 @@ class Premises(
         """Returns last word of the building name"""
         return self.last_word('building_name')
 
+    @property
+    def building_name_last_two_words(self):
+        """Returns last two words of the building name"""
+        return self.last_two_words('building_name')
+
     @property
     def sub_building_name_but_last_word(self):
         """Returns all but last word of the sub-building name"""

{pypaf-1.0.1 → pypaf-1.0.2}/src/paf/premises/exception.py

@@ -50,4 +50,8 @@ class ExceptionMixin(BuildingTypeMixin, SplitMixin):
                 or self.__is_exception_ii(self.last_word(attr)))
             and not self.last_word(attr).isdigit()
             and not self.__is_exception_iv(attr)
+            and (
+                attr != 'building_name'
+                or not self.is_known_building_type('building_name_last_two_words')
+                )
             )

{pypaf-1.0.1 → pypaf-1.0.2}/src/paf/premises/split.py

@@ -24,6 +24,15 @@ class SplitMixin():
         except ValueError:
             return string
 
+    @classmethod
+    def __last_two_words(cls, string):
+        """Returns last two words of the string"""
+        try:
+            *_, penultimate, last = string.split()
+            return ' '.join([penultimate, last])
+        except ValueError:
+            return cls.__last_word(string)
+
     @classmethod
     def __leading_digits(cls, string):
         """Returns the leading digits from the string"""
@@ -49,6 +58,10 @@ class SplitMixin():
         """Returns last word of the attribute"""
         return self.__last_word(str(getattr(self, attr, '')))
 
+    def last_two_words(self, attr):
+        """Returns last two word of the attribute"""
+        return self.__last_two_words(str(getattr(self, attr, '')))
+
     def leading_digits(self, attr):
         """Returns the leading digits from the attribute"""
         return self.__leading_digits(str(getattr(self, attr, '')))

pypaf-1.0.2/src/paf/version.py

@@ -0,0 +1,3 @@
+"""Version"""
+
+__version__ = '1.0.2'

{pypaf-1.0.1 → pypaf-1.0.2}/tests/test_rule_3.py

@@ -349,5 +349,85 @@ class TestRule3WithoutCharSplit(unittest.TestCase):
             )
 
 
+class TestRule3WithoutTypeSplit(unittest.TestCase):
+    """Test Address Rule 3 without Building Type Split Exception"""
+
+    @classmethod
+    def setUpClass(cls):
+        """Set up Address instance"""
+        cls.address = paf.Address({
+            'organisation_name': "P S G MARINE & LOGISTICS LTD",
+            'building_name': "PORT SERVICES HOUSE UNIT 14A",
+            'thoroughfare_name': "PETERSEAT",
+            'thoroughfare_descriptor': "DRIVE",
+            'dependent_locality': "ALTENS INDUSTRIAL ESTATE",
+            'post_town': "ABERDEEN",
+            'postcode': "AB12 3HT"
+            })
+
+    def test_list(self):
+        """Test conversion to an list"""
+        address = [
+            "P S G MARINE & LOGISTICS LTD",
+            "PORT SERVICES HOUSE UNIT 14A",
+            "PETERSEAT DRIVE",
+            "ALTENS INDUSTRIAL ESTATE",
+            "ABERDEEN",
+            "AB12 3HT"
+            ]
+        self.assertEqual(
+            self.address.as_list(), address, "Incorrect Rule 3 w/o type split list format"
+            )
+
+    def test_string(self):
+        """Test conversion to a string"""
+        address = (
+            "P S G MARINE & LOGISTICS LTD, "
+            "PORT SERVICES HOUSE UNIT 14A, "
+            "PETERSEAT DRIVE, "
+            "ALTENS INDUSTRIAL ESTATE, "
+            "ABERDEEN. "
+            "AB12 3HT"
+            )
+        self.assertEqual(
+            self.address.as_str(), address, "Incorrect Rule 3 w/o type split string format"
+            )
+
+    def test_tuple(self):
+        """Test conversion to a tuple"""
+        address = (
+            "P S G MARINE & LOGISTICS LTD",
+            "PORT SERVICES HOUSE UNIT 14A",
+            "PETERSEAT DRIVE",
+            "ALTENS INDUSTRIAL ESTATE",
+            "ABERDEEN",
+            "AB12 3HT"
+            )
+        self.assertEqual(
+            self.address.as_tuple(), address, "Incorrect Rule 3 w/o type split tuple format"
+            )
+
+    def test_dict(self):
+        """Test conversion to a dict"""
+        address = {
+            'line_1': "P S G MARINE & LOGISTICS LTD",
+            'line_2': "PORT SERVICES HOUSE UNIT 14A",
+            'line_3': "PETERSEAT DRIVE",
+            'line_4': "ALTENS INDUSTRIAL ESTATE",
+            'post_town': "ABERDEEN",
+            'postcode': "AB12 3HT"
+            }
+        self.assertEqual(
+            self.address.as_dict(), address, "Incorrect Rule 3 w/o type split dict format"
+            )
+
+    def test_premises(self):
+        """Test premises"""
+        premises = {'premises_name': 'PORT SERVICES HOUSE UNIT 14A'}
+        self.assertEqual(
+            self.address.premises(), premises, "Incorrect Rule 3 w/o type split premises"
+            )
+
+
 if __name__ == '__main__':
     unittest.main()

pypaf-1.0.1/src/paf/version.py

@@ -1,3 +0,0 @@
-"""Version"""
-
-__version__ = '1.0.1'