spree_core 4.6.3 → 4.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfc76e7ab1af8b397215184841f2d4303ee2407111799e9c5c5b042fac17898b
-  data.tar.gz: b1da196aebc88f74e6c17dea7e4df41fc56c68797e8691dfa8ab2a968fd5143b
+  metadata.gz: b694ef25dfdd98db89c6c36a42cc50de19b6dab09cc827c5273e57dc066f38d6
+  data.tar.gz: '09ecb007e8e2181ace749a1b6776c8fe62eafdb07f321238d5fd69670f209206'
 SHA512:
-  metadata.gz: 70240708a3c284ea4c4ef0894be9f3ec90b3665882e6d492c1d682373250c3e186bb0b32c81bfde362cdfe75e146afb27bfbd49d1b6722c28037e9e5507dc31a
-  data.tar.gz: a612ea4fce2402684bdda0d6da721406b63161659f41827e8e9e05d42b1f899ac248d4b5e12ee5bbf8ca204a17c13c310787677cc7d0c41e87acd225d83e5ac6
+  metadata.gz: 3620378de0b17967f36b2d0a4c72e302aa25dae3f700aaf09e2d9b9cec73bf4b924a81a273beb9da245571c1c48128e5ad53c26539a7f8de04b0c38cdbb31d20
+  data.tar.gz: f902de746ff1dfbeef5f778f6cc204db4c47477fd76c8a0eeea60874fa45a188be8cf33ca1462240f636f57394cf790f71ce6dbdd2ac48bf756aa4e3379b059f

data/app/finders/spree/countries/find.rb

@@ -8,7 +8,7 @@ module Spree
       end
 
       def call
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           Spree::Countries::Find.new.call is deprecated and will be removed in Spree 5.0.
           Please use Spree::Countries::Find.new.execute instead
         DEPRECATION

data/app/finders/spree/products/find.rb

@@ -5,7 +5,7 @@ module Spree
         @scope = scope
 
         if current_currency.present?
-          ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+          Spree::Deprecation.warn(<<-DEPRECATION, caller)
             `current_currency` param is deprecated and will be removed in Spree 5.
             Please pass `:currency` in `params` hash instead.
           DEPRECATION

data/app/finders/spree/taxons/find.rb

@@ -65,15 +65,9 @@ module Spree
       def by_parent_permalink(taxons)
         return taxons unless parent_permalink?
 
-        if Rails::VERSION::STRING >= '6.1'
-          taxons.joins(:parent).
-            join_translation_table(Taxon, 'parents_spree_taxons').
-            where(["#{Taxon.translation_table_alias}.permalink = ?", parent_permalink])
-        else
-          taxons.joins("INNER JOIN #{Spree::Taxon.table_name} AS parent_taxon ON parent_taxon.id = #{Spree::Taxon.table_name}.parent_id").
-            join_translation_table(Taxon, 'parent_taxon').
-            where(["#{Taxon.translation_table_alias}.permalink = ?", parent_permalink])
-        end
+        taxons.joins(:parent).
+          join_translation_table(Taxon, 'parents_spree_taxons').
+          where(["#{Taxon.translation_table_alias}.permalink = ?", parent_permalink])
       end
 
       def by_taxonomy(taxons)

data/app/helpers/spree/base_helper.rb

@@ -55,7 +55,7 @@ module Spree
     end
 
     def logo(image_path = nil, options = {})
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `BaseHelper#logo` is deprecated and will be removed in Spree 5.0.
         Please use `FrontendHelper#logo` instead
       DEPRECATION
@@ -174,10 +174,6 @@ module Spree
       Spree::Core::Engine.frontend_available?
     end
 
-    def rails_5?
-      Rails::VERSION::STRING < '6.0'
-    end
-
     def spree_storefront_resource_url(resource, options = {})
       if defined?(locale_param) && locale_param.present?
         options.merge!(locale: locale_param)

data/app/helpers/spree/products_helper.rb

@@ -53,7 +53,7 @@ module Spree
     end
 
     def cache_key_for_products(products = @products, additional_cache_key = nil)
-      max_updated_at = (products.except(:group, :order).maximum(:updated_at) || Date.today).to_s(:number)
+      max_updated_at = (products.except(:group, :order).maximum(:updated_at) || Date.today).to_formatted_s(:number)
       products_cache_keys = "spree/products/#{products.map(&:id).join('-')}-#{params[:page]}-#{params[:sort_by]}-#{max_updated_at}-#{@taxon&.id}"
       (common_product_cache_keys + [products_cache_keys] + [additional_cache_key]).compact.join('/')
     end
@@ -76,7 +76,7 @@ module Spree
 
     # will return a human readable string
     def available_status(product)
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `Spree::ProductsHelper#available_status` method from spree/core is deprecated and will be removed.
         Please use `Spree::Admin::ProductsHelper#available_status` from spree_backend instead.
       DEPRECATION
@@ -140,7 +140,7 @@ module Spree
     end
 
     def related_products
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         ProductsHelper#related_products is deprecated and will be removed in Spree 5.0.
         Please use ProductsHelper#relations from now on.
       DEPRECATION

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

@@ -5,8 +5,13 @@ module Spree
     included do
       attribute :public_metadata, default: {}
       attribute :private_metadata, default: {}
-      serialize :public_metadata, HashSerializer
-      serialize :private_metadata, HashSerializer
+      if Rails::VERSION::STRING >= '7.1.0'
+        serialize :public_metadata, coder: HashSerializer
+        serialize :private_metadata, coder: HashSerializer
+      else
+        serialize :public_metadata, HashSerializer
+        serialize :private_metadata, HashSerializer
+      end
     end
 
     # https://nandovieira.com/using-postgresql-and-jsonb-with-ruby-on-rails

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

@@ -14,19 +14,19 @@ module Spree
       end
 
       def self.admin
-        ActiveSupport::Deprecation.warn('`User#admin` is deprecated and will be removed in Spree 5. Please use `User#spree_admin`')
+        Spree::Deprecation.warn('`User#admin` is deprecated and will be removed in Spree 5. Please use `User#spree_admin`')
 
         spree_admin
       end
 
       def self.admin_created?
-        ActiveSupport::Deprecation.warn('`User#admin_created?` is deprecated and will be removed in Spree 5. Please use `User#spree_admin_created?`')
+        Spree::Deprecation.warn('`User#admin_created?` is deprecated and will be removed in Spree 5. Please use `User#spree_admin_created?`')
 
         spree_admin_created?
       end
 
       def admin?
-        ActiveSupport::Deprecation.warn('`User#admin?` is deprecated and will be removed in Spree 5. Please use `User#spree_admin?`')
+        Spree::Deprecation.warn('`User#admin?` is deprecated and will be removed in Spree 5. Please use `User#spree_admin?`')
 
         spree_admin?
       end

data/app/models/spree/address.rb

@@ -10,7 +10,9 @@ module Spree
       include Spree::Security::Addresses
     end
 
-    if Rails::VERSION::STRING >= '6.1'
+    if Rails::VERSION::STRING >= '7.1.0'
+      serialize :preferences, type: Hash, coder: YAML, default: {}
+    else
       serialize :preferences, Hash, default: {}
     end
 
@@ -67,7 +69,7 @@ module Spree
     self.whitelisted_ransackable_associations = %w[country state user]
 
     def self.build_default
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `Address#build_default` is deprecated and will be removed in Spree 5.0.
         Please use standard rails `Address.new(country: current_store.default_country)`
       DEPRECATION
@@ -75,7 +77,7 @@ module Spree
     end
 
     def self.default(user = nil, kind = 'bill')
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `Address#default` is deprecated and will be removed in Spree 5.0.
       DEPRECATION
       if user && user_address = user.public_send(:"#{kind}_address")

data/app/models/spree/base.rb

@@ -1,6 +1,10 @@
 class Spree::Base < ApplicationRecord
   include Spree::Preferences::Preferable
