solidus_core 4.6.2 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54346c8f091dd2395832f0e0118d80c50e52f6fc7bda852c0147164061f28055
-  data.tar.gz: 445ada16ce8a53ae7f4904fdacae27215954de7f2f1387a39ae4f6b8c8ee73be
+  metadata.gz: 83a084afb161c2cb55167e455d6b84e305c50fe62403210a689e0aedd84e24dd
+  data.tar.gz: a19d4dc02d4f0aa3d55fe61dc04fe9676c95bc41c60080ba0976165aca6351c2
 SHA512:
-  metadata.gz: 92d7572979dddd22c078e452a0ade011ac4f230876ea24cbb130917d7c088086d316685e2efe6618d73ed5317a24aa17aeb9376cb6d18c4a4704c56f0f3caf51
-  data.tar.gz: e815c14e8992cdb3549c44711338c43e24f8dfe2195b6f0540b9427f0f7043832d94e7f78c32028af579ea842a53a8edbb53714d5fa7ee97fda962e12b8b19c6
+  metadata.gz: a46112878fad1da1501aa4f6a802cacf8b532df996057050c35749ba7cf9b299f80f0fc5094a5859c730602fbeddbeb98ec0463e6adcc3f1a0ed88272cde788d
+  data.tar.gz: 41f5daa52188b4c1bfcfa186bc6ebeb0ae55b05bbdb9d267b8cc09d4e5a741e62198879fd68000314a5054bf2fc4ed9105a0d515cf86260d0141d8c37a21aad6

data/Rakefile

@@ -1,34 +1,34 @@
 # frozen_string_literal: true
 
-require 'rubygems'
-require 'rake'
-require 'rake/testtask'
-require 'rspec/core/rake_task'
-require 'spree/testing_support/dummy_app/rake_tasks'
-require 'bundler/gem_tasks'
+require "rubygems"
+require "rake"
+require "rake/testtask"
+require "rspec/core/rake_task"
+require "spree/testing_support/dummy_app/rake_tasks"
+require "bundler/gem_tasks"
 
 RSpec::Core::RakeTask.new
 task default: :spec
 
 DummyApp::RakeTasks.new(
   gem_root: File.dirname(__FILE__),
-  lib_name: 'solidus_core'
+  lib_name: "solidus_core"
 )
 
-require 'yard/rake/yardoc_task'
+require "yard/rake/yardoc_task"
 YARD::Rake::YardocTask.new(:yard)
 # The following workaround can be removed
 # once https://github.com/lsegal/yard/pull/1457 is merged.
-task('yard:require') { require 'yard' }
-task yard: 'yard:require'
+task("yard:require") { require "yard" }
+task yard: "yard:require"
 
 namespace :spec do
   task :isolated do
-    spec_files = Dir['spec/**/*_spec.rb']
+    spec_files = Dir["spec/**/*_spec.rb"]
     failed_specs =
       spec_files.reject do |file|
         puts "rspec #{file}"
-        system('rspec', file)
+        system("rspec", file)
       end
 
     if !failed_specs.empty?
@@ -39,4 +39,4 @@ namespace :spec do
   end
 end
 
-task test_app: 'db:reset'
+task test_app: "db:reset"

data/app/controllers/spree/base_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'cancan'
-require_dependency 'spree/core/controller_helpers/strong_parameters'
+require "cancan"
+require_dependency "spree/core/controller_helpers/strong_parameters"
 
 class Spree::BaseController < ApplicationController
   include ActiveStorage::SetCurrent

data/app/helpers/spree/base_helper.rb

@@ -1,19 +1,19 @@
 # frozen_string_literal: true
 
-require 'carmen'
+require "carmen"
 
 module Spree
   module BaseHelper
     def link_to_cart(text = nil)
-      text = text ? h(text) : t('spree.cart')
+      text = text ? h(text) : t("spree.cart")
       css_class = nil
 
       if current_order.nil? || current_order.item_count.zero?
-        text = "#{text}: (#{t('spree.empty')})"
-        css_class = 'empty'
+        text = "#{text}: (#{t("spree.empty")})"
+        css_class = "empty"
       else
         text = "#{text}: (#{current_order.item_count})  <span class='amount'>#{current_order.display_total.to_html}</span>"
