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 preparation work (#11406)

Damian Legawiecbb26c79f6b59
diff --git a/api/lib/spree/api.rb b/api/lib/spree/api.rb
index 889152191d..e9a86283fc 100644
--- a/api/lib/spree/api.rb
+++ b/api/lib/spree/api.rb
@@ -8,4 +8,5 @@ module Spree
end
end
+require 'spree/api/api_dependencies'
require 'spree/api/engine'
diff --git a/api/app/models/spree/api_dependencies.rb b/api/lib/spree/api/api_dependencies.rb
similarity index 100%
rename from api/app/models/spree/api_dependencies.rb
rename to api/lib/spree/api/api_dependencies.rb
diff --git a/common_spree_dependencies.rb b/common_spree_dependencies.rb
index db5b2b3edb..70788010a3 100644
--- a/common_spree_dependencies.rb
+++ b/common_spree_dependencies.rb
@@ -21,6 +21,12 @@ platforms :ruby do
gem 'pg', '~> 1.1'
end
+if ENV['RAILS_VERSION']&.match(/7\.0\.0/)
+ gem 'paranoia', github: 'damianlegawiec/paranoia', branch: 'core'
+ gem 'awesome_nested_set', github: 'damianlegawiec/awesome_nested_set', branch: 'master'
+ gem 'ransack', github: 'activerecord-hackery/ransack', branch: 'master'
+end
+
group :test do
gem 'capybara', '~> 3.24'
gem 'capybara-screenshot', '~> 1.0'
diff --git a/core/config/initializers/active_storage.rb b/core/config/initializers/active_storage.rb
index 32f14a02dd..892e53f8aa 100644
--- a/core/config/initializers/active_storage.rb
+++ b/core/config/initializers/active_storage.rb
@@ -1,7 +1 @@
-class ActiveStorage::PurgeJob < ActiveStorage::BaseJob
- def perform(blob)
- blob.purge unless blob.attachments.present?
- end
-end
-
Rails.application.config.active_storage.content_types_to_serve_as_binary.delete('image/svg+xml')
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rb
index 68d13e9297..84c3cbf55d 100644
--- a/core/lib/spree/core.rb
+++ b/core/lib/spree/core.rb
@@ -103,9 +103,11 @@ require 'spree/localized_number'
require 'spree/money'
require 'spree/permitted_attributes'
require 'spree/service_module'
-require 'spree/dependencies_helper'
require 'spree/database_type_utilities'
+require 'spree/core/dependencies_helper'
+require 'spree/core/app_dependencies'
+
require 'spree/core/importer'
require 'spree/core/query_filters'
require 'spree/core/product_duplicator'
diff --git a/core/app/models/spree/app_dependencies.rb b/core/lib/spree/core/app_dependencies.rb
similarity index 100%
rename from core/app/models/spree/app_dependencies.rb
rename to core/lib/spree/core/app_dependencies.rb
diff --git a/core/lib/spree/dependencies_helper.rb b/core/lib/spree/core/dependencies_helper.rb
similarity index 100%
rename from core/lib/spree/dependencies_helper.rb
rename to core/lib/spree/core/dependencies_helper.rb