spree_core 5.1.0.beta3 → 5.1.0.rc1

data/lib/spree/permitted_attributes.rb

@@ -12,6 +12,8 @@ module Spree
       :digital_attributes,
       :digital_link_attributes,
       :export_attributes,
+      :gift_card_attributes,
+      :gift_card_batch_attributes,
       :image_attributes,
       :integration_attributes,
       :inventory_unit_attributes,
@@ -105,6 +107,10 @@ module Spree
 
     @@export_attributes = [:type, :format, :record_selection, :search_params]
 
+    @@gift_card_attributes = [:code, :amount, :expires_at, :user_id]
+
+    @@gift_card_batch_attributes = [:prefix, :codes_count, :amount, :expires_at]
+
     @@image_attributes = [:alt, :attachment, :position, :viewable_type, :viewable_id]
 
     @@integration_attributes = [:type, :active]
@@ -127,7 +133,7 @@ module Spree
 
     @@page_attributes = [:name, :slug, :meta_title, :meta_description, :meta_keywords]
 
-    @@page_block_attributes = [:type, :name, :text, :position]
+    @@page_block_attributes = [:type, :name, :text, :position, :asset]
 
     @@page_link_attributes = [:linkable_id, :linkable_type, :position, :label, :url, :open_in_new_tab]
 
@@ -145,7 +151,7 @@ module Spree
 
     @@product_attributes = [
       :name, :description, :available_on, :make_active_at, :discontinue_on, :permalink, :meta_description,
-      :meta_keywords, :price, :sku, :deleted_at, :prototype_id,
+      :meta_keywords, :meta_title, :price, :sku, :deleted_at, :prototype_id,
       :option_values_hash, :weight, :height, :width, :depth,
       :shipping_category_id, :tax_category_id,
       :cost_currency, :cost_price, :compare_at_price,
@@ -164,7 +170,7 @@ module Spree
     @@promotion_attributes = [:name, :description, :starts_at, :expires_at, :code, :usage_limit, :path, :match_policy,
                               :advertise, :promotion_category_id, :code_prefix, :kind, :number_of_codes, :multi_codes, store_ids: []]
 
-    @@promotion_rule_attributes = [:type, :preferred_match_policy, user_ids_to_add: [], product_ids_to_add: [], taxon_ids_to_add: []]
+    @@promotion_rule_attributes = [:type, :preferred_match_policy, preferred_eligible_values: [], user_ids_to_add: [], product_ids_to_add: [], taxon_ids_to_add: []]
 
     @@promotion_action_attributes = [:type, :calculator_type, calculator_attributes: {}, promotion_action_line_items_attributes: [:id, :promotion_action_id, :variant_id, :quantity, :_destroy]]
 
@@ -180,11 +186,18 @@ module Spree
 
     @@report_attributes = [:type, :date_from, :date_to, :currency]
 
-    @@return_authorization_attributes = [:amount, :memo, :stock_location_id, :inventory_units_attributes,
-                                         :return_authorization_reason_id, {
-                                          return_items_attributes: [:id, :inventory_unit_id, :return_authorization_id, :returned, :pre_tax_amount,
-                                            :acceptance_status, :exchange_variant_id, :resellable]
-                                        }]
+    @@return_authorization_attributes = [
+      :amount, :memo, :stock_location_id, :inventory_units_attributes,
+      :return_authorization_reason_id, {
+        return_items_attributes: [
+          :_destroy,
+          :id, :inventory_unit_id,
+          :preferred_reimbursement_type_id,
+          :return_authorization_id, :returned, :pre_tax_amount,
+          :acceptance_status, :exchange_variant_id, :resellable
+        ]
+      }
+    ]
 
     @@return_authorization_reason_attributes = [:name, :active]
 
@@ -199,7 +212,7 @@ module Spree
 
     @@shipping_category_attributes = [:name]
 
-    @@shipping_method_attributes = [:name, :code,:tracking_url, :tax_category_id, :display_on,
+    @@shipping_method_attributes = [:name, :admin_name, :code, :tracking_url, :tax_category_id, :display_on,
                                     :estimated_transit_business_days_min, :estimated_transit_business_days_max,
                                     :calculator_type, :preferences, zone_ids: [], shipping_category_ids: [], calculator_attributes: {}]
 
@@ -271,7 +284,7 @@ module Spree
       :weight, :height, :width, :depth, :sku, :barcode, :cost_currency,
       :weight_unit, :dimensions_unit,
       {
-        options: [:id, :name, :value, :position, :_destroy],
+        options: [:id, :name, :option_value_presentation, :option_value_name, :position, :_destroy],
         stock_items_attributes: [:id, :count_on_hand, :stock_location_id, :backorderable, :_destroy],
         prices_attributes: [:id, :amount, :compare_at_amount, :currency, :_destroy],
         price: {},

data/lib/spree/testing_support/authorization_helpers.rb

@@ -15,15 +15,11 @@ module Spree
         include CustomAbility
 
         def stub_authorization!(&block)
-          ability_class = build_ability(&block)
-
-          let(:user) { Spree.admin_user_class.new(email: FFaker::Internet.email) }
+          let(:admin_user) { FactoryBot.create(:admin_user) }
 
           before do
-            allow(controller).to receive(:current_ability).and_return(ability_class.new(nil))
-
             if defined?(Spree::Admin::BaseController)
-              allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(user)
+              allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(admin_user)
             end
           end
         end
@@ -44,12 +40,11 @@ module Spree
             ability_class.register_ability(ability)
           end
 
-          let(:user) { Spree.admin_user_class.new(email: FFaker::Internet.email) }
+          let(:admin_user) { FactoryBot.create(:admin_user) }
 
           before do
-            allow(Spree.admin_user_class).to receive(:find_by).and_return(user)
             if defined?(Spree::Admin::BaseController)
-              allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(user)
+              allow_any_instance_of(Spree::Admin::BaseController).to receive(:try_spree_current_user).and_return(admin_user)
             end
           end
         end
@@ -73,4 +68,5 @@ end
 RSpec.configure do |config|
   config.extend Spree::TestingSupport::AuthorizationHelpers::Controller, type: :controller
   config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :feature
+  config.extend Spree::TestingSupport::AuthorizationHelpers::Request, type: :request
 end

data/lib/spree/testing_support/common_rake.rb

@@ -33,13 +33,19 @@ namespace :common do
       system('bin/rails stimulus:install')
     end
 
+    # install devise if it's not the legacy user, useful for testing storefront
+    if args[:authentication] == 'devise' && args[:user_class] != 'Spree::LegacyUser'
+      system('bin/rails g devise:install --force --auto-accept')
+      system("bin/rails g devise #{args[:user_class]} --force --auto-accept")
+      system('rm -rf spec') # we need to cleanup factories created by devise to avoid naming conflict
+    end
+
     Spree::InstallGenerator.start [
       "--lib_name=#{ENV['LIB_NAME']}",
       '--auto-accept',
       '--migrate=false',
       '--seed=false',
       '--sample=false',
-      '--copy_storefront=false',
       "--install_storefront=#{args[:install_storefront]}",
       "--install_admin=#{args[:install_admin]}",
       "--user_class=#{args[:user_class]}",

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

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :gift_card_batch, class: Spree::GiftCardBatch do
+    store { Spree::Store.default || create(:store) }
+  end
+end

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

@@ -0,0 +1,17 @@
+FactoryBot.define do
+  factory :gift_card, class: Spree::GiftCard do
+    state { :active }
+    amount { 10.00 }
+    store { Spree::Store.default || create(:store) }
+
+    trait :redeemed do
+      state { :redeemed }
+      redeemed_at { Time.current }
+      amount_used { amount }
+    end
+
+    trait :expired do
+      expires_at { 1.day.ago }
+    end
+  end
+end

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

@@ -1,7 +1,6 @@
 FactoryBot.define do
   factory :page_section, class: Spree::PageSection do
     pageable { Spree::Page.find_by!(name: 'Homepage') }
-    pageable_type { 'Spree::Page' }
 
     trait :without_links do
       do_not_create_links { true }
@@ -22,5 +21,7 @@ FactoryBot.define do
     factory :video_page_section, class: Spree::PageSections::Video
 
     factory :image_with_text_page_section, class: Spree::PageSections::ImageWithText
+
+    factory :featured_posts_page_section, class: Spree::PageSections::FeaturedPosts
   end
 end

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

@@ -14,6 +14,11 @@ FactoryBot.define do
         create(:refund, amount: 5, payment: payment)
       end
     end
+
+    factory :custom_payment, class: Spree::Payment do
+      payment_method { create(:custom_payment_method, stores: [order.store]) }
+      source { create(:payment_source, user: order.user, payment_method: payment_method) }
+    end
   end
 
   factory :check_payment, class: Spree::Payment do

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

@@ -37,4 +37,9 @@ FactoryBot.define do
     active        { true }
     auto_capture  { true }
   end
+
+  factory :custom_payment_method, parent: :payment_method, class: Spree::Gateway::CustomPaymentSourceMethod do
+    type { 'Spree::Gateway::CustomPaymentSourceMethod' }
+    name { 'Custom' }
+  end
 end

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

@@ -0,0 +1,5 @@
+FactoryBot.define do
+  factory :payment_source, class: Spree::PaymentSource do
+    association(:payment_method, factory: :custom_payment_method)
+  end
+end

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

@@ -6,5 +6,9 @@ FactoryBot.define do
     published_at { Time.current }
     author { create(:admin_user) }
     store { Spree::Store.default || create(:store) }
+
+    trait :with_image do
+      image { Rack::Test::UploadedFile.new(Spree::Core::Engine.root.join('spec/fixtures/thinking-cat.jpg'), 'image/jpeg') }
+    end
   end
 end

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

@@ -14,4 +14,8 @@ FactoryBot.define do
   factory :promotion_rule_taxon, class: Spree::Promotion::Rules::Taxon do
     association :promotion
   end
+
+  factory :promotion_rule_option_value, class: Spree::Promotion::Rules::OptionValue do
+    association :promotion
+  end
 end

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

@@ -8,7 +8,7 @@ FactoryBot.define do
     end
 
     trait :preview do
-      parent { create(:theme) }
+      parent { Spree::Store.default.default_theme || create(:theme, store: store) }
     end
   end
 end

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

@@ -5,8 +5,8 @@ FactoryBot.define do
     password              { 'secret' }
     password_confirmation { password }
 
-    first_name { FFaker::Name.first_name } if Spree.user_class.attribute_method?(:first_name)
-    last_name  { FFaker::Name.last_name } if Spree.user_class.attribute_method?(:last_name)
+    first_name { FFaker::Name.first_name }
+    last_name  { FFaker::Name.last_name }
 
     public_metadata { {} }
     private_metadata { {} }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_core
 version: !ruby/object:Gem::Version
-  version: 5.1.0.beta3
+  version: 5.1.0.rc1
 platform: ruby
 authors:
 - Sean Schofield
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-05-29 00:00:00.000000000 Z
+date: 2025-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
@@ -336,28 +336,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: state_machines-activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: stringex
   requirement: !ruby/object:Gem::Requirement
@@ -434,14 +434,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.3.2
 - !ruby/object:Gem::Dependency
   name: mobility-ransack
   requirement: !ruby/object:Gem::Requirement
@@ -540,6 +546,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: phonelib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
 description: Spree Models, Helpers, Services and core libraries
 email: hello@spreecommerce.org
 executables: []
@@ -577,6 +597,7 @@ files:
 - app/helpers/spree/locale_helper.rb
 - app/helpers/spree/mail_helper.rb
 - app/helpers/spree/products_helper.rb
+- app/helpers/spree/shipment_helper.rb
 - app/javascript/spree/core/controllers/address_autocomplete_controller.js
 - app/javascript/spree/core/controllers/address_form_controller.js
 - app/javascript/spree/core/controllers/disable_submit_button_controller.js
@@ -588,6 +609,7 @@ files:
 - app/jobs/spree/base_job.rb
 - app/jobs/spree/coupon_codes/bulk_generate_job.rb
 - app/jobs/spree/exports/generate_job.rb
+- app/jobs/spree/gift_cards/bulk_generate_job.rb
 - app/jobs/spree/products/auto_match_taxons_job.rb
 - app/jobs/spree/products/touch_taxons_job.rb
 - app/jobs/spree/reports/generate_job.rb
@@ -622,6 +644,7 @@ files:
 - app/models/concerns/spree/number_as_param.rb
 - app/models/concerns/spree/number_identifier.rb
 - app/models/concerns/spree/parameterizable_name.rb
+- app/models/concerns/spree/payment_source_concern.rb
 - app/models/concerns/spree/previewable.rb
 - app/models/concerns/spree/product_scopes.rb
 - app/models/concerns/spree/ransackable_attributes.rb
@@ -686,7 +709,10 @@ files:
 - app/models/spree/gateway.rb
 - app/models/spree/gateway/bogus.rb
 - app/models/spree/gateway/bogus_simple.rb
+- app/models/spree/gateway/custom_payment_source_method.rb
 - app/models/spree/gateway_customer.rb
+- app/models/spree/gift_card.rb
+- app/models/spree/gift_card_batch.rb
 - app/models/spree/image.rb
 - app/models/spree/image/configuration/active_storage.rb
 - app/models/spree/integration.rb
@@ -706,6 +732,7 @@ files:
 - app/models/spree/order/currency_updater.rb
 - app/models/spree/order/digital.rb
 - app/models/spree/order/emails.rb
+- app/models/spree/order/gift_card.rb
 - app/models/spree/order/payments.rb
 - app/models/spree/order/store_credit.rb
 - app/models/spree/order/webhooks.rb
@@ -787,6 +814,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
@@ -940,6 +968,7 @@ files:
 - app/services/spree/account/update.rb
 - app/services/spree/addresses/create.rb
 - app/services/spree/addresses/helper.rb
+- app/services/spree/addresses/phone_validator.rb
 - app/services/spree/addresses/update.rb
 - app/services/spree/cart/add_item.rb
 - app/services/spree/cart/associate.rb
@@ -974,6 +1003,9 @@ files:
 - app/services/spree/data_feeds/google/required_attributes.rb
 - app/services/spree/data_feeds/google/rss.rb
 - app/services/spree/generate_token.rb
+- app/services/spree/gift_cards/apply.rb
+- app/services/spree/gift_cards/redeem.rb
+- app/services/spree/gift_cards/remove.rb
 - app/services/spree/line_items/create.rb
 - app/services/spree/line_items/destroy.rb
 - app/services/spree/line_items/helper.rb
@@ -1055,7 +1087,6 @@ files:
 - config/initializers/mobility.rb
 - config/initializers/oembed.rb
 - config/initializers/rails61_fixes.rb
-- config/initializers/state_machine.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20210914000000_spree_four_three.rb
@@ -1156,9 +1187,12 @@ files:
 - db/migrate/20250407085228_create_spree_integrations.rb
 - db/migrate/20250410061306_create_spree_invitations.rb
 - db/migrate/20250418174652_add_resource_to_spree_role_users.rb
+- db/migrate/20250506073057_create_spree_gift_cards_and_spree_gift_card_batches.rb
 - db/migrate/20250508060800_add_selected_locale_to_spree_admin_users.rb
 - db/migrate/20250509143831_add_session_id_to_spree_assets.rb
 - db/migrate/20250527134027_add_company_to_spree_stock_locations.rb
+- db/migrate/20250530101236_enable_pg_trgm_extension.rb
+- db/migrate/20250605131334_add_missing_fields_to_users.rb
 - db/seeds.rb
 - lib/friendly_id/paranoia.rb
 - lib/generators/spree/authentication/custom/custom_generator.rb
@@ -1249,6 +1283,8 @@ files:
 - lib/spree/testing_support/factories/export_factory.rb
 - lib/spree/testing_support/factories/favicon_image_factory.rb
 - lib/spree/testing_support/factories/gateway_customer_factory.rb
+- lib/spree/testing_support/factories/gift_card_batch_factory.rb
+- lib/spree/testing_support/factories/gift_card_factory.rb
 - lib/spree/testing_support/factories/google_data_feed_factory.rb
 - lib/spree/testing_support/factories/image_factory.rb
 - lib/spree/testing_support/factories/integration_factory.rb
@@ -1266,6 +1302,7 @@ files:
 - lib/spree/testing_support/factories/payment_capture_event_factory.rb
 - lib/spree/testing_support/factories/payment_factory.rb
 - lib/spree/testing_support/factories/payment_method_factory.rb
+- lib/spree/testing_support/factories/payment_source_factory.rb
 - lib/spree/testing_support/factories/post_category_factory.rb
 - lib/spree/testing_support/factories/post_factory.rb
 - lib/spree/testing_support/factories/price_factory.rb
@@ -1345,9 +1382,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.beta3
+  changelog_uri: https://github.com/spree/spree/releases/tag/v5.1.0.rc1
   documentation_uri: https://docs.spreecommerce.org/
-  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.beta3
+  source_code_uri: https://github.com/spree/spree/tree/v5.1.0.rc1
 post_install_message:
 rdoc_options: []
 require_paths:

data/config/initializers/state_machine.rb

@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-module MachineDecorator
-  protected
-
-  # Determines whether there's already a helper method defined within the
-  # given scope.  This is true only if one of the owner's ancestors defines
-  # the method and is further along in the ancestor chain than this
-  # machine's helper module.
-  def owner_class_ancestor_has_method?(scope, method)
-    return false unless owner_class_has_method?(scope, method)
-
-    superclasses = owner_class.ancestors.select { |ancestor| ancestor.is_a?(Class) }[1..-1]
-
-    if scope == :class
-      current = owner_class.singleton_class
-      superclass = superclasses.first
-    else
-      current = owner_class
-      superclass = owner_class.superclass
-    end
-
-    # Generate the list of modules that *only* occur in the owner class, but
-    # were included *prior* to the helper modules, in addition to the
-    # superclasses
-    ancestors = current.ancestors - superclass.ancestors + superclasses
-    ancestors = ancestors[ancestors.index(@helper_modules[scope])..-1].reverse
-
-    # Search for for the first ancestor that defined this method
-    ancestors.detect do |ancestor|
-      ancestor = ancestor.singleton_class if scope == :class && ancestor.is_a?(Class)
-      ancestor.method_defined?(method) || ancestor.private_method_defined?(method)
-    end
-  end
-end
-
-::StateMachines::Machine.prepend MachineDecorator