spree_core 4.2.5 → 4.3.0.rc1

data/db/migrate/20210730154425_fix_promotion_code_and_path_unique_indexes.rb

@@ -0,0 +1,9 @@
+class FixPromotionCodeAndPathUniqueIndexes < ActiveRecord::Migration[5.2]
+  def change
+    # removing unique indexes
+    remove_index :spree_promotions, :code
+    # applying standard indexes
+    add_index :spree_promotions, :code
+    add_index :spree_promotions, :path unless index_exists?(:spree_promotions, :path)
+  end
+end

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

@@ -4,6 +4,8 @@ require 'spree/core/version'
 
 module Spree
   class DummyGenerator < Rails::Generators::Base
+    SPREE_GEMS = %w(spree_backend spree_frontend spree_api spree_emails).freeze
+
     desc 'Creates blank Rails application, installs Spree and all sample data'
 
     class_option :lib_name, default: ''
@@ -56,15 +58,18 @@ module Spree
       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 'initializers/bullet.rb', "#{dummy_path}/config/initializers/bullet.rb", force: true
     end
 
     def test_dummy_inject_extension_requirements
       if DummyGeneratorHelper.inject_extension_requirements
-        inside dummy_path do
-          inject_require_for('spree_frontend')
-          inject_require_for('spree_backend')
-          inject_require_for('spree_api')
+        SPREE_GEMS.each do |gem|
+          begin
+            require "#{gem}"
+            inside dummy_path do
+              inject_require_for(gem)
+            end
+          rescue
+          end
         end
       end
     end
@@ -137,7 +142,7 @@ end
     end
 
     def gemfile_path
-      core_gems = ['spree/core', 'spree/api', 'spree/backend', 'spree/frontend', 'spree/sample']
+      core_gems = ['spree/core', 'spree/api']
 
       if core_gems.include?(lib_name)
         '../../../../../Gemfile'

data/lib/generators/spree/dummy_model/templates/model.rb.tt

@@ -1,5 +1,5 @@
 module Spree
-  class Spree::DummyModel < ApplicationRecord
+  class DummyModel < Spree::Base
     acts_as_list
     validates :name, presence: true
   end

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

@@ -9,8 +9,9 @@ module Spree
   class InstallGenerator < Rails::Generators::Base
     class_option :migrate, type: :boolean, default: true, banner: 'Run Spree migrations'
     class_option :seed, type: :boolean, default: true, banner: 'load seed data (migrations must be run)'
-    class_option :sample, type: :boolean, default: true, banner: 'load sample data (migrations must be run)'
-    class_option :install_storefront, type: :boolean, default: true, banner: 'installs storefront configuration files'
+    class_option :sample, type: :boolean, default: false, banner: 'load sample data (migrations must be run)'
+    class_option :install_storefront, type: :boolean, default: false, banner: 'installs default rails storefront'
+    class_option :install_admin, type: :boolean, default: false, banner: 'installs default rails admin'
     class_option :copy_storefront, type: :boolean, default: false, banner: 'copy all storefront views and stylesheets'
     class_option :auto_accept, type: :boolean
     class_option :user_class, type: :string
@@ -32,6 +33,7 @@ module Spree
       @load_seed_data = options[:seed]
       @load_sample_data = options[:sample]
       @install_storefront = options[:install_storefront]
+      @install_admin = options[:install_admin]
       @copy_storefront = options[:copy_storefront]
 
       unless @run_migrations
@@ -62,28 +64,6 @@ module Spree
       ROBOTS
     end
 
-    def setup_assets
-      @lib_name = 'spree'
-      %w{javascripts stylesheets images}.each do |path|
-        if Spree::Core::Engine.frontend_available? || Rails.env.test?
-          empty_directory "vendor/assets/#{path}/spree/frontend"
-        end
-        if Spree::Core::Engine.backend_available? || Rails.env.test?
-          empty_directory "vendor/assets/#{path}/spree/backend"
-        end
-      end
-
-      if Spree::Core::Engine.frontend_available? || Rails.env.test?
-        template 'vendor/assets/javascripts/spree/frontend/all.js'
-        template 'vendor/assets/stylesheets/spree/frontend/all.css'
-      end
-
-      if Spree::Core::Engine.backend_available? || Rails.env.test?
-        template 'vendor/assets/javascripts/spree/backend/all.js'
-        template 'vendor/assets/stylesheets/spree/backend/all.css'
-      end
-    end
-
     def create_overrides_directory
       empty_directory 'app/overrides'
     end
@@ -94,6 +74,12 @@ module Spree
       end
     end
 
+    def install_admin
+      if @install_admin && Spree::Core::Engine.backend_available?
+        generate 'spree:backend:install'
+      end
+    end
+
     def copy_storefront
       if @copy_storefront && Spree::Core::Engine.frontend_available?
         generate 'spree:frontend:copy_storefront'
@@ -185,6 +171,8 @@ module Spree
     end
 
     def load_sample_data
+      return unless Spree::Core::Engine.sample_available?
+
       if @load_sample_data
         say_status :loading, 'sample data'
         silence_stream(STDOUT) do

data/lib/spree/core.rb

@@ -1,17 +1,21 @@
-require 'rails/all'
+require 'action_controller/railtie'
+require 'action_view/railtie'
+require 'active_job/railtie'
+require 'active_model/railtie'
+require 'active_record/railtie'
+require 'active_storage/engine'
+
 require 'active_merchant'
 require 'acts_as_list'
+require 'auto_strip_attributes'
 require 'awesome_nested_set'
 require 'cancan'
 require 'friendly_id'
 require 'kaminari'
-require 'mail'
 require 'monetize'
 require 'paranoia'
 require 'mini_magick'
-require 'premailer/rails'
 require 'ransack'
-require 'responders'
 require 'state_machines-activerecord'
 require 'active_storage_validations'
 

data/lib/spree/core/components.rb

@@ -12,6 +12,14 @@ module Spree
       def self.frontend_available?
         @@frontend_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('Spree::Frontend::Engine')
       end
+
+      def self.emails_available?
+        @@emails_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('Spree::Emails::Engine')
+      end
+
+      def self.sample_available?
+        @@sample_available ||= ::Rails::Engine.subclasses.map(&:instance).map { |e| e.class.to_s }.include?('SpreeSample::Engine')
+      end
     end
   end
 end

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

@@ -34,10 +34,12 @@ module Spree
         end
 
         def current_oauth_token
+          get_last_access_token = ->(user) { Doorkeeper::AccessToken.active_for(user).where(expires_in: nil).last }
+          create_access_token = ->(user) { Doorkeeper::AccessToken.create!(resource_owner_id: user.id) }
           user = try_spree_current_user
           return unless user
 
-          @current_oauth_token ||= Doorkeeper::AccessToken.active_for(user).last || Doorkeeper::AccessToken.create!(resource_owner_id: user.id)
+          @current_oauth_token ||= get_last_access_token.call(user) || create_access_token.call(user)
         end
 
         def store_location
@@ -71,6 +73,10 @@ 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)
+            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
           if try_spree_current_user
             flash[:error] = Spree.t(:authorization_failure)
             redirect_to spree.forbidden_path

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

@@ -19,7 +19,7 @@ module Spree
           def title
             title_string = @title.present? ? @title : accurate_title
             if title_string.present?
-              if Spree::Config[:always_put_site_name_in_title]
+              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

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

@@ -19,7 +19,7 @@ module Spree
             @simple_current_order.last_ip_address = ip_address
             return @simple_current_order
           else
-            @simple_current_order = Spree::Order.new
+            @simple_current_order = current_store.orders.new
           end
         end
 
@@ -36,7 +36,7 @@ module Spree
           @current_order = find_order_by_token_or_user(options, true)
 
           if options[:create_order_if_necessary] && (@current_order.nil? || @current_order.completed?)
-            @current_order = Spree::Order.create!(current_order_params)
+            @current_order = current_store.orders.create!(current_order_params)
             @current_order.associate_user! try_spree_current_user if try_spree_current_user
             @current_order.last_ip_address = ip_address
           end