-        css_class = 'full'
+        css_class = "full"
       end
 
       link_to text.html_safe, spree.cart_path, class: "cart-info #{css_class}"
@@ -25,7 +25,7 @@ module Spree
     end
 
     def meta_data
-      object = instance_variable_get('@' + controller_name.singularize)
+      object = instance_variable_get("@" + controller_name.singularize)
       meta = {}
 
       if object.is_a? ActiveRecord::Base
@@ -34,7 +34,7 @@ module Spree
       end
 
       if meta[:description].blank? && object.is_a?(Spree::Product)
-        meta[:description] = truncate(strip_tags(object.description), length: 160, separator: ' ')
+        meta[:description] = truncate(strip_tags(object.description), length: 160, separator: " ")
       end
 
       if meta[:keywords].blank? || meta[:description].blank?
@@ -48,12 +48,12 @@ module Spree
 
     def meta_data_tags
       meta_data.map do |name, content|
-        tag('meta', name:, content:)
+        tag("meta", name:, content:)
       end.join("\n")
     end
 
     def body_class
-      @body_class ||= content_for?(:sidebar) ? 'two-col' : 'one-col'
+      @body_class ||= content_for?(:sidebar) ? "two-col" : "one-col"
       @body_class
     end
 
@@ -72,12 +72,12 @@ module Spree
       nil
     end
 
-    def taxon_breadcrumbs(taxon, separator = '&nbsp;&raquo;&nbsp;', breadcrumb_class = 'inline')
-      return '' if current_page?('/') || taxon.nil?
+    def taxon_breadcrumbs(taxon, separator = "&nbsp;&raquo;&nbsp;", breadcrumb_class = "inline")
+      return "" if current_page?("/") || taxon.nil?
 
-      crumbs = [[t('spree.home'), spree.root_path]]
+      crumbs = [[t("spree.home"), spree.root_path]]
 
-      crumbs << [t('spree.products'), products_path]
+      crumbs << [t("spree.products"), products_path]
       if taxon
         crumbs += taxon.ancestors.collect { |ancestor| [ancestor.name, spree.nested_taxons_path(ancestor.permalink)] } unless taxon.ancestors.empty?
         crumbs << [taxon.name, spree.nested_taxons_path(taxon.permalink)]
@@ -86,24 +86,24 @@ module Spree
       separator = raw(separator)
 
       items = crumbs.each_with_index.collect do |crumb, index|
-        content_tag(:li, itemprop: 'itemListElement', itemscope: '', itemtype: 'https://schema.org/ListItem') do
-          link_to(crumb.last, itemprop: 'item') do
-            content_tag(:span, crumb.first, itemprop: 'name') + tag('meta', { itemprop: 'position', content: (index + 1).to_s }, false, false)
-          end + (crumb == crumbs.last ? '' : separator)
+        content_tag(:li, itemprop: "itemListElement", itemscope: "", itemtype: "https://schema.org/ListItem") do
+          link_to(crumb.last, itemprop: "item") do
+            content_tag(:span, crumb.first, itemprop: "name") + tag("meta", {itemprop: "position", content: (index + 1).to_s}, false, false)
+          end + ((crumb == crumbs.last) ? "" : separator)
         end
       end
 
-      content_tag(:nav, content_tag(:ol, raw(items.map(&:mb_chars).join), class: breadcrumb_class, itemscope: '', itemtype: 'https://schema.org/BreadcrumbList'), id: 'breadcrumbs', class: 'sixteen columns')
+      content_tag(:nav, content_tag(:ol, raw(items.map(&:mb_chars).join), class: breadcrumb_class, itemscope: "", itemtype: "https://schema.org/BreadcrumbList"), id: "breadcrumbs", class: "sixteen columns")
     end
 
     def taxons_tree(root_taxon, current_taxon, max_level = 1)
-      return '' if max_level < 1 || root_taxon.children.empty?
-      content_tag :ul, class: 'taxons-list' do
+      return "" if max_level < 1 || root_taxon.children.empty?
+      content_tag :ul, class: "taxons-list" do
         taxons = root_taxon.children.map do |taxon|
-          css_class = (current_taxon && current_taxon.self_and_ancestors.include?(taxon)) ? 'current' : nil
+          css_class = current_taxon&.self_and_ancestors&.include?(taxon) ? "current" : nil
           content_tag :li, class: css_class do
-           link_to(taxon.name, seo_url(taxon)) +
-             taxons_tree(taxon, current_taxon, max_level - 1)
+            link_to(taxon.name, seo_url(taxon)) +
+              taxons_tree(taxon, current_taxon, max_level - 1)
           end
         end
         safe_join(taxons, "\n")
@@ -117,7 +117,7 @@ module Spree
         [country.code, country.name]
       end.to_h
 
-      country_names.update I18n.t('spree.country_names', default: {}).stringify_keys
+      country_names.update I18n.t("spree.country_names", default: {}).stringify_keys
 
       countries.collect do |country|
         country.name = country_names.fetch(country.iso, country.name)

data/app/helpers/spree/checkout_helper.rb

@@ -16,18 +16,18 @@ module Spree
         state_index = states.index(state)
 
         if state_index < current_index
-          css_classes << 'completed'
+          css_classes << "completed"
           text = link_to text, checkout_state_path(state)
         end
 
-        css_classes << 'next' if state_index == current_index + 1
-        css_classes << 'current' if state == @order.state
-        css_classes << 'first' if state_index == 0
-        css_classes << 'last' if state_index == states.length - 1
+        css_classes << "next" if state_index == current_index + 1
+        css_classes << "current" if state == @order.state
+        css_classes << "first" if state_index == 0
+        css_classes << "last" if state_index == states.length - 1
         # It'd be nice to have separate classes but combining them with a dash helps out for IE6 which only sees the last class
-        content_tag('li', content_tag('span', text), class: css_classes.join('-'))
+        content_tag("li", content_tag("span", text), class: css_classes.join("-"))
       end
-      content_tag('ol', raw(items.join("\n")), class: 'progress-steps', id: "checkout-step-#{@order.state}")
+      content_tag("ol", raw(items.join("\n")), class: "progress-steps", id: "checkout-step-#{@order.state}")
     end
   end
 end

data/app/helpers/spree/core/controller_helpers/auth.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'cancan'
+require "cancan"
 
 module Spree
   module Core

data/app/helpers/spree/core/controller_helpers/common.rb

@@ -1,12 +1,13 @@
 # frozen_string_literal: true
 
-require 'carmen'
+require "carmen"
 
 module Spree
   module Core
     module ControllerHelpers
       module Common
         extend ActiveSupport::Concern
+
         included do
           helper_method :title
           helper_method :title=
@@ -27,7 +28,7 @@ module Spree
           title_string = @title.presence || accurate_title
           if title_string.present?
             if Spree::Config[:always_put_site_name_in_title]
-              [title_string, default_title].join(' - ')
+              [title_string, default_title].join(" - ")
             else
               title_string
             end

data/app/helpers/spree/core/controller_helpers/order.rb

@@ -42,10 +42,8 @@ module Spree
         end
 
         def set_current_order
-          if spree_current_user && current_order
-            spree_current_user.orders.by_store(current_store).incomplete.where('id != ?', current_order.id).find_each do |order|
-              current_order.merge!(order, spree_current_user)
-            end
+          Spree::Config.mergeable_orders_finder_class.new(context: self).call.find_each do |order|
+            current_order.merge!(order, spree_current_user)
           end
         end
 
@@ -60,7 +58,7 @@ module Spree
         end
 
         def current_order_params
-          { currency: current_pricing_options.currency, guest_token: cookies.signed[:guest_token], store_id: current_store.id, user_id: spree_current_user.try(:id) }
+          {currency: current_pricing_options.currency, guest_token: cookies.signed[:guest_token], store_id: current_store.id, user_id: spree_current_user.try(:id)}
         end
 
         def new_order_params

data/app/helpers/spree/core/controller_helpers/payment_parameters.rb

@@ -46,8 +46,7 @@ module Spree
       return params if params[:payment_source].blank?
 
       payment_params = params[:order] &&
