paf 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b233ff56fedadfea9e1f21508ea7b6fb85f852c1
-  data.tar.gz: 59dbbde56e750c387774368cad006e4d3e4a0a7c
+  metadata.gz: 7138b6a5f3acbe97f7f227410d48f972310a7d1a
+  data.tar.gz: ce12de78a4ca2e7f7556375de50fbc9cf143a982
 SHA512:
-  metadata.gz: c379a989578aa2c9a0398f26dddf50d0cce40d15f0ddc8394e54e24bd7c13c016b30734ff3f2375ff985d63caf707d9b024c8720edade1ac3cccbf7a67b78779
-  data.tar.gz: 7414a214e0a027bffa8c774f595844a208e75db227af5f2338e9e2f80804088f0e50a0ff39c69f2a5e01412582060d39faa36badd96365ebf630abc8a4a18579
+  metadata.gz: ddc67a2e7ea3e1e5493a45d37e5b80473532f3d33bd8c2a733e4bf0a6529e88caa532c8ac44f10dad0ca2dd9036f52ab12d330a0f05f686ce2407e4b5bc6db3b
+  data.tar.gz: 7d5b94a394240e8406eb53e947cb5fb010ee9cf4a3123d1d392b5f775c25338df46b71f98e827764fbb0590c5b7e97c70a0f905312d06cb60969c2f617ae397b

data/lib/paf/lineable.rb

@@ -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/thoroughfare_locality.rb

@@ -1,36 +1,36 @@
 class 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
+  VERSION = '0.5.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: paf
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - John Bard