-  serialize :preferences, Hash
+  if Rails::VERSION::STRING >= '7.1.0'
+    serialize :preferences, type: Hash, coder: YAML
+  else
+    serialize :preferences, Hash
+  end
 
   include Spree::RansackableAttributes
   include Spree::TranslatableResourceScopes

data/app/models/spree/cms/sections/image_gallery.rb

@@ -3,11 +3,7 @@ module Spree::Cms::Sections
     after_initialize :default_values
     validate :reset_multiple_link_attributes
 
-    LINKED_RESOURCE_TYPE = if Rails::VERSION::STRING < '6.0'
-                             ['Spree::Taxon'].freeze
-                           else
-                             ['Spree::Taxon', 'Spree::Product'].freeze
-                           end
+    LINKED_RESOURCE_TYPE = ['Spree::Taxon', 'Spree::Product'].freeze
 
     LAYOUT_OPTIONS = ['Default', 'Reversed'].freeze
     LABEL_OPTIONS = ['Show', 'Hide'].freeze
@@ -71,8 +67,6 @@ module Spree::Cms::Sections
     private
 
     def reset_multiple_link_attributes
-      return if Rails::VERSION::STRING < '6.0'
-
       if link_type_one_changed?
         return if link_type_one_was.nil?
 

data/app/models/spree/cms/sections/side_by_side_images.rb

@@ -3,11 +3,7 @@ module Spree::Cms::Sections
     after_initialize :default_values
     validate :reset_multiple_link_attributes
 
-    LINKED_RESOURCE_TYPE = if Rails::VERSION::STRING < '6.0'
-                             ['Spree::Taxon'].freeze
-                           else
-                             ['Spree::Taxon', 'Spree::Product'].freeze
-                           end
+    LINKED_RESOURCE_TYPE = ['Spree::Taxon', 'Spree::Product'].freeze
 
     store :content, accessors: [:link_type_one, :link_one, :title_one, :subtitle_one,
                                 :link_type_two, :link_two, :title_two, :subtitle_two], coder: JSON
@@ -49,8 +45,6 @@ module Spree::Cms::Sections
     private
 
     def reset_multiple_link_attributes
-      return if Rails::VERSION::STRING < '6.0'
-
       if link_type_one_changed?
         return if link_type_one_was.nil?
 

data/app/models/spree/country.rb

@@ -19,7 +19,7 @@ module Spree
     validates :name, :iso_name, :iso, :iso3, presence: true, uniqueness: { case_sensitive: false, scope: spree_base_uniqueness_scope }
 
     def self.default(store = nil)
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `Country#default` is deprecated and will be removed in Spree 5.0.
         Please use `current_store.default_country` instead
       DEPRECATION
@@ -49,7 +49,7 @@ module Spree
     private
 
     def ensure_not_default
-      ActiveSupport::Deprecation.warn('Country#ensure_not_default is deprecated and will be removed in Spree v5')
+      Spree::Deprecation.warn('Country#ensure_not_default is deprecated and will be removed in Spree v5')
 
       if id.eql?(Spree::Config[:default_country_id])
         errors.add(:base, Spree.t(:default_country_cannot_be_deleted))

data/app/models/spree/digital_link.rb

@@ -1,6 +1,10 @@
 module Spree
   class DigitalLink < Spree::Base
-    has_secure_token
+    if Rails::VERSION::STRING >= '7.1.0'
+      has_secure_token on: :save
+    else
+      has_secure_token
+    end
 
     if defined?(Spree::Webhooks)
       include Spree::Webhooks::HasWebhooks

data/app/models/spree/order.rb

@@ -415,7 +415,7 @@ module Spree
 
     def available_payment_methods(store = nil)
       if store.present?
-        ActiveSupport::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')
+        Spree::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')
       end
 
       @available_payment_methods ||= collect_payment_methods(store)
@@ -449,7 +449,7 @@ module Spree
     end
 
     def empty!
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `Order#empty!` is deprecated and will be removed in Spree 5.0.
         Please use `Spree::Cart::Empty.call(order: order)` instead.
       DEPRECATION
