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.

Rails 7.2 support (#12136)

Damian Legawiec39f669bff0c6
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 92e0957583..32d2645618 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -15,7 +15,7 @@ defaults: &defaults
type: string
rails_version:
type: string
- default: '~> 7.1.0'
+ default: '~> 7.2.0'
store_artefacts:
type: boolean
default: false
@@ -141,6 +141,13 @@ workflows:
run_file_path: ./bin/tests_database_ci.sh
requires:
- bundle_ruby
+ - tests_postgres:
+ name: tests_rails_7_1_postgres
+ rails_version: '~> 7.1.0'
+ store_artefacts: true
+ run_file_path: ./bin/tests_database_ci.sh
+ requires:
+ - bundle_ruby
- tests_postgres:
name: tests_rails_7_0_postgres
rails_version: '~> 7.0.0'
diff --git a/common_spree_dependencies.rb b/common_spree_dependencies.rb
index 3dfd7e98ad..f3d840e8e1 100644
--- a/common_spree_dependencies.rb
+++ b/common_spree_dependencies.rb
@@ -9,7 +9,7 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw]
actionmailer actionpack actionview activejob activemodel activerecord
activestorage activesupport railties
].each do |rails_gem|
- gem rails_gem, ENV.fetch('RAILS_VERSION', '~> 7.1.0'), require: false
+ gem rails_gem, ENV.fetch('RAILS_VERSION', '~> 7.2.0'), require: false
end
platforms :jruby do
diff --git a/core/app/models/spree/taxon.rb b/core/app/models/spree/taxon.rb
index 466752a2cb..726c38aee5 100644
--- a/core/app/models/spree/taxon.rb
+++ b/core/app/models/spree/taxon.rb
@@ -13,7 +13,6 @@ module Spree
extend FriendlyId
friendly_id :permalink, slug_column: :permalink, use: :history
before_validation :set_permalink, on: :create, if: :name
- alias_attribute :slug, :permalink
acts_as_nested_set dependent: :destroy
@@ -68,11 +67,26 @@ module Spree
TRANSLATABLE_FIELDS = %i[name pretty_name description permalink].freeze
translates(*TRANSLATABLE_FIELDS, column_fallback: !Spree.always_use_translations?)
+ def slug
+ permalink
+ end
+
+ def slug=(value)
+ self.permalink = value
+ end
+
self::Translation.class_eval do
- alias_attribute :slug, :permalink
before_save :set_permalink
before_save :set_pretty_name
+ def slug
+ permalink
+ end
+
+ def slug=(value)
+ self.permalink = value
+ end
+
def set_permalink
self.permalink = generate_slug
end
diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec
index 7452abc41d..f3542204d0 100644
--- a/core/spree_core.gemspec
+++ b/core/spree_core.gemspec
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
s.add_dependency 'kaminari', '~> 1.2'
s.add_dependency 'money', '~> 6.13'
s.add_dependency 'monetize', '~> 1.9'
- s.add_dependency 'paranoia', '~> 2.4'
+ s.add_dependency 'paranoia', '>= 2.4'
s.add_dependency 'ransack', '>= 4.1'
s.add_dependency 'rexml'
s.add_dependency 'state_machines-activerecord', '~> 0.6'