solidus_core 4.6.0 → 4.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f616e30c09a8f81468fd2f3d646b4ba5624ad26af29aae44985622adf3db57b8
-  data.tar.gz: 982dc95e2dc4518445e5dd6d133354cd283663028902c55ad4850af1e18ea4cd
+  metadata.gz: 54346c8f091dd2395832f0e0118d80c50e52f6fc7bda852c0147164061f28055
+  data.tar.gz: 445ada16ce8a53ae7f4904fdacae27215954de7f2f1387a39ae4f6b8c8ee73be
 SHA512:
-  metadata.gz: 9a4cd294113878e692b12af0214b7200522d4ce583a2d515e7d848c342fe787d64dd78c9b9a9b6de02fdf7b2c47a5bab7e3a5054cb0d76935851c7935d3b79d3
-  data.tar.gz: aa69ad3e6b7616a701675aca113da85e7b9472f6f95ffe2bc42ea1fa1115ceffdcb1c710482e8d4a509616d1a6c5c0036a157dd92405f6937eea261fbdc38c77
+  metadata.gz: 92d7572979dddd22c078e452a0ade011ac4f230876ea24cbb130917d7c088086d316685e2efe6618d73ed5317a24aa17aeb9376cb6d18c4a4704c56f0f3caf51
+  data.tar.gz: e815c14e8992cdb3549c44711338c43e24f8dfe2195b6f0540b9427f0f7043832d94e7f78c32028af579ea842a53a8edbb53714d5fa7ee97fda962e12b8b19c6

data/app/models/concerns/spree/state_change_tracking.rb

@@ -5,21 +5,25 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      after_update :enqueue_state_change_tracking, if: :saved_change_to_state?
+      after_update :enqueue_state_change_tracking, if: :track_state_change?
     end
 
     private
 
+    def track_state_change?
+      saved_change_to_state?
+    end
+
     # Enqueue background job to track state changes asynchronously
     def enqueue_state_change_tracking
       previous_state, current_state = saved_changes['state']
 
       # Enqueue the job to track this state change
-      StateChangeTrackingJob.perform_later(
-        self,
-        previous_state,
-        current_state,
-        Time.current
+      Spree::Config.state_change_tracking_class.call(
+        stateful: self,
+        previous_state:,
+        current_state:,
+        transition_timestamp: Time.current
       )
     end
   end

data/app/models/spree/payment.rb

@@ -83,7 +83,7 @@ module Spree
         when String
           separator = I18n.t('number.currency.format.separator')
           number    = amount.delete("^0-9-#{separator}\.").tr(separator, '.')
-          number.to_d if number.present?
+          number.presence&.to_d
         end || amount
     end
 

data/app/models/spree/shipment.rb

@@ -9,7 +9,7 @@ module Spree
     belongs_to :order, class_name: 'Spree::Order', touch: true, inverse_of: :shipments, optional: true
     belongs_to :stock_location, class_name: 'Spree::StockLocation', optional: true
 
-    has_many :adjustments, as: :adjustable, inverse_of: :adjustable, dependent: :delete_all
+    has_many :adjustments, as: :adjustable, inverse_of: :adjustable, dependent: :delete_all, autosave: true
     has_many :inventory_units, dependent: :destroy, inverse_of: :shipment
     has_many :shipping_rates, -> { order(:cost) }, dependent: :destroy, inverse_of: :shipment
     has_many :shipping_methods, through: :shipping_rates

data/app/models/spree/state_change_tracker.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Spree
+  # Configurable class to enqueue state change tracking jobs
+  # Configure your custom logic by setting Spree::Config.state_change_tracking_class
+  # @example Spree::Config.state_change_tracking_class = MyCustomTracker
+  class StateChangeTracker
+    # @param stateful [Object] The stateful object to track changes for
+    # @param previous_state [String] The previous state of the order
+    # @param current_state [String] The current state of the order
+    # @param transition_timestamp [Time] When the state transition occurred
+    # @param stateful_name [String] The element name of the state transition being
+    #   tracked. It defaults to the `stateful` model element name.
+    def self.call(
+      stateful:,
+      previous_state:,
+      current_state:,
+      transition_timestamp:,
+      stateful_name: stateful.class.model_name.element
+    )
+      # Enqueue a background job to track this state change
+      StateChangeTrackingJob.perform_later(
+        stateful,
+        previous_state,
+        current_state,
+        transition_timestamp,
+        stateful_name
+      )
+    end
+  end
+end

data/db/migrate/20250605105424_add_shipping_category_foreign_keys.rb

@@ -7,7 +7,7 @@ class AddShippingCategoryForeignKeys < ActiveRecord::Migration[7.0]
     # Uncomment the following code to remove orphaned records if the following code fails
     #
     # say_with_time "Removing orphaned products (no corresponding shipping category)" do
-    #   Spree::Product.left_joins(:shipping_category).where(spree_shipping_category: { id: nil }).delete_all
+    #   Spree::Product.left_joins(:shipping_category).where(spree_shipping_categories: { id: nil }).delete_all
     # end
     begin
       add_foreign_key :spree_products, :spree_shipping_categories, column: :shipping_category_id, null: false
@@ -27,7 +27,7 @@ class AddShippingCategoryForeignKeys < ActiveRecord::Migration[7.0]
     # Uncomment the following code to remove orphaned records if the following code fails
     #
     # say_with_time "Removing orphaned shipping method categories (no corresponding shipping category)" do
-    #   Spree::ShippingMethodCategory.left_joins(:shipping_category).where(spree_shipping_category: { id: nil }).delete_all
+    #   Spree::ShippingMethodCategory.left_joins(:shipping_category).where(spree_shipping_categories: { id: nil }).delete_all
     # end
     begin
       add_foreign_key :spree_shipping_method_categories, :spree_shipping_methods, column: :shipping_method_id, null: false
@@ -47,7 +47,7 @@ class AddShippingCategoryForeignKeys < ActiveRecord::Migration[7.0]
     # Uncomment the following code to remove orphaned records if the following code fails
     #
     # say_with_time "Removing orphaned shipping method categories (no corresponding shipping method)" do
-    #   Spree::ShippingMethodCategory.left_joins(:shipping_method).where(spree_shipping_method: { id: nil }).delete_all
+    #   Spree::ShippingMethodCategory.left_joins(:shipping_method).where(spree_shipping_methods: { id: nil }).delete_all
     # end
     begin
       add_foreign_key :spree_shipping_method_categories, :spree_shipping_categories, column: :shipping_category_id, null: false

data/lib/generators/solidus/install/app_templates/authentication/existing.rb

@@ -4,7 +4,9 @@ begin
   user_class.classify.constantize
 rescue NameError
   say_status :error, "Can't find an existing user class named #{user_class.classify}, plese set up one before using this authentication option.", :red
+  # rubocop:disable Rails/Exit
   abort
+  # rubocop:enable Rails/Exit
 end
 
 generate "spree:custom_user #{user_class.shellescape}"

data/lib/spree/app_configuration.rb

@@ -549,6 +549,13 @@ module Spree
                                                           product: '680x680>',
                                                           large: '1200x1200>' }
 
+    # Allows to provide your own class for tracking state changes of stateful models
+    #
+    # @!attribute [rw] state_change_tracking_class
+    # @return [Class] a class with the same public interfaces as
+    #   Spree::StateChangeTracker.
+    class_name_attribute :state_change_tracking_class, default: "Spree::StateChangeTracker"
+
     # Allows providing your own class for prioritizing store credit application
     # to an order.
     #

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "4.6.0"
+  VERSION = "4.6.2"
 
   def self.solidus_version = VERSION
 

data/lib/spree/testing_support/shared_examples/state_change_tracking.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples "tracking state changes" do
+  context "with track_state_change? true" do
+    before do
+      expect(stateful).to receive(:track_state_change?).and_return(true)
+    end
+
+    it "enqueues state change tracking job" do
+      expect { stateful.update!(state:) }
+        .to enqueue_job(Spree::StateChangeTrackingJob)
+    end
+  end
+
+  context "with track_state_change? false" do
+    before do
+      expect(stateful).to receive(:track_state_change?).and_return(false)
+    end
+
+    it "does not enqueue state change tracking job" do
+      expect { stateful.update!(state:) }
+        .not_to enqueue_job(Spree::StateChangeTrackingJob)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 4.6.0
+  version: 4.6.2
 platform: ruby
 authors:
 - Solidus Team
@@ -684,6 +684,7 @@ files:
 - app/models/spree/simple_order_contents.rb
 - app/models/spree/state.rb
 - app/models/spree/state_change.rb
+- app/models/spree/state_change_tracker.rb
 - app/models/spree/stock/allocator/base.rb
 - app/models/spree/stock/allocator/on_hand_first.rb
 - app/models/spree/stock/availability.rb
@@ -1056,6 +1057,7 @@ files:
 - lib/spree/testing_support/shared_examples/calculator.rb
 - lib/spree/testing_support/shared_examples/gallery.rb
 - lib/spree/testing_support/shared_examples/order_factory.rb
+- lib/spree/testing_support/shared_examples/state_change_tracking.rb
 - lib/spree/testing_support/shared_examples/working_factory.rb
 - lib/spree/testing_support/silence_deprecations.rb
 - lib/spree/testing_support/translations.rb
@@ -1112,7 +1114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 3.7.2
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.
 test_files: []