solidus_core 4.6.1 → 4.7.0

data/lib/spree/core/importer/product.rb

@@ -18,7 +18,7 @@ module Spree
           if product.save
             variants_attrs.each do |variant_attribute|
               # make sure the product is assigned before the options=
-              product.variants.create({ product: }.merge(variant_attribute))
+              product.variants.create({product:}.merge(variant_attribute))
             end
 
             set_up_options
@@ -31,11 +31,11 @@ module Spree
           if product.update(product_attrs)
             variants_attrs.each do |variant_attribute|
               # update the variant if the id is present in the payload
-              if variant_attribute['id'].present?
-                product.variants.find(variant_attribute['id'].to_i).update(variant_attribute)
+              if variant_attribute["id"].present?
+                product.variants.find(variant_attribute["id"].to_i).update(variant_attribute)
               else
                 # make sure the product is assigned before the options=
-                product.variants.create({ product: }.merge(variant_attribute))
+                product.variants.create({product:}.merge(variant_attribute))
               end
             end
 

data/lib/spree/core/importer.rb

@@ -7,5 +7,5 @@ module Spree
   end
 end
 
-require 'spree/core/importer/order'
-require 'spree/core/importer/product'
+require "spree/core/importer/order"
+require "spree/core/importer/product"

data/lib/spree/core/null_promotion_configuration.rb

@@ -6,7 +6,7 @@ module Spree
       include Spree::Core::EnvironmentExtension
 
       # order_adjuster_class allows extensions to provide their own Order Adjuster
-      class_name_attribute :order_adjuster_class, default: 'Spree::NullPromotionAdjuster'
+      class_name_attribute :order_adjuster_class, default: "Spree::NullPromotionAdjuster"
 
       # Allows providing a different coupon code handler.
       # @!attribute [rw] coupon_code_handler_class
@@ -14,7 +14,7 @@ module Spree
       # @return [Class] an object that conforms to the API of
       #   the standard coupon code handler class
       #   Spree::NullPromotionHandler.
-      class_name_attribute :coupon_code_handler_class, default: 'Spree::NullPromotionHandler'
+      class_name_attribute :coupon_code_handler_class, default: "Spree::NullPromotionHandler"
 
       # Allows providing a different promotion finder.
       # @!attribute [rw] promotion_finder_class
@@ -22,16 +22,16 @@ module Spree
       # @return [Class] an object that conforms to the API of
       #   the standard promotion finder class
       #   Spree::NullPromotionFinder.
-      class_name_attribute :promotion_finder_class, default: 'Spree::NullPromotionFinder'
+      class_name_attribute :promotion_finder_class, default: "Spree::NullPromotionFinder"
 
       # Allows getting and setting `Spree::Config.promotion_code_batch_mailer_class`.
       # Both will issue a deprecation warning.
-      class_name_attribute :promotion_code_batch_mailer_class, default: 'Spree::DeprecatedConfigurableClass'
+      class_name_attribute :promotion_code_batch_mailer_class, default: "Spree::DeprecatedConfigurableClass"
       deprecate :promotion_code_batch_mailer_class, :promotion_code_batch_mailer_class=, deprecator: Spree.deprecator
 
       # Allows getting and setting `Spree::Config.promotion_chooser_class`.
       # Both will issue a deprecation warning.
-      class_name_attribute :promotion_chooser_class, default: 'Spree::DeprecatedConfigurableClass'
+      class_name_attribute :promotion_chooser_class, default: "Spree::DeprecatedConfigurableClass"
       deprecate :promotion_chooser_class, :promotion_chooser_class=, deprecator: Spree.deprecator
 
       # Allows getting and setting rules. Deprecated.
@@ -64,7 +64,7 @@ module Spree
       # @return [Class] an object that conforms to the API of
       #   the standard promotion finder class
       #   Spree::NullPromotionHandler.
-      class_name_attribute :shipping_promotion_handler_class, default: 'Spree::NullPromotionHandler'
+      class_name_attribute :shipping_promotion_handler_class, default: "Spree::NullPromotionHandler"
       deprecate :shipping_promotion_handler_class, deprecator: Spree.deprecator
       deprecate :shipping_promotion_handler_class=, deprecator: Spree.deprecator
 
@@ -74,7 +74,7 @@ module Spree
       # @return [Class] an object that conforms to the API of
       #   the standard promotion advertiser class
       #   Spree::NullPromotionAdvertiser.
-      class_name_attribute :advertiser_class, default: 'Spree::NullPromotionAdvertiser'
+      class_name_attribute :advertiser_class, default: "Spree::NullPromotionAdvertiser"
 
       # !@attribute [rw] promotion_api_attributes
       #   @return [Array<Symbol>] Attributes to be returned by the API for a promotion

data/lib/spree/core/permalinks.rb

@@ -44,7 +44,7 @@ module Spree
       end
 
       def generate_permalink
-        "#{self.class.permalink_prefix}#{Array.new(self.class.permalink_length){ rand(9) }.join}"
+        "#{self.class.permalink_prefix}#{Array.new(self.class.permalink_length) { rand(9) }.join}"
       end
 
       def save_permalink(permalink_value = to_param)

data/lib/spree/core/product_filters.rb

@@ -2,64 +2,61 @@
 
 module Spree
   module Core
-    # THIS FILE SHOULD BE OVER-RIDDEN IN YOUR SITE EXTENSION!
-    #   the exact code probably won't be useful, though you're welcome to modify and reuse
-    #   the current contents are mainly for testing and documentation
-
-    # To override this file...
-    #   1) Make a copy of it in your sites local /lib/spree folder
-    #   2) Add it to the config load path, or require it in an initializer, e.g...
+    # THIS FILE SHOULD BE OVER-RIDDEN IN YOUR APP!
     #
-    #      # config/initializers/spree.rb
-    #      require 'spree/product_filters'
+    # Use this code as a reference or a starting point for your own product
+    # filters.
     #
+    # To override this file make a copy of it in lib/spree/core and modify it.
 
-    # set up some basic filters for use with products
+    # Each filter has two parts:
+    #
+    #   * a parametrized named scope which expects a list of labels
+    #   * an object which describes/defines the filter
     #
-    # Each filter has two parts
-    #  * a parametrized named scope which expects a list of labels
-    #  * an object which describes/defines the filter
+    # The filter description has the following components:
     #
-    # The filter description has three components
-    #  * a name, for displaying on pages
-    #  * a named scope which will 'execute' the filter
-    #  * a mapping of presentation labels to the relevant condition (in the context of the named scope)
-    #  * an optional list of labels and values (for use with object selection - see taxons examples below)
+    #   * a name for displaying on pages
+    #   * a named scope which filters the products
+    #   * a mapping of presentation labels to the relevant condition (in the
+    #     context of the named scope)
+    #   * an optional list of labels and values (for use with object selection -
+    #     see taxons examples below)
     #
-    # The named scopes here have a suffix '_any', following Ransack's convention for a
-    # scope which returns results which match any of the inputs. This is purely a convention,
-    # but might be a useful reminder.
+    # The named scopes here have a suffix '_any', following Ransack's convention
+    # for a scope which returns results which match any of the inputs. This is
+    # purely a convention, but might be a useful reminder.
     #
-    # When creating a form, the name of the checkbox group for a filter F should be
-    # the name of F's scope with [] appended, eg "price_range_any[]", and for
-    # each label you should have a checkbox with the label as its value. On submission,
-    # Rails will send the action a hash containing (among other things) an array named
+    # When creating a form, the name of the checkbox group for a filter F should
+    # be the name of F's scope with [] appended, e.g. "price_range_any[]", and
+    # for each label you should have a checkbox with the label as its value. On
+    # submission, Rails will send the action a hash containing an array named
     # after the scope whose values are the active labels.
     #
-    # Ransack will then convert this array to a call to the named scope with the array
-    # contents, and the named scope will build a query with the disjunction of the conditions
-    # relating to the labels, all relative to the scope's context.
+    # Ransack will then convert this array to a call to the named scope with the
+    # array contents, and the named scope will build a query with the
+    # disjunction of the conditions relating to the labels, all relative to the
+    # scope's context.
     #
