effective_addresses 1.9.10 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c807a8092382e92e91d4f5ca5044e0db66c6b65f5c429a012001d65574368a7
-  data.tar.gz: f137ade40e7a67a34cb0aa7deab9d41d703aba1b9d7c073bf8d180bb5d75c138
+  metadata.gz: e257e305f2f6447f8a91e137a65dd35255c5b65d3825c1ff802989bd57032cdd
+  data.tar.gz: e0db38e0fe6c6d71e45df54fb12d84aeb89ecc1bcbee1617f2d85abb0b17c626
 SHA512:
-  metadata.gz: 2c6d33356448efa633b0854f5a7f27b4c72d34dfbf2caa8bbfcadddfc394462492eff4286e30aa6ac4f23a5bd21c72b5d1a5afd6f2338e0c58b2c0e6b7f60afb
-  data.tar.gz: 82a70d7781ef2a260711db99f4b2a507b8cf86b37e5e360419ec1713c8c6a61dc2573d2b7a1196d5b858f2a1bbc3547d157964d7078e83c21a4f28cc18a73eb5
+  metadata.gz: 8fa4f895765b5982ae7b87498ba7f0ee02b89fcabb0f88c82856569bd6dcff1acbf2e6a52054ade228bb7cdaf822381a4890d882dddd8ecda949172ccaf0ddaf
+  data.tar.gz: b851883afa543835fb6055155729acd5f6d3a7720580df4fb7ccd8fadbe10cca3bc3c4dc3d4af4370528d259fa7f17711c57cc39a1a262ce83e84b8bf7f8fb87

data/app/helpers/effective_addresses_helper.rb

@@ -7,6 +7,7 @@ module EffectiveAddressesHelper
     required = (form.object._validators[method.to_sym].any? { |v| v.kind_of?(ActiveRecord::Validations::PresenceValidator) && (v.options[:if].blank? || (v.options[:if].respond_to?(:call) ? f.object.instance_exec(&v.options[:if]) : v.options[:if])) } rescue true)
 
     address = form.object.send(method) || form.object.addresses.build(category: method.to_s.gsub('_address', ''))
+
     effective_address_pre_select(address) if address.new_record?
 
     opts = { required: required, field_order: [:full_name, :address1, :address2, :city, :country_code, :state_code, :postal_code] }.merge(options).merge({:f => form, :address => address, :method => method})
@@ -24,16 +25,23 @@ module EffectiveAddressesHelper
   end
 
   def effective_address_pre_select(address)
-    if EffectiveAddresses.pre_selected_country.present?
-      address.country ||= EffectiveAddresses.pre_selected_country
-      address.state ||= EffectiveAddresses.pre_selected_state if EffectiveAddresses.pre_selected_state.present?
-    elsif defined?(Geocoder) && request.location.present?
+    if address.country.blank? && EffectiveAddresses.pre_selected_country.present?
+      address.country = EffectiveAddresses.pre_selected_country
+    end
+
+    if address.state.blank? && EffectiveAddresses.pre_selected_state.present?
+      address.state = EffectiveAddresses.pre_selected_state
+    end
+
+    if defined?(Geocoder) && request.try(:location).present?
       location = request.location
       address.country = location.country_code
       address.state = location.state_code
       address.postal_code = location.postal_code
       address.city = location.city
     end
+
+    address
   end
 
   def effective_address_regions_collection(regions = nil, resource: nil)

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.10'.freeze
+  VERSION = '1.10.1'.freeze
 end

metadata

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