spree_core 5.1.0.beta → 5.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c1195535152943b227b48f47f34f8a53164727cff509e72ef64a720b4dfbf36
-  data.tar.gz: e88f4d0212bf72d2ef986faae3bd97a1793cffa2fa215a7d078f47044a1ad8f8
+  metadata.gz: f8150046e1776256aacec11512b848d9cbd5074d17b7aacafd7b2736cfd934c3
+  data.tar.gz: 8a04db5d73b2abf21a587ea66313d4fb7ff7120ed46ef9d22f38ddf1b3c5f295
 SHA512:
-  metadata.gz: 702032f4dbd79afda63c303e4f2a957e982f6cac18f95dded6f241a920f6600b3ea5e08253780185b7e87ec4d676dd4fa7d6fa92c99e43e4cb79420afeef94ad
-  data.tar.gz: 72a2841b3265909bcc97404cc8c504216dc65033b251010ba96acc2e666ece5c30cba4902eed857ced89598c9b411659f424a376c61230d5d71771deda6660cb
+  metadata.gz: 8024d8aa8b617d7be12713acf1787a7c4569dc708d74cbf34850ec6bc8fcea5630c15fdfe6efa4796c82825fc9724d637b219da887f888f909dd29d22582178f
+  data.tar.gz: 60db3009f9a9a30bfca2b8c6895b7777a35eaac8819ca06a112e2315e234137ee87e5fea3796335e53e8a8e5c562f22183d7d8c6c3c3b1f8e9466d76ba3bbde5

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

@@ -7,14 +7,6 @@ module Spree
         @shippable = String(params[:filter][:shippable]) unless params[:filter].nil?
       end
 
-      def call
-        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
-        execute
-      end
-
       def execute
         countries = by_shippability(scope)
 

data/app/helpers/spree/base_helper.rb

@@ -136,10 +136,7 @@ module Spree
     def pretty_time(time)
       return '' if time.blank?
 
-      Spree::Deprecation.warn(<<-DEPRECATION, caller)
-        `BaseHelper#pretty_time` is deprecated and will be removed in Spree 6.0.
-        Please add `local_time` gem to your Gemfile and use `local_time(time)` instead
-      DEPRECATION
+      Spree::Deprecation.warn('BaseHelper#pretty_time is deprecated and will be removed in Spree 6.0. Please add `local_time` gem to your Gemfile and use `local_time(time)` instead')
 
       [I18n.l(time.to_date, format: :long), time.strftime('%l:%M %p %Z')].join(' ')
     end
@@ -147,10 +144,7 @@ module Spree
     def pretty_date(date)
       return '' if date.blank?
 
-      Spree::Deprecation.warn(<<-DEPRECATION, caller)
-        `BaseHelper#pretty_date` is deprecated and will be removed in Spree 6.0.
-        Please add `local_time` gem to your Gemfile and use `local_date(date)` instead
-      DEPRECATION
+      Spree::Deprecation.warn('BaseHelper#pretty_date is deprecated and will be removed in Spree 6.0. Please add `local_time` gem to your Gemfile and use `local_date(date)` instead')
 
       [I18n.l(date.to_date, format: :long)].join(' ')
     end
@@ -219,19 +213,13 @@ module Spree
     # we should always try to render image of the default variant
     # same as it's done on PDP
     def default_image_for_product(product)
-      Spree::Deprecation.warn(<<-DEPRECATION, caller)
-        `BaseHelper#default_image_for_product` is deprecated and will be removed in Spree 6.0.
-        Please use `product.default_image` instead
-      DEPRECATION
+      Spree::Deprecation.warn('BaseHelper#default_image_for_product is deprecated and will be removed in Spree 6.0. Please use product.default_image instead')
 
       product.default_image
     end
 
     def default_image_for_product_or_variant(product_or_variant)
-      Spree::Deprecation.warn(<<-DEPRECATION, caller)
-        `BaseHelper#default_image_for_product_or_variant` is deprecated and will be removed in Spree 6.0.
-        Please use `product_or_variant.default_image` instead
-      DEPRECATION
+      Spree::Deprecation.warn('BaseHelper#default_image_for_product_or_variant is deprecated and will be removed in Spree 6.0. Please use product_or_variant.default_image instead')
 
       product_or_variant.default_image
     end

data/app/helpers/spree/mail_helper.rb

@@ -1,10 +1,11 @@
 module Spree
   module MailHelper
-    include BaseHelper
+    include Spree::BaseHelper
+    include Spree::ImagesHelper
 
     def variant_image_url(variant)
