paf 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b233ff56fedadfea9e1f21508ea7b6fb85f852c1
-  data.tar.gz: 59dbbde56e750c387774368cad006e4d3e4a0a7c
+SHA256:
+  metadata.gz: ff95e5cecbf89542069a082cc4267ce172f9a3c8e31658ec62d6603ef57e2ca7
+  data.tar.gz: 441db96e17ce9102520fb810e5900d6d0be89959b6428e2a336c14ba569fa7d8
 SHA512:
-  metadata.gz: c379a989578aa2c9a0398f26dddf50d0cce40d15f0ddc8394e54e24bd7c13c016b30734ff3f2375ff985d63caf707d9b024c8720edade1ac3cccbf7a67b78779
-  data.tar.gz: 7414a214e0a027bffa8c774f595844a208e75db227af5f2338e9e2f80804088f0e50a0ff39c69f2a5e01412582060d39faa36badd96365ebf630abc8a4a18579
+  metadata.gz: '029f8dedc38e173e6ca65ea1d66fd39d2ed306d3292e9a2b86d5ec49f79bc47b56b91753885cd98d7f51dd64f6e758517df046eb0d7068ed6cb618e55157cdda'
+  data.tar.gz: b93b2170bc646954ebcd14eaabf11e5e7b467432cad4111f93b294cb71bc307149dd0d93d07cdcbe9be42bbd66b519574de7dfa252e52f010fe4cf54b6d29eb9

data/.rubocop.yml

@@ -1,4 +1,13 @@
 require: rubocop-rspec
 
+AllCops:
+  TargetRubyVersion: 2.4
+
 RSpec/ExampleLength:
-  Max: 25
+  Max: 25
+
+Style/EndOfLine:
+  EnforcedStyle: lf
+
+Style/FrozenStringLiteralComment:
+  Enabled: false

data/README.md

@@ -1,6 +1,6 @@
 # PAF
 
