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.

Update serialize to work with Rails 7.1

Rafal Cymerys2179899615b9
diff --git a/core/app/models/concerns/spree/metadata.rb b/core/app/models/concerns/spree/metadata.rb
index e00dc79ab0..6f43e0283a 100644
--- a/core/app/models/concerns/spree/metadata.rb
+++ b/core/app/models/concerns/spree/metadata.rb
@@ -5,8 +5,13 @@ module Spree
included do
attribute :public_metadata, default: {}
attribute :private_metadata, default: {}
- serialize :public_metadata, HashSerializer
- serialize :private_metadata, HashSerializer
+ if Rails::VERSION::STRING >= '7.1.0'
+ serialize :public_metadata, coder: HashSerializer
+ serialize :private_metadata, coder: HashSerializer
+ else
+ serialize :public_metadata, HashSerializer
+ serialize :private_metadata, HashSerializer
+ end
end
# https://nandovieira.com/using-postgresql-and-jsonb-with-ruby-on-rails
diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rb
index 6279712cca..222355f88b 100644
--- a/core/app/models/spree/address.rb
+++ b/core/app/models/spree/address.rb
@@ -10,7 +10,11 @@ module Spree
include Spree::Security::Addresses
end
- serialize :preferences, Hash, default: {}
+ if Rails::VERSION::STRING >= '7.1.0'
+ serialize :preferences, type: Hash, coder: YAML, default: {}
+ else
+ serialize :preferences, Hash, default: {}
+ end
NO_ZIPCODE_ISO_CODES ||= [
'AO', 'AG', 'AW', 'BS', 'BZ', 'BJ', 'BM', 'BO', 'BW', 'BF', 'BI', 'CM', 'CF', 'KM', 'CG',
diff --git a/core/app/models/spree/base.rb b/core/app/models/spree/base.rb
index 094edc7226..5ab3d00293 100644
--- a/core/app/models/spree/base.rb
+++ b/core/app/models/spree/base.rb
@@ -1,6 +1,10 @@
class Spree::Base < ApplicationRecord
include Spree::Preferences::Preferable
- serialize :preferences, Hash
+ if Rails::VERSION::STRING >= '7.1.0'
+ serialize :preferences, type: Hash, coder: YAML
+ else
+ serialize :preferences, Hash
+ end
include Spree::RansackableAttributes
include Spree::TranslatableResourceScopes
diff --git a/core/app/models/spree/preference.rb b/core/app/models/spree/preference.rb
index 750f9735e2..2db88afcd6 100644
--- a/core/app/models/spree/preference.rb
+++ b/core/app/models/spree/preference.rb
@@ -1,5 +1,9 @@
class Spree::Preference < Spree::Base
- serialize :value
+ if Rails::VERSION::STRING >= '7.1.0'
+ serialize :value, coder: YAML
+ else
+ serialize :value
+ end
validates :key, presence: true,
uniqueness: { case_sensitive: false, allow_blank: true, scope: spree_base_uniqueness_scope }
diff --git a/core/app/models/spree/return_item.rb b/core/app/models/spree/return_item.rb
index ae15a2ad37..44e8028fc4 100644
--- a/core/app/models/spree/return_item.rb
+++ b/core/app/models/spree/return_item.rb
@@ -62,7 +62,11 @@ module Spree
scope :exchange_required, -> { eager_load(:exchange_inventory_units).where(spree_inventory_units: { original_return_item_id: nil }).distinct }
scope :resellable, -> { where resellable: true }
- serialize :acceptance_status_errors
+ if Rails::VERSION::STRING >= '7.1.0'
+ serialize :acceptance_status_errors, coder: YAML
+ else
+ serialize :acceptance_status_errors
+ end
delegate :eligible_for_return?, :requires_manual_intervention?, to: :validator
delegate :variant, to: :inventory_unit