lite-address 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c29871c0adebc108e69481fd2029bbcb3d9176670e7b1d82d0cff2f83dc74a6e
-  data.tar.gz: 3a93c78446f6d75d78a9a8ba7e1af9137dd569704ed5abf88606a21f1b60c87b
+  metadata.gz: 36e2c1997170c93506425dd544c0062935dcd259907358f65369939d2eaa6873
+  data.tar.gz: e49a679ac35e9112ace7cefcf692801764b75dfecc7c0fbe36d144906b4c1b2e
 SHA512:
-  metadata.gz: 800cb307c14b5f64acffa705694ada48b2e6f7d9224a4d20c8db6486da02a7e20ce65225df6095d566adefec953143e9ffaa5be28a10cea5e3e854de0e4cb1d1
-  data.tar.gz: 34c1856153094313069ab2b687dc867d8570330416fc1c3569febdc87d1f015ea94a09019bcea7083752ce561c91d5eb926f982633d885ab81b8e945242a8291
+  metadata.gz: 6325e5bbb27050fbb0d187c4a82f0198972c1cf570fd323bb08eb786bde058724c9dc678bd078e060c62b6a046b5474b9a172cc7793026bf83e6f7628b66b907
+  data.tar.gz: 8f345971caa3e404ab079b970f07e2e4bab655c2c64eba1abf93af3b69f593857c1853dc1fb791a290268709a1eb8ea74d936cc21dc9b423ec5cd0d1f66fd891

data/.rubocop.yml

@@ -3,7 +3,6 @@ require:
   - rubocop-rake
   - rubocop-rspec
 AllCops:
-  TargetRubyVersion: 3.0
   NewCops: enable
   DisplayCopNames: true
   DisplayStyleGuide: true
@@ -19,13 +18,15 @@ Layout/EmptyLinesAroundClassBody:
 Layout/EmptyLinesAroundModuleBody:
   EnforcedStyle: empty_lines_except_namespace
 Layout/LineLength:
-  Max: 100
+  Enabled: false
 Layout/SpaceAroundMethodCallOperator:
   Enabled: true
 Lint/RaiseException:
   Enabled: true
 Lint/StructNewOverride:
   Enabled: true
+Metrics/AbcSize:
+  Enabled: false
 Metrics/BlockLength:
   Exclude:
     - 'spec/**/**/*'
@@ -38,11 +39,15 @@ RSpec/ExampleLength:
   Enabled: false
 RSpec/MultipleExpectations:
   Enabled: false
+RSpec/NoExpectationExample:
+  Enabled: false
 Style/ArgumentsForwarding:
   Enabled: false
 Style/Documentation:
   Enabled: false
 Style/ExpandPathArguments:
   Enabled: false
+Style/StringLiterals:
+  EnforcedStyle: double_quotes
 Style/StructInheritance:
   Enabled: false

data/CHANGELOG.md

@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.1.0] - 2022-11-17
+### Changed
+- Improved docs
+- Updated internal setup
+- Improved rubocop setup
+
+## [1.0.1] - 2021-09-09
+### Changed
+- Remove snail dependency
+
 ## [1.0.0] - 2021-09-09
 ### Added
 - Initial project version

data/Gemfile

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in lite-address.gemspec
 gemspec

data/Gemfile.lock

@@ -1,85 +1,69 @@
 PATH
   remote: .
   specs:
-    lite-address (1.0.0)
+    lite-address (1.1.0)
       countries
-      snail
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     ast (2.4.2)
     colorize (0.8.1)
-    concurrent-ruby (1.1.9)
-    countries (4.0.1)
-      i18n_data (~> 0.13.0)
-      sixarm_ruby_unaccent (~> 1.1)
-    diff-lcs (1.4.4)
-    fasterer (0.9.0)
+    countries (5.2.0)
+      unaccent (~> 0.3)
+    diff-lcs (1.5.0)
+    fasterer (0.10.0)
       colorize (~> 0.7)
-      ruby_parser (>= 3.14.1)
-    i18n (1.8.10)
-      concurrent-ruby (~> 1.0)
-    i18n_data (0.13.0)
-    minitest (5.14.4)
-    parallel (1.20.2)
-    parser (3.0.2.0)
+      ruby_parser (>= 3.19.1)
+    json (2.6.2)
+    parallel (1.22.1)
+    parser (3.1.2.1)
       ast (~> 2.4.1)
-    rainbow (3.0.0)
+    rainbow (3.1.1)
     rake (13.0.6)
-    regexp_parser (2.1.1)
+    regexp_parser (2.6.1)
     rexml (3.2.5)
-    rspec (3.10.0)
-      rspec-core (~> 3.10.0)
-      rspec-expectations (~> 3.10.0)
-      rspec-mocks (~> 3.10.0)
-    rspec-core (3.10.1)
-      rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.10.0)
-    rspec-support (3.10.2)
-    rubocop (1.20.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    rubocop (1.39.0)
+      json (~> 2.3)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.1.2.1)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      rexml (>= 3.2.5, < 4.0)
+      rubocop-ast (>= 1.23.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.11.0)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.11.5)
+    rubocop-ast (1.23.0)
+      parser (>= 3.1.1.0)
+    rubocop-performance (1.15.1)
       rubocop (>= 1.7.0, < 2.0)
       rubocop-ast (>= 0.4.0)
     rubocop-rake (0.6.0)
       rubocop (~> 1.0)
-    rubocop-rspec (2.4.0)
-      rubocop (~> 1.0)
-      rubocop-ast (>= 1.1.0)
+    rubocop-rspec (2.15.0)
+      rubocop (~> 1.33)
     ruby-progressbar (1.11.0)
-    ruby_parser (3.17.0)
-      sexp_processor (~> 4.15, >= 4.15.1)
-    sexp_processor (4.15.3)
-    sixarm_ruby_unaccent (1.2.0)
-    snail (2.2.3)
-      activesupport
-    tzinfo (2.0.4)
-      concurrent-ruby (~> 1.0)
-    unicode-display_width (2.0.0)
-    zeitwerk (2.4.2)
+    ruby_parser (3.19.1)
+      sexp_processor (~> 4.16)
+    sexp_processor (4.16.1)
+    unaccent (0.4.0)
+    unicode-display_width (2.3.0)
 
 PLATFORMS
+  arm64-darwin-21
   x86_64-darwin-20
 
 DEPENDENCIES
@@ -94,4 +78,4 @@ DEPENDENCIES
   rubocop-rspec
 
 BUNDLED WITH
-   2.2.26
+   2.3.26

data/README.md

@@ -31,8 +31,9 @@ methods below (check the class to see more). If an address cannot be parsed then
 will be returned, but partial matches can be returned. All addresses will try to be
 normalized to return a predictable pattern.
 
+#### Full matches
 ```
-address = Lite::Address::Parse.parse("1600 Pennsylvania Ave, Washington, DC, 20500")
+address = Lite::Address::Parser.any("1600 Pennsylvania Ave, Washington, DC, 20500")
 address.street        #=> Pennsylvania
 address.number        #=> 1600
 address.postal_code   #=> 20500
@@ -41,17 +42,14 @@ address.state         #=> DC
 address.state_name    #=> District of Columbia
 address.street_type   #=> Ave
 address.intersection? #=> false
+```
 
-address = Lite::Address::Parse.parse("1600 Pennsylvania Ave")
+#### Partial matches
+```
+address = Lite::Address::Parser.any("1600 Pennsylvania Ave")
 address.street  #=> Pennsylvania
 address.number  #=> 1600
 address.state   #=> nil
-
-address = Lite::Address::Parse.parse("5904 Richmond Hwy Ste 340 Alexandria VA 22303-1864")
-address.postal_code_ext #=> 1846
-
-address = Lite::Address::Parse.parse("5904 Richmond Hwy Ste 340 Alexandria VA 223031864")
-address.postal_code_ext #=> 1846
 ```
 
 ## Formatting
@@ -59,7 +57,7 @@ address.postal_code_ext #=> 1846
 A formatted can be returned to as a whole or in parts of simple strings.
 
 ```
-address = Lite::Address::Parse.parse("1600 Pennsylvania Ave, Washington, DC, 20500")
+address = Lite::Address::Parser.any("1600 Pennsylvania Ave, Washington, DC, 20500")
 address.to_s         #=> 1600 Pennsylvania Ave, Washington, DC 20500
 address.to_s(:line1) #=> 1600 Pennsylvania Ave
 address.to_s(:line2) #=> Washington, DC 20500
@@ -67,14 +65,20 @@ address.to_s(:line2) #=> Washington, DC 20500
 
 You can also format strings to the proper country mail format.
 
+#### Address only
 ```
