snail 2.2.2 → 2.3.0

data/lib/snail/initializable.rb

@@ -1,13 +1,10 @@
 class Snail
   module Initializable
-    def initialize(attrs = {}, &block)
+    def initialize(attrs = {})
       attrs.each do |k, v|
         m = "#{k}="
-        if respond_to? m
-          self.send(m, v)
-        else
-          raise UnknownAttribute.new(k)
-        end
+        raise UnknownAttribute, k unless respond_to? m
+        send(m, v)
       end
       yield self if block_given?
     end

data/lib/snail/version.rb

@@ -1,3 +1,3 @@
 class Snail
-  VERSION = '2.2.2'
+  VERSION = '2.3.0'.freeze
 end

data/lib/snail.rb

@@ -14,51 +14,17 @@ class Snail
   # this will be raised whenever initialization doesn't recognize a key
   class UnknownAttribute < ArgumentError; end
 
-  # My made-up standard fields.
-  attr_accessor :name
-  attr_accessor :line_1
-  attr_accessor :line_2
-  attr_accessor :city
-  attr_accessor :region
-  attr_accessor :postal_code
-  attr_reader   :country
-
-  # Store country as ISO-3166 Alpha 2
-  def country=(val)
-    @country = Snail.lookup_country_iso(val)
-  end
-
-  # Aliases for easier assignment compatibility
-  {
-    :full_name  => :name,
-    :street     => :line_1,
-    :street_1   => :line_1,
-    :street1    => :line_1,
-    :street_2   => :line_2,
-    :street2    => :line_2,
-    :town       => :city,
-    :locality   => :city,
-    :state      => :region,
-    :province   => :region,
-    :zip        => :postal_code,
-    :zip_code   => :postal_code,
-    :postcode   => :postal_code
-  }.each do |new, existing|
-    alias_method "#{new}=", "#{existing}="
-  end
-
   # Load the SnailHelpers module into ActionView::Base.  Previously this was done
   # automatically, but going forward it must be included explicitly by calling
   # Snail.load_helpers.
   def self.load_helpers
-    if defined? ActionView
-      warn '[DEPRECATION] Snail::Helpers will be removed in a future release.'
-      ActionView::Base.class_eval { include Snail::Helpers }
-    end
+    return unless defined? ActionView
+    warn '[DEPRECATION] Snail::Helpers will be removed in a future release.'
+    ActionView::Base.class_eval { include Snail::Helpers }
   end
 
   def self.home_country
-    @home_country ||= "US"
+    @home_country ||= 'US'
   end
 
   def self.home_country=(val)
@@ -66,19 +32,46 @@ class Snail
   end
 
   def self.lookup_country_iso(val)
-    return nil if val.nil? || val.empty?
+    return if val.nil? || val.empty?
     val = val.upcase
     if ::Snail::Iso3166::ALPHA2[val]
       val
-    elsif iso = ::Snail::Iso3166::ALPHA2_EXCEPTIONS[val]
-      iso
-    elsif iso = ::Snail::Iso3166::ALPHA3_TO_ALPHA2[val]
-      iso
     else
-      nil
+      ::Snail::Iso3166::ALPHA2_EXCEPTIONS[val] || ::Snail::Iso3166::ALPHA3_TO_ALPHA2[val]
     end
   end
 
+  # Snail's canonical fields
+  attr_accessor :name
+  alias full_name= name=
+
+  attr_accessor :line_1
+  alias street=   line_1=
+  alias street_1= line_1=
+  alias street1=  line_1=
+
+  attr_accessor :line_2
+  alias street_2= line_2=
+  alias street2=  line_2=
+
+  attr_accessor :city
+  alias town=     city=
+  alias locality= city=
+
+  attr_accessor :region
+  alias state=    region=
+  alias province= region=
+
+  attr_accessor :postal_code
+  alias zip=      postal_code=
+  alias zip_code= postal_code=
+  alias postcode= postal_code=
+
+  attr_reader   :country
+  def country=(val)
+    @country = Snail.lookup_country_iso(val)
+  end
+
   # Where the mail is coming from.
   def origin=(val)
     @origin = Snail.lookup_country_iso(val)
@@ -90,7 +83,7 @@ class Snail
   end
 
   def international?
-    country && self.origin != country
+    country && origin != country
   end
 
   def to_s(with_country: nil)
@@ -102,7 +95,9 @@ class Snail
       line_2,
       city_line,
       (country_line if with_country)
-    ].select{|line| !(line.nil? or line.empty?)}.join("\n")
+    ]
+      .reject { |line| line.nil? || line.empty? }
+      .join("\n")
   end
 
   def to_html(with_country: nil)
@@ -123,7 +118,7 @@ class Snail
       "#{postal_code} #{city} #{region}"
     when 'BY'
       "#{postal_code} #{city}-#{region}"
-    when 'US', 'CA', 'AU', nil, ""
+    when 'US', 'CA', 'AU', nil, ''
       "#{city} #{region}  #{postal_code}"
     when 'IL', 'DK', 'FI', 'FR', 'DE', 'GR', 'NO', 'ES', 'SE', 'TR', 'CY', 'PT', 'MK', 'BA'
       "#{postal_code} #{city}"
@@ -137,7 +132,7 @@ class Snail
       "#{city}  #{postal_code}" # Locally these may be on separate lines. The USPS prefers the city line above the country line, though.
     when 'EC'
       "#{postal_code} #{city}"
-    when 'HK', 'IQ', 'YE', 'QA', 'AL'
+    when 'HK', 'IQ', 'YE', 'QA', 'AL', 'BS'
       "#{city}"
     when 'AE'
       "#{postal_code}\n#{city}"
@@ -153,8 +148,10 @@ class Snail
       "SI-#{postal_code} #{city}"
     when 'CZ'
       "#{postal_code} #{region}\n#{city}"
+    when 'SG'
+      "#{country_line.titleize} #{postal_code}"
     else
-      if Kernel.const_defined?("Rails")
+      if Kernel.const_defined?('Rails')
         Rails.logger.error "[Snail] Unknown Country: #{country}"
       end
       "#{city} #{region}  #{postal_code}"
@@ -162,7 +159,7 @@ class Snail
   end
 
   def country_line
-    (translated_country(self.origin, @country) || translated_country("US", @country))
+    (translated_country(origin, @country) || translated_country('US', @country))
   end
 
   def translated_country(origin, country)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: snail
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Lance Ivy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-29 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -310,8 +310,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.3.1
 signing_key: 
 specification_version: 4
 summary: Easily format snail mail addresses for international delivery