solidus_core 4.1.5 → 4.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8422983aea32a3cdf481647862a2ada3210d21c38936c0d0af370772bc04b4d
-  data.tar.gz: 6fb241fe0339fce0747a496366f449f69671d90c0a69cd9483ccd1b0229ce7c0
+  metadata.gz: 38811ef28b9faebde7b3e42b07d31d5565b80d06835baf1ac58bb0ae97414af9
+  data.tar.gz: 2d6068d00488c061d340b7d3fd64f1e1ee1400b8d74dcb2e7488651b44738fd8
 SHA512:
-  metadata.gz: 5ca4af53faa281166a5a0f345d60a628e96dadbfce58a30d4948a63a21dc7386009d4b2a7c88521dc9979a61d8ac1adc4741e70168cc689e70b7b6f0deeb5368
-  data.tar.gz: 59ea38f49224546adf4bafc2720e6bd583b8823f3e4582c250c3fa949cc1a153479f2d969694f65a0b2e1d224e3c60595cfd0140e69c0e929db7d50a039b679d
+  metadata.gz: e6e9c756ed977b4f49af8d1289917227aab0d7014f48c57c7292cfbe7777ac73663e302845c7d2934c2103d8d67da7af622dbaac06e2c6e5ff20ee7e3d0fa313
+  data.tar.gz: afd76f1f8e11e2c2c0f18fecb226a197b3c7a7ae70d22449bb3866c48f5e8d3dea0bb2b23113a0324dedb1439820bec6a87f2a4b5c5ad7f743b140e418d722f7

data/app/models/spree/order.rb

@@ -264,7 +264,7 @@ module Spree
       @recalculator ||= Spree::Config.order_recalculator_class.new(self)
     end
     alias_method :updater, :recalculator
-    deprecate updater: :recalculator, deprecator: Spree::Deprecation
+    deprecate updater: :recalculator, deprecator: Spree.deprecator
 
     def assign_billing_to_shipping_address
       self.ship_address = bill_address if bill_address
@@ -513,7 +513,7 @@ module Spree
     end
 
     alias_method :ensure_updated_shipments, :check_shipments_and_restart_checkout
-    deprecate ensure_updated_shipments: :check_shipments_and_restart_checkout, deprecator: Spree::Deprecation
+    deprecate ensure_updated_shipments: :check_shipments_and_restart_checkout, deprecator: Spree.deprecator
 
     def restart_checkout_flow
       return if state == 'cart'

data/app/models/spree/order_shipping.rb

@@ -44,7 +44,6 @@ class Spree::OrderShipping
   # @return The carton created.
   def ship(inventory_units:, stock_location:, address:, shipping_method:,
            shipped_at: Time.current, external_number: nil, tracking_number: nil, suppress_mailer: false)
-
     carton = nil
 
     Spree::InventoryUnit.transaction do

data/app/models/spree/order_updater.rb

@@ -31,7 +31,7 @@ module Spree
       end
     end
     alias_method :update, :recalculate
-    deprecate update: :recalculate, deprecator: Spree::Deprecation
+    deprecate update: :recalculate, deprecator: Spree.deprecator
 
     # Updates the +shipment_state+ attribute according to the following logic:
     #

data/config/locales/en.yml

@@ -1539,6 +1539,7 @@ en:
     end: End
     ending_in: Ending in
     error: error
+    error_user_destroy_with_orders: Cannot delete a user with orders
     errors:
       messages:
         cannot_delete_finalized_stock_location: Stock Location cannot be destroyed if you have open stock transfers.

data/lib/generators/spree/dummy/templates/rails/test.rb

@@ -33,6 +33,6 @@ Dummy::Application.configure do
 
   # Raise on deprecation warnings
   if ENV['SOLIDUS_RAISE_DEPRECATIONS'].present?
-    Spree::Deprecation.behavior = :raise
+    Spree.deprecator.behavior = :raise
   end
 end

data/lib/spree/core/engine.rb

@@ -75,6 +75,12 @@ module Spree
         ActionMailer::Base.preview_path = app.config.action_mailer.preview_path
       end
 
+      initializer "spree.deprecator" do |app|
+        if app.respond_to?(:deprecators)
+          app.deprecators[:spree] = Spree.deprecator
+        end
+      end
+
       config.after_initialize do
         Spree::Config.check_load_defaults_called('Spree::Config')
         Spree::Config.static_model_preferences.validate!

data/lib/spree/core/version.rb

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

data/lib/spree/core.rb

