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
Move `searcher_class` from `Spree::Config` to `Spree` (#11666)
Damian Legawiec4a39a4044439
diff --git a/core/lib/spree/core.rb b/core/lib/spree/core.rbindex 0ca2128e4a..5c2e02af03 100644--- a/core/lib/spree/core.rb+++ b/core/lib/spree/core.rb@@ -26,7 +26,7 @@ StateMachines::Machine.ignore_method_conflicts = truemodule Spreemattr_accessor :user_class, :admin_user_class, :private_storage_service_name,- :public_storage_service_name, :cdn_host+ :public_storage_service_name, :cdn_host, :searcher_classdef self.user_class(constantize: true)if @@user_class.is_a?(Class)@@ -66,6 +66,16 @@ module Spreeendend+ def self.searcher_class(constantize: true)+ @@searcher_class ||= 'Spree::Core::Search::Base'++ if @@searcher_class.is_a?(Class)+ raise 'Spree.searcher_class MUST be a String or Symbol object, not a Class object.'+ elsif @@searcher_class.is_a?(String) || @@searcher_class.is_a?(Symbol)+ constantize ? @@searcher_class.to_s.constantize : @@searcher_class.to_s+ end+ end+# Used to configure Spree.## Example:diff --git a/core/lib/spree/core/configuration.rb b/core/lib/spree/core/configuration.rbindex e3e76f2ee7..54278ba283 100644--- a/core/lib/spree/core/configuration.rb+++ b/core/lib/spree/core/configuration.rb@@ -75,7 +75,8 @@ module Spree# searcher_class allows spree extension writers to provide their own Search classdef searcher_class- @searcher_class ||= Spree::Core::Search::Base+ ActiveSupport::Deprecation.warn('`Spree::Config.searcher_class` is deprecated and will be removed in Spree v5, please use `Spree.searcher_class` instead.')+ @searcher_class ||= Spree.searcher_classend# Sets the path used for products, taxons and pages.diff --git a/core/lib/spree/core/controller_helpers/search.rb b/core/lib/spree/core/controller_helpers/search.rbindex 5f56146c74..865b72784f 100644--- a/core/lib/spree/core/controller_helpers/search.rb+++ b/core/lib/spree/core/controller_helpers/search.rb@@ -3,7 +3,7 @@ module Spreemodule ControllerHelpersmodule Searchdef build_searcher(params)- Spree::Config.searcher_class.new(params).tap do |searcher|+ Spree.searcher_class.new(params).tap do |searcher|searcher.current_user = try_spree_current_usersearcher.current_currency = current_currency&.upcasesearcher.current_store = current_storediff --git a/core/spec/lib/spree/core/controller_helpers/search_spec.rb b/core/spec/lib/spree/core/controller_helpers/search_spec.rbindex 89747a4c6f..7c13e27f4f 100644--- a/core/spec/lib/spree/core/controller_helpers/search_spec.rb+++ b/core/spec/lib/spree/core/controller_helpers/search_spec.rb@@ -10,7 +10,7 @@ describe Spree::Core::ControllerHelpers::Search, type: :controller dodescribe '#build_searcher' doit 'returns Spree::Core::Search::Base instance' doallow(controller).to receive_messages(try_spree_current_user: create(:user),- current_currency: 'USD')+ current_currency: 'USD', current_store: Spree::Store.default)expect(controller.build_searcher({}).class).to eq Spree::Core::Search::Baseendenddiff --git a/core/spec/lib/spree/core_spec.rb b/core/spec/lib/spree/core_spec.rbindex a186961d43..70e2aaca90 100644--- a/core/spec/lib/spree/core_spec.rb+++ b/core/spec/lib/spree/core_spec.rb@@ -122,4 +122,42 @@ describe Spree doendendend++ describe '.searcher_class' do+ after do+ described_class.searcher_class = 'Spree::Core::Search::Base'+ end++ context 'when searcher_class is a Class instance' do+ it 'raises an error' do+ described_class.searcher_class = Spree::Core::Search::Base++ expect { described_class.searcher_class }.to raise_error(RuntimeError)+ end+ end++ context 'when searcher_class is a Symbol instance' do+ it 'returns the searcher_class constant' do+ described_class.searcher_class = :'Spree::Core::Search::Base'++ expect(described_class.searcher_class).to eq(Spree::Core::Search::Base)+ end+ end++ context 'when searcher_class is a String instance' do+ it 'returns the searcher_class constant' do+ described_class.searcher_class = 'Spree::Core::Search::Base'++ expect(described_class.searcher_class).to eq(Spree::Core::Search::Base)+ end+ end++ context 'when constantize is false' do+ it 'returns the searcher_class as a String' do+ described_class.searcher_class = 'Spree::Core::Search::Base'++ expect(described_class.searcher_class(constantize: false)).to eq('Spree::Core::Search::Base')+ end+ end+ endend