-      image = default_image_for_product_or_variant(variant)
-      image ? main_app.cdn_image_url(image.url(:small)) : image_url('noimage/small.png')
+      image = variant.default_image
+      image.present? && image.attached? ? spree_image_url(image, width: 100, height: 100) : image_url('noimage/small.png')
     end
 
     def name_for(order)

data/app/helpers/spree/products_helper.rb

@@ -121,10 +121,7 @@ module Spree
     end
 
     def related_products
-      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
+      Spree::Deprecation.warn('ProductsHelper#related_products is deprecated and will be removed in Spree 6.0. Please use ProductsHelper#relations from now on.')
 
       return [] unless @product.respond_to?(:has_related_products?)
 

data/app/models/spree/order.rb

@@ -830,6 +830,10 @@ module Spree
       csv_lines
     end
 
+    def all_line_items
+      line_items
+    end
+
     private
 
     def link_by_email

data/app/models/spree/product_property.rb

@@ -42,19 +42,6 @@ module Spree
     # virtual attributes for use with AJAX completion stuff
     delegate :name, :presentation, to: :property, prefix: true, allow_nil: true
 
-    def property_name=(name)
-      Spree::Deprecation.warn(<<-DEPRECATION, caller)
-        `ProductProperty#property_name=` is deprecated and will be removed in Spree 5.0.
-      DEPRECATION
-      if name.present?
-        self.property = if Property.where(name: name).exists?
-                          Property.where(name: name).first
-                        else
-                          Property.create(name: name, presentation: name)
-                        end
-      end
-    end
-
     protected
 
     def param_candidate

data/lib/generators/spree/dummy/dummy_generator.rb

@@ -54,8 +54,8 @@ module Spree
       template 'rails/application.rb', "#{dummy_path}/config/application.rb", force: true
       template 'rails/routes.rb', "#{dummy_path}/config/routes.rb", force: true
       template 'rails/test.rb', "#{dummy_path}/config/environments/test.rb", force: true
-      template 'rails/script/rails', "#{dummy_path}/spec/dummy/script/rails", force: true
       template 'initializers/devise.rb', "#{dummy_path}/config/initializers/devise.rb", force: true
+      template "app/assets/config/manifest.js", "#{dummy_path}/app/assets/config/manifest.js", force: true
     end
 
     def test_dummy_inject_extension_requirements

data/lib/generators/spree/dummy/templates/rails/application.rb

@@ -2,9 +2,8 @@ require File.expand_path('../boot', __FILE__)
 
 require 'rails/all'
 
-Bundler.require(*Rails.groups(assets: %w(development test)))
+Bundler.require(*Rails.groups)
 
 require '<%= lib_name %>'
 
 <%= application_definition %>
-

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

@@ -2,77 +2,6 @@ module Spree
   module Core
     module ControllerHelpers
       module Common
-        extend ActiveSupport::Concern
-        included do
-          helper_method :title
-          helper_method :title=
-          helper_method :accurate_title
-
-          layout :get_layout
-
-          protected
-
-          # can be used in views as well as controllers.
-          # e.g. <% self.title = 'This is a custom title for this view' %>
-          attr_writer :title
-
-          def title
-            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
-            if title_string.present?
-              if Spree::Config[:always_put_site_name_in_title] && !title_string.include?(default_title)
-                [title_string, default_title].join(" #{Spree::Config[:title_site_name_separator]} ")
-              else
-                title_string
-              end
-            else
-              default_title
-            end
-          end
-
-          def default_title
-            Spree::Deprecation.warn(<<-DEPRECATION, caller)
-              ControllerHelpers::Common is deprecated and will be removed in Spree 5.0.
-            DEPRECATION
-            current_store.name
-          end
-
-          # this is a hook for subclasses to provide title
-          def accurate_title
-            Spree::Deprecation.warn(<<-DEPRECATION, caller)
-              ControllerHelpers::Common is deprecated and will be removed in Spree 5.0.
-            DEPRECATION
-            current_store.seo_title
-          end
-
-          private
-
-          def set_user_language
-            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
-
-            set_locale
-          end
-
-          # Returns which layout to render.
-          #
-          # You can set the layout you want to render inside your Spree configuration with the +:layout+ option.
-          #
-          # Default layout is: +app/views/spree/layouts/spree_application+
-          #
-          def get_layout
-            Spree::Deprecation.warn(<<-DEPRECATION, caller)
-              ControllerHelpers::Common is deprecated and will be removed in Spree 5.0.
-            DEPRECATION
-            return unless defined?(Spree::Frontend)
-
-            layout ||= Spree::Frontend::Config[:layout]
-          end
-        end
       end
     end
   end

data/lib/spree/core/engine.rb

@@ -42,7 +42,7 @@ module Spree
         Spree::Config = app.config.spree.preferences
         Spree::RuntimeConfig = app.config.spree.preferences # for compatibility
         Spree::Dependencies = app.config.spree.dependencies
