spree_core 5.4.0.beta → 5.4.0.beta2

data/config/locales/en.yml

@@ -1,8 +1,5 @@
 ---
 en:
-  action_text:
-    video_embed:
-      not_found: Can't embed a video using the provided URL
   activemodel:
     errors:
       messages:
@@ -737,8 +734,6 @@ en:
     all_adjustments_opened: All adjustments successfully opened!
     all_departments: All departments
     all_items_have_been_returned: All items have been returned
-    all_posts: All posts
-    all_posts_with_tag: All posts with tag
     all_products: All products
     all_rights_reserved: All rights reserved
     all_time: All time
@@ -805,8 +800,6 @@ en:
     bill_address: Bill Address
     billing: Billing
     billing_address: Billing Address
-    blog: Blog
-    blogs_posts: Blogs posts
     body_tag_end: Body tag end
     body_tag_start: Body tag start
     both: Both
@@ -1000,10 +993,6 @@ en:
     default_country_help: Country that will be used for the default shipping and billing addresses on Checkout
     default_currency: Default currency
     default_locale: Default locale
-    default_post_categories:
-      articles: Articles
-      news: News
-      resources: Resources
     default_refund_amount: Default Refund Amount
     default_shipping_address: Default shipping address
     default_stock_location_name: Shop location
@@ -1334,7 +1323,9 @@ en:
     list: List
     live: Live
     loading: Loading
+    locale: Locale
     locale_changed: Locale Changed
+    locale_not_supported_by_store: is not supported by this store
     location: Location
     lock: Lock
     log_entries: Log Entries
@@ -1438,8 +1429,6 @@ en:
     new_payment: New Payment
     new_payment_method: New Payment Method
     new_policy: New Policy
-    new_post: New Post
-    new_post_category: New Post Category
     new_price_list: New Price List
     new_product: New Product
     new_promotion: New Promotion
@@ -1742,8 +1731,6 @@ en:
     please_enter_reasonable_quantity: Please enter a reasonable quantity.
     policies: Policies
     populate_get_error: Something went wrong. Please try adding the item again.
-    post_categories: Post categories
-    posts: Posts
     powered_by: Powered by
     pre_tax_amount: Pre-Tax Amount
     pre_tax_refund_amount: Pre-Tax Refund Amount
@@ -2302,6 +2289,7 @@ en:
     tax_category: Tax Category
     tax_code: Tax Code
     tax_included: Tax (incl.)
+    tax_inclusive: Tax inclusive
     tax_rate_amount_explanation: Tax rates are a decimal amount to aid in calculations, (i.e. if the tax rate is 5% then enter 0.05)
     tax_rates: Tax Rates
     taxes: Taxes
@@ -2325,11 +2313,6 @@ en:
     taxons: Taxons
     terms_of_service: Terms of Service
     test: Test
-    test_mailer:
-      test_email:
-        greeting: Congratulations!
-        message: If you have received this email, then your email settings are correct.
-        subject: Test Mail
     test_mode: Test Mode
     text_alignment: Text alignment
     thank_you_for_your_order: Thank you for your business.  Please print out a copy of this confirmation page for your records.

data/db/migrate/20210914000000_spree_four_three.rb

@@ -407,22 +407,6 @@ class SpreeFourThree < ActiveRecord::Migration[5.2]
       t.index ["promotion_rule_id", "product_id"], name: "index_products_promotion_rules_on_promotion_rule_and_product"
     end
 
-    create_table "spree_product_properties", force: :cascade do |t|
-      t.string "value"
-      t.bigint "product_id"
-      t.bigint "property_id"
-      t.datetime "created_at", precision: 6, null: false
-      t.datetime "updated_at", precision: 6, null: false
-      t.integer "position", default: 0
-      t.boolean "show_property", default: true
-      t.string "filter_param"
-      t.index ["filter_param"], name: "index_spree_product_properties_on_filter_param"
-      t.index ["position"], name: "index_spree_product_properties_on_position"
-      t.index ["product_id"], name: "index_product_properties_on_product_id"
-      t.index ["property_id", "product_id"], name: "index_spree_product_properties_on_property_id_and_product_id", unique: true
-      t.index ["property_id"], name: "index_spree_product_properties_on_property_id"
-    end
-
     create_table "spree_products", force: :cascade do |t|
       t.string "name", default: "", null: false
       t.text "description"
@@ -563,28 +547,6 @@ class SpreeFourThree < ActiveRecord::Migration[5.2]
       t.index ["store_id"], name: "index_spree_promotions_stores_on_store_id"
     end
 
-    create_table "spree_properties", force: :cascade do |t|
-      t.string "name"
-      t.string "presentation", null: false
-      t.datetime "created_at", precision: 6, null: false
-      t.datetime "updated_at", precision: 6, null: false
-      t.boolean "filterable", default: false, null: false
-      t.string "filter_param"
-      t.index ["filter_param"], name: "index_spree_properties_on_filter_param"
-      t.index ["filterable"], name: "index_spree_properties_on_filterable"
-      t.index ["name"], name: "index_spree_properties_on_name"
-    end
-
-    create_table "spree_property_prototypes", force: :cascade do |t|
-      t.bigint "prototype_id"
-      t.bigint "property_id"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.index ["property_id"], name: "index_spree_property_prototypes_on_property_id"
-      t.index ["prototype_id", "property_id"], name: "index_property_prototypes_on_prototype_id_and_property_id", unique: true
-      t.index ["prototype_id"], name: "index_spree_property_prototypes_on_prototype_id"
-    end
-
     create_table "spree_prototype_taxons", force: :cascade do |t|
       t.bigint "taxon_id"
       t.bigint "prototype_id"

data/db/migrate/20210915064329_add_metadata_to_spree_multiple_tables.rb

@@ -4,7 +4,6 @@ class AddMetadataToSpreeMultipleTables < ActiveRecord::Migration[5.2]
       spree_assets
       spree_option_types
       spree_option_values
-      spree_properties
       spree_promotions
       spree_payment_methods
       spree_shipping_methods

data/db/migrate/20260226000000_add_locale_to_spree_orders.rb

@@ -0,0 +1,5 @@
+class AddLocaleToSpreeOrders < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_orders, :locale, :string
+  end
+end

data/db/migrate/20260226100000_add_token_digest_to_spree_api_keys.rb

@@ -0,0 +1,21 @@
+class AddTokenDigestToSpreeApiKeys < ActiveRecord::Migration[7.2]
+  def change
+    add_column :spree_api_keys, :token_digest, :string
+    add_column :spree_api_keys, :token_prefix, :string
+
+    add_index :spree_api_keys, :token_digest, unique: true
+
+    # Replace the unconditional unique index on token with one that only covers
+    # non-NULL values (publishable keys). Secret keys store token as NULL
+    # and use token_digest for lookups instead.
+    change_column_null :spree_api_keys, :token, true
+    remove_index :spree_api_keys, :token
+    if ActiveRecord::Base.connection.adapter_name == 'Mysql2'
+      # MySQL doesn't support partial indexes, but treats NULL as distinct
+      # in unique indexes so multiple secret keys with NULL token are allowed
+      add_index :spree_api_keys, :token, unique: true
+    else
+      add_index :spree_api_keys, :token, unique: true, where: 'token IS NOT NULL'
+    end
+  end
+end

data/lib/generators/spree/cursor_rules/templates/spree_rules.mdc

@@ -77,9 +77,7 @@ class Spree::Product < Spree.base_class
   include Spree::Metafields
   
   has_many :variants, class_name: 'Spree::Variant', dependent: :destroy
-  has_many :product_properties, class_name: 'Spree::ProductProperty', dependent: :destroy
-  has_many :properties, through: :product_properties, source: :property
-  
+
   scope :available, -> { where(available_on: ..Time.current) }
   
   validates :name, presence: true

data/lib/spree/core/configuration.rb

@@ -15,7 +15,6 @@
 # a.get :color
 # a.preferred_color
 #
-require 'spree/core/search/base'
 require 'spree/core/preferences/configuration' # for compatibility reasons
 require 'spree/core/preferences/runtime_configuration'
 require 'spree/core/preferences/preferable'
@@ -83,7 +82,6 @@ module Spree
       preference :mailer_logo, :string, deprecated: true
       preference :max_level_in_taxons_menu, :integer, deprecated: true
       preference :non_expiring_credit_types, :array, default: []
-      preference :product_properties_enabled, :boolean, default: false # enable legacy product properties
       preference :products_per_page, :integer, default: 12
       preference :require_master_price, :boolean, default: false
       preference :restock_inventory, :boolean, default: true # Determines if a return item is restocked automatically once it has been received
@@ -112,7 +110,6 @@ module Spree
       preference :gift_card_batch_web_limit, :integer, default: 500 # number of gift card codes to be generated in the web process, more than this will be generated in a background job
       preference :gift_card_batch_limit, :integer, default: 50_000
 
-      attr_writer :searcher_class
     end
   end
 end

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

@@ -34,8 +34,7 @@ module Spree
         def permitted_product_attributes
           permitted_attributes.product_attributes + [
             variants_attributes: permitted_variant_attributes + ['id', :_destroy],
-            master_attributes: permitted_variant_attributes + ['id'],
-            product_properties_attributes: permitted_product_properties_attributes + ['id', :_destroy]
+            master_attributes: permitted_variant_attributes + ['id']
           ]
         end
 

data/lib/spree/core/dependencies.rb

@@ -56,9 +56,8 @@ module Spree
         # sorter
         collection_sorter: 'Spree::BaseSorter',
         order_sorter: 'Spree::BaseSorter',
+        posts_sorter: nil,
         products_sorter: 'Spree::Products::Sort',
-        posts_sorter: 'Spree::Posts::Sort',
-
         # paginator
         collection_paginator: 'Spree::Shared::Paginate',
 
@@ -87,13 +86,6 @@ module Spree
 
         payment_create_service: 'Spree::Payments::Create',
 
-        # data feeds
-        data_feeds_google_rss_service: 'Spree::DataFeeds::Google::Rss',
-        data_feeds_google_optional_attributes_service: 'Spree::DataFeeds::Google::OptionalAttributes',
-        data_feeds_google_required_attributes_service: 'Spree::DataFeeds::Google::RequiredAttributes',
-        data_feeds_google_optional_sub_attributes_service: 'Spree::DataFeeds::Google::OptionalSubAttributes',
-        data_feeds_google_products_list: 'Spree::DataFeeds::Google::ProductsList',
-
         # finders
         address_finder: 'Spree::Addresses::Find',
         country_finder: 'Spree::Countries::Find',
@@ -103,8 +95,8 @@ module Spree
         current_store_finder: 'Spree::Stores::FindDefault',
         completed_order_finder: 'Spree::Orders::FindComplete',
         credit_card_finder: 'Spree::CreditCards::Find',
+        posts_finder: nil,
         products_finder: 'Spree::Products::Find',
-        posts_finder: 'Spree::Posts::Find',
         taxon_finder: 'Spree::Taxons::Find',
         line_item_by_variant_finder: 'Spree::LineItems::FindByVariant',
         variant_finder: 'Spree::Variants::Find'

data/lib/spree/core/engine.rb

@@ -14,7 +14,6 @@ module Spree
                                :promotions,
                                :pricing,
                                :line_item_comparison_hooks,
-                               :data_feed_types,
                                :export_types,
                                :import_types,
                                :taxon_rules,
@@ -43,10 +42,6 @@ module Spree
       # Add app/subscribers to autoload paths
       config.paths.add 'app/subscribers', eager_load: true
 
-      rake_tasks do
-        load File.join(root, 'lib', 'tasks', 'exchanges.rake')
-      end
-
       initializer 'spree.environment', before: :load_config_initializers do |app|
         app.config.spree = Environment.new(SpreeCalculators.new, SpreeValidators.new, Spree::Core::Configuration.new, Spree::Core::Dependencies.new)
 
@@ -127,7 +122,6 @@ module Spree
 
         Rails.application.config.spree.payment_methods = [
           Spree::Gateway::Bogus,
-          Spree::Gateway::BogusSimple,
           Spree::Gateway::CustomPaymentSourceMethod,
           Spree::PaymentMethod::Check,
           Spree::PaymentMethod::StoreCredit
@@ -181,10 +175,6 @@ module Spree
           Promotion::Actions::FreeShipping
         ]
 
-        Rails.application.config.spree.data_feed_types = [
-          Spree::DataFeed::Google
-        ]
-
         Rails.application.config.spree.export_types = [
           Spree::Exports::Products,
           Spree::Exports::Orders,
@@ -212,7 +202,6 @@ module Spree
         Rails.application.config.spree.translatable_resources = [
           Spree::OptionType,
           Spree::Product,
-          Spree::Property,
           Spree::Taxon,
           Spree::Taxonomy,
           Spree::Store,
@@ -243,8 +232,6 @@ module Spree
           Spree::Payment,
           Spree::PaymentMethod,
           Spree::PaymentSource,
-          Spree::Post,
-          Spree::PostCategory,
           Spree::Product,
           Spree::Promotion,
           Spree::Refund,

data/lib/spree/core/pricing/resolver.rb

@@ -12,9 +12,7 @@ module Spree
       # Returns the best price for the variant
       # @return [Spree::Price]
       def resolve
-        Rails.cache.fetch(cache_key, expires_in: 15.minutes) do
-          find_best_price
-        end
+        find_best_price
       end
 
       private
@@ -118,12 +116,6 @@ module Spree
           price_list_id: nil
         )
       end
-
-      # Returns the cache key for the resolver
-      # @return [String]
-      def cache_key
-        "#{context.cache_key}/resolved_price"
-      end
     end
   end
 end

data/lib/spree/core/version.rb

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

data/lib/spree/core.rb

@@ -11,7 +11,7 @@ require 'action_cable/engine'
 require 'mail'
 require 'action_mailer/railtie'
 
-require 'active_merchant'
+
 require 'acts_as_list'
 require 'acts-as-taggable-on'
 require 'awesome_nested_set'
@@ -28,7 +28,7 @@ require 'state_machines-activerecord'
 require 'active_storage_validations'
 require 'wannabe_bool'
 require 'geocoder'
-require 'oembed'
+
 require 'safely_block'
 require 'ar_lazy_preload'
 require 'sqids'
@@ -41,7 +41,7 @@ module Spree
   mattr_accessor :base_class, :user_class, :admin_user_class,
                  :private_storage_service_name, :public_storage_service_name,
                  :cdn_host, :root_domain, :searcher_class, :events_adapter_class, :queues,
-                 :google_places_api_key, :screenshot_api_token
+                 :google_places_api_key
 
   def self.base_class(constantize: true)
     @@base_class ||= 'Spree::Base'
@@ -113,14 +113,14 @@ module Spree
     )
   end
 
-  def self.searcher_class(constantize: true)
-    @@searcher_class ||= 'Spree::Core::Search::Base'
+  # @deprecated Spree.searcher_class is deprecated and will be removed in Spree 5.5.
+  def self.searcher_class=(value)
+    Spree::Deprecation.warn('Spree.searcher_class is deprecated and will be removed in Spree 5.5. Please remove it from your initializer.')
+    @@searcher_class = value
+  end
 
-    if @@searcher_class.is_a?(Class)
-      raise 'Spree.searcher_class MUST be a String or Symbol object, not a Class object.'
-    elsif @@searcher_class.is_a?(String) || @@searcher_class.is_a?(Symbol)
-      constantize ? @@searcher_class.to_s.constantize : @@searcher_class.to_s
-    end
+  def self.searcher_class(constantize: true)
+    @@searcher_class
   end
 
   # Returns the events adapter class used for publishing and subscribing to events.
@@ -144,10 +144,6 @@ module Spree
     @@google_places_api_key
   end
 
-  def self.screenshot_api_token
-    @@screenshot_api_token
-  end
-
   def self.always_use_translations?
     Spree::Config.always_use_translations
   end
@@ -246,14 +242,6 @@ module Spree
     Rails.application.config.spree.line_item_comparison_hooks = value
   end
 
-  def self.data_feed_types
-    Rails.application.config.spree.data_feed_types
-  end
-
-  def self.data_feed_types=(value)
-    Rails.application.config.spree.data_feed_types = value
-  end
-
   def self.export_types
     Rails.application.config.spree.export_types
   end
@@ -414,7 +402,6 @@ module Spree
   end
 
   module Core
-    autoload :ProductFilters, 'spree/core/product_filters'
     autoload :TokenGenerator, 'spree/core/token_generator'
 
     class GatewayError < RuntimeError; end
@@ -441,11 +428,9 @@ require 'spree/webhooks'
 
 require 'spree/core/partials'
 require 'spree/core/importer'
-require 'spree/core/query_filters'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/order'
-require 'spree/core/controller_helpers/search'
 require 'spree/core/controller_helpers/store'
 require 'spree/core/controller_helpers/strong_parameters'
 require 'spree/core/controller_helpers/locale'

data/lib/spree/permitted_attributes.rb

@@ -39,15 +39,11 @@ module Spree
       :payment_session_attributes,
       :payment_setup_session_attributes,
       :policy_attributes,
