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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Remove deprecated code scheduled for Spree 5.5 (#14013)
Damian Legawiec45c470f2a5c2
diff --git a/spree/core/lib/spree/core.rb b/spree/core/lib/spree/core.rbindex 8d61e2d218..2bf7154998 100644--- a/spree/core/lib/spree/core.rb+++ b/spree/core/lib/spree/core.rb@@ -426,8 +426,6 @@ module Spreeendmodule Core- autoload :TokenGenerator, 'spree/core/token_generator'-class GatewayError < RuntimeError; endclass DestroyWithOrdersError < StandardError; endend@@ -445,14 +443,12 @@ require 'spree/localized_number'require 'spree/money'require 'spree/permitted_attributes'require 'spree/service_module'-require 'spree/database_type_utilities'require 'spree/analytics'require 'spree/events'require 'spree/webhooks'require 'spree/core/partials'require 'spree/core/controller_helpers/auth'-require 'spree/core/controller_helpers/common'require 'spree/core/controller_helpers/order'require 'spree/core/controller_helpers/store'require 'spree/core/controller_helpers/strong_parameters'diff --git a/spree/core/lib/spree/core/controller_helpers/auth.rb b/spree/core/lib/spree/core/controller_helpers/auth.rbindex 7d78fc5011..611efe4c7b 100644--- a/spree/core/lib/spree/core/controller_helpers/auth.rb+++ b/spree/core/lib/spree/core/controller_helpers/auth.rb@@ -3,7 +3,6 @@ module Spreemodule ControllerHelpersmodule Authextend ActiveSupport::Concern- include Spree::Core::TokenGeneratorincluded doif defined?(helper_method)@@ -20,17 +19,6 @@ module Spree@current_ability ||= Spree.ability_class.new(try_spree_current_user, { store: current_store })end- def current_oauth_token- Spree::Deprecation.warn('Spree::Current.oauth_token is deprecated and will be removed in Spree 5.5')-- get_last_access_token = ->(user) { Spree::OauthAccessToken.active_for(user).where(expires_in: nil).last }- create_access_token = ->(user) { Spree::OauthAccessToken.create!(resource_owner: user) }- user = try_spree_current_user- return unless user-- @current_oauth_token ||= get_last_access_token.call(user) || create_access_token.call(user)- end-# this will work for devise out of the box# for other auth systems you will need to override this methoddef store_location(location = nil)diff --git a/spree/core/lib/spree/core/controller_helpers/common.rb b/spree/core/lib/spree/core/controller_helpers/common.rbdeleted file mode 100644index 5ea64a94c4..0000000000--- a/spree/core/lib/spree/core/controller_helpers/common.rb+++ /dev/null@@ -1,14 +0,0 @@-module Spree- module Core- module ControllerHelpers- # @deprecated This module is deprecated and will be removed in Spree 5.5.- module Common- def self.included(base)- Spree::Deprecation.warn(- 'Spree::Core::ControllerHelpers::Common is deprecated and will be removed in Spree 5.5.'- )- end- end- end- end-enddiff --git a/spree/core/lib/spree/core/controller_helpers/currency.rb b/spree/core/lib/spree/core/controller_helpers/currency.rbindex 0f54704a84..62d48da746 100644--- a/spree/core/lib/spree/core/controller_helpers/currency.rb+++ b/spree/core/lib/spree/core/controller_helpers/currency.rb@@ -7,7 +7,6 @@ module Spreeincluded doif defined?(helper_method)helper_method :supported_currencies- helper_method :supported_currencies_for_all_storeshelper_method :current_currencyhelper_method :supported_currency?helper_method :currency_param@@ -38,22 +37,6 @@ module Spree@supported_currencies ||= current_store&.supported_currencies_listend- # Returns the list of supported currencies for all stores.- # @deprecated This method will be removed in Spree 5.5.- # @return [Array<String>] the list of supported currencies, eg. `["USD", "EUR"]`- def supported_currencies_for_all_stores- Spree::Deprecation.warn(- 'supported_currencies_for_all_stores is deprecated and will be removed in Spree 5.5.'- )-- @supported_currencies_for_all_stores ||= begin- (- Spree::Store.pluck(:supported_currencies).map { |c| c&.split(',') }.flatten + Spree::Store.pluck(:default_currency)- ).- compact.uniq.map { |code| ::Money::Currency.find(code.strip) }- end- end-# Checks if the given currency is supported.# @param currency_iso_code [String] the ISO code of the currency, eg. `USD`# @return [Boolean] `true` if the currency is supported, `false` otherwisediff --git a/spree/core/lib/spree/core/controller_helpers/order.rb b/spree/core/lib/spree/core/controller_helpers/order.rbindex a57f1f98cb..03eb2ae26c 100644--- a/spree/core/lib/spree/core/controller_helpers/order.rb+++ b/spree/core/lib/spree/core/controller_helpers/order.rb@@ -7,7 +7,6 @@ module Spreeincluded doif defined?(helper_method)helper_method :current_order- helper_method :simple_current_orderendend@@ -15,24 +14,6 @@ module Spree@order_token ||= cookies.signed[:token] || params[:order_token]end- # @deprecated Use `current_order` instead. This method will be removed in Spree 5.5.- def simple_current_order- Spree::Deprecation.warn(- 'simple_current_order is deprecated and will be removed in Spree 5.5. Use current_order instead.'- )-- return @simple_current_order if @simple_current_order-- @simple_current_order = find_order_by_token_or_user-- if @simple_current_order- @simple_current_order.last_ip_address = ip_address- return @simple_current_order- else- @simple_current_order = current_store.orders.new- end- end-# The current incomplete order from the token for use in cart and during checkoutdef current_order(options = {})options[:create_order_if_necessary] ||= falsediff --git a/spree/core/lib/spree/core/token_generator.rb b/spree/core/lib/spree/core/token_generator.rbdeleted file mode 100644index f30131ac3c..0000000000--- a/spree/core/lib/spree/core/token_generator.rb+++ /dev/null@@ -1,23 +0,0 @@-module Spree- module Core- module TokenGenerator- def generate_token(model_class = Spree::Order)- Spree::Deprecation.warn('generate_token is deprecated and will be removed in Spree 5.5. Please use Rails secure token generator: https://api.rubyonrails.org/classes/ActiveRecord/SecureToken/ClassMethods.html')- loop do- token = "#{random_token}#{unique_ending}"- break token unless model_class.exists?(token: token)- end- end-- private-- def random_token- SecureRandom.urlsafe_base64(nil, false)- end-- def unique_ending- (Time.now.to_f * 1000).to_i- end- end- end-enddiff --git a/spree/core/lib/spree/database_type_utilities.rb b/spree/core/lib/spree/database_type_utilities.rbdeleted file mode 100644index 9817174891..0000000000--- a/spree/core/lib/spree/database_type_utilities.rb+++ /dev/null@@ -1,22 +0,0 @@-module Spree- # @deprecated Use the integer constant directly instead, eg. `2_147_483_647` for 4-byte signed integer max.- # This module will be removed in Spree 5.5.- module DatabaseTypeUtilities- # Maximum value for a 4-byte signed integer (default database integer type)- INTEGER_MAX = (2**31) - 1-- def self.maximum_value_for(data_type)- Spree::Deprecation.warn(- 'Spree::DatabaseTypeUtilities.maximum_value_for is deprecated and will be removed in Spree 5.5. ' \- 'Use the integer constant directly instead, eg. 2_147_483_647 for 4-byte signed integer max.'- )-- case data_type- when :integer- INTEGER_MAX- else- raise ArgumentError, 'Currently only :integer argument is acceptable'- end- end- end-enddiff --git a/spree/core/spec/lib/spree/core/controller_helpers/order_spec.rb b/spree/core/spec/lib/spree/core/controller_helpers/order_spec.rbindex ab63e9f28f..fb4d8fd94d 100644--- a/spree/core/spec/lib/spree/core/controller_helpers/order_spec.rb+++ b/spree/core/spec/lib/spree/core/controller_helpers/order_spec.rb@@ -27,27 +27,6 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller dolet(:order) { create(:order, user: user, store: store) }let!(:store) { @default_store }- describe '#simple_current_order' do- before do- allow(controller).to receive_messages(try_spree_current_user: user)- allow(Spree::Deprecation).to receive(:warn)- end-- it 'returns an empty order' do- expect(controller.simple_current_order.item_count).to eq 0- end-- it 'returns Spree::Order instance' do- allow(controller).to receive_messages(cookies: double(signed: { token: order.token }))- expect(controller.simple_current_order).to eq order- end-- it 'emits a deprecation warning' do- controller.simple_current_order- expect(Spree::Deprecation).to have_received(:warn).with(/simple_current_order is deprecated/)- end- end-describe '#current_order' dobefore doallow(controller).to receive_messages(current_store: store)diff --git a/spree/core/spec/lib/spree/core/token_generator_spec.rb b/spree/core/spec/lib/spree/core/token_generator_spec.rbdeleted file mode 100644index 5537fd1e78..0000000000--- a/spree/core/spec/lib/spree/core/token_generator_spec.rb+++ /dev/null@@ -1,24 +0,0 @@-require 'spec_helper'--describe Spree::Core::TokenGenerator do- class DummyClass- include Spree::Core::TokenGenerator-- attr_reader :created_at-- def initialize- @created_at = Time.now.to_i- end- end-- let(:dummy_class_instance) { DummyClass.new }-- describe 'generate_token' do- let(:generated_token) { dummy_class_instance.generate_token }-- it 'generates random token with timestamp' do- expect(generated_token.size).to eq 35- expect(generated_token).to include dummy_class_instance.created_at.to_s- end- end-end