-                       params[:order][:payments_attributes] &&
-                       params[:order][:payments_attributes].first
+        params[:order][:payments_attributes]&.first
       return params if payment_params.blank?
 
       payment_method_id = payment_params[:payment_method_id]

data/app/helpers/spree/core/controller_helpers/strong_parameters.rb

@@ -9,24 +9,24 @@ module Spree
         end
 
         delegate(*Spree::PermittedAttributes::ATTRIBUTES,
-                 to: :permitted_attributes,
-                 prefix: :permitted)
+          to: :permitted_attributes,
+          prefix: :permitted)
 
         def permitted_credit_card_update_attributes
           permitted_attributes.credit_card_update_attributes + [
-            address_attributes: permitted_address_attributes
+            {address_attributes: permitted_address_attributes}
           ]
         end
 
         def permitted_payment_attributes
           permitted_attributes.payment_attributes + [
-            source_attributes: permitted_source_attributes
+            {source_attributes: permitted_source_attributes}
           ]
         end
 
         def permitted_source_attributes
           permitted_attributes.source_attributes + [
-            address_attributes: permitted_address_attributes
+            {address_attributes: permitted_address_attributes}
           ]
         end
 
@@ -52,20 +52,20 @@ module Spree
             permitted_checkout_payment_attributes +
             permitted_attributes.customer_metadata_attributes +
             permitted_checkout_confirm_attributes + [
-            line_items_attributes: permitted_line_item_attributes
-          ]
+              {line_items_attributes: permitted_line_item_attributes}
+            ]
         end
 
         def permitted_product_attributes
           permitted_attributes.product_attributes + [
-            product_properties_attributes: permitted_product_properties_attributes
+            {product_properties_attributes: permitted_product_properties_attributes}
           ]
         end
 
         def permitted_user_attributes
           permitted_attributes.user_attributes + [
-            bill_address_attributes: permitted_address_attributes,
-            ship_address_attributes: permitted_address_attributes
+            {bill_address_attributes: permitted_address_attributes,
+             ship_address_attributes: permitted_address_attributes}
           ]
         end
       end

data/app/helpers/spree/products_helper.rb

@@ -24,7 +24,7 @@ module Spree
       return if variant.price_same_as_master?(current_pricing_options)
       difference = variant.price_difference_from_master(current_pricing_options)
       absolute_amount = Spree::Money.new(difference.to_d.abs, currency: difference.currency.iso_code)
-      i18n_key = difference.to_d > 0 ? :price_diff_add_html : :price_diff_subtract_html
+      i18n_key = (difference.to_d > 0) ? :price_diff_add_html : :price_diff_subtract_html
       t(i18n_key, scope: [:spree, :helpers, :products], amount_html: absolute_amount.to_html)
     end
 
@@ -35,8 +35,8 @@ module Spree
     # @return [Spree::Money] the full price
     def variant_full_price(variant)
       return if variant.product.variants
-                  .with_prices(current_pricing_options)
-                  .all? { |variant_with_prices| variant_with_prices.price_same_as_master?(current_pricing_options) }
+        .with_prices(current_pricing_options)
+        .all? { |variant_with_prices| variant_with_prices.price_same_as_master?(current_pricing_options) }
 
       variant.price_for_options(current_pricing_options)&.money&.to_html
     end
@@ -59,9 +59,9 @@ module Spree
     # @return [String] the filtered text
     def line_item_description_text(description_text)
       if description_text.present?
-        truncate(strip_tags(description_text.gsub(' ', ' ')), length: 100)
+        truncate(strip_tags(description_text.gsub(" ", " ")), length: 100)
       else
-        t('spree.product_has_no_description')
+        t("spree.product_has_no_description")
       end
     end
 

data/app/helpers/spree/store_helper.rb

@@ -6,7 +6,7 @@ module Spree
   module StoreHelper
     # @return [Boolean] true when it is appropriate to show the store menu
     def store_menu?
-      %w{thank_you}.exclude? params[:action]
+      %w[thank_you].exclude? params[:action]
     end
   end
 end

data/app/mailers/spree/carton_mailer.rb

