effective_addresses 1.9.11 → 1.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 314234d1308d0c4490e47e3ea34cfcb3f040aa8fd6058324aa7632d2814c2a75
-  data.tar.gz: 1d4483aa861846e02ba59267b011b34bdf079eef4b68a9f47492a963935b186c
+  metadata.gz: 8325b6dbda492afed227134949c76166048f015456ffd4c4439f9889953b3233
+  data.tar.gz: a999fda6ee710a503f3398d59a5cd9a64ce44b1705e251dc52f499824e935f98
 SHA512:
-  metadata.gz: d0809850d34e59c7a5314fa15ad4a5148ebdd6f00adac0ce55ba22ca322f485c221e1c20a771cf506c2edbc2bbd9d8d823555943293bba5cfbdbb312ba82ee91
-  data.tar.gz: 77a1f4d3dc70584ef8e5ed1cf1405f07249a47547a1bdb5da8df61656ebcd90d8484f5cc06a34fa17fc305cc12eba147edbcb9cb6e2776424a78cec885ddd06f
+  metadata.gz: 4a747baffcfc900eee8d6ebb2a9e5f60b5a2017594411e3714252d1964258db438e8027ce6ee8c958c74a09cbc13f75e035b4fdc9868c6d0f40542958a2bbac5
+  data.tar.gz: 55f5bcfb22341dec2e3d147b2ef2312569970fb9899cb52451702025e7a6778e679681d7fb27de02e3192cd897b2444144bdf531fdcaa82b67efac347a591b55

data/app/models/concerns/acts_as_addressable.rb

@@ -83,6 +83,8 @@ module ActsAsAddressable
   end
 
   def set_effective_address(category, obj)
+    return if obj.blank?
+
     raise "#{category}_address= expected an Effective::Address or Hash" unless obj.kind_of?(Effective::Address) || obj.kind_of?(Hash)
 
     address = (obj.kind_of?(Effective::Address) ? obj : Effective::Address.new(obj))
@@ -110,6 +112,8 @@ module ActsAsAddressable
   end
 
   def set_singular_effective_address(category, obj)
+    return if obj.blank?
+
     raise "#{category}_address= expected an Effective::Address or Hash" unless obj.kind_of?(Effective::Address) || obj.kind_of?(Hash)
 
     address = (obj.kind_of?(Effective::Address) ? obj : Effective::Address.new(obj))

data/app/models/effective/address.rb

@@ -6,7 +6,7 @@ module Effective
     attr_accessor :shipping_address_same_as_billing
 
     POSTAL_CODE_CA = /\A[A-Z]{1}\d{1}[A-Z]{1}\ \d{1}[A-Z]{1}\d{1}\z/  # Matches 'T5Z 2B1'
-    POSTAL_CODE_US = /\A\d{5}\z/ # Matches 5 digits
+    POSTAL_CODE_US = /\A\d{5}(-\d{4})?\z/ # matches 5 digits plus optional hyphen and 4 digits
 
     belongs_to :addressable, polymorphic: true, touch: true
 
@@ -93,6 +93,7 @@ module Effective
           code = code.insert(3, ' ') if code.length == 6
         elsif country_code == 'US'
           code = code.gsub(/[^0-9]/, '')
+          code = code.insert(5, '-') if code.length == 9
         end
       end
 

data/lib/effective_addresses/engine.rb

@@ -7,7 +7,7 @@ module EffectiveAddresses
 
     # Include acts_as_addressable concern and allow any ActiveRecord object to call it
     initializer 'effective_addresses.active_record' do |app|
-      ActiveSupport.on_load :active_record do
+      app.config.to_prepare do
         ActiveRecord::Base.extend(ActsAsAddressable::Base)
       end
     end

data/lib/effective_addresses/version.rb

@@ -1,3 +1,3 @@
 module EffectiveAddresses
-  VERSION = '1.9.11'.freeze
+  VERSION = '1.10.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_addresses
 version: !ruby/object:Gem::Version
-  version: 1.9.11
+  version: 1.10.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-20 00:00:00.000000000 Z
+date: 2022-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails