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.

Removed redundant store associations and unused preference and hook helpers

Claude8b2b24cf6379
diff --git a/spree/core/app/models/acts_as_taggable_on/tag_decorator.rb b/spree/core/app/models/acts_as_taggable_on/tag_decorator.rb
deleted file mode 100644
index 44d81456ea..0000000000
--- a/spree/core/app/models/acts_as_taggable_on/tag_decorator.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-module ActsAsTaggableOn
- module TagDecorator
- def self.prepended(base)
- base.include ::Spree::RansackableAttributes
- base.whitelisted_ransackable_attributes = %w[id name]
- end
- end
-
- Tag.prepend(TagDecorator)
-end
diff --git a/spree/core/app/models/spree/allowed_origin.rb b/spree/core/app/models/spree/allowed_origin.rb
index 0ae36067d3..a60f05ecc9 100644
--- a/spree/core/app/models/spree/allowed_origin.rb
+++ b/spree/core/app/models/spree/allowed_origin.rb
@@ -10,7 +10,6 @@ module Spree
include Spree::SingleStoreResource
- belongs_to :store, class_name: 'Spree::Store'
validates :origin, presence: true
validates :origin, uniqueness: { scope: [:store_id, *spree_base_uniqueness_scope] }
diff --git a/spree/core/app/models/spree/api_key.rb b/spree/core/app/models/spree/api_key.rb
index 4d34c43653..604816bce6 100644
--- a/spree/core/app/models/spree/api_key.rb
+++ b/spree/core/app/models/spree/api_key.rb
@@ -44,7 +44,6 @@ module Spree
publishable? ? token : @plaintext_token
end
- belongs_to :store, class_name: 'Spree::Store'
# Optional single-channel binding for publishable keys. A bound key
# server-assigns the request's channel (see Api::V3::ChannelResolution),
# making channel identity unforgeable instead of client-asserted via the
diff --git a/spree/core/app/models/spree/channel.rb b/spree/core/app/models/spree/channel.rb
index 5a9ab7a4a6..1cf46d2f10 100644
--- a/spree/core/app/models/spree/channel.rb
+++ b/spree/core/app/models/spree/channel.rb
@@ -16,7 +16,6 @@ module Spree
# Empty -> falls back to the Store-level preference.
preference :order_routing_strategy, :string, default: nil
- belongs_to :store, class_name: 'Spree::Store'
has_many :orders, class_name: 'Spree::Order', inverse_of: :channel, dependent: :nullify
has_many :order_routing_rules, class_name: 'Spree::OrderRoutingRule', dependent: :destroy
diff --git a/spree/core/app/models/spree/claim.rb b/spree/core/app/models/spree/claim.rb
index c22fb98760..0d88034237 100644
--- a/spree/core/app/models/spree/claim.rb
+++ b/spree/core/app/models/spree/claim.rb
@@ -26,7 +26,6 @@ module Spree
# stays closed — an unrecognised value would silently do nothing.
RESOLUTIONS = %w[refund replacement refund_and_replacement].freeze
- belongs_to :store, class_name: 'Spree::Store'
belongs_to :order, class_name: 'Spree::Order', inverse_of: :claims
belongs_to :reason, class_name: 'Spree::ClaimReason', optional: true, inverse_of: :claims
acted_by :created_by
diff --git a/spree/core/app/models/spree/collection.rb b/spree/core/app/models/spree/collection.rb
index b2d0c132fa..9942dc9c8c 100644
--- a/spree/core/app/models/spree/collection.rb
+++ b/spree/core/app/models/spree/collection.rb
@@ -58,7 +58,6 @@ module Spree
#
# Associations
#
- belongs_to :store, class_name: 'Spree::Store'
has_many :product_collections, class_name: 'Spree::ProductCollection', dependent: :destroy_async, inverse_of: :collection
has_many :products, through: :product_collections
diff --git a/spree/core/app/models/spree/commission_rate.rb b/spree/core/app/models/spree/commission_rate.rb
index b9672a5dcf..9d59cbaa3e 100644
--- a/spree/core/app/models/spree/commission_rate.rb
+++ b/spree/core/app/models/spree/commission_rate.rb
@@ -43,7 +43,6 @@ module Spree
#
# Associations
#
- belongs_to :store, class_name: 'Spree::Store'
# Every amount this rate states, one row per currency: what a flat fee
# charges, and the floor and cap a percentage charges within. A flat rate
# with no amount for the sale's currency does not apply to it (see
diff --git a/spree/core/app/models/spree/consent_record.rb b/spree/core/app/models/spree/consent_record.rb
index f8a78604c7..4f6adcfae9 100644
--- a/spree/core/app/models/spree/consent_record.rb
+++ b/spree/core/app/models/spree/consent_record.rb
@@ -42,7 +42,6 @@ module Spree
SOURCES = [CHECKOUT, REGISTRATION, ACCOUNT, ADMIN, NEWSLETTER, ANONYMIZATION,
UNKNOWN, 'import', 'storefront'].freeze
- belongs_to :store, class_name: 'Spree::Store'
belongs_to :owner, polymorphic: true
validates :purpose, presence: true
diff --git a/spree/core/app/models/spree/data_request.rb b/spree/core/app/models/spree/data_request.rb
index d64beec5e4..d9935165ea 100644
--- a/spree/core/app/models/spree/data_request.rb
+++ b/spree/core/app/models/spree/data_request.rb
@@ -37,7 +37,6 @@ module Spree
# asked, and it stops working when the request expires.
has_secure_token :download_token
- belongs_to :store, class_name: 'Spree::Store'
belongs_to :customer, class_name: Spree.customer_class.to_s
# Null when the subject asked for it themselves; set when staff acted on a
# request that arrived by email.
diff --git a/spree/core/app/models/spree/delivery_zone.rb b/spree/core/app/models/spree/delivery_zone.rb
index f6574c8fb6..1064f21b82 100644
--- a/spree/core/app/models/spree/delivery_zone.rb
+++ b/spree/core/app/models/spree/delivery_zone.rb
@@ -8,7 +8,6 @@ module Spree
# 2026-03-16 "Consolidate metadata") — write-only developer escape hatch.
attribute :metadata, default: -> { {} }
- belongs_to :store, class_name: 'Spree::Store'
# Zones are destination sets owned by a delivery profile; within it they
# hang off an origin group, so the same profile can quote different
# tables per warehouse. The profile's methods bind to at most one zone.
diff --git a/spree/core/app/models/spree/exchange.rb b/spree/core/app/models/spree/exchange.rb
index 22eaf43cf2..f5d7db2b38 100644
--- a/spree/core/app/models/spree/exchange.rb
+++ b/spree/core/app/models/spree/exchange.rb
@@ -24,7 +24,6 @@ module Spree
has_status :requested, :approved, :received, :fulfilled, :canceled,
default: :requested
- belongs_to :store, class_name: 'Spree::Store'
belongs_to :order, class_name: 'Spree::Order', inverse_of: :exchanges
belongs_to :stock_location, class_name: 'Spree::StockLocation'
belongs_to :reason, class_name: 'Spree::ReturnReason', optional: true, inverse_of: :exchanges
diff --git a/spree/core/app/models/spree/export.rb b/spree/core/app/models/spree/export.rb
index 686357a39a..49562e3a81 100644
--- a/spree/core/app/models/spree/export.rb
+++ b/spree/core/app/models/spree/export.rb
@@ -30,7 +30,6 @@ module Spree
#
# Associations
#
- belongs_to :store, class_name: 'Spree::Store'
# Optional so secret-API-key callers (apps / server-to-server) can create
# exports without a human user attached. The email notification is
# skipped for these — apps poll instead.
diff --git a/spree/core/app/models/spree/gift_card.rb b/spree/core/app/models/spree/gift_card.rb
index ba0b06056a..ca4b72b329 100644
--- a/spree/core/app/models/spree/gift_card.rb
+++ b/spree/core/app/models/spree/gift_card.rb
@@ -35,7 +35,6 @@ module Spree
#
# Associations
#
- belongs_to :store, class_name: 'Spree::Store'
belongs_to :customer, class_name: Spree.customer_class.to_s, optional: true
include Spree::DeprecatedCustomerAlias
belongs_to :created_by, class_name: Spree.admin_user_class.to_s, optional: true
diff --git a/spree/core/app/models/spree/gift_card_batch.rb b/spree/core/app/models/spree/gift_card_batch.rb
index 370443bb51..c98f929ec2 100644
--- a/spree/core/app/models/spree/gift_card_batch.rb
+++ b/spree/core/app/models/spree/gift_card_batch.rb
@@ -10,7 +10,6 @@ module Spree
#
# Associations
#
- belongs_to :store, class_name: 'Spree::Store'
belongs_to :created_by, class_name: Spree.admin_user_class.to_s, optional: true
has_many :gift_cards, class_name: 'Spree::GiftCard', inverse_of: :batch, dependent: :destroy
diff --git a/spree/core/app/models/spree/order_group.rb b/spree/core/app/models/spree/order_group.rb
index 4cfa1391e5..ef27a57831 100644
--- a/spree/core/app/models/spree/order_group.rb
+++ b/spree/core/app/models/spree/order_group.rb
@@ -43,7 +43,6 @@ module Spree
#
# Associations
#
- belongs_to :store, class_name: 'Spree::Store'
belongs_to :customer, class_name: "::#{Spree.customer_class}", optional: true
# The cart this group was completed from — unique, and the replay key that
# makes a retried completion return this group instead of building another.
diff --git a/spree/core/app/models/spree/order_routing_rule.rb b/spree/core/app/models/spree/order_routing_rule.rb
index 03f6d193da..2a66740acb 100644
--- a/spree/core/app/models/spree/order_routing_rule.rb
+++ b/spree/core/app/models/spree/order_routing_rule.rb
@@ -25,7 +25,6 @@ module Spree
include Spree::SingleStoreResource
include Spree::HasListPosition
- belongs_to :store, class_name: 'Spree::Store'
belongs_to :channel, class_name: 'Spree::Channel'
attribute :active, :boolean, default: true
diff --git a/spree/core/app/models/spree/package_type.rb b/spree/core/app/models/spree/package_type.rb
index d8a42b558c..90d7ef8b11 100644
--- a/spree/core/app/models/spree/package_type.rb
+++ b/spree/core/app/models/spree/package_type.rb
@@ -18,7 +18,6 @@ module Spree
include Spree::SingleStoreResource
include Spree::Metadata
- belongs_to :store, class_name: 'Spree::Store'
# Whose packaging this is. Nil is the marketplace's own row — the shared
# vocabulary every seller may pack into — and a seller's rows are theirs
diff --git a/spree/core/app/models/spree/payment_method.rb b/spree/core/app/models/spree/payment_method.rb
index 867104e926..659df172e5 100644
--- a/spree/core/app/models/spree/payment_method.rb
+++ b/spree/core/app/models/spree/payment_method.rb
@@ -57,7 +57,6 @@ module Spree
validates :storefront_visible, inclusion: { in: [true, false] }
normalizes :name, with: ->(value) { value&.to_s&.squish&.presence }
- belongs_to :store, class_name: 'Spree::Store'
has_many :payments, class_name: 'Spree::Payment', inverse_of: :payment_method, dependent: :nullify
has_many :credit_cards, class_name: 'Spree::CreditCard', dependent: :destroy # CCs are soft deleted
diff --git a/spree/core/app/models/spree/price_list.rb b/spree/core/app/models/spree/price_list.rb
index a80487af38..39bf191023 100644
--- a/spree/core/app/models/spree/price_list.rb
+++ b/spree/core/app/models/spree/price_list.rb
@@ -10,7 +10,6 @@ module Spree
MATCH_POLICIES = %w[all any].freeze
- belongs_to :store, class_name: 'Spree::Store'
# The owning agreement, or nil for a standalone list. An owned list is
# reached only through its catalog — generic rule matching skips it in
# SQL (see .for_context) — so a deactivated catalog's list goes dormant
diff --git a/spree/core/app/models/spree/product_type.rb b/spree/core/app/models/spree/product_type.rb
index e9e79ad2fa..cedcc835a1 100644
--- a/spree/core/app/models/spree/product_type.rb
+++ b/spree/core/app/models/spree/product_type.rb
@@ -10,7 +10,6 @@ module Spree
TRANSLATABLE_FIELDS = %i[name].freeze
translates(*TRANSLATABLE_FIELDS, column_fallback: Spree.mobility_column_fallback)
- belongs_to :store, class_name: 'Spree::Store'
# Creation-time template only: stamped onto the product when it is
# created with this type, never managed through it afterwards — the same
# doctrine as every other type-driven attribute. Nil means the store's
diff --git a/spree/core/app/models/spree/return.rb b/spree/core/app/models/spree/return.rb
index ddbe77f0ae..367c0f2120 100644
--- a/spree/core/app/models/spree/return.rb
+++ b/spree/core/app/models/spree/return.rb
@@ -27,7 +27,6 @@ module Spree
has_status :requested, :approved, :received, :refunded, :canceled,
default: :requested
- belongs_to :store, class_name: 'Spree::Store'
belongs_to :order, class_name: 'Spree::Order', inverse_of: :returns
belongs_to :stock_location, class_name: 'Spree::StockLocation'
belongs_to :reason, class_name: 'Spree::ReturnReason', optional: true, inverse_of: :returns
diff --git a/spree/core/app/models/spree/seller.rb b/spree/core/app/models/spree/seller.rb
index 9717721c66..1d22e1c5e2 100644
--- a/spree/core/app/models/spree/seller.rb
+++ b/spree/core/app/models/spree/seller.rb
@@ -62,7 +62,6 @@ module Spree
#
# Associations
#
- belongs_to :store, class_name: 'Spree::Store'
# The address knows it is a seller's from its owner, so it is read back
# with the business rules — no personal name insisted on, the company line
# required. Not `dependent: :destroy`: a seller is paranoid, so destroy is
diff --git a/spree/core/app/models/spree/store_credit.rb b/spree/core/app/models/spree/store_credit.rb
index ed5edc3cca..6b8f0ed87f 100644
--- a/spree/core/app/models/spree/store_credit.rb
+++ b/spree/core/app/models/spree/store_credit.rb
@@ -18,7 +18,6 @@ module Spree
AUTHORIZE_ACTION = 'authorize'.freeze
ALLOCATION_ACTION = 'allocation'.freeze
- belongs_to :store, class_name: 'Spree::Store'
# A gift card applied to a guest cart issues store credit with no customer
# to attach it to.
belongs_to :customer, class_name: "::#{Spree.customer_class}", optional: true
diff --git a/spree/core/app/models/spree/taxonomy.rb b/spree/core/app/models/spree/taxonomy.rb
index 04f51908cb..495094fbcb 100644
--- a/spree/core/app/models/spree/taxonomy.rb
+++ b/spree/core/app/models/spree/taxonomy.rb
@@ -12,7 +12,6 @@ module Spree
has_many :taxons, class_name: 'Spree::Category', inverse_of: :taxonomy
has_one :root, -> { where parent_id: nil }, class_name: 'Spree::Category', dependent: :destroy
- belongs_to :store, class_name: 'Spree::Store'
default_scope { order("#{table_name}.position, #{table_name}.created_at") }
end
diff --git a/spree/core/app/models/spree/webhook_endpoint.rb b/spree/core/app/models/spree/webhook_endpoint.rb
index fec49c86db..733134675a 100644
--- a/spree/core/app/models/spree/webhook_endpoint.rb
+++ b/spree/core/app/models/spree/webhook_endpoint.rb
@@ -13,7 +13,6 @@ module Spree
encrypts :secret_key, deterministic: true if Rails.configuration.active_record.encryption.include?(:primary_key)
- belongs_to :store, class_name: 'Spree::Store'
has_many :webhook_deliveries, class_name: 'Spree::WebhookDelivery', dependent: :destroy_async
validates :url, presence: true
diff --git a/spree/core/app/models/spree/wishlist.rb b/spree/core/app/models/spree/wishlist.rb
index ccd9c3bdb5..2c57b61dd2 100644
--- a/spree/core/app/models/spree/wishlist.rb
+++ b/spree/core/app/models/spree/wishlist.rb
@@ -10,7 +10,6 @@ module Spree
belongs_to :customer, class_name: "::#{Spree.customer_class}", touch: true
include Spree::DeprecatedCustomerAlias
- belongs_to :store, class_name: 'Spree::Store'
has_many :wishlist_items, class_name: 'Spree::WishlistItem', dependent: :destroy
has_many :wished_items, class_name: 'Spree::WishlistItem', inverse_of: :wishlist, deprecated: true
diff --git a/spree/core/lib/spree/core.rb b/spree/core/lib/spree/core.rb
index 445b3d4e40..25ff670232 100644
--- a/spree/core/lib/spree/core.rb
+++ b/spree/core/lib/spree/core.rb
@@ -911,7 +911,6 @@ require 'spree/checkout/requirements'
require 'spree/core/controller_helpers/store'
require 'spree/core/preferences/store'
-require 'spree/core/preferences/scoped_store'
require 'spree/core/preferences/runtime_configuration'
require 'spree/core/preferences/masking'
diff --git a/spree/core/lib/spree/core/engine.rb b/spree/core/lib/spree/core/engine.rb
index c418cc5383..b13a9be2e5 100644
--- a/spree/core/lib/spree/core/engine.rb
+++ b/spree/core/lib/spree/core/engine.rb
@@ -572,17 +572,14 @@ module Spree
end
config.to_prepare do
- # Ensure spree locale paths are present before decorators
I18n.load_path.unshift(*(Dir.glob(
File.join(
File.dirname(__FILE__), '../../../config/locales', '*.{rb,yml}'
)
) - I18n.load_path))
- # Load application's model / class decorators
- Dir.glob(File.join(File.dirname(__FILE__), '../../../app/**/*_decorator*.rb')) do |c|
- Rails.configuration.cache_classes ? require(c) : load(c)
- end
+ ActsAsTaggableOn::Tag.include(Spree::RansackableAttributes)
+ ActsAsTaggableOn::Tag.whitelisted_ransackable_attributes = %w[id name]
# Reset and re-activate event subscribers on code reload
# activate! will register all subscribers from Spree.subscribers
diff --git a/spree/core/lib/spree/core/preferences/scoped_store.rb b/spree/core/lib/spree/core/preferences/scoped_store.rb
deleted file mode 100644
index 37afb2c7da..0000000000
--- a/spree/core/lib/spree/core/preferences/scoped_store.rb
+++ /dev/null
@@ -1,34 +0,0 @@
-module Spree::Preferences
- class ScopedStore
- def initialize(prefix, suffix = nil)
- @prefix = prefix
- @suffix = suffix
- end
-
- def store
- Spree::Preferences::Store.instance
- end
-
- def fetch(key, &block)
- store.fetch(key_for(key), &block)
- end
-
- def []=(key, value)
- store[key_for(key)] = value
- end
-
- def delete(key)
- store.delete(key_for(key))
- end
-
- private
-
- def key_for(key)
- [rails_cache_id, @prefix, key, @suffix].compact.join('/')
- end
-
- def rails_cache_id
- ENV['RAILS_CACHE_ID']
- end
- end
-end
diff --git a/spree/core/lib/spree/hooks.rb b/spree/core/lib/spree/hooks.rb
index f53b306180..f63631f363 100644
--- a/spree/core/lib/spree/hooks.rb
+++ b/spree/core/lib/spree/hooks.rb
@@ -98,23 +98,6 @@ module Spree
@handlers.clear
end
- # Introspection facade: Spree.hooks.carts => { 'carts.add_item' => [...] }
- def method_missing(name, *args, &block)
- prefix = "#{name}."
- matching = @workflows.keys.select { |workflow_key| workflow_key.start_with?(prefix) || workflow_key == name.to_s }
- return super if matching.empty? && [email protected]? { |k| k.start_with?(prefix) }
-
- matching.index_with do |workflow_key|
- workflow = @workflows[workflow_key]&.safe_constantize
- workflow ? workflow.declared_hooks : []
- end
- end
-
- def respond_to_missing?(name, include_private = false)
- prefix = "#{name}."
- @workflows.keys.any? { |workflow_key| workflow_key.start_with?(prefix) } || super
- end
-
private
# Last writer wins on a collision, which is only defensible if it's
diff --git a/spree/core/spec/models/spree/preferences/scoped_store_spec.rb b/spree/core/spec/models/spree/preferences/scoped_store_spec.rb
deleted file mode 100644
index 4b33d3ce8f..0000000000
--- a/spree/core/spec/models/spree/preferences/scoped_store_spec.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-require 'spec_helper'
-
-describe Spree::Preferences::ScopedStore, type: :model do
- subject { scoped_store }
-
- let(:scoped_store) { described_class.new(prefix, suffix) }
-
- let(:prefix) { nil }
- let(:suffix) { nil }
-
- describe '#store' do
- subject { scoped_store.store }
-
- it { is_expected.to be Spree::Preferences::Store.instance }
- end
-
- context 'stubbed store' do
- let(:store) { double(:store) }
-
- before do
- allow(scoped_store).to receive(:store).and_return(store)
- end
-
- context 'with a prefix' do
- let(:prefix) { 'my_class' }
-
- it 'can fetch' do
- expect(store).to receive(:fetch).with('my_class/attr')
- scoped_store.fetch('attr') { 'default' }
- end
-
- it 'can assign' do
- expect(store).to receive(:[]=).with('my_class/attr', 'val')
- scoped_store['attr'] = 'val'
- end
-
- it 'can delete' do
- expect(store).to receive(:delete).with('my_class/attr')
- scoped_store.delete('attr')
- end
-
- context 'and suffix' do
- let(:suffix) { 123 }
-
- it 'can fetch' do
- expect(store).to receive(:fetch).with('my_class/attr/123')
- scoped_store.fetch('attr') { 'default' }
- end
-
- it 'can assign' do
- expect(store).to receive(:[]=).with('my_class/attr/123', 'val')
- scoped_store['attr'] = 'val'
- end
-
- it 'can delete' do
- expect(store).to receive(:delete).with('my_class/attr/123')
- scoped_store.delete('attr')
- end
- end
- end
- end
-end