paf 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dd17987d33a92bdf4f5fe218b0ad72c570add4f
-  data.tar.gz: d8c7802c5b9bf6cd4cd02dbd6b56d33a8d89629d
+  metadata.gz: 36b4513b6be17e49ed9962e9aafcdbbb4039ee3d
+  data.tar.gz: 1f2d2a352533a1fcfb6e6d8ccd321f3de40b2c75
 SHA512:
-  metadata.gz: a38a0e2a2922cbaa10f98adfb594ae3abdddf7283d0cc08c4266ab88ecfa0de8cac08f25a185aa8b32325f7c484d3fb0a3fcc083ad7bbd6b5362d8b7a643ea8d
-  data.tar.gz: b3ba1f6afaca1d5b4654f0186f99e2465be036550310757a15090fae9aee65d2ce14e0cec066e14043bc84f4ccb53348df8115c5c9b79e5cb279d0b9bba259d2
+  metadata.gz: 409df603f878fafd0b169d39fc65b26e3419b880d3a3bf8bf857bfff53625fedda83c62d64a629de03117fd22f984cbf13954eefe6414e5d67cfd2ff8e1fb0df
+  data.tar.gz: 00d5ae8fef08d1324f7998b1899451fecb1dc52a9e893f2210020085c12c415905acdd0612f862fed5b2f97079d55dca4e34ca5322498a27d89aac760c3e97b4

data/lib/paf.rb

@@ -1,6 +1,9 @@
 require 'paf/version'
 require 'paf/attribute'
 require 'paf/formattable'
+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
@@ -16,7 +19,7 @@ class Paf
 
   # PO Box number prepended with the string PO BOX
   def po_box
-    "PO BOX #{po_box_number}" unless po_box_number.to_s.empty?
+    "PO BOX #{po_box_number}" unless po_box_number.vacant?
   end
 
   # Dependent thoroughfare name and descriptor
@@ -32,7 +35,7 @@ class Paf
   private
 
   def concatenated(attrs)
-    value = attrs.map { |attr| send(attr).to_s }.reject(&:empty?).join(' ')
-    value unless value.to_s.empty?
+    value = attrs.map { |attr| send(attr) }.condense.join(' ')
+    value unless value.vacant?
   end
 end

data/lib/paf/attribute.rb

@@ -9,13 +9,19 @@ class Paf
     # Methods to be added to the including class
     module ClassMethods
       def attrs
-        premises_attrs +
+        organisation_attrs +
+          premises_attrs +
           dependent_thoroughfare_attrs +
           thoroughfare_attrs +
           locality_attrs +
+          post_attrs +
           other_attrs
       end
 
+      def organisation_attrs
+        %i[organisation_name department_name]
+      end
+
       def premises_attrs
         %i[sub_building_name building_name building_number]
       end
@@ -32,15 +38,12 @@ class Paf
         %i[double_dependent_locality dependent_locality]
       end
 
+      def post_attrs
+        %i[post_town postcode]
+      end
+
       def other_attrs
-        %i[
-          organisation_name
-          department_name
-          po_box_number
-          post_town
-          postcode
-          udprn
-        ]
+        %i[po_box_number udprn]
       end
     end
   end

data/lib/paf/core_ext/array.rb

@@ -0,0 +1,14 @@
+require 'paf/core_ext/string'
+
+class Paf
+  module CoreExt
+    # Extend the core Array class with PAF specific processing
+    module Array
+      def condense
+        reject(&:vacant?)
+      end
+    end
+  end
+end
+
+Array.include Paf::CoreExt::Array

data/lib/paf/core_ext/object.rb

@@ -0,0 +1,12 @@
+class Paf
+  module CoreExt
+    # Extend the core Object class with PAF specific processing
+    module Object
+      def vacant?
+        respond_to?(:empty?) ? empty? : !self
+      end
+    end
+  end
+end
+
+Object.include Paf::CoreExt::Object

data/lib/paf/{premises → core_ext}/string.rb

@@ -1,5 +1,5 @@
 class Paf
-  module Premises
+  module CoreExt
     # Extend the core String class with PAF specific processing
     module String
       def paf_exception?
@@ -13,4 +13,4 @@ class Paf
   end
 end
 
-String.include Paf::Premises::String
+String.include Paf::CoreExt::String

data/lib/paf/formattable.rb

@@ -1,3 +1,4 @@
+require 'paf/lineable'
 require 'paf/premises'
 require 'paf/thoroughfare_locality'
 
@@ -7,6 +8,7 @@ class Paf
     def self.included(base)
       base.extend ClassMethods
       base.class_eval do
+        include Lineable
         include Premises
         include ThoroughfareLocality
       end
@@ -15,16 +17,6 @@ class Paf
 
     # Methods to be added to the including class
     module ClassMethods
-      def lines_methods
-        %i[
-          organisation_name
-          department_name
-          po_box
-          premises
-          thoroughfares_and_localities
-        ]
-      end
-
       # Formats a hash of PAF address elements into an array of strings
       def format(args)
         new(args).format
@@ -40,27 +32,16 @@ class Paf
     # Formats a Paf instance into an array of strings
     def format
       array = lines
-      %i[post_town postcode].each do |attr|
-        array << send(attr) unless send(attr).to_s.empty?
+      self.class.post_attrs.each do |attr|
+        array << send(attr) unless send(attr).vacant?
       end
       array
     end
 
     # Formats a Paf instance into a string
     def to_s
-      string = (lines + [post_town.to_s]).reject(&:empty?).join(', ')
-      ([string] + [postcode]).reject(&:empty?).join('. ')
-    end
-
-    private
-
-    def lines
-      lines = []
-      self.class.lines_methods.each do |method|
-        value = send(method)
-        (lines << value).flatten! unless value.nil? || value.empty?
-      end
-      lines
+      string = (lines + [post_town]).condense.join(', ')
+      ([string] + [postcode]).condense.join('. ')
     end
   end
 end

data/lib/paf/lineable.rb

@@ -0,0 +1,27 @@
+class Paf
+  # Processing to format PAF entry lines
+  module Lineable
+    def self.included(base)
+      base.extend ClassMethods
+    end
+    private_class_method :included
+
+    # Methods to be added to the including class
+    module ClassMethods
+      def lines_methods
+        organisation_attrs + %i[po_box premises thoroughfares_and_localities]
+      end
+    end
+
+    private
+
+    def lines
+      lines = []
+      self.class.lines_methods.each do |method|
+        value = send(method)
+        (lines << value).flatten! unless value.vacant?
+      end
+      lines
+    end
+  end
+end

data/lib/paf/premises.rb

@@ -1,4 +1,3 @@
-require 'paf/premises/string'
 require 'paf/premises/common'
 
 class Paf
@@ -35,9 +34,7 @@ class Paf
     end
 
     def rule_key
-      self.class.premises_attrs.map do |attr|
-        send(attr).to_s.empty? ? 0 : 1
-      end.join
+      self.class.premises_attrs.map { |attr| send(attr).vacant? ? 0 : 1 }.join
     end
   end
 end

data/lib/paf/thoroughfare_locality.rb

@@ -20,7 +20,7 @@ class Paf
       self.class.thoroughfare_and_locality_attrs.each do |attr|
         next if used?(attr)
         value = send(attr)
-        array << value unless value.to_s.empty?
+        array << value unless value.vacant?
       end
       array
     end
@@ -32,7 +32,7 @@ class Paf
 
     def first_thoroughfare_or_locality_attr
       self.class.thoroughfare_and_locality_attrs.find do |attr|
-        !send(attr).to_s.empty?
+        !send(attr).vacant?
       end
     end
 

data/lib/paf/version.rb

@@ -1,4 +1,4 @@
 # PAF gem version
 class Paf
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: paf
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - John Bard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -104,7 +104,11 @@ files:
 - bin/setup
 - lib/paf.rb
 - lib/paf/attribute.rb
+- lib/paf/core_ext/array.rb
+- lib/paf/core_ext/object.rb
+- lib/paf/core_ext/string.rb
 - lib/paf/formattable.rb
+- lib/paf/lineable.rb
 - lib/paf/premises.rb
 - lib/paf/premises/common.rb
 - lib/paf/premises/rule000.rb
@@ -114,7 +118,6 @@ files:
 - lib/paf/premises/rule101.rb
 - lib/paf/premises/rule110.rb
 - lib/paf/premises/rule111.rb
-- lib/paf/premises/string.rb
 - lib/paf/thoroughfare_locality.rb
 - lib/paf/version.rb
 - paf.gemspec