paf 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff95e5cecbf89542069a082cc4267ce172f9a3c8e31658ec62d6603ef57e2ca7
-  data.tar.gz: 441db96e17ce9102520fb810e5900d6d0be89959b6428e2a336c14ba569fa7d8
+  metadata.gz: 269cc685e003a0106f7a804214b07e9b092b0eaa5a83819683c7e7fe84262860
+  data.tar.gz: b07e3c71d8f2563c463ebc884a9519c45113227d377851b7971932b9007263b6
 SHA512:
-  metadata.gz: '029f8dedc38e173e6ca65ea1d66fd39d2ed306d3292e9a2b86d5ec49f79bc47b56b91753885cd98d7f51dd64f6e758517df046eb0d7068ed6cb618e55157cdda'
-  data.tar.gz: b93b2170bc646954ebcd14eaabf11e5e7b467432cad4111f93b294cb71bc307149dd0d93d07cdcbe9be42bbd66b519574de7dfa252e52f010fe4cf54b6d29eb9
+  metadata.gz: 67dc68a5c3f48cfbfb276d86dbbf9bcb9aa1e9cbee76a38fb2fae3c1807060ec8866daecad2ea8aca1182db343c85debe3cd74a1865013e15034b2b67485b1a1
+  data.tar.gz: e96a0558f766afd92fcd8a09110ca83ac4783c2293c3a05585a92d4f7e3002503f153cf3d69eb00cc0af14a16b3900b1d843aa5f2ff76a221b098b2b96cc74ac

data/lib/paf/core_ext/string.rb

@@ -2,12 +2,31 @@ module Paf
   module CoreExt
     # Extend the core String class with PAF specific processing
     module String
+      def exception_i?
+        !/\A\d.*\d\z/.match(self).nil?
+      end
+
+      def exception_ii?
+        !/\A\d[A-Za-z]\z|\A\d.*\d[A-Za-z]\z/.match(self).nil?
+      end
+
+      def exception_iii?
+        !/\A\S\z/.match(self).nil?
+      end
+
       def exception?
         !/^(.|[\d][[:alpha:]]|[\d].*?[\d][[:alpha:]]?)$/.match(self).nil?
       end
 
       def split_exception?
-        last_word.exception? && /^\d+$/.match(last_word).nil? && !but_last_word.known_building_type?
+        (last_word.exception_i? || last_word.exception_ii?) &&
+          /^\d+$/.match(last_word).nil? &&
+          !but_last_word.known_building_type? &&
+          !penultimate_word.known_split_building_type?
+      end
+
+      def penultimate_word
+        but_last_word.last_word
       end
 
       def last_word
@@ -21,9 +40,14 @@ module Paf
       def known_building_type?
         [
           'BACK OF', 'BLOCK', 'BLOCKS', 'BUILDING', 'MAISONETTE', 'MAISONETTES', 'REAR OF',
-          'SHOP', 'SHOPS', 'STALL', 'STALLS', 'SUITE', 'SUITES', 'UNIT', 'UNITS'
+          'SHOP', 'SHOPS', 'STALL', 'STALLS', 'SUITE', 'SUITES', 'UNIT', 'UNITS',
+          'FLAT', 'FLATS', 'PO BOX'
         ].include?(self)
       end
+
+      def known_split_building_type?
+        ['UNIT'].include?(self)
+      end
     end
   end
 end

data/lib/paf/premises/common.rb

@@ -19,6 +19,10 @@ module Paf
       def name_and_thoroughfare_or_locality
         "#{building_name} #{first_thoroughfare_or_locality}"
       end
+
+      def name_last_word_and_thoroughfare_or_locality
+        "#{building_name.last_word} #{first_thoroughfare_or_locality}"
+      end
     end
   end
 end

data/lib/paf/premises/rule010.rb

@@ -19,10 +19,6 @@ module Paf
       def premises_includes_first_thoroughfare_or_locality?
         building_name.exception? || building_name.split_exception?
       end
-
-      def name_last_word_and_thoroughfare_or_locality
-        "#{building_name.last_word} #{first_thoroughfare_or_locality}"
-      end
     end
   end
 end

data/lib/paf/premises/rule100.rb

@@ -0,0 +1,22 @@
+module Paf
+  module Premises
+    # Processing for premises elements of a PAF entry under Rule X
+    module Rule100
+      def premises
+        return [sub_name_and_thoroughfare_or_locality] if sub_building_name.exception?
+
+        [sub_building_name]
+      end
+
+      private
+
+      def premises_includes_first_thoroughfare_or_locality?
+        sub_building_name.exception?
+      end
+
+      def sub_name_and_thoroughfare_or_locality
+        "#{sub_building_name} #{first_thoroughfare_or_locality}"
+      end
+    end
+  end
+end

data/lib/paf/premises/rule110.rb

@@ -3,9 +3,14 @@ module Paf
     # Processing for premises elements of a PAF entry under Rule 6
     module Rule110
       def premises
+        if sub_building_name.exception? && building_name.split_exception?
+          return [sub_and_building_name_but_last_word, name_last_word_and_thoroughfare_or_locality]
+        end
         return [sub_name_and_name] if sub_building_name.exception?
-        return [sub_building_name, name_and_thoroughfare_or_locality] if
-          building_name.exception?
+        return [sub_building_name, name_and_thoroughfare_or_locality] if building_name.exception?
+        if building_name.split_exception?
+          return [sub_building_name, building_name.but_last_word, name_last_word_and_thoroughfare_or_locality]
+        end
 
         [sub_building_name, building_name]
       end
@@ -13,7 +18,11 @@ module Paf
       private
 
       def premises_includes_first_thoroughfare_or_locality?
-        !sub_building_name.exception? && building_name.exception?
+        building_name.split_exception? || (!sub_building_name.exception? && building_name.exception?)
+      end
+
+      def sub_and_building_name_but_last_word
+        "#{sub_building_name} #{building_name.but_last_word}"
       end
     end
   end

data/lib/paf/version.rb

@@ -1,4 +1,4 @@
 # PAF gem version
 module Paf
-  VERSION = '0.6.0'.freeze
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paf
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - John Bard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-04 00:00:00.000000000 Z
+date: 2025-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -119,6 +119,7 @@ files:
 - lib/paf/premises/rule001.rb
 - lib/paf/premises/rule010.rb
 - lib/paf/premises/rule011.rb
+- lib/paf/premises/rule100.rb
 - lib/paf/premises/rule101.rb
 - lib/paf/premises/rule110.rb
 - lib/paf/premises/rule111.rb