-address = Lite::Address::Parse.parse("1600 Pennsylvania Ave, Washington, DC, 20500")
-address.to_snail                    #=> 1600 Pennsylvania Ave,
-                                        Washington, DC 20500
+address = Lite::Address::Parser.any("1600 Pennsylvania Ave, Washington, DC, 20500")
+address.to_snail #=> 1600 Pennsylvania Ave,
+                     Washington, DC 20500
 
-address.to_snail(name: 'John Doe')  #=> John Doe
-                                        1600 Pennsylvania Ave,
-                                        Washington, DC 20500
+```
+
+#### Name prepended
+```
+address = Lite::Address::Parser.any("1600 Pennsylvania Ave, Washington, DC, 20500")
+address.to_snail(name: 'John Doe') #=> John Doe
+                                       1600 Pennsylvania Ave,
+                                       Washington, DC 20500
 ```
 
 ## Development

data/Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'bundler/gem_tasks'
-require 'rspec/core/rake_task'
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new(:spec)
 

data/bin/console

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require 'bundler/setup'
-require 'lite/address'
+require "bundler/setup"
+require "lite/address"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -11,5 +11,5 @@ require 'lite/address'
 # require "pry"
 # Pry.start
 
-require 'irb'
+require "irb"
 IRB.start(__FILE__)

data/lib/lite/address/format.rb

@@ -1,31 +1,21 @@
 # frozen_string_literal: true
 
-require 'snail' unless defined?(Snail)
-
 module Lite
   module Address
 
-    FORMAT_KEYS = %i[
-      number
-      street street2
-      street_type street_type2 redundant_street_type
-      unit_prefix unit
-      prefix prefix2
-      suffix suffix2
-      city
-      state
-      postal_code postal_code_ext
-      country list regexp
-    ].freeze
-
-    class Format < Struct.new(*FORMAT_KEYS, keyword_init: true)
+    PARTS = begin
+      file_path = File.expand_path("types/part.yml", File.dirname(__FILE__))
+      YAML.load_file(file_path).map(&:to_sym)
+    end
+
+    class Format < Struct.new(:list, *PARTS, keyword_init: true)
 
       def country_code
         country.alpha2
       end
 
       def country_name
-        country.name
+        country.iso_short_name
       end
 
       def intersection?
@@ -35,16 +25,16 @@ module Lite
       def full_postal_code
         return if postal_code.nil?
 
-        @full_postal_code ||= [postal_code, postal_code_ext].compact.join('-')
+        @full_postal_code ||= [postal_code, postal_code_ext].compact.join("-")
       end
 
-      def line1(str = +'')
+      def line1(str = +"")
         parts = intersection? ? intersection_line1 : address_line1
-        str + parts.compact.join(' ').strip
+        str + parts.compact.join(" ").strip
       end
 
-      def line2(str = +'')
-        str += [city, state].compact.join(', ')
+      def line2(str = +"")
+        str += [city, state].compact.join(", ")
         str << " #{full_postal_code}" if postal_code
         str.strip
       end
@@ -54,7 +44,7 @@ module Lite
       end
 
       def to_h
-        @to_h ||= Lite::Address::FORMAT_KEYS.each_with_object({}) do |key, hash|
+        @to_h ||= Lite::Address::PARTS.each_with_object({}) do |key, hash|
           hash[key] = public_send(key)
         end
       end
@@ -63,12 +53,14 @@ module Lite
         case format
         when :line1 then line1
         when :line2 then line2
-        else [line1, line2].reject(&:empty?).join(', ')
+        else [line1, line2].reject(&:empty?).join(", ")
         end
       end
 
-      def to_snail(options = {})
-        Snail.new(snail_params.merge(options)).to_s
+      def to_snail(prefixes: [], include_country: false)
+        prefixes.push(line1, line2)
+        prefixes.push(country_name) if include_country
+        prefixes.compact.join("\n")
       end
 
       def to_ukey
@@ -84,7 +76,6 @@ module Lite
 
       private
 
-      # rubocop:disable Metrics/AbcSize, Naming/VariableNumber
       def address_line1
         parts = []
         parts << number
@@ -94,34 +85,24 @@ module Lite
         parts << suffix
         parts << unit_prefix
         # http://pe.usps.gov/cpim/ftp/pubs/Pub28/pub28.pdf pg28
-        parts << (unit_prefix ? unit : "\# #{unit}") if unit
+        parts << (unit_prefix ? unit : "# #{unit}") if unit
         parts
       end
 
-      def snail_params
-        {
-          line_1: line1,
-          city: city,
-          region: state,
-          postal_code: full_postal_code,
-          country: country_code
-        }
-      end
-
       def intersection_line1
         parts = []
         parts << prefix
         parts << street
         parts << street_type
         parts << suffix
-        parts << 'and'
+        parts << "and"
         parts << prefix2
         parts << street2
         parts << street_type2
         parts << suffix2
         parts
       end
-      # rubocop:enable Metrics/AbcSize, Naming/VariableNumber
+      # rubocop:enable Metrics/AbcSize
 
     end
 

data/lib/lite/address/list.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'yaml' unless defined?(YAML)
+require "yaml" unless defined?(YAML)
 
 module Lite
   module Address
@@ -18,14 +18,14 @@ module Lite
 
       def cardinal_types
         @cardinal_types ||= begin
-          file_path = File.expand_path('types/cardinal.yml', File.dirname(__FILE__))
+          file_path = File.expand_path("types/cardinal.yml", File.dirname(__FILE__))
           YAML.load_file(file_path)
         end
       end
 
       def street_types
         @street_types ||= begin
-          file_path = File.expand_path('types/street.yml', File.dirname(__FILE__))
+          file_path = File.expand_path("types/street.yml", File.dirname(__FILE__))
           YAML.load_file(file_path)
         end
       end
@@ -57,37 +57,37 @@ module Lite
 
       def unit_abbr_numbered_regexps
         @unit_abbr_numbered_regexps ||= {
-          'Apt' => /(?:ap|dep)(?:ar)?t(?:me?nt)?/i,
-          'PO Box' => /p\W*[om]\W*b(?:ox)?/i,
-          'Bldg' => /bu?i?ldi?n?g/i,
-          'Dept' => /dep(artmen)?t/i,
-          'Floor' => /flo*r?/i,
-          'Hanger' => /ha?nga?r/i,
-          'Lot' => /lo?t/i,
-          'Room' => /ro*m/i,
-          'Pier' => /pier/i,
-          'Slip' => /slip/i,
-          'Space' => /spa?ce?/i,
-          'Stop' => /stop/i,
-          'Drawer' => /drawer/i,
-          'Suite' => /su?i?te/i,
-          'Trailer' => /tra?i?le?r/i,
-          'Box' => /\w*(?<!po\W)box/i,
-          'Unit' => /uni?t/i
+          "Apt" => /(?:ap|dep)(?:ar)?t(?:me?nt)?/i,
+          "PO Box" => /p\W*[om]\W*b(?:ox)?/i,
+          "Bldg" => /bu?i?ldi?n?g/i,
+          "Dept" => /dep(artmen)?t/i,
+          "Floor" => /flo*r?/i,
+          "Hanger" => /ha?nga?r/i,
+          "Lot" => /lo?t/i,
+          "Room" => /ro*m/i,
+          "Pier" => /pier/i,
+          "Slip" => /slip/i,
+          "Space" => /spa?ce?/i,
+          "Stop" => /stop/i,
+          "Drawer" => /drawer/i,
+          "Suite" => /su?i?te/i,
+          "Trailer" => /tra?i?le?r/i,
+          "Box" => /\w*(?<!po\W)box/i,
+          "Unit" => /uni?t/i
         }
       end
 
       def unit_abbr_unnumbered_regexps
         @unit_abbr_unnumbered_regexps ||= {
-          'Basement' => /ba?se?me?n?t/i,
-          'Front' => /fro?nt/i,
-          'Lobby' => /lo?bby/i,
-          'Lower' => /lowe?r/i,
-          'Office' => /off?i?ce?/i,
-          'PH' => /pe?n?t?ho?u?s?e?/i,
-          'Rear' => /rear/i,
-          'Side' => /side/i,
-          'Upper' => /uppe?r/i
+          "Basement" => /ba?se?me?n?t/i,
+          "Front" => /fro?nt/i,
+          "Lobby" => /lo?bby/i,
+          "Lower" => /lowe?r/i,
+          "Office" => /off?i?ce?/i,
+          "PH" => /pe?n?t?ho?u?s?e?/i,
+          "Rear" => /rear/i,
+          "Side" => /side/i,
+          "Upper" => /uppe?r/i
         }
       end
 

data/lib/lite/address/parser.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'countries' unless defined?(ISO3166::Country)
+require "countries" unless defined?(ISO3166::Country)
 
 module Lite
   module Address
@@ -8,11 +8,11 @@ module Lite
 
       LOOKUPS = %i[any formal informal intersectional].freeze
       CAPITALIZATION_PARTS = %w[street street_type street2 street_type2 city unit_prefix].freeze
-      STREET_POSITIONS = ['', '1', '2'].freeze
+      STREET_POSITIONS = ["", "1", "2"].freeze
 
       attr_reader :address, :country_code
 
-      def initialize(address, country_code: 'US')
+      def initialize(address, country_code: "US")
         @address = sanitize_address(address)
         @country_code = sanitize_country_code(country_code)
       end
@@ -21,7 +21,7 @@ module Lite
 
         LOOKUPS.each do |method_name|
           define_method(method_name) do |address, args = {}|
-            instance = new(address, country_code: args.delete(:country_code) || 'US')
+            instance = new(address, country_code: args.delete(:country_code) || "US")
             instance.public_send(method_name, args)
           end
         end
@@ -52,9 +52,9 @@ module Lite
         return unless (match = regexp.intersectional_address.match(address))
 
         map = match_map(match)
-        intersectional_submatch(match, map, 'street')
-        intersectional_submatch(match, map, 'street_type')
-        intersectional_rematch(match, map, 'street_type')
+        intersectional_submatch(match, map, "street")
+        intersectional_submatch(match, map, "street_type")
+        intersectional_rematch(match, map, "street_type")
 
         generate_address(map, args)
       end
@@ -76,7 +76,7 @@ module Lite
       private
 
       def sanitize_address(value)
-        value.delete_prefix('(').delete_suffix(')')
+        value.delete_prefix("(").delete_suffix(")")
       end
 
       def sanitize_country_code(value)
@@ -89,19 +89,18 @@ module Lite
         end
       end
 
-      # rubocop:disable Metrics/AbcSize
       def normalization_map
         @normalization_map ||= {
-          'prefix' => list.cardinal_types,
-          'prefix1' => list.cardinal_types,
-          'prefix2' => list.cardinal_types,
-          'suffix' => list.cardinal_types,
-          'suffix1' => list.cardinal_types,
-          'suffix2' => list.cardinal_types,
-          'street_type' => list.street_types,
-          'street_type1' => list.street_types,
-          'street_type2' => list.street_types,
-          'state' => list.subdivision_names
+          "prefix" => list.cardinal_types,
+          "prefix1" => list.cardinal_types,
+          "prefix2" => list.cardinal_types,
+          "suffix" => list.cardinal_types,
+          "suffix1" => list.cardinal_types,
+          "suffix2" => list.cardinal_types,
+          "street_type" => list.street_types,
+          "street_type1" => list.street_types,
+          "street_type2" => list.street_types,
+          "state" => list.subdivision_names
         }
       end
       # rubocop:enable Metrics/AbcSize
@@ -117,7 +116,7 @@ module Lite
         return unless map[part] && (!map["#{part}2"] || (map[part] == map["#{part}2"]))
 
         type = map[part].dup
-        return unless type.gsub!(/s\W*$/i, '') && (/\A#{regexp.public_send(part)}\z/io =~ type)
+        return unless type.gsub!(/s\W*$/i, "") && (/\A#{regexp.public_send(part)}\z/io =~ type)
 
         map[part] = map["#{part}2"] = type
       end
@@ -126,27 +125,27 @@ module Lite
         map.each do |key, string|
           string.strip!
 
-          if key == 'number'
-            string.gsub!(%r{[^\w\s\-\#&/.]}, '')
+          if key == "number"
+            string.gsub!(%r{[^\w\s\-\#&/.]}, "")
           else
-            string.gsub!(%r{[^\w\s\-\#&/]}, '')
+            string.gsub!(%r{[^\w\s\-\#&/]}, "")
           end
         end
       end
 
       def address_redundantize_street_type(map)
-        map['redundant_street_type'] = false
-        return unless map['street'] && !map['street_type']
+        map["redundant_street_type"] = false
+        return unless map["street"] && !map["street_type"]
 
-        match = regexp.street.match(map['street'])
-        map['street_type'] = match['street_type'] if match
-        map['redundant_street_type'] = true
+        match = regexp.street.match(map["street"])
+        map["street_type"] = match["street_type"] if match
+        map["redundant_street_type"] = true
       end
 
       def address_abbreviate_unit_prefixes(map)
         list.unit_abbr_regexps.each do |abbr, regex|
-          regex.match(map['unit_prefix']) do |_match|
-            map['unit_prefix'] = abbr
+          regex.match(map["unit_prefix"]) do |_match|
+            map["unit_prefix"] = abbr
           end
         end
       end
@@ -174,25 +173,25 @@ module Lite
       end
 
       def address_expand_cardinals(map)
-        return unless map['city']
+        return unless map["city"]
 
-        map['city'].gsub!(/^(#{regexp.cardinal_code})\s+(?=\S)/o) do |match|
+        map["city"].gsub!(/^(#{regexp.cardinal_code})\s+(?=\S)/o) do |match|
           "#{list.cardinal_codes[match[0].upcase]} "
         end
       end
 
       def address_fix_dirty_ordinals(map)
         # Sometimes parcel data will have addresses like "1 1ST ST" as "1 1 ST ST"
-        return unless map['street']
+        return unless map["street"]
 
-        map['street'].gsub!(/\A(\d+\s+st|\d+\s+nd|\d+\s+rd|\d+\s+th)\z/i) do |match|
-          match.gsub!(/\s+/, '')
+        map["street"].gsub!(/\A(\d+\s+st|\d+\s+nd|\d+\s+rd|\d+\s+th)\z/i) do |match|
+          match.gsub!(/\s+/, "")
         end
       end
 
       def address_capitalize_parts(map)
         CAPITALIZATION_PARTS.each do |k|
-          map[k] = map[k].split.map(&:capitalize).join(' ') if map[k]
+          map[k] = map[k].split.map(&:capitalize).join(" ") if map[k]
         end
       end
 
@@ -206,8 +205,9 @@ module Lite
         address_fix_dirty_ordinals(map)
         address_capitalize_parts(map)
 
-        map.merge!(country: country, list: list, regexp: regexp)
-        Lite::Address::Format.new(map)
+        map[:country] = country
+
+        Lite::Address::Format.new(list:, **map)
       end
 
     end

data/lib/lite/address/regexp.rb

@@ -17,7 +17,7 @@ module Lite
       def cardinal_code
         @cardinal_code ||= begin
           values = list.cardinal_codes.keys
-          ::Regexp.new(values.join('|'), ::Regexp::IGNORECASE)
+          ::Regexp.new(values.join("|"), ::Regexp::IGNORECASE)
         end
       end
 
@@ -28,7 +28,7 @@ module Lite
             array << [::Regexp.quote(val.gsub(/(\w)/, '\1.')), ::Regexp.quote(val)]
           end
 
-          ::Regexp.new(values.join('|'), ::Regexp::IGNORECASE)
+          ::Regexp.new(values.join("|"), ::Regexp::IGNORECASE)
         end
       end
 
@@ -113,7 +113,7 @@ module Lite
       def street_type
         @street_type ||= begin
           values = (list.street_types.keys + list.street_types.values).uniq
-          ::Regexp.new(values.join('|'), ::Regexp::IGNORECASE)
+          ::Regexp.new(values.join("|"), ::Regexp::IGNORECASE)
         end
       end
 

data/lib/lite/address/types/part.yml

@@ -0,0 +1,17 @@
+- number
+- street
+- street2
+- street_type
+- street_type2
+- redundant_street_type
+- unit_prefix
+- unit
+- prefix
+- prefix2
+- suffix
+- suffix2
+- city
+- state
+- postal_code
+- postal_code_ext
+- country

data/lib/lite/address/ukey.rb

@@ -1,18 +1,16 @@
 # frozen_string_literal: true
 
-require 'digest' unless defined?(Digest)
+require "digest" unless defined?(Digest)
 
 module Lite
   module Address
-    class Ukey
+    module Ukey
 
-      class << self
-
-        def generate(value)
-          result = value.downcase.gsub(/[^0-9a-z]/i, '')
-          Digest::MD5.hexdigest(result)
-        end
+      module_function
 
+      def generate(value)
+        result = value.downcase.gsub(/[^0-9a-z]/i, "")
+        Digest::MD5.hexdigest(result)
       end
 
     end

data/lib/lite/address/version.rb

@@ -3,7 +3,7 @@
 module Lite
   module Address
 
-    VERSION = '1.0.0'
+    VERSION = "1.1.0"
 
   end
 end

data/lib/lite/address.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'lite/address/version'
-require 'lite/address/ukey'
-require 'lite/address/list'
-require 'lite/address/regexp'
-require 'lite/address/format'
-require 'lite/address/parser'
+require "lite/address/version"
+require "lite/address/ukey"
+require "lite/address/list"
+require "lite/address/regexp"
+require "lite/address/format"
+require "lite/address/parser"

data/lite-address.gemspec

@@ -1,51 +1,44 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'lite/address/version'
+require "lite/address/version"
 
 Gem::Specification.new do |spec|
-  spec.name = 'lite-address'
+  spec.name = "lite-address"
   spec.version = Lite::Address::VERSION
-  spec.authors = ['Juan Gomez']
+  spec.authors = ["Juan Gomez"]
   spec.email = %w[j.gomez@drexed.com]
 
-  spec.summary = 'Parse and normalize street addresses'
-  spec.homepage = 'http://drexed.github.io/lite-address'
-  spec.license = 'MIT'
+  spec.summary = "Parse and normalize street addresses"
+  spec.homepage = "http://drexed.github.io/lite-address"
+  spec.license = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
   # to allow pushing to a single host or delete this section to allow pushing to any host.
-  if spec.respond_to?(:metadata)
-    spec.metadata.merge(
-      'allowed_push_host' => 'https://rubygems.org',
-      'changelog_uri' => 'https://github.com/drexed/lite-address/blob/master/CHANGELOG.md',
-      'homepage_uri' => spec.homepage,
-      'source_code_uri' => 'https://github.com/drexed/lite-address'
-    )
-  else
-    raise 'RubyGems 2.0 or newer is required to protect against ' \
-          'public gem pushes.'
-  end
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["changelog_uri"] = "https://github.com/drexed/lite-address/blob/master/CHANGELOG.md"
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["rubygems_mfa_required"] = "true"
+  spec.metadata["source_code_uri"] = "https://github.com/drexed/lite-address"
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path("..", __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
-  spec.bindir = 'exe'
+  spec.bindir = "exe"
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w[lib]
 
-  spec.add_dependency 'countries'
-  spec.add_dependency 'snail'
+  spec.add_dependency "countries"
 
-  spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'fasterer'
-  spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'rubocop'
-  spec.add_development_dependency 'rubocop-performance'
-  spec.add_development_dependency 'rubocop-rake'
-  spec.add_development_dependency 'rubocop-rspec'
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "fasterer"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-performance"
+  spec.add_development_dependency "rubocop-rake"
+  spec.add_development_dependency "rubocop-rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lite-address
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Juan Gomez
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-09 00:00:00.000000000 Z
+date: 2022-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: countries
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: snail
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -177,6 +163,7 @@ files:
 - lib/lite/address/parser.rb
 - lib/lite/address/regexp.rb
 - lib/lite/address/types/cardinal.yml
+- lib/lite/address/types/part.yml
 - lib/lite/address/types/street.yml
 - lib/lite/address/ukey.rb
 - lib/lite/address/version.rb
@@ -184,7 +171,12 @@ files:
 homepage: http://drexed.github.io/lite-address
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/drexed/lite-address/blob/master/CHANGELOG.md
+  homepage_uri: http://drexed.github.io/lite-address
+  rubygems_mfa_required: 'true'
+  source_code_uri: https://github.com/drexed/lite-address
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -200,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.26
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Parse and normalize street addresses