spree_core 5.2.0.rc2 → 5.2.0

data/lib/generators/spree/install/templates/config/initializers/spree.rb

@@ -61,33 +61,40 @@ end
 # uncomment lines below to add your own custom business logic
 # such as promotions, shipping methods, etc
 Rails.application.config.after_initialize do
-  # Rails.application.config.spree.shipping_methods << Spree::ShippingMethods::SuperExpensiveNotVeryFastShipping
-  # Rails.application.config.spree.payment_methods << Spree::PaymentMethods::VerySafeAndReliablePaymentMethod
+  # Payment methods and shipping calculators
+  # Spree.payment_methods << Spree::PaymentMethods::VerySafeAndReliablePaymentMethod
+  # Spree.calculators.shipping_methods << Spree::ShippingMethods::SuperExpensiveNotVeryFastShipping
+  # Spree.calculators.tax_rates << Spree::TaxRates::FinanceTeamForcedMeToCodeThis
 
-  # Rails.application.config.spree.calculators.tax_rates << Spree::TaxRates::FinanceTeamForcedMeToCodeThis
-
-  # Rails.application.config.spree.stock_splitters << Spree::Stock::Splitters::SecretLogicSplitter
-
-  # Rails.application.config.spree.adjusters << Spree::Adjustable::Adjuster::TaxTheRich
+  # Stock splitters and adjusters
+  # Spree.stock_splitters << Spree::Stock::Splitters::SecretLogicSplitter
+  # Spree.adjusters << Spree::Adjustable::Adjuster::TaxTheRich
 
   # Custom promotions
-  # Rails.application.config.spree.calculators.promotion_actions_create_adjustments << Spree::Calculators::PromotionActions::CreateAdjustments::AddDiscountForFriends
-  # Rails.application.config.spree.calculators.promotion_actions_create_item_adjustments << Spree::Calculators::PromotionActions::CreateItemAdjustments::FinanceTeamForcedMeToCodeThis
-  # Rails.application.config.spree.promotions.rules << Spree::Promotions::Rules::OnlyForVIPCustomers
-  # Rails.application.config.spree.promotions.actions << Spree::Promotions::Actions::GiftWithPurchase
-
-  # Rails.application.config.spree.taxon_rules << Spree::TaxonRules::ProductsWithColor
-
-  # Rails.application.config.spree.exports << Spree::Exports::Payments
-  # Rails.application.config.spree.reports << Spree::Reports::MassivelyOvercomplexReportForCfo
-
-  # Themes and page builder
-  # Rails.application.config.spree.themes << Spree::Themes::NewShinyTheme
-  # Rails.application.config.spree.theme_layout_sections << Spree::PageSections::SuperImportantCeoBio
-  # Rails.application.config.spree.page_sections << Spree::PageSections::ContactFormToGetInTouch
-  # Rails.application.config.spree.page_blocks << Spree::PageBlocks::BigRedButtonToCallSales
-
-  # Rails.application.config.spree_storefront.head_partials << 'spree/shared/that_js_snippet_that_marketing_forced_me_to_include'
+  # Spree.calculators.promotion_actions_create_adjustments << Spree::Calculators::PromotionActions::CreateAdjustments::AddDiscountForFriends
+  # Spree.calculators.promotion_actions_create_item_adjustments << Spree::Calculators::PromotionActions::CreateItemAdjustments::FinanceTeamForcedMeToCodeThis
+  # Spree.promotions.rules << Spree::Promotions::Rules::OnlyForVIPCustomers
+  # Spree.promotions.actions << Spree::Promotions::Actions::GiftWithPurchase
+
+  # Taxon rules
+  # Spree.taxon_rules << Spree::TaxonRules::ProductsWithColor
+
+  # Exports and reports
+  # Spree.export_types << Spree::Exports::Payments
+  # Spree.reports << Spree::Reports::MassivelyOvercomplexReportForCfo
+
+  # Page builder (themes, pages, sections, blocks)
+  # Spree.page_builder.themes << Spree::Themes::NewShinyTheme
+  # Spree.page_builder.theme_layout_sections << Spree::PageSections::SuperImportantCeoBio
+  # Spree.page_builder.pages << Spree::Pages::CustomLandingPage
+  # Spree.page_builder.page_sections << Spree::PageSections::ContactFormToGetInTouch
+  # Spree.page_builder.page_blocks << Spree::PageBlocks::BigRedButtonToCallSales
+
+  # Storefront partials
+  # Spree.storefront.partials.head << 'spree/shared/that_js_snippet_that_marketing_forced_me_to_include'
+
+  # Admin partials
+  # Spree.admin.partials.product_form << 'spree/admin/products/custom_section'
 end
 
 Spree.user_class = <%= (options[:user_class].blank? ? 'Spree::LegacyUser' : options[:user_class]).inspect %>

data/lib/generators/spree/model/model_generator.rb

