spree_core 5.0.5 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f19fd414a37bad67d13a4a491582f6c391ab2677a3ee2a93952e7e8cd52d94d0
-  data.tar.gz: 98d87831e0aeed0b5165eb4a38c6198a66423a4b2102a91f529eb2c9941db059
+  metadata.gz: 964d9b4646aa2d9c5ac22647f126c304bc7756b3034757b8bda9b0f9faa6d496
+  data.tar.gz: '07803df2f7c528d8a35c10b04f02f591b4c2ffe859163c7b2c94e5ad0edfc388'
 SHA512:
-  metadata.gz: a6e96c2e6e5ac2c433392016b01fc5aa6a73a719ce766ba3d6619fae46559b9ca25141be70621d0f31d207a8896a1d79de7dc154d474334af02c46fc9dbe9fba
-  data.tar.gz: 524ecf14bf52c91ac982cd6c489d45592eab70e68ed8de95f0565be7740a49a04aac9aeacffe94c3d355b480f68e6af051efd32b5ba2bd2334cdea1f1119f9f9
+  metadata.gz: 36a5518a9bfd31ed6b6b3a74df7953534a8568cc36a7204acf0eca5499e93bd0b88068f35bd8b7dcbc52d09b9f47ea629cfa582a39d24d717d61c9803e865748
+  data.tar.gz: 46fb9aab1ceafb1d44f872e870908e3ff0df44458c4b6248a4bc6e54655f4de4e457b47c9a5c8c133b16cc631f93226a0280585cb8ebee3920b677cd48acee40

data/app/models/spree/custom_domain.rb

@@ -28,7 +28,7 @@ module Spree
     def url_is_valid
       parts = url.split('.')
 
-      errors.add(:url, 'use domain or subdomain') if (parts[0] != 'www' && parts.size > 3) || (parts[0] == 'www' && parts.size > 4) || parts.size < 2
+      errors.add(:url, 'use domain or subdomain') if parts.size > 4 || parts.size < 2
     end
 
     def ensure_default

data/app/models/spree/product/slugs.rb

@@ -0,0 +1,112 @@
+module Spree
+  class Product < Spree.base_class
+    module Slugs
+      extend ActiveSupport::Concern
+
+      included do
+        extend FriendlyId
+        include Spree::TranslatableResourceSlug
+
+        translates :slug
+        friendly_id :slug_candidates, use: [:history, :slugged, :scoped, :mobility], scope: spree_base_uniqueness_scope, slug_limit: 255
+
+        Product::Translation.class_eval do
+          acts_as_paranoid
+          # deleted translation values also need to be accessible for index views listing deleted resources
+          default_scope { unscope(where: :deleted_at) }
+
+          before_validation :set_slug
+          before_validation :ensure_slug_is_unique
+
+          validates :slug, presence: true, uniqueness: { allow_blank: true, case_sensitive: true, scope: [*::Spree.base_class.spree_base_uniqueness_scope, :locale] }
+
+          private
+
+          def set_slug
+            self.slug = generate_slug
+          end
+
+          def generate_slug
+            if name.blank? && slug.blank?
+              translated_model.name.to_url
+            elsif slug.blank?
+              name.to_url
+            else
+              slug.to_url
+            end
+          end
+
+          def ensure_slug_is_unique
+            slug_exists = self.class.where(slug: slug, locale: locale).where.not(id: id).exists?
+            self.slug = [slug, SecureRandom.uuid].join('-') if slug_exists
+          end
+        end
+
+        before_validation :downcase_slug
+        before_validation :normalize_slug, on: :update
+        after_destroy :punch_slugs
+        after_restore :regenerate_slug
+
+        validates :slug, presence: true, uniqueness: { allow_blank: true, case_sensitive: true, scope: spree_base_uniqueness_scope }
+
+        def self.slug_available?(slug, id)
+          !where(slug: slug).where.not(id: id).exists?
+        end
+      end
+
+      def ensure_slug_is_unique(candidate_slug)
+        return slug if candidate_slug.blank? || slug.blank?
+        return candidate_slug if self.class.slug_available?(candidate_slug, id)
+
+        normalize_friendly_id([candidate_slug, uuid_for_friendly_id])
+      end
+
+      private
+
+      def slug_candidates
+        if defined?(:deleted_at) && deleted_at.present?
+          [
+            ['deleted', :name],
+            ['deleted', :name, :sku],
+            ['deleted', :name, :uuid_for_friendly_id]
+          ]
+        else
+          [
+            [:name],
+            [:name, :sku],
+            [:name, :uuid_for_friendly_id]
+          ]
+        end
+      end
+
+      def downcase_slug
+        slug&.downcase!
+      end
+
+      def normalize_slug
+        self.slug = normalize_friendly_id(slug)
+      end
+
+      def regenerate_slug
+        self.slug = nil
+        save!
+      end
+
+      def punch_slugs
+        return if new_record? || frozen?
+
+        self.slug = nil
+
+        set_slug
+        update_column(:slug, slug)
+
+        new_slug = ->(rec) { "deleted-#{rec.id}_#{rec.slug}"[..254] }
+
+        translations.with_deleted.each { |rec| rec.update_columns(slug: new_slug.call(rec)) }
+        slugs.with_deleted.each { |rec| rec.update_column(:slug, new_slug.call(rec)) }
+
+        translations.find_by!(locale: I18n.locale).update_column(:slug, slug) if Spree.use_translations?
+      end
+    end
+  end
+end

data/app/models/spree/product.rb

@@ -20,14 +20,17 @@
 
 module Spree
   class Product < Spree.base_class
-    extend FriendlyId
+    acts_as_paranoid
+    acts_as_taggable_on :tags, :labels
+    auto_strip_attributes :name
+
     include Spree::ProductScopes
     include Spree::MultiStoreResource
     include Spree::TranslatableResource
-    include Spree::TranslatableResourceSlug
     include Spree::MemoizedData
     include Spree::Metadata
     include Spree::Product::Webhooks
+    include Spree::Product::Slugs
     if defined?(Spree::VendorConcern)
       include Spree::VendorConcern
     end
@@ -53,33 +56,8 @@ module Spree
         pg_search_scope :search_by_name, against: { name: 'A', meta_title: 'B' },
                                          using: { tsearch: { prefix: true, any_word: true } }
       end
-
-      before_save :set_slug
-      acts_as_paranoid
-      # deleted translation values also need to be accessible for index views listing deleted resources
-      default_scope { unscope(where: :deleted_at) }
-      def set_slug
-        self.slug = generate_slug
-      end
-
-      private
-
-      def generate_slug
-        if name.blank? && slug.blank?
-          translated_model.name.to_url
-        elsif slug.blank?
-          name.to_url
-        else
-          slug.to_url
-        end
-      end
     end
 
-    friendly_id :slug_candidates, use: [:history, :scoped, :mobility], scope: spree_base_uniqueness_scope
-    acts_as_paranoid
-    auto_strip_attributes :name
-    acts_as_taggable_on :tags, :labels
-
     # we need to have this callback before any dependent: :destroy associations
     # https://github.com/rails/rails/issues/3458
     before_destroy :ensure_not_in_complete_orders
@@ -145,17 +123,12 @@ module Spree
     after_initialize :ensure_master
     after_initialize :assign_default_tax_category
 
-    before_validation :downcase_slug
-    before_validation :normalize_slug, on: :update
     before_validation :validate_master
     before_validation :ensure_default_shipping_category
 
     after_create :add_associations_from_prototype
     after_create :build_variants_from_option_values_hash, if: :option_values_hash
 
-    after_destroy :punch_slug
-    after_restore :update_slug_history
-
     after_save :save_master
     after_save :run_touch_callbacks, if: :anything_changed?
     after_save :reset_nested_changes
@@ -173,7 +146,6 @@ module Spree
       validates :price, if: :requires_price?
     end
 
-    validates :slug, presence: true, uniqueness: { allow_blank: true, case_sensitive: true, scope: spree_base_uniqueness_scope }
     validate :discontinue_on_must_be_later_than_make_active_at, if: -> { make_active_at && discontinue_on }
 
     scope :for_store, ->(store) { joins(:store_products).where(StoreProduct.table_name => { store_id: store.id }) }
@@ -512,17 +484,6 @@ module Spree
       where conditions.inject(:or)
     end
 
-    def self.slug_available?(slug, id)
-      !where(slug: slug).where.not(id: id).exists?
-    end
-
-    def ensure_slug_is_unique(candidate_slug)
-      return slug if candidate_slug.blank? || slug.blank?
-      return candidate_slug if self.class.slug_available?(candidate_slug, id)
-
-      normalize_friendly_id([candidate_slug, uuid_for_friendly_id])
-    end
-
     # Suitable for displaying only variants that has at least one option value.
     # There may be scenarios where an option type is removed and along with it
     # all option values. At that point all variants associated with only those
@@ -738,25 +699,6 @@ module Spree
       self.tax_category = Spree::TaxCategory.default if new_record?
     end
 
