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.

Use Ruby 3.2+ Data for Event registry (#13409)

Damian Legawieca8b2ce779216
diff --git a/admin/spree_admin.gemspec b/admin/spree_admin.gemspec
index 2fb9417cdf..f4c8661463 100644
--- a/admin/spree_admin.gemspec
+++ b/admin/spree_admin.gemspec
@@ -20,8 +20,7 @@ Gem::Specification.new do |s|
"source_code_uri" => "https://github.com/spree/spree/tree/v#{s.version}",
}
- s.required_ruby_version = '>= 3.0'
- s.required_rubygems_version = '>= 1.8.23'
+ s.required_ruby_version = '>= 3.2'
s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_path = 'lib'
diff --git a/api/spree_api.gemspec b/api/spree_api.gemspec
index a88f91e9f0..98e5e9bf81 100644
--- a/api/spree_api.gemspec
+++ b/api/spree_api.gemspec
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
'source_code_uri' => "https://github.com/spree/spree/tree/v#{s.version}",
}
- s.required_ruby_version = '>= 3.0'
+ s.required_ruby_version = '>= 3.2'
s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_paths = ['lib']
diff --git a/cli/lib/spree_cli/templates/extension/extension.gemspec b/cli/lib/spree_cli/templates/extension/extension.gemspec
index 7d38e1fa38..4486f19eeb 100644
--- a/cli/lib/spree_cli/templates/extension/extension.gemspec
+++ b/cli/lib/spree_cli/templates/extension/extension.gemspec
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
s.name = '<%= file_name %>'
s.version = <%= class_name %>::VERSION
s.summary = "Spree Commerce <%= human_name %> Extension"
- s.required_ruby_version = '>= 3.0'
+ s.required_ruby_version = '>= 3.2'
s.author = 'You'
s.email = '[email protected]'
diff --git a/core/lib/spree/events/registry.rb b/core/lib/spree/events/registry.rb
index 1bab04fbba..bbf57da07b 100644
--- a/core/lib/spree/events/registry.rb
+++ b/core/lib/spree/events/registry.rb
@@ -2,21 +2,28 @@
module Spree
module Events
- # Registry for managing event subscribers.
+ # Registry for managing event subscribers across different adapters.
#
- # The registry keeps track of all registered subscribers and their
- # event subscriptions. It supports pattern matching for event names.
+ # The registry provides an adapter-agnostic way to track subscriptions.
+ # This allows Spree to support different event backends (ActiveSupport::Notifications,
+ # Kafka, Redis Pub/Sub, etc.) while maintaining a consistent subscription API.
#
- # @example Registering a subscriber
- # registry = Spree::Events::Registry.new
- # registry.register('order.complete', MySubscriber)
+ # Thread safety: Uses a Mutex for safe concurrent access during subscription
+ # registration/unregistration, which may happen during Rails initialization
+ # or hot reloading in development.
#
- # @example Finding subscribers for an event
- # registry.subscribers_for('order.complete')
- # # => [MySubscriber, AnotherSubscriber]
+ # @example
+ # registry = Spree::Events::Registry.new
+ # registry.register('order.*', MySubscriber, async: true)
+ # registry.subscriptions_for('order.complete') # => [Subscription]
#
class Registry
- Subscription = Struct.new(:pattern, :subscriber, :options, keyword_init: true)
+ # Immutable subscription data using Ruby 3.2+ Data class
+ Subscription = Data.define(:pattern, :subscriber, :options) do
+ def async?
+ options.fetch(:async, true)
+ end
+ end
def initialize
@subscriptions = []
@@ -27,19 +34,16 @@ module Spree
#
# @param pattern [String] Event pattern (supports wildcards like 'order.*')
# @param subscriber [Class, Proc] The subscriber class or callable
- # @param options [Hash] Additional options for the subscription
- # @return [Subscription] The created subscription
+ # @param options [Hash] Subscription options (:async, etc.)
+ # @return [Subscription]
def register(pattern, subscriber, options = {})
subscription = Subscription.new(
pattern: pattern.to_s,
subscriber: subscriber,
- options: options
+ options: options.freeze
)
- @mutex.synchronize do
- @subscriptions << subscription
- end
-
+ @mutex.synchronize { @subscriptions << subscription }
subscription
end
@@ -47,63 +51,48 @@ module Spree
#
# @param pattern [String] Event pattern
# @param subscriber [Class, Proc] The subscriber to remove
- # @return [Boolean] true if removed, false if not found
+ # @return [Boolean] true if removed
def unregister(pattern, subscriber)
@mutex.synchronize do
original_size = @subscriptions.size
- @subscriptions.reject! do |sub|
- sub.pattern == pattern.to_s && sub.subscriber == subscriber
- end
+ @subscriptions.reject! { |s| s.pattern == pattern.to_s && s.subscriber == subscriber }
@subscriptions.size < original_size
end
end
- # Find all subscribers that match an event name
+ # Find all subscriptions matching an event name
#
- # @param event_name [String] The event name to match
- # @return [Array<Subscription>] Matching subscriptions
+ # @param event_name [String] The event name
+ # @return [Array<Subscription>]
def subscriptions_for(event_name)
@mutex.synchronize do
- @subscriptions.select do |subscription|
- Spree::Event.matches?(event_name, subscription.pattern)
- end
+ @subscriptions.select { |s| Spree::Event.matches?(event_name, s.pattern) }
end
end
- # Get all registered subscriptions
- #
# @return [Array<Subscription>]
def all_subscriptions
@mutex.synchronize { @subscriptions.dup }
end
- # Get all unique patterns
- #
- # @return [Array<String>]
+ # @return [Array<String>] Unique patterns
def patterns
@mutex.synchronize { @subscriptions.map(&:pattern).uniq }
end
- # Clear all subscriptions
- def clear!
- @mutex.synchronize { @subscriptions.clear }
- end
-
- # Number of subscriptions
- #
# @return [Integer]
def size
@mutex.synchronize { @subscriptions.size }
end
- # Check if a pattern is registered
- #
# @param pattern [String]
# @return [Boolean]
def registered?(pattern)
- @mutex.synchronize do
- @subscriptions.any? { |sub| sub.pattern == pattern.to_s }
- end
+ @mutex.synchronize { @subscriptions.any? { |s| s.pattern == pattern.to_s } }
+ end
+
+ def clear!
+ @mutex.synchronize { @subscriptions.clear }
end
end
end
diff --git a/core/spree_core.gemspec b/core/spree_core.gemspec
index 04f0b67b8a..5d8b894237 100644
--- a/core/spree_core.gemspec
+++ b/core/spree_core.gemspec
@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
"source_code_uri" => "https://github.com/spree/spree/tree/v#{s.version}",
}
- s.required_ruby_version = '>= 3.0'
+ s.required_ruby_version = '>= 3.2'
s.required_rubygems_version = '>= 1.8.23'
s.files = Dir["{app,config,db,lib,vendor}/**/*", "spec/fixtures/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
diff --git a/emails/spree_emails.gemspec b/emails/spree_emails.gemspec
index 007c4b261b..c3752e4427 100644
--- a/emails/spree_emails.gemspec
+++ b/emails/spree_emails.gemspec
@@ -20,8 +20,7 @@ Gem::Specification.new do |s|
"source_code_uri" => "https://github.com/spree/spree/tree/v#{s.version}",
}
- s.required_ruby_version = '>= 3.0'
- s.required_rubygems_version = '>= 1.8.23'
+ s.required_ruby_version = '>= 3.2'
s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_path = 'lib'
diff --git a/packages/legacy_webhooks/spree_legacy_webhooks.gemspec b/packages/legacy_webhooks/spree_legacy_webhooks.gemspec
index 9dea20ab3b..a0da4f9702 100644
--- a/packages/legacy_webhooks/spree_legacy_webhooks.gemspec
+++ b/packages/legacy_webhooks/spree_legacy_webhooks.gemspec
@@ -20,8 +20,7 @@ Gem::Specification.new do |s|
"source_code_uri" => "https://github.com/spree/spree/tree/v#{s.version}",
}
- s.required_ruby_version = '>= 3.0'
- s.required_rubygems_version = '>= 1.8.23'
+ s.required_ruby_version = '>= 3.2'
s.files = Dir["{app,config,db,lib}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_path = 'lib'
diff --git a/packages/page_builder/spree_page_builder.gemspec b/packages/page_builder/spree_page_builder.gemspec
index 2830c96768..81c8eedf4d 100644
--- a/packages/page_builder/spree_page_builder.gemspec
+++ b/packages/page_builder/spree_page_builder.gemspec
@@ -18,8 +18,7 @@ Gem::Specification.new do |s|
'source_code_uri' => "https://github.com/spree/spree/tree/v#{s.version}",
}
- s.required_ruby_version = '>= 3.0'
- s.required_rubygems_version = '>= 1.8.23'
+ s.required_ruby_version = '>= 3.2'
s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_path = 'lib'
diff --git a/spree.gemspec b/spree.gemspec
index 3ddd97eec8..424ffbaecf 100644
--- a/spree.gemspec
+++ b/spree.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
"source_code_uri" => "https://github.com/spree/spree/tree/v#{s.version}",
}
- s.required_ruby_version = '>= 3.0'
+ s.required_ruby_version = '>= 3.2'
s.files = Dir['README.md', 'lib/**/*']
s.require_path = 'lib'
diff --git a/storefront/spree_storefront.gemspec b/storefront/spree_storefront.gemspec
index d3b2977d6c..1db9e8e52b 100644
--- a/storefront/spree_storefront.gemspec
+++ b/storefront/spree_storefront.gemspec
@@ -18,8 +18,7 @@ Gem::Specification.new do |s|
'source_code_uri' => "https://github.com/spree/spree/tree/v#{s.version}",
}
- s.required_ruby_version = '>= 3.0'
- s.required_rubygems_version = '>= 1.8.23'
+ s.required_ruby_version = '>= 3.2'
s.files = Dir["{app,config,db,lib,vendor}/**/*", "LICENSE.md", "Rakefile", "README.md"].reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
s.require_path = 'lib'