@@ -9,6 +9,8 @@ require "active_record/railtie"
 require "active_storage/engine"
 require "sprockets/railtie"
 
+require 'active_support/deprecation'
+require 'spree/deprecated_instance_variable_proxy'
 require 'acts_as_list'
 require 'awesome_nested_set'
 require 'cancan'
@@ -19,13 +21,17 @@ require 'paperclip'
 require 'ransack'
 require 'state_machines-activerecord'
 
-require 'spree/deprecation'
-
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.
 StateMachines::Machine.ignore_method_conflicts = true
 
 module Spree
+  def self.deprecator
+    @deprecator ||= ActiveSupport::Deprecation.new('5.0', 'Solidus')
+  end
+
+  autoload :Deprecation, 'spree/deprecation'
+
   mattr_accessor :user_class, default: 'Spree::LegacyUser'
 
   def self.user_class
@@ -36,6 +42,10 @@ module Spree
     end
   end
 
+  def self.user_class_name
+    @@user_class
+  end
+
   # Load the same version defaults for all available Solidus components
   #
   # @see Spree::Preferences::Configuration#load_defaults

data/lib/spree/deprecated_instance_variable_proxy.rb

@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+require 'active_support/deprecation'
+
+module Spree
+  # This DeprecatedInstanceVariableProxy transforms instance variable to
+  # deprecated instance variable.
+  #
+  # It differs from ActiveSupport::DeprecatedInstanceVariableProxy since
+  # it allows to define a custom message.
+  #
+  #   class Example
+  #     def initialize(deprecator)
+  #       @request = Spree::DeprecatedInstanceVariableProxy.new(self, :request, :@request, deprecator, "Please, do not use this thing.")
+  #       @_request = :a_request
+  #     end
+  #
+  #     def request
+  #       @_request
+  #     end
+  #
+  #     def old_request
+  #       @request
+  #     end
+  #   end
+  #
+  # When someone execute any method on @request variable this will trigger
+  # +warn+ method on +deprecator_instance+ and will fetch <tt>@_request</tt>
+  # variable via +request+ method and execute the same method on non-proxy
+  # instance variable.
+  #
+  # Default deprecator is <tt>Spree.deprecator</tt>.
+  class DeprecatedInstanceVariableProxy < ActiveSupport::Deprecation::DeprecationProxy
+    def initialize(instance, method_or_var, var = "@#{method}", deprecator = Spree.deprecator, message = nil)
+      @instance = instance
+      @method_or_var = method_or_var
+      @var = var
+      @deprecator = deprecator
+      @message = message
+    end
+
+    private
+
+    def target
+      return @instance.instance_variable_get(@method_or_var) if @instance.instance_variable_defined?(@method_or_var)
+
+      @instance.__send__(@method_or_var)
+    end
+
+    def warn(callstack, called, args)
+      message = @message || "#{@var} is deprecated! Call #{@method_or_var}.#{called} instead of #{@var}.#{called}."
+      message = [message, "Args: #{args.inspect}"].join(" ") unless args.empty?
+
+      @deprecator.warn(message, callstack)
+    end
+  end
+end

data/lib/spree/deprecation.rb

@@ -1,57 +1,9 @@
 # frozen_string_literal: true
 
-require 'active_support/deprecation'
+require 'spree/core'
 
 module Spree
-  Deprecation = ActiveSupport::Deprecation.new('5.0', 'Solidus')
+  Deprecation = Spree.deprecator
 
-  # This DeprecatedInstanceVariableProxy transforms instance variable to
-  # deprecated instance variable.
-  #
-  # It differs from ActiveSupport::DeprecatedInstanceVariableProxy since
-  # it allows to define a custom message.
-  #
-  #   class Example
-  #     def initialize(deprecator)
-  #       @request = Spree::DeprecatedInstanceVariableProxy.new(self, :request, :@request, deprecator, "Please, do not use this thing.")
-  #       @_request = :a_request
-  #     end
-  #
-  #     def request
-  #       @_request
-  #     end
-  #
-  #     def old_request
-  #       @request
-  #     end
-  #   end
-  #
-  # When someone execute any method on @request variable this will trigger
-  # +warn+ method on +deprecator_instance+ and will fetch <tt>@_request</tt>
-  # variable via +request+ method and execute the same method on non-proxy
-  # instance variable.
-  #
-  # Default deprecator is <tt>Spree::Deprecation</tt>.
-  class DeprecatedInstanceVariableProxy < ActiveSupport::Deprecation::DeprecationProxy
-    def initialize(instance, method, var = "@#{method}", deprecator = Spree::Deprecation, message = nil)
-      @instance = instance
-      @method = method
-      @var = var
-      @deprecator = deprecator
-      @message = message
-    end
-
-    private
-
-    def target
-      @instance.__send__(@method)
-    end
-
-    def warn(callstack, called, args)
-      message = @message || "#{@var} is deprecated! Call #{@method}.#{called} instead of #{@var}.#{called}."
-      message = [message, "Args: #{args.inspect}"].join(" ")
-
-      @deprecator.warn(message, callstack)
-    end
-  end
+  Spree.deprecator.warn "Spree::Deprecation is deprecated. Please use Spree.deprecator instead.", caller(2)
 end