-    def normalize_slug
-      self.slug = normalize_friendly_id(slug)
-    end
-
-    def punch_slug
-      # punch slug with date prefix to allow reuse of original
-      return if frozen?
-
-      update_column(:slug, "#{Time.current.to_i}_#{slug}"[0..254])
-
-      translations.with_deleted.each do |t|
-        t.update_column :slug, "#{Time.current.to_i}_#{t.slug}"[0..254]
-      end
-    end
-
-    def update_slug_history
-      save!
-    end
-
     def anything_changed?
       saved_changes? || @nested_changes
     end
@@ -812,14 +754,6 @@ module Spree
       end
     end
 
-    # Try building a slug based on the following fields in increasing order of specificity.
-    def slug_candidates
-      [
-        :name,
-        [:name, :sku]
-      ]
-    end
-
     def run_touch_callbacks
       run_callbacks(:touch)
     end
@@ -867,10 +801,6 @@ module Spree
       previously_new_record? || tag_list_previously_changed? || available_on_previously_changed?
     end
 
-    def downcase_slug
-      slug&.downcase!
-    end
-
     def after_activate
       # Implement your logic here
     end

data/app/models/spree/promotion/rules/item_total.rb

@@ -27,39 +27,39 @@ module Spree
             upper_limit_condition = true
           end
 
-          eligibility_errors.add(:base, ineligible_message_max) unless upper_limit_condition
-          eligibility_errors.add(:base, ineligible_message_min) unless lower_limit_condition
+          eligibility_errors.add(:base, ineligible_message_max(order)) unless upper_limit_condition
+          eligibility_errors.add(:base, ineligible_message_min(order)) unless lower_limit_condition
 
           eligibility_errors.empty?
         end
 
         private
 
-        def formatted_amount_min
-          Spree::Money.new(preferred_amount_min).to_s
+        def formatted_amount_min(order)
+          Spree::Money.new(preferred_amount_min, currency: order.currency).to_s
         end
 
-        def formatted_amount_max
+        def formatted_amount_max(order)
           if preferred_amount_max.present?
-            Spree::Money.new(preferred_amount_max).to_s
+            Spree::Money.new(preferred_amount_max, currency: order.currency).to_s
           else
             Spree.t('no_maximum')
           end
         end
 
-        def ineligible_message_max
+        def ineligible_message_max(order)
           if preferred_operator_max == 'lt'
-            eligibility_error_message(:item_total_more_than_or_equal, amount: formatted_amount_max)
+            eligibility_error_message(:item_total_more_than_or_equal, amount: formatted_amount_max(order))
           else
-            eligibility_error_message(:item_total_more_than, amount: formatted_amount_max)
+            eligibility_error_message(:item_total_more_than, amount: formatted_amount_max(order))
           end
         end
 
-        def ineligible_message_min
+        def ineligible_message_min(order)
           if preferred_operator_min == 'gte'
-            eligibility_error_message(:item_total_less_than, amount: formatted_amount_min)
+            eligibility_error_message(:item_total_less_than, amount: formatted_amount_min(order))
           else
-            eligibility_error_message(:item_total_less_than_or_equal, amount: formatted_amount_min)
+            eligibility_error_message(:item_total_less_than_or_equal, amount: formatted_amount_min(order))
           end
         end
       end

data/app/views/spree/addresses/_form.html.erb

@@ -5,7 +5,7 @@
      data-controller="address-form address-autocomplete"
      data-address-form-countries-value="<%= available_countries.to_json %>"
      data-address-form-states-value="<%= available_states.to_json %>"
-     data-address-form-current-state-id-value="<%= address.state_id %>"
+     data-address-form-current-state-id-value="<%= address.state_id || address_form.object.state_id %>"
 >
   <div id="<%= "#{address_id}country" %>">
     <div class="form-group mb-0">

data/lib/generators/spree/authentication/devise/devise_generator.rb

@@ -33,6 +33,8 @@ module Spree
     include Spree::UserPaymentSource
             RUBY
           end
+          gsub_file user_class_file, "< ApplicationRecord", "< Spree.base_class"
+
           say "Successfully added Spree user modules into #{user_class_file}"
         else
           say "Could not locate user model file at #{user_class_file}. Please add these lines manually:", :red
@@ -42,13 +44,14 @@ module Spree
             include Spree::UserMethods
             include Spree::UserPaymentSource
           RUBY
+
+          say "Please replace < ApplicationRecord with < Spree.base_class in #{user_class_file}"
         end
 
         append_file 'config/initializers/spree.rb' do
           %Q{
             if defined?(Devise) && Devise.respond_to?(:parent_controller)
-              Devise.parent_controller = "Spree::StoreController"
-              Devise.parent_mailer = "Spree::BaseMailer"
+              Devise.parent_controller = "Spree::BaseController"
             end\n}
         end
       end

data/lib/generators/spree/install/install_generator.rb

@@ -78,6 +78,11 @@ module Spree
     def install_storefront
       if @install_storefront && Spree::Core::Engine.frontend_available?
         generate 'spree:storefront:install'
+
+        # generate devise controllers if authentication is devise
+        if @authentication == 'devise'
+          generate 'spree:storefront:devise'
+        end
       end
     end
 

data/lib/spree/core/version.rb

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

data/lib/spree/testing_support/common_rake.rb

@@ -46,21 +46,39 @@ namespace :common do
       "--authentication=#{args[:authentication]}"
     ]
 
-    puts 'Setting up dummy database...'
-    system('bin/rails db:environment:set RAILS_ENV=test > /dev/null 2>&1')
-    system('bundle exec rake db:drop db:create > /dev/null 2>&1')
-    Spree::DummyModelGenerator.start
-    system('bundle exec rake db:migrate > /dev/null 2>&1')
+    if !skip_javascript || ENV['LIB_NAME'] == 'spree/emails'
+      puts 'Precompiling assets...'
+      system('bundle exec rake assets:precompile > /dev/null 2>&1')
+    end
+
+    unless ENV['NO_MIGRATE']
+      puts 'Setting up dummy database...'
+      system('bin/rails db:environment:set RAILS_ENV=test > /dev/null 2>&1')
+      system('bundle exec rake db:drop db:create > /dev/null 2>&1')
+      Spree::DummyModelGenerator.start
+      system('bundle exec rake db:migrate > /dev/null 2>&1')
+    end
 
     begin
       require "generators/#{ENV['LIB_NAME']}/install/install_generator"
       puts 'Running extension installation generator...'
-      "#{ENV['LIB_NAME'].camelize}::Generators::InstallGenerator".constantize.start(['--auto-run-migrations'])
+
+      if ENV['NO_MIGRATE']
+        "#{ENV['LIB_NAME'].camelize}::Generators::InstallGenerator".constantize.start([])
+      else
+        "#{ENV['LIB_NAME'].camelize}::Generators::InstallGenerator".constantize.start(['--auto-run-migrations'])
+      end
     rescue LoadError
       puts 'Skipping installation no generator to run...'
     end
+  end
 
-    system('bundle exec rake assets:precompile > /dev/null 2>&1') if !skip_javascript || ENV['LIB_NAME'] == 'spree/emails'
+  task :db_setup do |_t|
+    puts 'Setting up dummy database...'
+    system('bin/rails db:environment:set RAILS_ENV=test > /dev/null 2>&1')
+    system('bundle exec rake db:drop db:create > /dev/null 2>&1')
+    Spree::DummyModelGenerator.start
+    system('bundle exec rake db:migrate > /dev/null 2>&1')
   end
 
   task :seed do |_t|

data/lib/spree/testing_support/extension_rake.rb

@@ -2,7 +2,7 @@ require 'spree/testing_support/common_rake'
 
 desc 'Generates a dummy app for testing an extension'
 namespace :extension do
-  task :test_app, [:user_class] do |_t, args|
+  task :test_app, [:authentication, :user_class] do |_t, args|
     Spree::DummyGeneratorHelper.inject_extension_requirements = true
     Rake::Task['common:test_app'].execute(args.with_defaults(install_admin: true, install_storefront: true))
   end

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

@@ -9,6 +9,12 @@ FactoryBot.define do
     trait :with_description do
       description { '<div>Test <strong>description</strong></div>' }
     end
+
+    trait :with_header_image do
+      after(:create) do |taxon|
+        taxon.image.attach(io: File.new(Spree::Core::Engine.root.join('spec', 'fixtures', 'thinking-cat.jpg')), filename: 'thinking-cat.jpg')
+      end
+    end
   end
 
   factory :automatic_taxon, parent: :taxon do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.0.5
+  version: 5.0.6
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-30 00:00:00.000000000 Z
+date: 2025-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -766,6 +766,7 @@ files:
 - app/models/spree/preference.rb
 - app/models/spree/price.rb
 - app/models/spree/product.rb
+- app/models/spree/product/slugs.rb
 - app/models/spree/product/webhooks.rb
 - app/models/spree/product_option_type.rb
 - app/models/spree/product_promotion_rule.rb
@@ -1311,9 +1312,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.0.5
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.0.6
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.0.5
+  source_code_uri: https://github.com/spree/spree/tree/v5.0.6
 post_install_message:
 rdoc_options: []
 require_paths: