spree_core 5.5.0 → 5.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5522880aae16fc9206a41a28edd797d20fc655337b0f5d3912de30128cec5177
-  data.tar.gz: 85a010b3e34acc15dca863636adc8bfe0e0da0373ffd711401b64e2e853d9858
+  metadata.gz: 6b15a0aab09b99fce9b5a361577d7cf8c45576e4e4fff0bde398374eb876dfa9
+  data.tar.gz: 8dea678d1da4bfe11d29aaa9b7806ebe702ae3e339318e2b72063ef330dd4b79
 SHA512:
-  metadata.gz: 966414759bbb3d5eab246e5321cf5ac659f2edff4e0d0579949eef912a5277d9fac7b9bc4046dcf11157786281a6e2ecf2b0d6db709aea17afa4d7cf6094cf1f
-  data.tar.gz: 96f8da6855281ae93ea61991218ed58db3362b9d8eff4e4c31c60894d233969528fa579d065f950082a4160dcb7a7477735a99bbef6c26bb037e459c44daeea2
+  metadata.gz: 5b6a38e339e292481b3ffea592632848b81dedec28bc1324896958366130ad55f3d06e85e0558d08d7111c2ba0ecdf4a4916efb91fb221a6d9bc5dac6dd49edd
+  data.tar.gz: 2cb8797d32de652508f96640a40a2157bbc69c5f73601f7369f4231daf98eecfb61e8bafec10b135bb4cd96189a1804d71e7f2a0f1bab1b9dad5b892a090b281

data/app/models/spree/current.rb

@@ -72,7 +72,8 @@ module Spree
           currency: currency,
           store: store,
           zone: zone,
-          market: market
+          market: market,
+          channel: channel
         )
       end
     end

data/app/models/spree/order.rb

@@ -62,17 +62,20 @@ module Spree
       [outstanding_balance - total_applied_store_credit, 0].max
     end
 
-    # Transient warnings populated by remove_out_of_stock_items!
+    # Transient warnings populated by remove_out_of_stock_items! and ensure_available_shipping_rates
     attribute :warnings, default: -> { [] }
 
     # Removes out-of-stock/discontinued items and populates warnings.
     # Returns self (reloaded if items were removed) with warnings set.
+    # Captured before the call because removing items reloads the order, which
+    # would drop warnings already recorded upstream.
     def remove_out_of_stock_items!
+      existing_warnings = warnings
       result = Spree::Cart::RemoveOutOfStockItems.call(order: self)
       return self unless result.success?
 
-      order, _messages, warnings = result.value
-      order.warnings = warnings || []
+      order, _messages, new_warnings = result.value
+      order.warnings = existing_warnings | (new_warnings || [])
       order
     end
 
@@ -1081,8 +1084,17 @@ module Spree
 
         if line_items_without_shipping_rates.present?
           errors.add(:base, Spree.t(:products_cannot_be_shipped, product_names: line_items_without_shipping_rates.map(&:name).to_sentence))
+          self.warnings |= line_items_without_shipping_rates.map do |line_item|
+            {
+              code: 'delivery_unavailable',
+              message: Spree.t('cart_line_item.delivery_unavailable', li_name: line_item.name),
+              line_item_id: line_item.prefixed_id,
+              variant_id: line_item.variant&.prefixed_id
+            }
+          end
         else
           errors.add(:base, Spree.t(:items_cannot_be_shipped))
+          self.warnings |= [{ code: 'delivery_unavailable', message: Spree.t(:items_cannot_be_shipped) }]
         end
 
         false

data/app/models/spree/permission_sets/product_management.rb

@@ -21,6 +21,7 @@ module Spree
         can :manage, Spree::PriceList
         can :manage, Spree::PriceRule
         can :manage, Spree::Asset
+        can :manage, Spree::ProductPublication
       end
     end
   end

data/app/models/spree/price_rules/channel_rule.rb

@@ -0,0 +1,36 @@
+module Spree
+  module PriceRules
+    class ChannelRule < Spree::PriceRule
+      # Stored as raw IDs. Accepts prefixed IDs (`ch_…`) from API
+      # callers and decodes them on write so eligibility checks compare
+      # against raw `channel_id` rows directly. Scope confines the
+      # existence check to the price-list's store so cross-store channel
+      # IDs can't sneak in.
+      preference :channel_ids, :array, default: [],
+                 parse_on_set: normalize_id_preference(
+                   klass: Spree::Channel,
+                   scope: ->(rule) { rule.store.channels }
+                 )
+
+      def channels
+        return [] if preferred_channel_ids.blank?
+
+        store.channels.where(id: preferred_channel_ids)
+      end
+
+      def applicable?(context)
+        # An empty preference means the rule is unrestricted, so it applies
+        # regardless of (and even without) a channel in the context.
+        return true if preferred_channel_ids.empty?
+        return false unless context.channel
+
+        # Compare as strings to support both integer and UUID primary keys
+        preferred_channel_ids.map(&:to_s).include?(context.channel.id.to_s)
+      end
+
+      def self.description
+        Spree.t('price_rules.channel_rule.description')
+      end
+    end
+  end
+end

data/app/models/spree/product.rb

@@ -966,7 +966,6 @@ module Spree
     end
 
     def requires_price?
-      Spree::Deprecation.warn('Spree::Product#requires_price? is deprecated and will be removed in Spree 6.0.')
       Spree::Config[:require_master_price]
     end
 

data/app/models/spree/store.rb

@@ -186,8 +186,13 @@ module Spree
       Spree::Store.default&.supported_locales_list || []
     end
 
+    # Resolves the store's default channel via the +default+ boolean column
+    # so promoting another channel in the admin takes effect immediately.
+    # Falls back to the first active channel only for malformed data with no
+    # flagged default.
+    # @return [Spree::Channel, nil]
     def default_channel
-      channels.find_by(code: Spree::Channel::DEFAULT_CODE) || channels.active.first
+      channels.default.first || channels.active.first
     end
 
     # @deprecated Use Markets instead. Will be removed in Spree 5.5.

data/app/services/spree/carts/update.rb

@@ -144,11 +144,14 @@ module Spree
       rescue StandardError => e
         Rails.error.report(e, context: { order_id: cart.id, state: cart.state }, source: 'spree.checkout')
       ensure
+        # A halted transition records warnings on the cart, which reload would drop, so carry them across the reload.
+        warnings = cart.warnings
         begin
           cart.reload
         rescue StandardError # rubocop:disable Lint/SuppressedException
           # reload failure must not mask the original result
         end
+        cart.warnings |= warnings if warnings.present?
       end
     end
   end

data/app/services/spree/products/prepare_nested_attributes.rb

@@ -67,6 +67,8 @@ module Spree
           end
         end
 
+        params.delete(:legacy_product_publications_attributes) unless can?(:manage, Spree::ProductPublication)
+
         # ensure the product is owned by a store
         params[:store_id] = store.id if params[:store_id].blank? && product.store_id.blank?
 

data/config/locales/en.yml

@@ -866,6 +866,7 @@ en:
     cart: Cart
     cart_already_updated: The cart has already been updated.
     cart_line_item:
+      delivery_unavailable: "%{li_name} cannot be delivered to the selected address"
       discontinued: "%{li_name} was removed because it was discontinued"
       out_of_stock: "%{li_name} was removed because it was sold out"
     cart_page:
@@ -1840,6 +1841,8 @@ en:
         description: Apply pricing based on geographic zone
         name: Zone
     price_rules:
+      channel_rule:
+        description: Apply pricing based on the sales channel
       customer_group_rule:
         description: Apply pricing to specific customer groups
     price_sack: Price Sack

data/lib/spree/core/engine.rb

@@ -201,7 +201,8 @@ module Spree
           Spree::PriceRules::UserRule,
           Spree::PriceRules::CustomerGroupRule,
           Spree::PriceRules::VolumeRule,