-    # The details of how/when filters are used is a detail for specific models (eg products
-    # or taxons), eg see the taxon model/controller.
-
-    # See specific filters below for concrete examples.
+    # The details of how/when filters are used is a detail for specific models.
+    # For example, see the Taxon model/controller. See specific filters below
+    # for concrete examples.
     module ProductFilters
-      # Example: filtering by price
-      #   The named scope just maps incoming labels onto their conditions, and builds the conjunction
-      #   'price' is in the base scope's context (ie, "select foo from products where ...") so
-      #     we can access the field right away
-      #   The filter identifies which scope to use, then sets the conditions for each price range
+      # Example: Filtering by price
       #
-      # If user checks off three different price ranges then the argument passed to
-      # below scope would be something like ["$10 - $15", "$15 - $18", "$18 - $20"]
+      # The named scope just maps incoming labels onto their conditions, and
+      # builds the conjunction 'price' is in the base scope's context (e.g.
+      # "select foo from products where ...") so we can access the field right
+      # away. The filter identifies which scope to use, then sets the
+      # conditions for each price range.
       #
+      # If user checks off three different price ranges then the argument passed
+      # to below scope would be something like ["$10 - $15", "$15 - $18", "$18 -
+      # $20"].
       Spree::Product.add_search_scope :price_range_any do |*opts|
-        conds = opts.map { |element| Spree::Core::ProductFilters.price_filter[:conds][element] }.reject(&:nil?)
-        scope = conds.shift
-        conds.each do |new_scope|
-          scope = scope.or(new_scope)
-        end
+        scope = opts.filter_map { |element|
+          Spree::Core::ProductFilters.price_filter[:conds][element]
+        }.inject { |scope1, scope2| scope1.or(scope2) }
 
         Spree::Product.joins(master: :prices).where(scope)
       end
@@ -70,86 +67,90 @@ module Spree
 
       def self.price_filter
         value = Spree::Price.arel_table
-        conds = [[I18n.t('spree.under_price', price: format_price(10)), value[:amount].lteq(10)],
-                 ["#{format_price(10)} - #{format_price(15)}", value[:amount].between(10..15)],
-                 ["#{format_price(15)} - #{format_price(18)}", value[:amount].between(15..18)],
-                 ["#{format_price(18)} - #{format_price(20)}", value[:amount].between(18..20)],
-                 [I18n.t('spree.or_over_price', price: format_price(20)), value[:amount].gteq(20)]]
+        conds = [[I18n.t("spree.under_price", price: format_price(10)), value[:amount].lteq(10)],
+          ["#{format_price(10)} - #{format_price(15)}", value[:amount].between(10..15)],
+          ["#{format_price(15)} - #{format_price(18)}", value[:amount].between(15..18)],
+          ["#{format_price(18)} - #{format_price(20)}", value[:amount].between(18..20)],
+          [I18n.t("spree.or_over_price", price: format_price(20)), value[:amount].gteq(20)]]
         {
-          name:   I18n.t('spree.price_range'),
-          scope:  :price_range_any,
-          conds:  Hash[*conds.flatten],
+          name: I18n.t("spree.price_range"),
+          scope: :price_range_any,
+          conds: Hash[*conds.flatten],
           labels: conds.map { |key, _value| [key, key] }
         }
       end
 
-      # Example: filtering by possible brands
+      # Example: Filtering by possible brands
       #
-      # First, we define the scope. Two interesting points here: (a) we run our conditions
-      #   in the scope where the info for the 'brand' property has been loaded; and (b)
-      #   because we may want to filter by other properties too, we give this part of the
-      #   query a unique name (which must be used in the associated conditions too).
+      # First, we define the scope. Two interesting points here:
       #