data/lib/spree/preferences/configuration.rb

@@ -59,7 +59,7 @@ module Spree::Preferences
       return if load_defaults_called || !Spree::Core.has_install_generator_been_run?
 
       target_name = instance_constant_name || "#{self.class.name}.new"
-      Spree::Deprecation.warn <<~MSG
+      Spree.deprecator.warn <<~MSG
         It's recommended that you explicitly load the default configuration for
         your current Solidus version. You can do it by adding the following call
         to your Solidus initializer within the #{target_name} block:

data/lib/spree/preferences/preferable_class_methods.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/deprecation'
 require 'spree/encryptor'
 
 module Spree::Preferences

data/lib/spree/testing_support/dummy_app.rb

@@ -142,5 +142,5 @@ end
 
 # Raise on deprecation warnings
 if ENV['SOLIDUS_RAISE_DEPRECATIONS'].present?
-  Spree::Deprecation.behavior = :raise
+  Spree.deprecator.behavior = :raise
 end

data/lib/spree/testing_support/extension_rake.rb

@@ -4,8 +4,8 @@ require 'spree/testing_support/common_rake'
 
 desc "Generates a dummy app for testing an extension"
 namespace :extension do
-  task :test_app, [:user_class] do |_t, _args|
+  task :test_app, [:user_class] do |_t, args|
     Spree::DummyGeneratorHelper.inject_extension_requirements = true
-    Rake::Task['common:test_app'].invoke
+    Rake::Task['common:test_app'].invoke(args[:user_class])
   end
 end

data/lib/spree/testing_support/factory_bot.rb

@@ -30,7 +30,7 @@ module Spree
           MSG
         end
       end
-      deprecate :check_version, deprecator: Spree::Deprecation
+      deprecate :check_version, deprecator: Spree.deprecator
 
       def self.add_definitions!
         ::FactoryBot.definition_file_paths.unshift(*definition_file_paths).uniq!

data/lib/spree/testing_support/silence_deprecations.rb

@@ -2,7 +2,7 @@
 
 RSpec.configure do |config|
   config.around(:each, silence_deprecations: true) do |example|
-    Spree::Deprecation.silence do
+    Spree.deprecator.silence do
       example.run
     end
   end

data/lib/spree/user_class_handle.rb

@@ -21,8 +21,8 @@ module Spree
     # @return [String] the name of the user class as a string.
     # @raise [RuntimeError] if Spree.user_class is nil
     def to_s
-      fail "'Spree.user_class' has not been set yet." unless Spree.user_class
-      "::#{Spree.user_class}"
+      fail "'Spree.user_class' has not been set yet." unless Spree.user_class_name
+      "::#{Spree.user_class_name}"
     end
   end
 end

data/solidus_core.gemspec

@@ -35,6 +35,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'awesome_nested_set', '~> 3.3'
   s.add_dependency 'cancancan', ['>= 2.2', '< 4.0']
   s.add_dependency 'carmen', '~> 1.1.0'
+  # Adding a constraint here to make sure Rails 7.0 does not crash on startup
+  # https://github.com/rails/rails/pull/54264
+  s.add_dependency 'concurrent-ruby', '< 1.3.5'
   s.add_dependency 'discard', '~> 1.0'
   s.add_dependency 'friendly_id', '~> 5.0'
   s.add_dependency 'image_processing', '~> 1.10'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 4.1.6
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2025-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -266,6 +266,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: discard
   requirement: !ruby/object:Gem::Requirement
@@ -866,6 +880,7 @@ files:
 - lib/spree/core/validators/email.rb
 - lib/spree/core/version.rb
 - lib/spree/core/versioned_value.rb
+- lib/spree/deprecated_instance_variable_proxy.rb
 - lib/spree/deprecation.rb
 - lib/spree/encryptor.rb
 - lib/spree/i18n.rb
@@ -1047,7 +1062,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.5.3
 signing_key:
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.