-A gem to format the elements of a Royal Mail Postcode Address File entry according to the rules described in the [Royal Mail Programmer's Guide Edition 7, Version 5.0](http://www.royalmail.com/sites/default/files/docs/pdf/programmers_guide_edition_7_v5.pdf)
+A gem to format the elements of a Royal Mail Postcode Address File entry according to the rules described in the [Royal Mail Programmer's Guide Edition 7, Version 6.2](https://www.poweredbypaf.com/wp-content/uploads/2024/11/Latest-Programmers_guide_Edition-7-Version-6-2.pdf)
 
 ## Installation
 
@@ -20,10 +20,10 @@ Or install it yourself as:
 
 ## Usage
 
-May be used to format the PAF elements as an array of strings:
+May be used to format the Paf::Address elements as an array of strings:
 
 ```ruby
-Paf.to_a(
+Paf::Address.to_a(
   building_name: '1-2',
   thoroughfare_name: 'NURSERY',
   thoroughfare_descriptor: 'LANE',
@@ -38,7 +38,7 @@ Paf.to_a(
 Or as a hash of strings:
 
 ```ruby
-Paf.to_h(
+Paf::Address.to_h(
   building_name: '1-2',
   thoroughfare_name: 'NURSERY',
   thoroughfare_descriptor: 'LANE',
@@ -57,7 +57,7 @@ Paf.to_h(
 Or as a single string:
 
 ```ruby
-Paf.to_s(
+Paf::Address.to_s(
   building_name: '1-2',
   thoroughfare_name: 'NURSERY',
   thoroughfare_descriptor: 'LANE',
@@ -69,10 +69,10 @@ Paf.to_s(
 '1-2 NURSERY LANE, PENN, HIGH WYCOMBE. HP10 8LS'
 ```
 
-Or from a Paf instance:
+Or from a Paf::Address instance:
 
 ```ruby
-paf = Paf.new(
+address = Paf::Address.new(
   building_name: '1-2',
   thoroughfare_name: 'NURSERY',
   thoroughfare_descriptor: 'LANE',
@@ -80,11 +80,11 @@ paf = Paf.new(
   post_town: 'HIGH WYCOMBE',
   postcode: 'HP10 8LS'
 )
-paf.to_a
+address.to_a
 
 ['1-2 NURSERY LANE', 'PENN', 'HIGH WYCOMBE', 'HP10 8LS']
 
-paf = Paf.new(
+address = Paf::Address.new(
   building_name: '1-2',
   thoroughfare_name: 'NURSERY',
   thoroughfare_descriptor: 'LANE',
@@ -92,7 +92,7 @@ paf = Paf.new(
   post_town: 'HIGH WYCOMBE',
   postcode: 'HP10 8LS'
 )
-paf.to_h
+address.to_h
 
 {
   lines: ['1-2 NURSERY LANE', 'PENN'],
@@ -100,7 +100,7 @@ paf.to_h
   postcode: 'HP10 8LS'
 }
 
-paf = Paf.new(
+address = Paf::Address.new(
   building_name: '1-2',
   thoroughfare_name: 'NURSERY',
   thoroughfare_descriptor: 'LANE',
@@ -108,7 +108,7 @@ paf = Paf.new(
   post_town: 'HIGH WYCOMBE',
   postcode: 'HP10 8LS'
 )
-paf.to_s
+address.to_s
 
 '1-2 NURSERY LANE, PENN, HIGH WYCOMBE. HP10 8LS'
 ```

data/lib/paf/address.rb

@@ -0,0 +1,39 @@
+require 'paf/attribute'
+require 'paf/formattable'
+
+module Paf
+  # Base class from the elements of a UK Royal Mail Postcode Address File entry
+  class Address
+    include Paf::Attribute
+    include Paf::Formattable
+
+    attr_accessor(*attrs)
+    private(*attrs.map { |attr| "#{attr}=" }) # rubocop:disable Style/AccessModifierDeclarations
+
+    def initialize(args)
+      args.each { |k, v| send("#{k}=", v) }
+    end
+
+    # PO Box number prepended with the string PO BOX
+    def po_box
+      "PO BOX #{po_box_number}" unless po_box_number.vacant?
+    end
+
+    # Dependent thoroughfare name and descriptor
+    def dependent_thoroughfare
+      concatenated(self.class.dependent_thoroughfare_attrs)
+    end
+
+    # Thoroughfare name and descriptor
+    def thoroughfare
+      concatenated(self.class.thoroughfare_attrs)
+    end
+
+    private
+
+    def concatenated(attrs)
+      value = attrs.map { |attr| send(attr) }.condense(' ')
+      value unless value.vacant?
+    end
+  end
+end

data/lib/paf/array_formatter.rb

@@ -1,6 +1,6 @@
 require 'paf/formatter'
 
-class Paf
+module Paf
   # Processing to format a PAF entry as an array
   class ArrayFormatter < Formatter
     def format(paf)

data/lib/paf/attribute.rb

@@ -1,4 +1,4 @@
-class Paf
+module Paf
   # Basic attributes or elements that make up a PAF entry
   module Attribute
     def self.included(base)

data/lib/paf/core_ext/array.rb

@@ -1,6 +1,6 @@
 require 'paf/core_ext/string'
 
-class Paf
+module Paf
   module CoreExt
     # Extend the core Array class with PAF specific processing
     module Array

data/lib/paf/core_ext/object.rb

@@ -1,4 +1,4 @@
-class Paf
+module Paf
   module CoreExt
     # Extend the core Object class with PAF specific processing
     module Object

data/lib/paf/core_ext/string.rb

@@ -1,4 +1,4 @@
-class Paf
+module Paf
   module CoreExt
     # Extend the core String class with PAF specific processing
     module String
@@ -7,7 +7,7 @@ class Paf
       end
 
       def split_exception?
-        last_word.exception? && /^\d+$/.match(last_word).nil?
+        last_word.exception? && /^\d+$/.match(last_word).nil? && !but_last_word.known_building_type?
       end
 
       def last_word
@@ -17,6 +17,13 @@ class Paf
       def but_last_word
         self[0...rindex(' ')]
       end
+
+      def known_building_type?
+        [
+          'BACK OF', 'BLOCK', 'BLOCKS', 'BUILDING', 'MAISONETTE', 'MAISONETTES', 'REAR OF',
+          'SHOP', 'SHOPS', 'STALL', 'STALLS', 'SUITE', 'SUITES', 'UNIT', 'UNITS'
+        ].include?(self)
+      end
     end
   end
 end

data/lib/paf/formattable.rb

@@ -2,7 +2,7 @@ require 'paf/array_formatter'
 require 'paf/hash_formatter'
 require 'paf/string_formatter'
 
-class Paf
+module Paf
   # Processing to format a PAF entry
   module Formattable
     attr_accessor :formatter, :concatenation_indicator
@@ -32,6 +32,7 @@ class Paf
 
       def to_s(*args)
         return super if args.empty?
+
         new(args[0]).to_s
       end
     end

data/lib/paf/formatter.rb

@@ -1,6 +1,6 @@
 require 'paf/lineable'
 
-class Paf
+module Paf
   # Processing to format a PAF entry
   class Formatter
     def self.format(paf)
@@ -15,6 +15,7 @@ class Paf
     def method_missing(method, *args)
       return @paf.send(method, *args) if @paf.respond_to?(method)
       return @paf.class.send(method, *args) if @paf.class.respond_to?(method)
+
       super
     end
 

data/lib/paf/hash_formatter.rb

@@ -1,6 +1,6 @@
 require 'paf/formatter'
 
-class Paf
+module Paf
   # Processing to format a PAF entry as a hash
   class HashFormatter < Formatter
     def format(paf)

data/lib/paf/lineable.rb

@@ -1,7 +1,7 @@
 require 'paf/premises'
 require 'paf/thoroughfare_locality'
 
-class Paf
+module Paf
   # Processing to format PAF entry lines
   module Lineable
     def self.extended(base)
@@ -12,8 +12,7 @@ class Paf
     def lines
       [].tap do |lines|
         lines_methods.each do |method|
-          value = send(method)
-          (lines << value).flatten! unless value.vacant?
+          (lines << send(method)).flatten! unless send(method).vacant?
         end
       end
     end

data/lib/paf/premises/common.rb

@@ -1,4 +1,4 @@
-class Paf
+module Paf
   module Premises
     # Common processing for premises elements of a PAF entry
     module Common

data/lib/paf/premises/rule000.rb

@@ -1,4 +1,4 @@
-class Paf
+module Paf
   module Premises
     # Processing for premises elements of a PAF entry under Rule 1
     module Rule000

data/lib/paf/premises/rule001.rb

@@ -1,4 +1,4 @@
-class Paf
+module Paf
   module Premises
     # Processing for premises elements of a PAF entry under Rule 2
     module Rule001

data/lib/paf/premises/rule010.rb

@@ -1,9 +1,10 @@
-class Paf
+module Paf
   module Premises
     # Processing for premises elements of a PAF entry under Rule 3
     module Rule010
       def premises
         return [name_and_thoroughfare_or_locality] if building_name.exception?
+
         if building_name.split_exception?
           return [
             building_name.but_last_word,

data/lib/paf/premises/rule011.rb

@@ -1,4 +1,4 @@
-class Paf
+module Paf
   module Premises
     # Processing for premises elements of a PAF entry under Rule 4
     module Rule011

data/lib/paf/premises/rule101.rb

@@ -1,9 +1,10 @@
-class Paf
+module Paf
   module Premises
     # Processing for premises elements of a PAF entry under Rule 5
     module Rule101
       def premises
         return [number_sub_name_and_thoroughfare_or_locality] if concatenate?
+
         [sub_building_name, number_and_thoroughfare_or_locality]
       end
 

data/lib/paf/premises/rule110.rb

@@ -1,4 +1,4 @@
-class Paf
+module Paf
   module Premises
     # Processing for premises elements of a PAF entry under Rule 6
     module Rule110
@@ -6,6 +6,7 @@ class Paf
         return [sub_name_and_name] if sub_building_name.exception?
         return [sub_building_name, name_and_thoroughfare_or_locality] if
           building_name.exception?
+
         [sub_building_name, building_name]
       end
 

data/lib/paf/premises/rule111.rb

@@ -1,17 +1,23 @@
-class Paf
+module Paf
   module Premises
     # Processing for premises elements of a PAF entry under Rule 7
     module Rule111
       def premises
+        return [sub_name_comma_name] if building_number.zero?
         return [sub_name_and_name, number_and_thoroughfare_or_locality] if
           sub_building_name.exception?
+
         [sub_building_name, building_name, number_and_thoroughfare_or_locality]
       end
 
       private
 
       def premises_includes_first_thoroughfare_or_locality?
-        true
+        !building_number.zero?
+      end
+
+      def sub_name_comma_name
+        "#{sub_building_name}, #{building_name}"
       end
     end
   end

data/lib/paf/premises.rb

@@ -1,6 +1,6 @@
 require 'paf/premises/common'
 
-class Paf
+module Paf
   # Determine which premises rule is applicable
   module Premises
     include Common

data/lib/paf/string_formatter.rb

@@ -1,6 +1,6 @@
 require 'paf/formatter'
 
-class Paf
+module Paf
   # Processing to format a PAF entry as a string
   class StringFormatter < Formatter
     def format(paf)

data/lib/paf/thoroughfare_locality.rb

@@ -1,36 +1,36 @@
-class Paf
+module Paf
   # Processing for thoroughfare and locality elements of a PAF entry
   module ThoroughfareLocality
-    def thoroughfare_and_locality_attrs
-      %i[dependent_thoroughfare thoroughfare] + self.class.locality_attrs
-    end
-
     def thoroughfares_and_localities
       [].tap do |array|
         thoroughfare_and_locality_attrs.each do |attr|
-          next if used?(attr)
-          value = send(attr)
-          array << value unless value.vacant?
+          array << send(attr) unless used_or_vacant?(attr)
         end
       end
     end
 
     private
 
+    def thoroughfare_and_locality_attrs
+      %i[dependent_thoroughfare thoroughfare] + self.class.locality_attrs
+    end
+
     def first_thoroughfare_or_locality
       send(first_thoroughfare_or_locality_attr) unless
         first_thoroughfare_or_locality_attr.nil?
     end
 
     def first_thoroughfare_or_locality_attr
-      thoroughfare_and_locality_attrs.find do |attr|
-        !send(attr).vacant?
-      end
+      thoroughfare_and_locality_attrs.find { |attr| !send(attr).vacant? }
     end
 
     def used?(attr)
       premises_includes_first_thoroughfare_or_locality? &&
         (attr == first_thoroughfare_or_locality_attr)
     end
+
+    def used_or_vacant?(attr)
+      used?(attr) || send(attr).vacant?
+    end
   end
 end

data/lib/paf/version.rb

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

data/lib/paf.rb

@@ -1,41 +1,9 @@
 require 'paf/version'
-require 'paf/attribute'
-require 'paf/formattable'
+require 'paf/address'
 require 'paf/core_ext/object'
 require 'paf/core_ext/string'
 require 'paf/core_ext/array'
 
-# Base class from the elements of a UK Royal Mail Postcode Address File entry
-class Paf
-  include Paf::Attribute
-  include Paf::Formattable
-
-  attr_accessor(*attrs)
-  private(*attrs.map { |attr| "#{attr}=" })
-
-  def initialize(args)
-    args.each { |k, v| send("#{k}=", v) }
-  end
-
-  # PO Box number prepended with the string PO BOX
-  def po_box
-    "PO BOX #{po_box_number}" unless po_box_number.vacant?
-  end
-
-  # Dependent thoroughfare name and descriptor
-  def dependent_thoroughfare
-    concatenated(self.class.dependent_thoroughfare_attrs)
-  end
-
-  # Thoroughfare name and descriptor
-  def thoroughfare
-    concatenated(self.class.thoroughfare_attrs)
-  end
-
-  private
-
-  def concatenated(attrs)
-    value = attrs.map { |attr| send(attr) }.condense(' ')
-    value unless value.vacant?
-  end
+# Base module for UK Royal Mail Postcode Address File processing
+module Paf
 end

data/paf.gemspec

@@ -1,6 +1,4 @@
-# coding: utf-8
-
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'paf/version'
 
@@ -12,12 +10,12 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/drabjay/paf'
 
   spec.summary       = 'Royal Mail Postcode Address File (PAF) Formatter'
-  spec.description   = <<-EOF
+  spec.description   = <<-DESC
     A gem to format the elements of a Royal Mail Postcode Address File entry
     according to the rules described in the Royal Mail Programmer's Guide
-    Edition 7, Version 5.0
-    (http://www.royalmail.com/sites/default/files/docs/pdf/programmers_guide_edition_7_v5.pdf)
-  EOF
+    Edition 7, Version 6.2
+    (https://www.poweredbypaf.com/wp-content/uploads/2024/11/Latest-Programmers_guide_Edition-7-Version-6-2.pdf)
+  DESC
   spec.license       = 'MIT'
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
@@ -27,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.required_ruby_version = '>= 2.4'
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.5'
   spec.add_development_dependency 'rspec', '~> 3.6'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paf
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - John Bard
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-07-08 00:00:00.000000000 Z
+date: 2025-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -83,8 +83,8 @@ dependencies:
 description: |2
       A gem to format the elements of a Royal Mail Postcode Address File entry
       according to the rules described in the Royal Mail Programmer's Guide
-      Edition 7, Version 5.0
-      (http://www.royalmail.com/sites/default/files/docs/pdf/programmers_guide_edition_7_v5.pdf)
+      Edition 7, Version 6.2
+      (https://www.poweredbypaf.com/wp-content/uploads/2024/11/Latest-Programmers_guide_Edition-7-Version-6-2.pdf)
 email:
 - johnbard@globalnet.co.uk
 executables: []
@@ -103,6 +103,7 @@ files:
 - bin/console
 - bin/setup
 - lib/paf.rb
+- lib/paf/address.rb
 - lib/paf/array_formatter.rb
 - lib/paf/attribute.rb
 - lib/paf/core_ext/array.rb
@@ -129,7 +130,7 @@ homepage: https://github.com/drabjay/paf
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -137,16 +138,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Royal Mail Postcode Address File (PAF) Formatter
 test_files: []