spree_core 5.2.0.rc3 → 5.2.1

data/lib/spree/core/partials.rb

@@ -0,0 +1,42 @@
+# Ability to define partial injection points for Admin and Storefront
+module Spree
+  module Core
+    class Partials
+      def initialize(config, environment)
+        @config = config
+        @environment = environment
+        define_dynamic_methods
+      end
+
+      attr_reader :config, :environment
+
+      def partial_members
+        environment.members.select { |member| member.to_s.end_with?('_partials') }
+      end
+
+      def keys
+        partial_members.map { |member| member.to_s.sub(/_partials$/, '') }
+      end
+
+      private
+
+      def define_dynamic_methods
+        # Get all members that end with _partials from the Environment
+        partial_members.each do |member|
+          # Strip the _partials suffix for the method name
+          method_name = member.to_s.sub(/_partials$/, '')
+
+          # Define getter method on singleton class
+          singleton_class.define_method(method_name) do
+            config.send(member)
+          end
+
+          # Define setter method on singleton class
+          singleton_class.define_method("#{method_name}=") do |value|
+            config.send("#{member}=", value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/spree/core/permission_configuration.rb

@@ -0,0 +1,102 @@
+# Manages the mapping between roles and permission sets.
+#
+# This configuration allows you to define which permission sets are assigned to each role.
+# Permission sets are reusable groups of permissions that can be applied to roles.
+#
+# @example Assigning permission sets to a role
+#   Spree.permissions.assign(:customer_service, [
+#     Spree::PermissionSets::OrderDisplay,
+#     Spree::PermissionSets::UserManagement
+#   ])
+#
+# @example Clearing permission sets from a role
+#   Spree.permissions.clear(:customer_service)
+#
+# @example Getting permission sets for a role
+#   Spree.permissions.permission_sets_for(:admin)
+#   # => [Spree::PermissionSets::SuperUser]
+#
+module Spree
+  class PermissionConfiguration
+    # Default role used for unauthenticated users
+    DEFAULT_ROLE = :default
+
+    # Admin role with full access
+    ADMIN_ROLE = :admin
+
+    def initialize
+      @role_permissions = {}
+    end
+
+    # Assigns permission sets to a role.
+    #
+    # @param role_name [Symbol, String] the name of the role
+    # @param permission_sets [Array<Class>, Class] permission set class(es) to assign
+    # @return [Array<Class>] the assigned permission sets
+    #
+    # @example
+    #   Spree.permissions.assign(:customer_service, Spree::PermissionSets::OrderDisplay)
+    #   Spree.permissions.assign(:admin, [
+    #     Spree::PermissionSets::SuperUser
+    #   ])
+    def assign(role_name, permission_sets)
+      role_key = normalize_role_name(role_name)
+      @role_permissions[role_key] ||= []
+      @role_permissions[role_key] |= Array(permission_sets)
+    end
+
+    # Clears all permission sets from a role.
+    #
+    # @param role_name [Symbol, String] the name of the role
+    # @return [Array<Class>] the removed permission sets
+    def clear(role_name)
+      role_key = normalize_role_name(role_name)
+      @role_permissions.delete(role_key)
+    end
+
+    # Returns the permission sets assigned to a role.
+    #
+    # @param role_name [Symbol, String] the name of the role
+    # @return [Array<Class>] the assigned permission sets
+    def permission_sets_for(role_name)
+      role_key = normalize_role_name(role_name)
+      @role_permissions[role_key] || []
+    end
+
+    # Returns all permission sets for multiple roles.
+    #
+    # @param role_names [Array<Symbol, String>] the names of the roles
+    # @return [Array<Class>] the combined permission sets (deduplicated)
+    def permission_sets_for_roles(role_names)
+      role_names.flat_map { |role_name| permission_sets_for(role_name) }.uniq
+    end
+
+    # Returns all configured roles.
+    #
+    # @return [Array<Symbol>] the configured role names
+    def roles
+      @role_permissions.keys
+    end
+
+    # Checks if a role has any permission sets assigned.
+    #
+    # @param role_name [Symbol, String] the name of the role
+    # @return [Boolean]
+    def role_configured?(role_name)
+      role_key = normalize_role_name(role_name)
+      @role_permissions.key?(role_key) && @role_permissions[role_key].any?
+    end
+
+    # Resets all role permissions to empty state.
+    # Useful for testing.
+    def reset!
+      @role_permissions = {}
+    end
+
+    private
+
+    def normalize_role_name(role_name)
+      role_name.to_s.downcase.to_sym
+    end
+  end
+end

data/lib/spree/core/token_generator.rb

@@ -2,6 +2,7 @@ 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 6.0. 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)

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.2.0.rc3'.freeze
+  VERSION = '5.2.1'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -168,6 +168,212 @@ module Spree
     yield(Spree::Dependencies)
   end
 