-        Spree::Deprecation = ActiveSupport::Deprecation.new
+        Spree::Deprecation = ActiveSupport::Deprecation.new('6.0', 'Spree')
       end
 
       initializer 'spree.register.calculators', before: :after_initialize do |app|

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

@@ -108,6 +108,16 @@ module Spree::Preferences::Preferable
     preference_keys.each { |pref| preferences[pref] = preference_default(pref) }
   end
 
+  def preference_change(name, changes_or_previous_changes)
+    preference_changes = changes_or_previous_changes.with_indifferent_access.fetch('preferences', [{}, {}])
+    before_preferences = preference_changes[0] || {}
+    after_preferences = preference_changes[1] || {}
+
+    return if before_preferences[name] == after_preferences[name]
+
+    [before_preferences[name], after_preferences[name]]
+  end
+
   private
 
   def convert_preference_value(value, type, nullable: false)

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

@@ -43,6 +43,34 @@ module Spree::Preferences
       define_method prefers_query_method(name) do
         preferences.fetch(name).to_b
       end
+
+      define_method preference_change_method(name) do
+        preference_change(name, changes) if respond_to?(:changes)
+      end
+
+      define_method preference_was_method(name) do
+        return unless respond_to?(:changes)
+
+        preference_change(name, changes)&.first || get_preference(name)
+      end
+
+      define_method preference_changed_method(name) do
+        respond_to?(:changes) && preference_change(name, changes).present?
+      end
+
+      define_method preference_previous_change_method(name) do
+        preference_change(name, previous_changes) if respond_to?(:previous_changes)
+      end
+
+      define_method preference_previous_was_method(name) do
+        return unless respond_to?(:previous_changes)
+
+        preference_change(name, previous_changes)&.first
+      end
+
+      define_method preference_previous_changed_method(name) do
+        respond_to?(:previous_changes) && preference_change(name, previous_changes).present?
+      end
     end
 
     def preference_getter_method(name)
@@ -68,5 +96,29 @@ module Spree::Preferences
     def prefers_query_method(name)
       "prefers_#{name}?".to_sym
     end
+
+    def preference_change_method(name)
+      "preferred_#{name}_change".to_sym
+    end
+
+    def preference_was_method(name)
+      "preferred_#{name}_was".to_sym
+    end
+
+    def preference_changed_method(name)
+      "preferred_#{name}_changed?".to_sym
+    end
+
+    def preference_previous_change_method(name)
+      "preferred_#{name}_previous_change".to_sym
+    end
+
+    def preference_previous_was_method(name)
+      "preferred_#{name}_previously_was".to_sym
+    end
+
+    def preference_previous_changed_method(name)
+      "preferred_#{name}_previously_changed?".to_sym
+    end
   end
 end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '5.1.0.beta'.freeze
+  VERSION = '5.1.0.beta2'.freeze
 
   def self.version
     VERSION

data/lib/spree/permitted_attributes.rb

@@ -22,6 +22,7 @@ module Spree
       :option_type_attributes,
       :option_value_attributes,
       :page_attributes,
+      :page_block_attributes,
       :page_link_attributes,
       :page_section_attributes,
       :payment_attributes,
@@ -124,6 +125,8 @@ module Spree
 
     @@page_attributes = [:name, :slug, :meta_title, :meta_description, :meta_keywords]
 
+    @@page_block_attributes = [:type, :name, :position]
+
     @@page_link_attributes = [:linkable_id, :linkable_type, :position, :label, :url]
 
     @@page_section_attributes = [:type, :name, :position, :asset]
@@ -167,7 +170,7 @@ module Spree
 
     @@reimbursement_attributes = [return_items_attributes: [:id, :override_reimbursement_type_id, :pre_tax_amount, :exchange_variant_id]]
 
-    @@reimbursement_type_attributes = [:name, :active]
+    @@reimbursement_type_attributes = [:name, :type, :active, :mutable]
 
     @@report_attributes = [:type, :date_from, :date_to, :currency]
 

data/lib/spree/testing_support/controller_requests.rb

@@ -6,98 +6,6 @@ module Spree
       included do
         routes { Spree::Core::Engine.routes }
       end