-      :post_attributes,
-      :post_category_attributes,
       :price_list_attributes,
       :product_attributes,
       :promotion_attributes,
       :promotion_rule_attributes,
       :promotion_action_attributes,
-      :product_properties_attributes,
-      :property_attributes,
       :refund_attributes,
       :refund_reason_attributes,
       :reimbursement_attributes,
@@ -97,7 +93,7 @@ module Spree
 
     @@checkout_attributes = [
       :coupon_code, :email, :shipping_method_id, :special_instructions, :use_billing, :use_shipping,
-      :user_id, :bill_address_id, :ship_address_id, :accept_marketing, :signup_for_an_account, :currency,
+      :user_id, :bill_address_id, :ship_address_id, :accept_marketing, :signup_for_an_account, :currency, :locale,
       :internal_note
     ]
 
@@ -140,7 +136,7 @@ module Spree
 
     @@invitation_attributes = [:email, :expires_at, :role_id]
 
-    @@line_item_attributes = [:id, :variant_id, :quantity]
+    @@line_item_attributes = [:id, :variant_id, :quantity, { metadata: {} }]
 
     @@market_attributes = [:name, :currency, :default_locale, :supported_locales,
                            :tax_inclusive, :default, :position, country_ids: []]
@@ -177,14 +173,8 @@ module Spree
 
     @@policy_attributes = [:name, :slug, :body]
 
-    @@post_attributes = [:title, :meta_title, :meta_description, :slug, :author_id, :post_category_id, :published_at, :content, :excerpt, :image, tag_list: []]
-
-    @@post_category_attributes = [:title, :slug, :description]
-
     @@price_list_attributes = [:name, :description, :match_policy, :starts_at, :ends_at, :status, :position]
 
-    @@product_properties_attributes = [:property_name, :property_id, :value, :position, :_destroy]
-
     @@product_attributes = [
       :name, :description, :available_on, :make_active_at, :discontinue_on, :permalink, :meta_description,
       :meta_keywords, :meta_title, :price, :sku, :deleted_at, :prototype_id,
@@ -210,8 +200,6 @@ module Spree
 
     @@promotion_action_attributes = [:type, :calculator_type, calculator_attributes: {}, promotion_action_line_items_attributes: [:id, :promotion_action_id, :variant_id, :quantity, :_destroy]]
 
-    @@property_attributes = [:name, :presentation, :position, :kind, :display_on]
-
     @@refund_attributes = [:amount, :refund_reason_id]
 
     @@refund_reason_attributes = [:name, :active, :mutable]

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

@@ -5,6 +5,7 @@ FactoryBot.define do
     completed_at { nil }
     email        { user&.email }
     currency     { 'USD' }
+    locale       { 'en' }
 
     transient do
       line_items_price { BigDecimal(10) }

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

@@ -23,12 +23,7 @@ FactoryBot.define do
     name { 'Credit Card' }
   end
 
-  # authorize.net was moved to spree_gateway.
-  # Leaving this factory in place with bogus in case anyone is using it.
-  factory :simple_credit_card_payment_method, parent: :payment_method, class: Spree::Gateway::BogusSimple do
-    type { 'Spree::Gateway::BogusSimple' }
-    name { 'Credit Card' }
-  end
+  factory :simple_credit_card_payment_method, parent: :credit_card_payment_method
 
   factory :store_credit_payment_method, parent: :payment_method, class: Spree::PaymentMethod::StoreCredit do
     type          { 'Spree::PaymentMethod::StoreCredit' }

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

@@ -50,13 +50,6 @@ FactoryBot.define do
       factory :product_with_option_types do
         after(:create) { |product| create(:product_option_type, product: product) }
       end
-      factory :product_with_properties do
-        after(:create) do |product|
-          property = create(:property, :brand)
-          create(:product_property, product: product, property: property, value: 'Epsilon')
-        end
-      end
-
       factory :digital_product do
         track_inventory { false }
         shipping_category { |r| Spree::ShippingCategory.digital || r.association(:digital_shipping_category) }

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

@@ -1,11 +1,9 @@
 FactoryBot.define do
   factory :prototype, class: Spree::Prototype do
     name       { 'Baseball Cap' }
-    properties { [build(:property)] }
   end
   factory :prototype_with_option_types, class: Spree::Prototype do
     name         { 'Baseball Cap' }
-    properties   { [build(:property)] }
     option_types { [build(:option_type)] }
   end
 end