solidus_core 4.3.4 → 4.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea120769fbc14df12db50f04ac8d60a7c6bc3de7980da4311b3a67e2483a5033
-  data.tar.gz: 2f5e3466c7e09fde1e015400c044e785bb9dd177a6a2b69fd67ae0d32cd561a4
+  metadata.gz: fbd743356e0483d0b439d874e48723fc20fe319baffb72a69d5f06816a74ca03
+  data.tar.gz: 59d06725f086c991e9c34e74deded36d8425834c806a0451add16bf06e6919bd
 SHA512:
-  metadata.gz: 304df05695271fc1d8011e563688fb1078f9dc5e81f136576f84c1fbd2291f7514cfbff613df8d45520ed24a9ee82283635d2dd13c2cfb68adee3caa4367e817
-  data.tar.gz: 2a9a5f58a7de0bbac0d4ecc2691898ad0a826137d7d25396479cec9880b449afa822509d79146bc88f4dc9e901d762e2d195e53e8b65c9e8c9f1f1945d1771a2
+  metadata.gz: f6d99fc15a2d2e7c281d782f731b420430a9dd35cc64f8a633a5a42950fba3da5c6c65aef23ea7dbf7f19975e2f56f04132916ca1c2641a36c5f5ed7e6141fdc
+  data.tar.gz: d8ba8324284f8285433d583e8db4b470c5f8b1c5579157b932fb6862efe1133092d5dda3d188923020b279ca01921c3172853b7e3971a78567fe7695d619f3a4

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/store_credit.rb

@@ -40,6 +40,8 @@ class Spree::StoreCredit < Spree::PaymentSource
   extend Spree::DisplayMoney
   money_methods :amount, :amount_used, :amount_authorized
 
+  alias_method :display_number, :category_name
+
   # Sets this store credit's amount to a new value,
   # parsing it as a localized number if the new value is a string.
   #

data/config/locales/en.yml

@@ -1549,6 +1549,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/spree/core/version.rb

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

data/lib/spree/core.rb

@@ -44,6 +44,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/testing_support/dummy_app.rb

@@ -34,8 +34,11 @@ end
 module DummyApp
   def self.setup(gem_root:, lib_name:, auto_migrate: true)
     ENV["LIB_NAME"] = lib_name
-    DummyApp::Application.config.root = File.join(gem_root, 'spec', 'dummy')
+    root = Pathname(gem_root).join('spec/dummy')
+    root.join("app/assets/config").mkpath
+    root.join("app/assets/config/manifest.js").write("// Intentionally empty\n")
 
+    DummyApp::Application.config.root = root
     DummyApp::Application.initialize! unless DummyApp::Application.initialized?
 
     if auto_migrate

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/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

@@ -42,8 +42,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'mini_magick', '~> 4.10'
   s.add_dependency 'monetize', '~> 1.8'
   s.add_dependency 'kt-paperclip', ['>= 6.3', '< 8']
-  s.add_dependency 'psych', ['>= 4.0.1', '< 5.0']
-  s.add_dependency 'ransack', '~> 4.0'
+  s.add_dependency 'psych', ['>= 4.0.1', '< 6.0']
+  # @note ransack 4.2 contains a bug which has not yet been addressed.
+  # @see https://github.com/activerecord-hackery/ransack/pull/1468
+  s.add_dependency 'ransack', ['~> 4.0', '< 4.2']
   s.add_dependency 'sprockets-rails'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
   s.add_dependency 'omnes', '~> 0.2.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 4.3.4
+  version: 4.3.6
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-05 00:00:00.000000000 Z
+date: 2025-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -379,7 +379,7 @@ dependencies:
         version: 4.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -389,7 +389,7 @@ dependencies:
         version: 4.0.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -397,6 +397,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -404,6 +407,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: sprockets-rails
   requirement: !ruby/object:Gem::Requirement