-
-      def spree_get(action, parameters = nil, session = nil, flash = nil)
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_get is deprecated and will be removed in Spree 5.0.
-          Please use get, params: {}
-        DEPRECATION
-        process_spree_action(action, parameters, session, flash, 'GET')
-      end
-
-      # Executes a request simulating POST HTTP method and set/volley the response
-      def spree_post(action, parameters = nil, session = nil, flash = nil)
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_post is deprecated and will be removed in Spree 5.0.
-          Please use post, params: {}
-        DEPRECATION
-        process_spree_action(action, parameters, session, flash, 'POST')
-      end
-
-      # Executes a request simulating PUT HTTP method and set/volley the response
-      def spree_put(action, parameters = nil, session = nil, flash = nil)
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_put is deprecated and will be removed in Spree 5.0.
-          Please use put, params: {}
-        DEPRECATION
-        process_spree_action(action, parameters, session, flash, 'PUT')
-      end
-
-      # # Executes a request simulating PATCH HTTP method and set/volley the response
-      def spree_patch(action, parameters = nil, session = nil, flash = nil)
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_patch is deprecated and will be removed in Spree 5.0.
-          Please use patch, params: {}
-        DEPRECATION
-        process_spree_action(action, parameters, session, flash, 'PATCH')
-      end
-
-      # Executes a request simulating DELETE HTTP method and set/volley the response
-      def spree_delete(action, parameters = nil, session = nil, flash = nil)
-        Spree::Deprecation.warn(<<-DEPRECATION, caller)
-          ControllerRequests#spree_delete is deprecated and will be removed in Spree 5.0.
-          Please use delete, params: {}
-        DEPRECATION
-        process_spree_action(action, parameters, session, flash, 'DELETE')
-      end
-
-      def spree_xhr_get(action, parameters = nil, session = nil, flash = nil)
-        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)
-        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)
-        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)
-        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)
-        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)
-      end
-
-      private
-
-      def process_spree_action(action, parameters = nil, session = nil, flash = nil, method = 'GET')
-        parameters ||= {}
-        process(action, method: method, params: parameters, session: session, flash: flash)
-      end
-
-      def process_spree_xhr_action(action, parameters = nil, session = nil, flash = nil, method = :get)
-        parameters ||= {}
-        parameters.reverse_merge!(format: :json)
-        process(action, method: method, params: parameters, session: session, flash: flash, xhr: true)
-      end
     end
   end
 end

data/lib/spree/testing_support/factories/page_block_factory.rb

@@ -16,6 +16,7 @@ FactoryBot.define do
       type { 'Spree::PageBlocks::Heading' }
     end
 
+    factory :buttons_block, traits: [:buttons], class: Spree::PageBlocks::Buttons
     factory :heading_block, traits: [:heading], class: Spree::PageBlocks::Heading
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.1.0.beta
+  version: 5.1.0.beta2
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-20 00:00:00.000000000 Z
+date: 2025-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -35,7 +35,7 @@ dependencies:
         version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -45,7 +45,7 @@ dependencies:
         version: '7.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '8.0'
+        version: '8.1'
 - !ruby/object:Gem::Dependency
   name: activemerchant
   requirement: !ruby/object:Gem::Requirement
@@ -1024,7 +1024,6 @@ files:
 - app/sorters/spree/classifications/sort.rb
 - app/sorters/spree/orders/sort.rb
 - app/sorters/spree/products/sort.rb
-- app/validators/db_maximum_length_validator.rb
 - app/validators/email_validator.rb
 - app/validators/spree/url_validator.rb
 - app/views/action_text/video_embeds/_thumbnail.html.erb
@@ -1166,12 +1165,12 @@ files:
 - lib/generators/spree/authentication/devise/devise_generator.rb
 - lib/generators/spree/authentication/devise/templates/authentication_helpers.rb.tt
 - lib/generators/spree/dummy/dummy_generator.rb
+- lib/generators/spree/dummy/templates/app/assets/config/manifest.js
 - lib/generators/spree/dummy/templates/initializers/devise.rb
 - lib/generators/spree/dummy/templates/rails/application.rb
 - lib/generators/spree/dummy/templates/rails/boot.rb
 - lib/generators/spree/dummy/templates/rails/database.yml
 - lib/generators/spree/dummy/templates/rails/routes.rb
-- lib/generators/spree/dummy/templates/rails/script/rails
 - lib/generators/spree/dummy/templates/rails/test.rb
 - lib/generators/spree/dummy_model/dummy_model_generator.rb
 - lib/generators/spree/dummy_model/templates/migration.rb.tt
@@ -1345,9 +1344,9 @@ licenses:
 - BSD-3-Clause
 metadata:
   bug_tracker_uri: https://github.com/spree/spree/issues
-  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.beta
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.beta2
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta2
 post_install_message:
 rdoc_options: []
 require_paths:

data/app/validators/db_maximum_length_validator.rb

@@ -1,16 +0,0 @@
-##
-# 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)
-    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 = 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)
-    end
-  end
-end

data/lib/generators/spree/dummy/templates/rails/script/rails

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
-
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require File.expand_path('../../config/boot',  __FILE__)
-require 'rails/commands'