lib/lite/address/format.rb in lite-address-1.0.0 vs lib/lite/address/format.rb in lite-address-1.0.1

- old
+ new

@@ -1,9 +1,7 @@ # frozen_string_literal: true -require 'snail' unless defined?(Snail) - module Lite module Address FORMAT_KEYS = %i[ number @@ -65,12 +63,14 @@ when :line2 then line2 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 Lite::Address::Ukey.generate(to_s) end @@ -82,11 +82,11 @@ alias alpha2 country_code alias state_code state private - # rubocop:disable Metrics/AbcSize, Naming/VariableNumber + # rubocop:disable Metrics/AbcSize def address_line1 parts = [] parts << number parts << prefix parts << street @@ -96,20 +96,10 @@ # http://pe.usps.gov/cpim/ftp/pubs/Pub28/pub28.pdf pg28 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 @@ -119,10 +109,10 @@ parts << street2 parts << street_type2 parts << suffix2 parts end - # rubocop:enable Metrics/AbcSize, Naming/VariableNumber + # rubocop:enable Metrics/AbcSize end end end