@@ -0,0 +1,21 @@
+require "rails/generators/active_record/model/model_generator"
+
+module Spree
+  class ModelGenerator < ActiveRecord::Generators::ModelGenerator
+
+    def self.source_paths
+      paths = superclass.source_paths
+      paths << File.expand_path('templates', __dir__)
+      paths.flatten
+    end
+
+    class_option :parent, type: :string, default: "Spree::Base", desc: "The parent class for the generated model"
+
+    desc 'Creates a new Spree model'
+
+    # Override to prevent module file from being created
+    def create_module_file
+      return
+    end
+  end
+end

data/lib/generators/spree/model/templates/model.rb.tt

@@ -0,0 +1,22 @@
+module Spree
+  class <%= class_name.demodulize %> < <%= parent_class_name.classify %>
+<% attributes.select(&:reference?).each do |attribute| -%>
+    belongs_to :<%= attribute.name %><%= ", polymorphic: true" if attribute.polymorphic? %>
+<% end -%>
+<% attributes.select(&:rich_text?).each do |attribute| -%>
+    has_rich_text :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:attachment?).each do |attribute| -%>
+    has_one_attached :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:attachments?).each do |attribute| -%>
+    has_many_attached :<%= attribute.name %>
+<% end -%>
+<% attributes.select(&:token?).each do |attribute| -%>
+    has_secure_token<% if attribute.name != "token" %> :<%= attribute.name %><% end %>
+<% end -%>
+<% if attributes.any?(&:password_digest?) -%>
+    has_secure_password
+<% end -%>
+  end
+end

data/lib/generators/spree/model_decorator/model_decorator_generator.rb

@@ -0,0 +1,37 @@
+module Spree
+  class ModelDecoratorGenerator < Rails::Generators::NamedBase
+    desc 'Creates a model decorator for a Spree model'
+
+    argument :name, type: :string, required: true, banner: 'Spree::ModelName'
+
+    def self.source_paths
+      paths = superclass.source_paths
+      paths << File.expand_path('templates', __dir__)
+      paths.flatten
+    end
+
+    def create_model_decorator_file
+      template 'model_decorator.rb.tt', "app/models/#{file_path}_decorator.rb"
+    end
+
+    private
+
+    # Returns the model name without the Spree:: prefix
+    # e.g., "Spree::Product" => "Product", "Product" => "Product"
+    def model_name
+      name.sub(/^Spree::/, '').classify
+    end
+
+    # Returns the decorator module name
+    # e.g., "Spree::Product" => "ProductDecorator"
+    def decorator_name
+      "#{model_name}Decorator"
+    end
+
+    # Returns the file path for the decorator
+    # e.g., "Spree::Product" => "spree/product", "Product" => "spree/product"
+    def file_path
+      "spree/#{model_name.underscore}"
+    end
+  end
+end

data/lib/generators/spree/model_decorator/templates/model_decorator.rb.tt

@@ -0,0 +1,12 @@
+module Spree
+  module <%= decorator_name %>
+    def self.prepended(base)
+      # base.belongs_to :brand
+    end
+
+    # add custom methods here
+  end
+end
+
+Spree::<%= model_name %>.prepend Spree::<%= decorator_name %>
+

data/lib/spree/analytics.rb

@@ -1,11 +1,11 @@
 module Spree
   module Analytics
     def self.events
-      @@supported_events ||= Rails.application.config.spree.analytics_events
+      @@supported_events ||= Spree.analytics.events
     end
 
     def self.event_handlers
-      @@event_handlers ||= Rails.application.config.spree.analytics_event_handlers
+      @@event_handlers ||= Spree.analytics.handlers
     end
   end
 end

data/lib/spree/core/configuration.rb

@@ -45,6 +45,7 @@ module Spree
       preference :expedited_exchanges, :boolean, default: false # NOTE this requires payment profiles to be supported on your gateway of choice as well as a delayed job handler to be configured with activejob. kicks off an exchange shipment upon return authorization save. charge customer if they do not return items within timely manner.
       preference :expedited_exchanges_days_window, :integer, default: 14 # the amount of days the customer has to return their item after the expedited exchange is shipped in order to avoid being charged
       preference :geocode_addresses, :boolean, default: true
+      preference :images_save_from_url_job_attempts, :integer, default: 5
       preference :layout, :string, deprecated: 'Please use Spree::Frontend::Config[:layout] instead'
       preference :logo, :string, deprecated: true
       preference :mailer_logo, :string, deprecated: true

data/lib/spree/core/controller_helpers/order.rb

@@ -118,11 +118,20 @@ module Spree
             value: token,
             expires: 90.days.from_now,
             secure: Rails.configuration.force_ssl || Rails.application.config.ssl_options[:secure_cookies],
-            domain: current_store.url_or_custom_domain,
+            domain: cookie_domain_without_port,
             httponly: true
           }
         end
 
