Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Replace Twitter::CLDR with ValidatesZipcode

Damian Kaczmarczykefc75d94808a
diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rb
index 4fca080a8e..66899200e9 100644
--- a/core/app/models/spree/address.rb
+++ b/core/app/models/spree/address.rb
@@ -1,6 +1,6 @@
module Spree
class Address < Spree::Base
- require 'twitter_cldr'
+ require 'validates_zipcode'
if Rails::VERSION::STRING >= '6.1'
serialize :preferences, Hash, default: {}
@@ -215,11 +215,15 @@ module Spree
end
def postal_code_validate
- return if country.blank? || country.iso.blank? || !require_zipcode?
- return unless TwitterCldr::Shared::PostalCodes.territories.include?(country.iso.downcase.to_sym)
+ return if country.blank? || country_iso.blank? || !require_zipcode?
+ return unless ::ValidatesZipcode::CldrRegexpCollection::ZIPCODES_REGEX.keys.include?(country_iso.upcase.to_sym)
- postal_code = TwitterCldr::Shared::PostalCodes.for_territory(country.iso)
- errors.add(:zipcode, :invalid) unless postal_code.valid?(zipcode.to_s.strip)
+ formatted_zip = ::ValidatesZipcode::Formatter.new(
+ zipcode: zipcode.to_s.strip,
+ country_alpha2: country_iso.upcase
+ ).format
+
+ errors.add(:zipcode, :invalid) unless ::ValidatesZipcode.valid?(formatted_zip, country_iso.upcase)
end
end
end
diff --git a/core/spec/models/spree/address_spec.rb b/core/spec/models/spree/address_spec.rb
index 4dd54a7ef5..6e1e1e2ec0 100644
--- a/core/spec/models/spree/address_spec.rb
+++ b/core/spec/models/spree/address_spec.rb
@@ -212,7 +212,7 @@ describe Spree::Address, type: :model do
end
it 'does not have a supported country iso' do
- allow(address.country).to receive(:iso).and_return('BO')
+ allow(address.country).to receive(:iso).and_return('XX')
address.valid?
expect(address.errors['zipcode']).not_to include('is invalid')
end
diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec
index d70610f50f..7550e62b1d 100644
--- a/core/spree_core.gemspec
+++ b/core/spree_core.gemspec
@@ -50,7 +50,7 @@ Gem::Specification.new do |s|
s.add_dependency 'state_machines-activerecord', '~> 0.6'
s.add_dependency 'state_machines-activemodel', '~> 0.7'
s.add_dependency 'stringex'
- s.add_dependency 'twitter_cldr', '>= 4.3'
+ s.add_dependency 'validates_zipcode'
s.add_dependency 'mini_magick', '~> 4.9', '>= 4.9.4'
s.add_dependency 'image_processing', '~> 1.2'
s.add_dependency 'active_storage_validations', '~> 0.9'