+  # Environment accessors for easier configuration access
+  # Instead of Rails.application.config.spree.payment_methods
+  # you can use Spree.payment_methods
+
+  def self.calculators
+    Rails.application.config.spree.calculators
+  end
+
+  def self.calculators=(value)
+    Rails.application.config.spree.calculators = value
+  end
+
+  def self.validators
+    Rails.application.config.spree.validators
+  end
+
+  def self.validators=(value)
+    Rails.application.config.spree.validators = value
+  end
+
+  def self.payment_methods
+    Rails.application.config.spree.payment_methods
+  end
+
+  def self.payment_methods=(value)
+    Rails.application.config.spree.payment_methods = value
+  end
+
+  def self.adjusters
+    Rails.application.config.spree.adjusters
+  end
+
+  def self.adjusters=(value)
+    Rails.application.config.spree.adjusters = value
+  end
+
+  def self.stock_splitters
+    Rails.application.config.spree.stock_splitters
+  end
+
+  def self.stock_splitters=(value)
+    Rails.application.config.spree.stock_splitters = value
+  end
+
+  def self.promotions
+    Rails.application.config.spree.promotions
+  end
+
+  def self.promotions=(value)
+    Rails.application.config.spree.promotions = value
+  end
+
+  def self.line_item_comparison_hooks
+    Rails.application.config.spree.line_item_comparison_hooks
+  end
+
+  def self.line_item_comparison_hooks=(value)
+    Rails.application.config.spree.line_item_comparison_hooks = value
+  end
+
+  def self.data_feed_types
+    Rails.application.config.spree.data_feed_types
+  end
+
+  def self.data_feed_types=(value)
+    Rails.application.config.spree.data_feed_types = value
+  end
+
+  def self.export_types
+    Rails.application.config.spree.export_types
+  end
+
+  def self.export_types=(value)
+    Rails.application.config.spree.export_types = value
+  end
+
+  def self.import_types
+    Rails.application.config.spree.import_types
+  end
+
+  def self.import_types=(value)
+    Rails.application.config.spree.import_types = value
+  end
+
+  def self.taxon_rules
+    Rails.application.config.spree.taxon_rules
+  end
+
+  def self.taxon_rules=(value)
+    Rails.application.config.spree.taxon_rules = value
+  end
+
+  def self.reports
+    Rails.application.config.spree.reports
+  end
+
+  def self.reports=(value)
+    Rails.application.config.spree.reports = value
+  end
+
+  def self.translatable_resources
+    Rails.application.config.spree.translatable_resources
+  end
+
+  def self.translatable_resources=(value)
+    Rails.application.config.spree.translatable_resources = value
+  end
+
+  def self.metafields
+    Rails.application.config.spree.metafields
+  end
+
+  def self.integrations
+    Rails.application.config.spree.integrations
+  end
+
+  def self.integrations=(value)
+    Rails.application.config.spree.integrations = value
+  end
+
+  # Page Builder configuration accessor
+  def self.page_builder
+    @page_builder ||= PageBuilderConfig.new
+  end
+
+  class PageBuilderConfig
+    def themes
+      Rails.application.config.spree.themes
+    end
+
+    def themes=(value)
+      Rails.application.config.spree.themes = value
+    end
+
+    def theme_layout_sections
+      Rails.application.config.spree.theme_layout_sections
+    end
+
+    def theme_layout_sections=(value)
+      Rails.application.config.spree.theme_layout_sections = value
+    end
+
+    def pages
+      Rails.application.config.spree.pages
+    end
+
+    def pages=(value)
+      Rails.application.config.spree.pages = value
+    end
+
+    def page_sections
+      Rails.application.config.spree.page_sections
+    end
+
+    def page_sections=(value)
+      Rails.application.config.spree.page_sections = value
+    end
+
+    def page_blocks
+      Rails.application.config.spree.page_blocks
+    end
+
+    def page_blocks=(value)
+      Rails.application.config.spree.page_blocks = value
+    end
+  end
+
+  def self.analytics
+    @analytics ||= AnalyticsConfig.new
+  end
+
+  # Group analytics configuration options together, but still make it backwards compatible.
+  class AnalyticsConfig
+    def events
+      Rails.application.config.spree.analytics_events
+    end
+
+    def events=(value)
+      Rails.application.config.spree.analytics_events = value
+    end
+
+    def handlers
+      Rails.application.config.spree.analytics_event_handlers
+    end
+
+    def handlers=(value)
+      Rails.application.config.spree.analytics_event_handlers = value
+    end
+  end
+
+  # Permission configuration accessor for managing role-to-permission-set mappings.
+  #
+  # @example Assigning permission sets to a role
+  #   Spree.permissions.assign(:customer_service, [
+  #     Spree::PermissionSets::OrderDisplay,
+  #     Spree::PermissionSets::UserManagement
+  #   ])
+  #
+  # @example Clearing permission sets from a role
+  #   Spree.permissions.clear(:customer_service)
+  #
+  # @return [Spree::PermissionConfiguration] the permission configuration instance
+  def self.permissions
+    @permissions ||= PermissionConfiguration.new
+  end
+
   module Core
     autoload :ProductFilters, 'spree/core/product_filters'
     autoload :TokenGenerator, 'spree/core/token_generator'
@@ -192,6 +398,7 @@ require 'spree/service_module'
 require 'spree/database_type_utilities'
 require 'spree/analytics'
 
+require 'spree/core/partials'
 require 'spree/core/importer'
 require 'spree/core/query_filters'
 require 'spree/core/controller_helpers/auth'
@@ -209,3 +416,4 @@ require 'spree/core/preferences/scoped_store'
 require 'spree/core/preferences/runtime_configuration'
 
 require 'spree/core/webhooks'
+require 'spree/core/permission_configuration'

data/lib/spree/testing_support/factories/order_factory.rb

@@ -73,7 +73,7 @@ FactoryBot.define do
 
         after(:create) do |order, evaluator|
           order.refresh_shipment_rates(evaluator.shipping_method_filter)
-          order.update_column(:completed_at, Time.current)
+          order.update_column(:completed_at, order.completed_at || Time.current)
         end
 
         factory :completed_order_with_pending_payment do
@@ -110,13 +110,16 @@ FactoryBot.define do
           end
 
           factory :shipped_order do
+            shipment_state { 'shipped' }
+
             after(:create) do |order|
               order.shipments.each do |shipment|
                 shipment.inventory_units.update_all state: 'shipped'
-                shipment.update_column('state', 'shipped')
+                shipment.update_columns(
+                  state: 'shipped',
+                  tracking: '1234567890'
+                )
               end
-              order.update_column('shipment_state', 'shipped')
-              order.reload
             end
           end
         end

data/lib/spree_core.rb

@@ -1,4 +1,5 @@
 require 'friendly_id/paranoia'
+require 'friendly_id/history_decorator'
 require 'mobility/plugins/store_based_fallbacks'
 require 'normalize_string'
 

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.2.0.rc3
+  version: 5.2.1
 platform: ruby
 authors:
 - Sean Schofield
 - Spark Solutions Sp. z o.o.
 - Vendo Connect Inc.
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-18 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -336,28 +335,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.100'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.100'
 - !ruby/object:Gem::Dependency
   name: state_machines-activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.100'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.100'
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -1051,6 +1050,21 @@ files:
 - app/models/spree/payment_method/check.rb
 - app/models/spree/payment_method/store_credit.rb
 - app/models/spree/payment_source.rb
+- app/models/spree/permission_sets/base.rb
+- app/models/spree/permission_sets/configuration_management.rb
+- app/models/spree/permission_sets/dashboard_display.rb
+- app/models/spree/permission_sets/default_customer.rb
+- app/models/spree/permission_sets/order_display.rb
+- app/models/spree/permission_sets/order_management.rb
+- app/models/spree/permission_sets/product_display.rb
+- app/models/spree/permission_sets/product_management.rb
+- app/models/spree/permission_sets/promotion_management.rb
+- app/models/spree/permission_sets/role_management.rb
+- app/models/spree/permission_sets/stock_display.rb
+- app/models/spree/permission_sets/stock_management.rb
+- app/models/spree/permission_sets/super_user.rb
+- app/models/spree/permission_sets/user_display.rb
+- app/models/spree/permission_sets/user_management.rb
 - app/models/spree/policy.rb
 - app/models/spree/post.rb
 - app/models/spree/post_category.rb
@@ -1458,6 +1472,7 @@ files:
 - db/migrate/20250915093930_add_metadata_to_spree_newsletter_subscribers.rb
 - db/migrate/20250923141845_create_spree_imports.rb
 - db/seeds.rb
+- lib/friendly_id/history_decorator.rb
 - lib/friendly_id/paranoia.rb
 - lib/generators/spree/authentication/custom/custom_generator.rb
 - lib/generators/spree/authentication/custom/templates/authentication_helpers.rb.tt
@@ -1478,6 +1493,10 @@ files:
 - lib/generators/spree/dummy_model/templates/model.rb.tt
 - lib/generators/spree/install/install_generator.rb
 - lib/generators/spree/install/templates/config/initializers/spree.rb
+- lib/generators/spree/model/model_generator.rb
+- lib/generators/spree/model/templates/model.rb.tt
+- lib/generators/spree/model_decorator/model_decorator_generator.rb
+- lib/generators/spree/model_decorator/templates/model_decorator.rb.tt
 - lib/mobility/plugins/store_based_fallbacks.rb
 - lib/normalize_string.rb
 - lib/spree/analytics.rb
@@ -1500,6 +1519,8 @@ files:
 - lib/spree/core/importer/order.rb
 - lib/spree/core/importer/product.rb
 - lib/spree/core/number_generator.rb
+- lib/spree/core/partials.rb
+- lib/spree/core/permission_configuration.rb
 - lib/spree/core/preferences/configuration.rb
 - lib/spree/core/preferences/preferable.rb
 - lib/spree/core/preferences/preferable_class_methods.rb
@@ -1656,10 +1677,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.0.rc3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.2.0.rc3
-post_install_message:
+  source_code_uri: https://github.com/spree/spree/tree/v5.2.1
 rdoc_options: []
 require_paths:
 - lib
@@ -1674,8 +1694,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.5.3
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: The bare bones necessary for Spree
 test_files: []