@@ -647,7 +647,7 @@ module Spree
     end
 
     def validate_payments_attributes(attributes)
-      ActiveSupport::Deprecation.warn('`Order#validate_payments_attributes` is deprecated and will be removed in Spree 5')
+      Spree::Deprecation.warn('`Order#validate_payments_attributes` is deprecated and will be removed in Spree 5')
 
       # Ensure the payment methods specified are allowed for this user
       payment_method_ids = available_payment_methods.map(&:id).map(&:to_s)
@@ -745,7 +745,7 @@ module Spree
 
     def collect_payment_methods(store = nil)
       if store.present?
-        ActiveSupport::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')
+        Spree::Deprecation.warn('The `store` parameter is deprecated and will be removed in Spree 5. Order is already associated with Store')
       end
       store ||= self.store
 

data/app/models/spree/payment.rb

@@ -222,18 +222,10 @@ module Spree
 
     def validate_source
       if source && !source.valid?
-        if Rails::VERSION::STRING >= '6.1'
-          source.errors.map { |error| { field: error.attribute, message: error&.message } }.each do |err|
-            next if err[:field].blank? || err[:message].blank?
-
-            add_source_error(err[:field], err[:message])
-          end
-        else
-          source.errors.messages.each do |field, error|
-            next if field.blank? || error.empty?
-
-            add_source_error(field, error.first)
-          end
+        source.errors.map { |error| { field: error.attribute, message: error&.message } }.each do |err|
+          next if err[:field].blank? || err[:message].blank?
+
+          add_source_error(err[:field], err[:message])
         end
       end
       !errors.present?

data/app/models/spree/preference.rb

@@ -1,5 +1,9 @@
 class Spree::Preference < Spree::Base
-  serialize :value
+  if Rails::VERSION::STRING >= '7.1.0'
+    serialize :value, coder: YAML
+  else
+    serialize :value
+  end
 
   validates :key, presence: true,
                   uniqueness: { case_sensitive: false, allow_blank: true, scope: spree_base_uniqueness_scope }

data/app/models/spree/product.rb

@@ -507,18 +507,10 @@ module Spree
       # We call master.default_price here to ensure price is initialized.
       # Required to avoid Variant#check_price validation failing on create.
       unless master.default_price && master.valid?
-        if Rails::VERSION::STRING >= '6.1'
-          master.errors.map { |error| { field: error.attribute, message: error&.message } }.each do |err|
-            next if err[:field].blank? || err[:message].blank?
+        master.errors.map { |error| { field: error.attribute, message: error&.message } }.each do |err|
+          next if err[:field].blank? || err[:message].blank?
 
-            errors.add(err[:field], err[:message])
-          end
-        else
-          master.errors.messages.each do |field, error|
-            next if field.blank? || error.empty?
-
-            errors.add(field, error.first)
-          end
+          errors.add(err[:field], err[:message])
         end
       end
     end

data/app/models/spree/product_property.rb

@@ -33,7 +33,7 @@ module Spree
     delegate :name, :presentation, to: :property, prefix: true, allow_nil: true
 
     def property_name=(name)
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `ProductProperty#property_name=` is deprecated and will be removed in Spree 5.0.
       DEPRECATION
       if name.present?

data/app/models/spree/return_item.rb

@@ -62,7 +62,11 @@ module Spree
     scope :exchange_required, -> { eager_load(:exchange_inventory_units).where(spree_inventory_units: { original_return_item_id: nil }).distinct }
     scope :resellable, -> { where resellable: true }
 
-    serialize :acceptance_status_errors
+    if Rails::VERSION::STRING >= '7.1.0'
+      serialize :acceptance_status_errors, coder: YAML
+    else
+      serialize :acceptance_status_errors
+    end
 
     delegate :eligible_for_return?, :requires_manual_intervention?, to: :validator
     delegate :variant, to: :inventory_unit

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

@@ -15,7 +15,7 @@ module Spree
         private
 
         def reduce(package)
-          contents = split_package_contents_over_threshold(package).sort { |x, y| y.weight <=> x.weight }
+          contents = split_package_contents_over_threshold(package).sort_by(&:weight).reverse
           # Treat current package as one of the generated packages for convenience and add the heaviest item
           # This also prevents an additional package if no fit is possible
           package.contents.clear

data/app/models/spree/store.rb

@@ -112,7 +112,7 @@ module Spree
     alias_attribute :contact_email, :customer_support_email
 
     def self.current(url = nil)
-      ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+      Spree::Deprecation.warn(<<-DEPRECATION, caller)
         `Spree::Store.current` is deprecated and will be removed in Spree 5.0
         Please use `Spree::Stores::FindCurrent.new(url: "https://example.com").execute` instead
       DEPRECATION
@@ -194,7 +194,7 @@ module Spree
     end
 
     def checkout_zone_or_default
-      ActiveSupport::Deprecation.warn('Store#checkout_zone_or_default is deprecated and will be removed in Spree 5')
+      Spree::Deprecation.warn('Store#checkout_zone_or_default is deprecated and will be removed in Spree 5')
 
       @checkout_zone_or_default ||= checkout_zone || Spree::Zone.default_checkout_zone
     end

data/app/models/spree/wishlist.rb

@@ -5,7 +5,11 @@ module Spree
       include Spree::Webhooks::HasWebhooks
     end
 
-    has_secure_token
+    if Rails::VERSION::STRING >= '7.1.0'
+      has_secure_token on: :save
+    else
+      has_secure_token
+    end
 
     belongs_to :user, class_name: "::#{Spree.user_class}", touch: true
     belongs_to :store, class_name: 'Spree::Store'

data/app/models/spree/zone.rb

@@ -74,7 +74,7 @@ module Spree
     end
 
     def self.default_checkout_zone
-      ActiveSupport::Deprecation.warn('Spree::Zone.default_checkout_zone is deprecated and will be removed in Spree 5')
+      Spree::Deprecation.warn('Spree::Zone.default_checkout_zone is deprecated and will be removed in Spree 5')
 
       first
     end

data/app/services/spree/seeds/countries.rb

@@ -9,34 +9,19 @@ module Spree
 
       def call
         ApplicationRecord.transaction do
-          if Rails::VERSION::MAJOR >= 6
-            new_countries = Carmen::Country.all.map do |country|
-              # Skip the creation of some territories, uninhabited islands and the Antarctic.
-              next if EXCLUDED_COUNTRIES.include?(country.alpha_2_code)
+          new_countries = Carmen::Country.all.map do |country|
+            # Skip the creation of some territories, uninhabited islands and the Antarctic.
+            next if EXCLUDED_COUNTRIES.include?(country.alpha_2_code)
 
-              Hash[
-                'name': country.name,
-                'iso3': country.alpha_3_code,
-                'iso': country.alpha_2_code,
-                'iso_name': country.name.upcase,
-                'numcode': country.numeric_code,
-              ]
-            end.compact.uniq
-            Spree::Country.insert_all(new_countries)
-          else
-            Carmen::Country.all.each do |country|
-              # Skip the creation of some territories, uninhabited islands and the Antarctic.
-              next if EXCLUDED_COUNTRIES.include?(country.alpha_2_code)
-
-              Spree::Country.where(
-                name: country.name,
-                iso3: country.alpha_3_code,
-                iso: country.alpha_2_code,
-                iso_name: country.name.upcase,
-                numcode: country.numeric_code
-              ).first_or_create!
-            end
-          end
+            Hash[
+              'name': country.name,
+              'iso3': country.alpha_3_code,
+              'iso': country.alpha_2_code,
+              'iso_name': country.name.upcase,
+              'numcode': country.numeric_code,
+            ]
+          end.compact.uniq
+          Spree::Country.insert_all(new_countries)
 
           # Find countries that do not use postal codes (by iso) and set 'zipcode_required' to false for them.
           Spree::Country.where(iso: Spree::Address::NO_ZIPCODE_ISO_CODES).update_all(zipcode_required: false)

data/app/services/spree/seeds/states.rb

