solidus_core 4.2.2 → 4.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 60bc6136c2e7e1fd1be7907da852474c4f3205c7e0f999d6ec4a072bec969add
-  data.tar.gz: 79304471bb793a689ba46407ed43dc5f510cc652a71e38bc1a763b552c56d9ec
+  metadata.gz: 0eb60fcde264131cbc3b6bdfcdced0854de8aa26dca53f8b68faeeebb9206391
+  data.tar.gz: 498d88f29ce16037d2acfadaccc9ae4416323cb60856bcc054236b068ba323e4
 SHA512:
-  metadata.gz: 965858227459fec4e4ff4472c539732607ab4e7dfbc192d478e6c928d0574ac0693c547dc08f90ee72189c87541bc01ec6b06dcc2fb63cff4cf617602073b974
-  data.tar.gz: b9c13fe8be48599e2614f06d0d08e1b1ca914876dd45cb43488a23932d60f9c61852a5173ab4657f63ee898d5ead1e8c293b4518092ae9079ba435eb8a78f938
+  metadata.gz: 69fb3f9bff92c01cb7794aa6d4814cd70015b8c815890bb96bca93cbfd145efd8600478db7c33d0db6dec415b121503393965f7c54e4d8e94ea913ad3ae84c28
+  data.tar.gz: bb83b03b5eaf069d76aeaacf1affa007c1a8e7cd135b08f9dcf77dac506a20e3476307878223bc9401be18d380880a49e3344bcb47754646dfca15226369b826

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/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/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.2"
+  VERSION = "4.2.4"
 
   def self.solidus_version
     VERSION

data/lib/spree/core.rb

@@ -6,6 +6,7 @@ require "action_view/railtie"
 require "active_job/railtie"
 require "active_model/railtie"
 require "active_record/railtie"
+require "active_storage/engine"
 require "sprockets/railtie"
 
 require 'active_support/deprecation'

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/solidus_core.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   %w[
     actionmailer actionpack actionview activejob activemodel activerecord
-    activesupport railties
+    activestorage activesupport railties
   ].each do |rails_dep|
     s.add_dependency rails_dep, ['>= 7.0', '< 7.1']
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_core
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 4.2.4
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-01 00:00:00.000000000 Z
+date: 2024-04-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -130,6 +130,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: activestorage
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -1028,7 +1048,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.