-      # Secondly, the filter. Instead of a static list of values, we pull out all existing
-      #   brands from the db, and then build conditions which test for string equality on
-      #   the (uniquely named) field "p_brand.value". There's also a test for brand info
-      #   being blank: note that this relies on with_property doing a left outer join
-      #   rather than an inner join.
+      #   * we run our conditions in the scope where the info for the 'brand'
+      #     property has been loaded; and
+      #   * because we may want to filter by other properties too, we give this
+      #     part of the query a unique name (which must be used in the
+      #     associated conditions too).
+      #
+      # Second, instead of a static list of values, we pull out all existing
+      # brands from the database. Then we build conditions which test for string
+      # equality on the (uniquely named) field "p_brand.value". There's also a
+      # test for brand info being blank. Note that this relies on
+      # `with_property` doing a left outer join rather than an inner join.
       Spree::Product.add_search_scope :brand_any do |*opts|
-        conds = opts.map { |value| ProductFilters.brand_filter[:conds][value] }.reject(&:nil?)
-        scope = conds.shift
-        conds.each do |new_scope|
-          scope = scope.or(new_scope)
-        end
-        Spree::Product.with_property('brand').where(scope)
+        scope = opts.filter_map { |value|
+          Spree::Core::ProductFilters.brand_filter[:conds][value]
+        }.inject { |scope1, scope2| scope1.or(scope2) }
+
+        Spree::Product.with_property("brand").where(scope)
       end
 
       def self.brand_filter
-        brand_property = Spree::Property.find_by(name: 'brand')
+        brand_property = Spree::Property.find_by(name: "brand")
         brands = brand_property ? Spree::ProductProperty.where(property_id: brand_property.id).pluck(:value).uniq.map(&:to_s) : []
         pp = Spree::ProductProperty.arel_table
         conds = Hash[*brands.flat_map { |brand| [brand, pp[:value].eq(brand)] }]
         {
-          name:   'Brands',
-          scope:  :brand_any,
+          name: "Brands",
+          scope: :brand_any,
           conds:,
           labels: brands.sort.map { |key| [key, key] }
         }
       end
 
-      # Example: a parameterized filter
-      #   The filter above may show brands which aren't applicable to the current taxon,
-      #   so this one only shows the brands that are relevant to a particular taxon and
-      #   its descendants.
+      # Example: A parameterized filter
+      #
+      # The filter above may show brands which aren't applicable to the current
+      # taxon, so this one only shows the brands that are relevant to a
+      # particular taxon and its descendants.
       #
-      #   We don't have to give a new scope since the conditions here are a subset of the
-      #   more general filter, so decoding will still work - as long as the filters on a
-      #   page all have unique names (ie, you can't use the two brand filters together
-      #   if they use the same scope). To be safe, the code uses a copy of the scope.
+      # We don't need to give a new scope since the conditions here are a subset
+      # of the more general filter, so decoding will still work as long as the
+      # filters on a page all have unique names (i.e. you can't use the two
+      # brand filters together if they use the same scope). To be safe, the code
+      # uses a copy of the scope.
       #
-      #   HOWEVER: what happens if we want a more precise scope?  we can't pass
-      #   parametrized scope names to Ransack, only atomic names, so couldn't ask
-      #   for taxon T's customized filter to be used. BUT: we can arrange for the form
-      #   to pass back a hash instead of an array, where the key acts as the (taxon)
-      #   parameter and value is its label array, and then get a modified named scope
-      #   to get its conditions from a particular filter.
+      # However, if we want a more precise scope, we can't pass parametrized
+      # scope names to Ransack, only atomic names. We can't ask for taxon T's
+      # customized filter to be used, but we can arrange for the form to pass
+      # back a hash instead of an array where the key acts as the taxon
+      # parameter and value is its label array, and then get a modified named
+      # scope to get its conditions from a particular filter.
       #
-      #   The brand-finding code can be simplified if a few more named scopes were added to
-      #   the product properties model.
+      # The brand-finding code could be simplified if a few more named scopes
+      # were added to the product properties model.
       Spree::Product.add_search_scope :selective_brand_any do |*opts|
         Spree::Product.brand_any(*opts)
       end
 
       def self.selective_brand_filter(taxon = nil)
         taxon ||= Spree::Taxonomy.first.root