@@ -49,23 +49,14 @@ module Spree
       end
 
       def province_level(country, subregion)
-        if Rails::VERSION::MAJOR >= 6
-          new_states = subregion.subregions.map do |province|
-            Hash[
-              name: province.name,
-              abbr: province.code,
-              country_id: country.id
-            ]
-          end.compact.uniq
-          Spree::State.insert_all(new_states)
-        else
-          subregion.subregions.each do |province|
-            country.states.where(
-              name: province.name,
-              abbr: province.code
-            ).first_or_create!
-          end
-        end
+        new_states = subregion.subregions.map do |province|
+          Hash[
+            name: province.name,
+            abbr: province.code,
+            country_id: country.id
+          ]
+        end.compact.uniq
+        Spree::State.insert_all(new_states)
       end
     end
   end

data/app/services/spree/stock_locations/stock_items/create.rb

@@ -5,24 +5,18 @@ module Spree
         prepend Spree::ServiceModule::Base
 
         def call(stock_location:, variants_scope: Spree::Variant)
-          if Rails::VERSION::MAJOR >= 6
-            prepared_stock_items = variants_scope.ids.map do |variant_id|
-              Hash[
-                'stock_location_id', stock_location.id,
-                'variant_id', variant_id,
-                'backorderable', stock_location.backorderable_default,
-                'created_at', Time.current,
-                'updated_at', Time.current
-              ]
-            end
-            if prepared_stock_items.any?
-              stock_location.stock_items.insert_all(prepared_stock_items)
-              variants_scope.touch_all
-            end
-          else
-            variants_scope.find_each do |variant|
-              stock_location.propagate_variant(variant)
-            end
+          prepared_stock_items = variants_scope.ids.map do |variant_id|
+            Hash[
+              'stock_location_id', stock_location.id,
+              'variant_id', variant_id,
+              'backorderable', stock_location.backorderable_default,
+              'created_at', Time.current,
+              'updated_at', Time.current
+            ]
+          end
+          if prepared_stock_items.any?
+            stock_location.stock_items.insert_all(prepared_stock_items)
+            variants_scope.touch_all
           end
         end
       end

data/app/validators/db_maximum_length_validator.rb

@@ -2,16 +2,12 @@
 # Validates a field based on the maximum length of the underlying DB field, if there is one.
 class DbMaximumLengthValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+    Spree::Deprecation.warn(<<-DEPRECATION, caller)
       `DbMaximumLengthValidator` is deprecated and will be removed in Spree 5.0.
       Please remove any `db_maximum_length: true` validations from your codebase
     DEPRECATION
 
-    limit = if defined?(Globalize)
-              record.class.translation_class.columns_hash[attribute.to_s].limit
-            else
-              record.class.columns_hash[attribute.to_s].limit
-            end
+    limit = record.class.columns_hash[attribute.to_s].limit
     value = record[attribute.to_sym]
     if value && limit && value.to_s.length > limit
       record.errors.add(attribute.to_sym, :too_long, count: limit)

data/config/initializers/rails61_fixes.rb

@@ -1,3 +1 @@
-if Rails::VERSION::STRING >= '6.1'
-  ActiveRecord::Base.has_many_inversing = false
-end
+ActiveRecord::Base.has_many_inversing = false

data/config/locales/en.yml

@@ -1,6 +1,8 @@
 en:
   activemodel:
     errors:
+      messages:
+        blank: can't be blank
       models:
         spree/fulfilment_changer:
           attributes:
@@ -309,6 +311,8 @@ en:
         one: Zone
         other: Zones
     errors:
+      messages:
+        blank: can't be blank
       models:
         spree/calculator/tiered_flat_rate:
           attributes:
@@ -1572,6 +1576,7 @@ en:
     starting_from: Starts at
     state: State
     state_based: State Based
+    state_changes: State Changes
     states: States
     state_machine_states:
       accepted: Accepted
@@ -1750,6 +1755,7 @@ en:
     transfer_from_location: Transfer From
     transfer_stock: Transfer Stock
     transfer_to_location: Transfer To