@@ -15,10 +15,10 @@ module Spree
       @order = options.fetch(:order)
       @carton = options.fetch(:carton)
       @manifest = @carton.manifest_for_order(@order)
-      options = { resend: false }.merge(options)
+      options = {resend: false}.merge(options)
       @store = @order.store
-      subject = (options[:resend] ? "[#{t('spree.resend').upcase}] " : '')
-      subject += "#{@store.name} #{t('spree.shipment_mailer.shipped_email.subject')} ##{@order.number}"
+      subject = (options[:resend] ? "[#{t("spree.resend").upcase}] " : "")
+      subject += "#{@store.name} #{t("spree.shipment_mailer.shipped_email.subject")} ##{@order.number}"
       mail(to: @order.email, from: from_address(@store), subject:)
     end
   end

data/app/mailers/spree/order_mailer.rb

@@ -5,7 +5,7 @@ module Spree
     def confirm_email(order, resend = false)
       @order = order
       @store = @order.store
-      subject = build_subject(t('.subject'), resend)
+      subject = build_subject(t(".subject"), resend)
 
       mail(to: @order.email, bcc: bcc_address(@store), from: from_address(@store), subject:)
     end
@@ -13,7 +13,7 @@ module Spree
     def cancel_email(order, resend = false)
       @order = order
       @store = @order.store
-      subject = build_subject(t('.subject'), resend)
+      subject = build_subject(t(".subject"), resend)
 
       mail(to: @order.email, from: from_address(@store), subject:)
     end
@@ -21,7 +21,7 @@ module Spree
     def inventory_cancellation_email(order, inventory_units, resend = false)
       @order, @inventory_units = order, inventory_units
       @store = @order.store
-      subject = build_subject(t('spree.order_mailer.inventory_cancellation.subject'), resend)
+      subject = build_subject(t("spree.order_mailer.inventory_cancellation.subject"), resend)
 
       mail(to: @order.email, from: from_address(@store), subject:)
     end
@@ -29,7 +29,7 @@ module Spree
     private
 
     def build_subject(subject_text, resend)
-      resend_text = (resend ? "[#{t('spree.resend').upcase}] " : '')
+      resend_text = (resend ? "[#{t("spree.resend").upcase}] " : "")
       "#{resend_text}#{@order.store.name} #{subject_text} ##{@order.number}"
     end
   end

data/app/mailers/spree/reimbursement_mailer.rb

@@ -5,8 +5,8 @@ module Spree
     def reimbursement_email(reimbursement, resend = false)
       @reimbursement = reimbursement.respond_to?(:id) ? reimbursement : Spree::Reimbursement.find(reimbursement)
       store = @reimbursement.order.store
-      subject = (resend ? "[#{t('spree.resend').upcase}] " : '')
-      subject += "#{store.name} #{t('.subject')} ##{@reimbursement.order.number}"
+      subject = (resend ? "[#{t("spree.resend").upcase}] " : "")
+      subject += "#{store.name} #{t(".subject")} ##{@reimbursement.order.number}"
       mail(to: @reimbursement.order.email, from: from_address(store), subject:)
     end
   end

data/app/models/concerns/spree/active_storage_adapter/attachment.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'mini_magick'
+require "mini_magick"
 
 module Spree
   module ActiveStorageAdapter
@@ -62,7 +62,7 @@ module Spree
       rescue ActiveStorage::FileNotFoundError => error
         logger.error("#{error} - Image id: #{attachment.record.id} is corrupted or cannot be found")
 
-        { identified: nil, width: nil, height: nil, analyzed: true }
+        {identified: nil, width: nil, height: nil, analyzed: true}
       end
 
       def styles_to_transformations(styles)
@@ -70,18 +70,18 @@ module Spree
       end
 
       def imagemagick_to_image_processing_definition(definition)
-        width_height = definition.split('x').map(&:to_i)
+        width_height = definition.split("x").map(&:to_i)
 
         case definition[-1].to_sym
         when :^
-          { resize_to_fill: width_height }
+          {resize_to_fill: width_height}
         else
           default_transformation(*width_height)
         end
       end
 
       def default_transformation(width, height)