-        brand_property = Spree::Property.find_by(name: 'brand')
-        scope = Spree::ProductProperty.where(property: brand_property).
-          joins(product: :taxons).
-          where("#{Spree::Taxon.table_name}.id" => [taxon] + taxon.descendants)
+        brand_property = Spree::Property.find_by(name: "brand")
+        scope = Spree::ProductProperty.where(property: brand_property)
+          .joins(product: :taxons)
+          .where("#{Spree::Taxon.table_name}.id" => [taxon] + taxon.descendants)
         brands = scope.pluck(:value).uniq
         {
-          name:   'Applicable Brands',
-          scope:  :selective_brand_any,
+          name: "Applicable Brands",
+          scope: :selective_brand_any,
           labels: brands.sort.map { |key| [key, key] }
         }
       end

data/lib/spree/core/role_configuration.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'singleton'
-require 'spree/core/class_constantizer'
+require "singleton"
+require "spree/core/class_constantizer"
 
 module Spree
   # A class responsible for associating {Spree::Role} with a list of permission sets.
@@ -40,7 +40,7 @@ module Spree
     # @param ability [CanCan::Ability] the ability to invoke declarations on
     # @param user [#spree_roles] the user that holds the spree_roles association.
     def activate_permissions!(ability, user)
-      spree_roles = ['default'] | user.spree_roles.map(&:name)
+      spree_roles = ["default"] | user.spree_roles.map(&:name)
       applicable_permissions = Set.new
 
       spree_roles.each do |role_name|

data/lib/spree/core/search/base.rb

@@ -37,8 +37,7 @@ module Spree
           base_scope = base_scope.in_taxon(@properties[:taxon]) unless @properties[:taxon].blank?
           base_scope = get_products_conditions_for(base_scope, @properties[:keywords])
           base_scope = add_search_scopes(base_scope)
-          base_scope = add_eagerload_scopes(base_scope)
-          base_scope
+          add_eagerload_scopes(base_scope)
         end
 
         def add_eagerload_scopes(scope)
@@ -69,10 +68,10 @@ module Spree
           @properties[:search].each_pair do |name, scope_attribute|
             scope_name = name.to_sym
 
-            if base_scope.respond_to?(:search_scopes) && base_scope.search_scopes.include?(scope_name.to_sym)
-              base_scope = base_scope.send(scope_name, *scope_attribute)
+            base_scope = if base_scope.respond_to?(:search_scopes) && base_scope.search_scopes.include?(scope_name.to_sym)
+              base_scope.send(scope_name, *scope_attribute)
             else
-              base_scope = base_scope.merge(Spree::Product.ransack({ scope_name => scope_attribute }).result)
+              base_scope.merge(Spree::Product.ransack({scope_name => scope_attribute}).result)
             end
           end
 
@@ -94,7 +93,7 @@ module Spree
           @properties[:include_images] = params[:include_images]
 
           per_page = params[:per_page].to_i
-          @properties[:per_page] = per_page > 0 ? per_page : Spree::Config[:products_per_page]
+          @properties[:per_page] = (per_page > 0) ? per_page : Spree::Config[:products_per_page]
           @properties[:page] = (params[:page].to_i <= 0) ? 1 : params[:page].to_i
         end
       end

data/lib/spree/core/search/variant.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/core_ext/class/attribute'
+require "active_support/core_ext/class/attribute"
 
 module Spree
   module Core
@@ -57,8 +57,8 @@ module Spree
         end
 
         def search_term_params(word)
-          terms = Hash[search_terms(word).map { |term| [term, word] }]
-          terms.merge(m: 'or')
+          terms = search_terms(word).map { |term| [term, word] }.to_h
+          terms.merge(m: "or")
         end
       end
     end

data/lib/spree/core/stock_configuration.rb

@@ -2,55 +2,16 @@
 
 module Spree
   module Core
-    class StockConfiguration
-      attr_writer :coordinator_class
-      attr_writer :estimator_class
-      attr_writer :location_filter_class
-      attr_writer :location_sorter_class
-      attr_writer :allocator_class
-      attr_writer :inventory_unit_builder_class
-      attr_writer :availability_validator_class
-      attr_writer :inventory_validator_class
-
-      def coordinator_class
-        @coordinator_class ||= '::Spree::Stock::SimpleCoordinator'
-        @coordinator_class.constantize
-      end
-
-      def estimator_class
-        @estimator_class ||= '::Spree::Stock::Estimator'
-        @estimator_class.constantize
-      end
-
-      def location_filter_class
-        @location_filter_class ||= '::Spree::Stock::LocationFilter::Active'
-        @location_filter_class.constantize
-      end
-
-      def location_sorter_class
-        @location_sorter_class ||= '::Spree::Stock::LocationSorter::Unsorted'
-        @location_sorter_class.constantize
-      end
-
-      def allocator_class
-        @allocator_class ||= '::Spree::Stock::Allocator::OnHandFirst'
-        @allocator_class.constantize
-      end
-
-      def inventory_unit_builder_class
-        @inventory_unit_builder_class ||= '::Spree::Stock::InventoryUnitBuilder'
-        @inventory_unit_builder_class.constantize
-      end
-
-      def availability_validator_class
-        @availability_validator_class ||= '::Spree::Stock::AvailabilityValidator'
-        @availability_validator_class.constantize
-      end
- 
-      def inventory_validator_class
-        @inventory_validator_class ||= '::Spree::Stock::InventoryValidator'
-        @inventory_validator_class.constantize
-      end
+    class StockConfiguration < Spree::Preferences::Configuration
+      class_name_attribute :coordinator_class, default: "::Spree::Stock::SimpleCoordinator"
+      class_name_attribute :estimator_class, default: "::Spree::Stock::Estimator"
+      class_name_attribute :location_filter_class, default: "::Spree::Stock::LocationFilter::Active"
+      class_name_attribute :location_sorter_class, default: "::Spree::Stock::LocationSorter::Unsorted"
+      class_name_attribute :allocator_class, default: "::Spree::Stock::Allocator::OnHandFirst"
+      class_name_attribute :inventory_unit_builder_class, default: "::Spree::Stock::InventoryUnitBuilder"
+      class_name_attribute :availability_validator_class, default: "::Spree::Stock::AvailabilityValidator"
+      class_name_attribute :inventory_validator_class, default: "::Spree::Stock::InventoryValidator"
+      class_name_attribute :quantifier_class, default: "::Spree::Stock::Quantifier"
     end
   end
 end

data/lib/spree/core/validators/email.rb

@@ -14,7 +14,7 @@ module Spree
   class EmailValidator < ActiveModel::EachValidator
     def validate_each(record, attribute, value)
       unless Spree::Config.default_email_regexp.match? value
-        record.errors.add(attribute, :invalid, **{ value: }.merge!(options))
+        record.errors.add(attribute, :invalid, value:, **options)
       end
     end
   end

data/lib/spree/core/version.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "4.6.1"
+  VERSION = "4.7.0"
 
   def self.solidus_version = VERSION
 
-  def self.minimum_required_rails_version = "7.0"
+  def self.minimum_required_rails_version = "7.2"
 
-  def self.previous_solidus_minor_version = "4.5"
+  def self.previous_solidus_minor_version = "4.6"
 
   def self.solidus_gem_version = Gem::Version.new(solidus_version)
 end

data/lib/spree/core/versioned_value.rb

@@ -41,12 +41,10 @@ module Spree
       # @param initial_value [Any]
       # @param boundary [Hash<String, Any>] Map from version number to new value
       def initialize(initial_value, boundaries = {})
-        @boundaries = Hash[
-                        { '0' => initial_value }
-                        .merge(boundaries)
-                        .transform_keys { |version| to_gem_version(version) }
-                        .sort
-                      ]
+        @boundaries = {"0" => initial_value}
+          .merge(boundaries)
+          .transform_keys { |version| to_gem_version(version) }
+          .sort.to_h
       end
 
       # @param solidus_version [String]