+    translations: Translations
     tree: Tree
     type: Type
     type_to_search: Type to search

data/lib/spree/core/configuration.rb

@@ -76,7 +76,7 @@ module Spree
 
       # searcher_class allows spree extension writers to provide their own Search class
       def searcher_class
-        ActiveSupport::Deprecation.warn('`Spree::Config.searcher_class` is deprecated and will be removed in Spree v5, please use `Spree.searcher_class` instead.')
+        Spree::Deprecation.warn('`Spree::Config.searcher_class` is deprecated and will be removed in Spree v5, please use `Spree.searcher_class` instead.')
         @searcher_class ||= Spree.searcher_class
       end
 

data/lib/spree/core/controller_helpers/auth.rb

@@ -75,7 +75,7 @@ module Spree
         # Override this method in your controllers if you want to have special behavior in case the user is not authorized
         # to access the requested action.  For example, a popup window might simply close itself.
         def redirect_unauthorized_access
-          ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+          Spree::Deprecation.warn(<<-DEPRECATION, caller)
             Core::ControllerHelpers#redirect_unauthorized_access is deprecated and will be removed in Spree 5.0.
             This method is implemented differently for Storefront and Admin
           DEPRECATION

data/lib/spree/core/controller_helpers/common.rb

@@ -17,7 +17,7 @@ module Spree
           attr_writer :title
 
           def title
-            ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+            Spree::Deprecation.warn(<<-DEPRECATION, caller)
               ControllerHelpers::Common is deprecated and will be removed in Spree 5.0.
             DEPRECATION
             title_string = @title.present? ? @title : accurate_title
@@ -33,7 +33,7 @@ module Spree
           end
 
           def default_title
-            ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+            Spree::Deprecation.warn(<<-DEPRECATION, caller)
               ControllerHelpers::Common is deprecated and will be removed in Spree 5.0.
             DEPRECATION
             current_store.name
@@ -41,7 +41,7 @@ module Spree
 
           # this is a hook for subclasses to provide title
           def accurate_title
-            ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+            Spree::Deprecation.warn(<<-DEPRECATION, caller)
               ControllerHelpers::Common is deprecated and will be removed in Spree 5.0.
             DEPRECATION
             current_store.seo_title
@@ -50,7 +50,7 @@ module Spree
           private
 
           def set_user_language
-            ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+            Spree::Deprecation.warn(<<-DEPRECATION, caller)
               ControllerHelpers::Common#set_user_language is deprecated and will be removed in Spree 5.0.
               Please use `before_action :set_locale` instead
             DEPRECATION
@@ -65,7 +65,7 @@ module Spree
           # Default layout is: +app/views/spree/layouts/spree_application+
           #
           def get_layout
-            ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+            Spree::Deprecation.warn(<<-DEPRECATION, caller)
               ControllerHelpers::Common is deprecated and will be removed in Spree 5.0.
             DEPRECATION
             return unless defined?(Spree::Frontend)

data/lib/spree/core/engine.rb

@@ -27,6 +27,7 @@ module Spree
         app.config.active_record.yaml_column_permitted_classes = [Symbol, BigDecimal]
         Spree::Config = app.config.spree.preferences
         Spree::Dependencies = app.config.spree.dependencies
+        Spree::Deprecation = ActiveSupport::Deprecation.new
       end
 
       initializer 'spree.register.calculators', before: :after_initialize do |app|

data/lib/spree/core/preferences/preferable_class_methods.rb

@@ -19,7 +19,7 @@ module Spree::Preferences
         value = convert_preference_value(value, type)
         preferences[name] = value
 
-        ActiveSupport::Deprecation.warn("`#{name}` is deprecated. #{deprecated}") if deprecated
+        Spree::Deprecation.warn("`#{name}` is deprecated. #{deprecated}") if deprecated
 
         # If this is an activerecord object, we need to inform
         # ActiveRecord::Dirty that this value has changed, since this is an

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.6.3'.freeze
+  VERSION = '4.7.0'.freeze
 
   def self.version
     VERSION

data/lib/spree/testing_support/controller_requests.rb

@@ -8,7 +8,7 @@ module Spree
       end
 
       def spree_get(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_get is deprecated and will be removed in Spree 5.0.
           Please use get, params: {}
         DEPRECATION
@@ -17,7 +17,7 @@ module Spree
 
       # Executes a request simulating POST HTTP method and set/volley the response
       def spree_post(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_post is deprecated and will be removed in Spree 5.0.
           Please use post, params: {}
         DEPRECATION
@@ -26,7 +26,7 @@ module Spree
 
       # Executes a request simulating PUT HTTP method and set/volley the response
       def spree_put(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_put is deprecated and will be removed in Spree 5.0.
           Please use put, params: {}
         DEPRECATION
@@ -35,7 +35,7 @@ module Spree
 
       # # Executes a request simulating PATCH HTTP method and set/volley the response
       def spree_patch(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_patch is deprecated and will be removed in Spree 5.0.
           Please use patch, params: {}
         DEPRECATION
@@ -44,7 +44,7 @@ module Spree
 
       # Executes a request simulating DELETE HTTP method and set/volley the response
       def spree_delete(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_delete is deprecated and will be removed in Spree 5.0.
           Please use delete, params: {}
         DEPRECATION
@@ -52,35 +52,35 @@ module Spree
       end
 
       def spree_xhr_get(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_xhr_get is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :get)
       end
 
       def spree_xhr_post(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_xhr_post is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :post)
       end
 
       def spree_xhr_put(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_xhr_put is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :put)
       end
 
       def spree_xhr_patch(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_xhr_patch is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :patch)
       end
 
       def spree_xhr_delete(action, parameters = nil, session = nil, flash = nil)
-        ActiveSupport::Deprecation.warn(<<-DEPRECATION, caller)
+        Spree::Deprecation.warn(<<-DEPRECATION, caller)
           ControllerRequests#spree_xhr_delete is deprecated and will be removed in Spree 5.0.
         DEPRECATION
         process_spree_xhr_action(action, parameters, session, flash, :delete)

data/spree_core.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     "source_code_uri"   => "https://github.com/spree/spree/tree/v#{s.version}",
   }
 
-  s.required_ruby_version     = '>= 2.5.0'
+  s.required_ruby_version     = '>= 3.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.files        = `git ls-files`.split("\n").reject { |f| f.match(/^spec/) && !f.match(/^spec\/fixtures/) }
@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
     actionpack actionview activejob activemodel activerecord
     activestorage activesupport railties
   ].each do |rails_gem|
-    s.add_dependency rails_gem, '>= 6.1', '< 7.1'
+    s.add_dependency rails_gem, '>= 6.1', '< 7.2'
   end
 
   s.add_dependency 'activemerchant', '~> 1.67'
@@ -45,7 +45,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'money', '~> 6.13'
   s.add_dependency 'monetize', '~> 1.9'
   s.add_dependency 'paranoia', '~> 2.4'
-  s.add_dependency 'ransack', '>= 2.3', '< 3.0'
+  s.add_dependency 'ransack', '>= 4.1'
   s.add_dependency 'rexml'
   s.add_dependency 'state_machines-activerecord', '~> 0.6'
   s.add_dependency 'state_machines-activemodel', '~> 0.7'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 4.6.3
+  version: 4.7.0
 platform: ruby
 authors:
 - Sean Schofield
@@ -20,7 +20,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: actionview
   requirement: !ruby/object:Gem::Requirement
@@ -40,7 +40,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activejob
   requirement: !ruby/object:Gem::Requirement
@@ -60,7 +60,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -70,7 +70,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -110,7 +110,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activestorage
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +140,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -150,7 +150,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -160,7 +160,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +170,7 @@ dependencies:
         version: '6.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -357,20 +357,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -1127,9 +1121,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v4.6.3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v4.7.0
   documentation_uri: https://dev-docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v4.6.3
+  source_code_uri: https://github.com/spree/spree/tree/v4.7.0
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -1138,7 +1132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="