+        def cookie_domain_without_port
+          domain = current_store.url_or_custom_domain
+          return nil if domain.blank?
+
+          # Remove port from domain (e.g., "localhost:3000" -> "localhost")
+          # Cookies don't support port numbers in the domain attribute
+          domain.split(':').first
+        end
+
         def last_incomplete_order(includes = {})
           @last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order(current_store, includes: includes)
         end

data/lib/spree/core/engine.rb

@@ -24,14 +24,14 @@ module Spree
                                :page_blocks,
                                :reports,
                                :translatable_resources,
-                               :metafield_types,
-                               :metafield_enabled_resources,
+                               :metafields,
                                :analytics_events,
                                :analytics_event_handlers,
                                :integrations)
       SpreeCalculators = Struct.new(:shipping_methods, :tax_rates, :promotion_actions_create_adjustments, :promotion_actions_create_item_adjustments)
       PromoEnvironment = Struct.new(:rules, :actions)
       SpreeValidators = Struct.new(:addresses)
+      MetafieldsEnvironment = Struct.new(:types, :enabled_resources)
       isolate_namespace Spree
       engine_name 'spree'
 
@@ -66,6 +66,12 @@ module Spree
       initializer 'spree.register.adjustable_adjusters' do |app|
       end
 
+      initializer 'spree.register.metafields' do |app|
+        app.config.spree.metafields = MetafieldsEnvironment.new
+        app.config.spree.metafields.types = []
+        app.config.spree.metafields.enabled_resources = []
+      end
+
       # We need to define promotions rules here so extensions and existing apps
       # can add their custom classes on their initializer files
       initializer 'spree.promo.environment' do |app|
@@ -260,7 +266,7 @@ module Spree
           Spree::Policy
         ]
 
-        Rails.application.config.spree.metafield_types = [
+        Rails.application.config.spree.metafields.types = [
           Spree::Metafields::ShortText,
           Spree::Metafields::LongText,
           Spree::Metafields::RichText,
@@ -269,7 +275,7 @@ module Spree
           Spree::Metafields::Json
         ]
 
-        Rails.application.config.spree.metafield_enabled_resources = [
+        Rails.application.config.spree.metafields.enabled_resources = [
           Spree::Address,
           Spree::Asset,
           Spree::CreditCard,

data/lib/spree/core/importer/order.rb

@@ -3,6 +3,8 @@ module Spree
     module Importer
       class Order
         def self.import(user, params)
+          Spree::Deprecation.warn('Spree::Core::Importer::Order is deprecated and will be removed in Spree 6.0. Please use `Spree::Imports::Order` instead.')
+
           ensure_country_id_from_params params[:ship_address_attributes]
           ensure_state_id_from_params params[:ship_address_attributes]
           ensure_country_id_from_params params[:bill_address_attributes]

data/lib/spree/core/importer/product.rb

@@ -5,6 +5,8 @@ module Spree
         attr_reader :product, :product_attrs, :variants_attrs, :options_attrs, :store
 
         def initialize(product, product_params, options = {})
+          Spree::Deprecation.warn('Spree::Core::Importer::Product is deprecated and will be removed in Spree 6.0. Please use `Spree::Imports::Product` instead.')
+
           @store = options[:store] || Spree::Store.default
           @product = product || Spree::Product.new(product_params)
           @product.stores << @store if @product.stores.exclude?(@store)

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/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.rc2'.freeze
+  VERSION = '5.2.0'.freeze
 
   def self.version
     VERSION

data/lib/spree/core.rb

@@ -168,6 +168,196 @@ 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
+
   module Core
     autoload :ProductFilters, 'spree/core/product_filters'
     autoload :TokenGenerator, 'spree/core/token_generator'
@@ -192,6 +382,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'

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

@@ -11,11 +11,11 @@ FactoryBot.define do
   end
 
   factory :shipping_calculator, class: Spree::Calculator::Shipping::FlatRate do
-    after(:create) { |c| c.set_preference(:amount, 10.0) }
+    preferred_amount { 10.0 }
   end
 
   factory :shipping_no_amount_calculator, class: Spree::Calculator::Shipping::FlatRate do
-    after(:create) { |c| c.set_preference(:amount, 0) }
+    preferred_amount { 0 }
   end
 
   factory :flat_rate_calculator, class: Spree::Calculator::FlatRate do

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

metadata

@@ -1,16 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.2.0.rc2
+  version: 5.2.0
 platform: ruby
 authors:
 - Sean Schofield
 - Spark Solutions Sp. z o.o.
 - Vendo Connect Inc.
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-09 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -1478,6 +1477,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 +1503,7 @@ 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/preferences/configuration.rb
 - lib/spree/core/preferences/preferable.rb
 - lib/spree/core/preferences/preferable_class_methods.rb
@@ -1656,10 +1660,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.rc2
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.2.0
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.2.0.rc2
-post_install_message:
+  source_code_uri: https://github.com/spree/spree/tree/v5.2.0
 rdoc_options: []
 require_paths:
 - lib
@@ -1674,8 +1677,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: []