-        { resize_to_limit: [width, height] }
+        {resize_to_limit: [width, height]}
       end
     end
   end

data/app/models/concerns/spree/active_storage_adapter/normalization.rb

@@ -26,13 +26,13 @@ module Spree
 
       def attachable_io(attachable)
         filename = if attachable.respond_to?(:to_path)
-                     attachable.to_path
-                   else
-                     SecureRandom.uuid
-                   end
+          attachable.to_path
+        else
+          SecureRandom.uuid
+        end
         attachable.rewind
 
-        { io: attachable, filename: }
+        {io: attachable, filename:}
       end
     end
   end

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

@@ -25,7 +25,7 @@ module Spree
       end
 
       def attachment_definitions
-        { attachment_name => attachment_definition }
+        {attachment_name => attachment_definition}
       end
 
       private
@@ -65,7 +65,7 @@ module Spree
           return unless attachment.attached?
           return if attachment.image?
 
-          errors.add(self.class.attachment_name, 'is not an image')
+          errors.add(self.class.attachment_name, "is not an image")
         end
       end
 

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

@@ -3,10 +3,10 @@
 module Spree
   module AdjustmentSource
     def remove_adjustments_from_incomplete_orders
-      adjustments.
-        joins(:order).
-        merge(Spree::Order.incomplete).
-        destroy_all
+      adjustments
+        .joins(:order)
+        .merge(Spree::Order.incomplete)
+        .destroy_all
     end
   end
 end

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

@@ -21,10 +21,10 @@ module Spree
     #     money_methods tax_amount: { currency: "CAD", no_cents: true }, :price
     def money_methods(*args)
       args.each do |money_method|
-        money_method = { money_method => {} } unless money_method.is_a? Hash
+        money_method = {money_method => {}} unless money_method.is_a? Hash
         money_method.each do |method_name, opts|
           define_method("display_#{method_name}") do
-            default_opts = respond_to?(:currency) ? { currency: } : {}
+            default_opts = respond_to?(:currency) ? {currency:} : {}
             Spree::Money.new(send(method_name), default_opts.merge(opts))
           end
         end

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

@@ -10,7 +10,7 @@ module Spree
       scope :active, -> { where(active: true) }
       default_scope -> { order(arel_table[:name].lower) }
 
-      validates :name, presence: true, uniqueness: { case_sensitive: false, allow_blank: true }
+      validates :name, presence: true, uniqueness: {case_sensitive: false, allow_blank: true}
     end
   end
 end

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

@@ -13,12 +13,12 @@ module Spree
 
     # virtual attributes for use with AJAX autocompletion
     def property_name
-      property.name if property
+      property&.name
     end
 
     def property_name=(name)
       unless name.blank?
-        unless property = Spree::Property.find_by(name:)
+        unless (property = Spree::Property.find_by(name:))
           property = Spree::Property.create(name:, presentation: name)
         end
         self.property = property

data/app/models/concerns/spree/preferences/persistable.rb

@@ -8,7 +8,7 @@ module Spree
       included do
         include Spree::Preferences::Preferable
 
-        if Rails.gem_version >= Gem::Version.new('7.1')
+        if Rails.gem_version >= Gem::Version.new("7.1")
           serialize :preferences, type: Hash, coder: YAML
         else
           serialize :preferences, Hash, coder: YAML

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

@@ -2,6 +2,7 @@
 
 module Spree::RansackableAttributes
   extend ActiveSupport::Concern
+
   included do
     class_attribute :allowed_ransackable_associations, default: []
     class_attribute :allowed_ransackable_attributes, default: []

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'discard'
+require "discard"
 
 module Spree
   module SoftDeletable
@@ -8,6 +8,7 @@ module Spree
 
     included do
       include Discard::Model
+
       self.discard_column = :deleted_at
 
       default_scope { kept }

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

@@ -16,7 +16,7 @@ module Spree
 
     # Enqueue background job to track state changes asynchronously
     def enqueue_state_change_tracking
-      previous_state, current_state = saved_changes['state']
+      previous_state, current_state = saved_changes["state"]
 
       # Enqueue the job to track this state change
       Spree::Config.state_change_tracking_class.call(