solidus_core 4.2.3 → 4.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c7938f34b4bcad40238d6e3b65de04d09adf33f858d356a4018e9786ca4ed6ab
-  data.tar.gz: 195dee172feed70780658e7bc036ee937968f49890d4d2ef7c0b0e8ad2444d8e
+  metadata.gz: 953ffc72143a1dfccbd673e6adb39714be3016827b927966f5aa009a99142a47
+  data.tar.gz: 88fe623e78c960b9d0ac9d21feab8d77b269f8dfeb4fe91ee3a8e9d54b219590
 SHA512:
-  metadata.gz: dac210f0e4f20d0d0d5ffb9b4544855ecb4577674283340a27c21943df9949d9a56bfeb514efa5ad70892ec3ecdc65d7134adb01b1861fd2567d9b289dd663b6
-  data.tar.gz: c7ee0dd8abcc63ac7efc17b6736da623e0ed9ff57c9954c3ef90666aea214d348dca3893b21b97aa883bfb8a493a7a6fca69b2e0507a9d3be2e7b60da855cbab
+  metadata.gz: 174ad9a0b3b673d3842e7c2204d41c9726f421cccb3aff38f50431f47658820d033573f940ffbb63baacfb02972af540f4722f82e79177c7f295864b4800e7d2
+  data.tar.gz: 5c676b1f2ff13fc1e274f8fe1b3855f2ee0bc95f694749011ccfbf21f1f09f010e53acf334bd045c3d11f9a9bb8e61fcf212623d8506106b0bdc12b330fcb38f

data/app/models/spree/order.rb

@@ -630,7 +630,7 @@ module Spree
       if can_complete? || complete?
         valid_store_credit_payments.to_a.sum(&:amount)
       else
-        [total, (user.try(:available_store_credit_total, currency: currency) || 0.0)].min
+        [total, user.try(:available_store_credit_total, currency: currency) || 0.0].min
       end
     end
 

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/promotion_handler/coupon.rb

@@ -73,7 +73,7 @@ module Spree
 
         unless promotion.eligible?(order, promotion_code: promotion_code)
           set_promotion_eligibility_error_code(promotion)
-          return (error || ineligible_for_this_order)
+          return error || ineligible_for_this_order
         end
 
         # If any of the actions for the promotion return `true`,

data/app/models/spree/stock/splitter/shipping_category.rb

@@ -24,7 +24,7 @@ module Spree
 
         def hash_to_packages(categories)
           packages = []
-          categories.each do |_id, contents|
+          categories.each_value do |contents|
             packages << build_package(contents)
           end
           packages

data/config/locales/en.yml

@@ -1540,6 +1540,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/dummy_generator.rb

@@ -44,6 +44,7 @@ module Spree
       opts[:skip_yarn] = true
       opts[:skip_bootsnap] = true
       opts[:skip_javascript] = true
+      opts[:skip_action_cable] = true
 
       puts "Generating dummy Rails application..."
       invoke Rails::Generators::AppGenerator,

data/lib/generators/spree/dummy/templates/rails/database.yml

@@ -3,7 +3,7 @@
           'mysql'
         when 'postgres', 'postgresql'
           'postgres'
-        when 'sqlite', '', nil
+        when /sqlite3?/, '', nil
           'sqlite'
         else
           raise "Invalid DB specified: #{ENV['DB']}"
@@ -19,7 +19,7 @@
 <% db_username = ENV['DB_USERNAME'] %>
 <% db_password = ENV['DB_PASSWORD'] %>
 
-<% case ENV['DB']
+<% case db
   when 'mysql' %>
 development:
   adapter: mysql2

data/lib/spree/app_configuration.rb

@@ -22,6 +22,8 @@ require "spree/core/search/variant"
 require 'spree/preferences/configuration'
 require 'spree/core/environment'
 
+require 'uri'
+
 module Spree
   class AppConfiguration < Preferences::Configuration
     # Preferences (alphabetized to more easily lookup particular preferences)

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

@@ -46,7 +46,11 @@ module Spree
 
               # Persist the state on the order
               after_transition do |order, transition|
-                order.state = order.state
+                # Hard to say if this is really necessary, it was introduced in this commit:
+                # https://github.com/mamhoff/solidus/commit/fa1d66c42e4c04ee7cd1c20d87e4cdb74a226d3d
+                # But it seems to be harmless, so we'll keep it for now.
+                order.state = order.state # rubocop:disable Lint/SelfAssignment
+
                 order.state_changes.create(
                   previous_state: transition.from,
                   next_state:     transition.to,

data/lib/spree/core/version.rb

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

data/lib/spree/core.rb

@@ -42,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/money.rb

@@ -35,7 +35,7 @@ module Spree
       if amount.is_a?(::Money)
         @money = amount
       else
-        currency = (options[:currency] || Spree::Config[:currency])
+        currency = options[:currency] || Spree::Config[:currency]
 
         @money = Monetize.from_string(amount, currency)
       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/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.2.3
+  version: 4.2.5
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-02 00:00:00.000000000 Z
+date: 2025-02-19 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
@@ -1048,7 +1062,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.4.17
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Essential models, mailers, and classes for the Solidus e-commerce project.