@@ -75,7 +75,7 @@ module Spree
         end
 
         def current_order_params
-          { currency: current_currency, token: cookies.signed[:token], store_id: current_store.id, user_id: try_spree_current_user.try(:id) }
+          { currency: current_currency, token: cookies.signed[:token], user_id: try_spree_current_user.try(:id) }
         end
 
         def find_order_by_token_or_user(options = {}, with_adjustments = false)
@@ -88,7 +88,7 @@ module Spree
                      end
 
           # Find any incomplete orders for the token
-          incomplete_orders = Spree::Order.incomplete.includes(includes)
+          incomplete_orders = current_store.orders.incomplete.includes(includes)
 
           token_order_params = current_order_params.except(:user_id)
           order = if with_adjustments

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

@@ -6,6 +6,7 @@ module Spree
           Spree::Config.searcher_class.new(params).tap do |searcher|
             searcher.current_user = try_spree_current_user
             searcher.current_currency = current_currency&.upcase
+            searcher.current_store = current_store
           end
         end
       end

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

@@ -7,10 +7,15 @@ module Spree
         included do
           helper_method :current_store
           helper_method :current_price_options
+          helper_method :available_menus
         end
 
         def current_store
-          @current_store ||= Spree::Store.current(request.env['SERVER_NAME'])
+          @current_store ||= current_store_finder.new(url: request.env['SERVER_NAME']).execute
+        end
+
+        def available_menus
+          @available_menus ||= current_store.menus
         end
 
         def store_locale
@@ -44,6 +49,10 @@ module Spree
         def current_tax_zone
           @current_tax_zone ||= @current_order&.tax_zone || Spree::Zone.default_tax
         end
+
+        def current_store_finder
+          Spree::Dependencies.current_store_finder.constantize
+        end
       end
     end
   end

data/lib/spree/core/engine.rb

@@ -129,6 +129,12 @@ module Spree
         Migrations.new(config, engine_name).check
       end
 
+      initializer 'spree.core.checking_deprecated_preferences' do
+        Spree::Config.deprecated_preferences.each do |pref|
+          warn "[DEPRECATION] Spree::Config[:#{pref[:name]}] is deprecated. #{pref[:message]}"
+        end
+      end
+
       config.to_prepare do
         # Ensure spree locale paths are present before decorators
         I18n.load_path.unshift(*(Dir.glob(

data/lib/spree/core/importer/product.rb

@@ -2,10 +2,12 @@ module Spree
   module Core
     module Importer
       class Product
-        attr_reader :product, :product_attrs, :variants_attrs, :options_attrs
+        attr_reader :product, :product_attrs, :variants_attrs, :options_attrs, :store
 
         def initialize(product, product_params, options = {})
+          @store = options[:store] || Spree::Store.default
           @product = product || Spree::Product.new(product_params)
+          @product.stores << @store if @product.stores.exclude?(@store)
 
           @product_attrs = product_params.to_h
           @variants_attrs = (options[:variants_attrs] || []).map(&:to_h)

data/lib/spree/core/product_duplicator.rb

@@ -28,6 +28,7 @@ module Spree
       product.dup.tap do |new_product|
         new_product.name = "COPY OF #{product.name}"
         new_product.taxons = product.taxons
+        new_product.stores = product.stores
         new_product.created_at = nil
         new_product.deleted_at = nil
         new_product.updated_at = nil

data/lib/spree/core/search/base.rb

@@ -2,25 +2,19 @@ module Spree
   module Core
     module Search
       class Base
-        attr_accessor :properties
-        attr_accessor :current_user
-        attr_accessor :current_currency
+        attr_accessor :properties, :current_user, :current_currency, :current_store, :taxon
 
         def initialize(params)
-          self.current_currency = Spree::Config[:currency]
           @properties = {}
+          @current_store = params[:current_store] || Spree::Store.default
+          @current_currency = @current_store.default_currency
+          @taxon = params[:taxon]
+
           prepare(params)
         end
 
         def retrieve_products
-          @products = extended_base_scope&.available
-          curr_page = page || 1
-
-          unless Spree::Config.show_products_without_price
-            @products = @products.where('spree_prices.amount IS NOT NULL').
-                        where('spree_prices.currency' => current_currency)
-          end
-          @products = @products.page(curr_page).per(per_page)
+          @products = extended_base_scope.page(page || 1).per(per_page)
         end
 
         def method_missing(name)
@@ -34,27 +28,28 @@ module Spree
         protected
 
         def extended_base_scope
-          base_scope = Spree::Product.spree_base_scopes.active
+          base_scope = current_store.products.spree_base_scopes
           base_scope = get_products_conditions_for(base_scope, keywords)
           base_scope = Spree::Dependencies.products_finder.constantize.new(
             scope: base_scope,
             params: {
+              store: current_store,
               filter: {
                 price: price,
                 option_value_ids: option_value_ids,
-                taxons: taxon&.id
+                properties: product_properties,
+                taxons: taxon&.id,
+                currency: current_currency
               },
               sort_by: sort_by
-            },
-            current_currency: current_currency
+            }
           ).execute
           base_scope = add_search_scopes(base_scope)
-          base_scope = add_eagerload_scopes(base_scope)
-          base_scope
+          add_eagerload_scopes(base_scope)
         end
 
         def add_eagerload_scopes(scope)
-          scope = scope.includes(
+          scope.includes(
             :tax_category,
             variants: [
               { images: { attachment_attachment: :blob } }
@@ -64,7 +59,6 @@ module Spree
               { images: { attachment_attachment: :blob } }
             ]
           )
-          scope
         end
 
         def add_search_scopes(base_scope)
@@ -107,13 +101,14 @@ module Spree
             high_price = Monetize.parse(price_param.remove("#{less_than_string} ")).to_i
           else
             low_price, high_price = Monetize.parse_collection(price_param).map(&:to_i)
+            high_price = Float::INFINITY if high_price&.zero?
           end
 
           "#{low_price},#{high_price}"
         end
 
         def build_option_value_ids(params)
-          filter_params = Spree::OptionType.all.map(&:filter_param)
+          filter_params = Spree::OptionType.filterable.map(&:filter_param)
 
           filter_params.reduce([]) do |acc, filter_param|
             acc + params[filter_param].to_s.split(',')
@@ -121,7 +116,6 @@ module Spree
         end
 
         def prepare(params)
-          @properties[:taxon] = params[:taxon].blank? ? nil : Spree::Taxon.find(params[:taxon])
           @properties[:keywords] = params[:keywords]
           @properties[:option_value_ids] = build_option_value_ids(params)
           @properties[:price] = get_price_range(params[:price])
@@ -136,6 +130,7 @@ module Spree
                                else
                                  1
                                end
+          @properties[:product_properties] = params[:properties]
         end
       end
     end

data/lib/spree/core/version.rb

@@ -1,5 +1,5 @@
 module Spree
-  VERSION = '4.2.5'.freeze
+  VERSION = '4.3.0.rc1'.freeze
 
   def self.version
     VERSION

data/lib/spree/i18n.rb

@@ -20,7 +20,7 @@ module Spree
       locales_from_i18n = I18n.available_locales
       locales =
         if defined?(SpreeI18n)
-          (SpreeI18n::Locale.all << :en).map(&:to_s)
+          (SpreeI18n::Locale.all << :en).map(&:to_sym)
         else
           [Rails.application.config.i18n.default_locale, I18n.locale, :en]
         end

data/lib/spree/money.rb

@@ -5,7 +5,7 @@ Money.rounding_mode = BigDecimal::ROUND_HALF_UP
 
 module Spree
   class Money
-    class <<self
+    class << self
       attr_accessor :default_formatting_rules
     end
 
@@ -16,6 +16,7 @@ module Spree
     }
 
     attr_reader :money
+
     delegate    :cents, :currency, to: :money
 
     def initialize(amount, options = {})