-          Spree::PriceRules::MarketRule
+          Spree::PriceRules::MarketRule,
+          Spree::PriceRules::ChannelRule
         ]
 
         Rails.application.config.spree.promotions.actions = [

data/lib/spree/core/pricing/context.rb

@@ -1,7 +1,7 @@
 module Spree
   module Pricing
     class Context
-      attr_reader :variant, :currency, :store, :zone, :market, :user, :quantity, :date, :order
+      attr_reader :variant, :currency, :store, :zone, :market, :channel, :user, :quantity, :date, :order
 
       # Initializes the context
       # @param variant [Spree::Variant]
@@ -9,16 +9,18 @@ module Spree
       # @param store [Spree::Store]
       # @param zone [Spree::Zone]
       # @param market [Spree::Market]
+      # @param channel [Spree::Channel]
       # @param user [Spree::User]
       # @param quantity [Integer]
       # @param date [Time]
       # @param order [Spree::Order]
-      def initialize(variant: nil, currency:, store: nil, zone: nil, market: nil, user: nil, quantity: nil, date: nil, order: nil)
+      def initialize(variant: nil, currency:, store: nil, zone: nil, market: nil, channel: nil, user: nil, quantity: nil, date: nil, order: nil)
         @variant = variant
         @currency = currency
         @store = store || Spree::Current.store
         @zone = zone || Spree::Current.zone
         @market = market || Spree::Current.market
+        @channel = channel || Spree::Current.channel
         @user = user
         @quantity = quantity
         @date = date || Time.current
@@ -39,6 +41,7 @@ module Spree
           currency: order.currency,
           store: order.store,
           zone: order.tax_zone || Spree::Zone.default_tax,
+          channel: order.channel,
           user: order.user,
           quantity: quantity || order.line_items.find_by(variant: variant)&.quantity,
           order: order
@@ -56,6 +59,7 @@ module Spree
           store&.id,
           zone&.id,
           market&.id,
+          channel&.id,
           user&.id,
           quantity,
           date&.to_i

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.5.0'.freeze
+  VERSION = '5.5.1'.freeze
 
   def self.version
     VERSION

data/lib/spree/testing_support/common_rake.rb

@@ -163,7 +163,9 @@ task :parallel_setup, [:count] do |_t, args|
   require 'erb'
   require 'yaml'
 
-  db_config = YAML.safe_load(ERB.new(File.read(db_config_path)).result, permitted_classes: [Symbol])
+  # database.yml uses YAML anchors/aliases (&postgres / <<: *postgres); Psych 5.4
+  # disables alias parsing in safe_load by default, so enable it explicitly.
+  db_config = YAML.safe_load(ERB.new(File.read(db_config_path)).result, permitted_classes: [Symbol], aliases: true)
   adapter = db_config.dig('test', 'adapter')
 
   if adapter == 'sqlite3'
@@ -198,3 +200,75 @@ task :parallel_spec, [:count] do |_t, args|
   success = system("bundle exec parallel_rspec #{count_arg} spec")
   exit(success ? 0 : 1)
 end
+
+# Run one CI shard's slice of the suite, balanced by file size.
+#
+# The suite is split into TOTAL_GROUPS size-weighted groups (TOTAL_GROUPS =
+# number of CI runners for this project × processes per runner). Each runner
+# claims a contiguous block of group indices via SHARD/TOTAL_SHARDS and runs
+# them with parallel_rspec, so balancing happens once across both the
+# cross-runner and the in-runner split. Replaces the previous filename
+# round-robin, which left core ~1.9x imbalanced.
+#
+# Grouping is by file size, NOT recorded runtime: under cross-runner sharding,
+# --only-group only tiles the suite correctly if every runner computes the
+# identical global partition. File size is a deterministic, log-free weight
+# (same checkout ⇒ same files + sizes on every runner), so the partition is
+# byte-identical everywhere and no spec is skipped or double-run. Recorded
+# runtime cannot guarantee this: each shard only records the files it ran, so
+# the per-runner partial logs — and thus the partitions — would diverge.
+#
+# Env:
+#   SHARD           1-based index of this runner (default 1)
+#   TOTAL_SHARDS    number of runners for this project (default 1)
+#   PROCS           processes per runner (default: nproc)
+#   RSPEC_OPTS      extra options forwarded to rspec (formatters, junit output, …)
+desc 'Run a size-balanced shard of the suite in parallel (CI)'
+task :parallel_shard do
+  require 'etc'
+
+  shard        = Integer(ENV.fetch('SHARD', '1'))
+  total_shards = Integer(ENV.fetch('TOTAL_SHARDS', '1'))
+  procs        = Integer(ENV.fetch('PROCS', Etc.nprocessors.to_s))
+  rspec_opts   = ENV['RSPEC_OPTS']
+
+  # Guard against a misconfigured matrix silently running zero specs (a
+  # false-green shard) or producing an invalid --only-group.
+  raise "PROCS must be >= 1 (got #{procs})" if procs < 1
+  raise "TOTAL_SHARDS must be >= 1 (got #{total_shards})" if total_shards < 1
+  raise "SHARD must be between 1 and TOTAL_SHARDS (got #{shard} of #{total_shards})" unless (1..total_shards).cover?(shard)
+
+  total_groups = total_shards * procs
+
+  # Contiguous block of 1-based group indices owned by this runner.
+  first = ((shard - 1) * procs) + 1
+  groups = (first...(first + procs)).to_a.join(',')
+
+  # Output readability under parallelism:
+  #   --serialize-stdout      each process's output is buffered and reprinted
+  #                           contiguously instead of interleaving, so a failing
+  #                           process's summary + "Failures:" block isn't buried
+  #                           between other processes' "0 failures" lines.
+  #   --combine-stderr        fold stderr into that serialized stream.
+  #   --verbose-rerun-command print a final "Tests have failed…" footer naming
+  #                           the failed group + an exact rerun command (w/ seed).
+  # Build as an argv array and exec without a shell (system(*argv)), so values
+  # like RSPEC_OPTS can't be interpreted as shell metacharacters. parallel_tests
+  # still performs its own $TEST_ENV_NUMBER interpolation on the -o string.
+  cmd = [
+    'bundle', 'exec', 'parallel_rspec',
+    '-n', total_groups.to_s,
+    '--only-group', groups,
+    '--group-by', 'filesize',
+    '--highest-exit-status',
+    '--verbose-rerun-command'
+  ]
+  cmd += ['--serialize-stdout', '--combine-stderr'] if total_groups > 1
+  cmd += ['-o', rspec_opts] if rspec_opts && !rspec_opts.empty?
+  cmd << 'spec'
+
+  puts "Shard #{shard}/#{total_shards}: running groups #{groups} of #{total_groups} with #{procs} processes"
+  puts cmd.join(' ')
+  success = system(*cmd)
+  exit(success ? 0 : 1)
+end

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

@@ -55,5 +55,15 @@ FactoryBot.define do
         market_ids { [] }
       end
     end
+
+    factory :channel_price_rule, class: Spree::PriceRules::ChannelRule do
+      after(:build) do |rule, evaluator|
+        rule.preferred_channel_ids = evaluator.channel_ids if evaluator.respond_to?(:channel_ids)
+      end
+
+      transient do
+        channel_ids { [] }
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.5.0
+  version: 5.5.1
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-06-18 00:00:00.000000000 Z
+date: 2026-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -1097,6 +1097,7 @@ files:
 - app/models/spree/price_history.rb
 - app/models/spree/price_list.rb
 - app/models/spree/price_rule.rb
+- app/models/spree/price_rules/channel_rule.rb
 - app/models/spree/price_rules/customer_group_rule.rb
 - app/models/spree/price_rules/market_rule.rb
 - app/models/spree/price_rules/user_rule.rb
@@ -1816,9 +1817,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.5.0
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.5.1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.5.0
+  source_code_uri: https://github.com/spree/spree/tree/v5.5.1
 post_install_message:
 rdoc_options: []
 require_paths: