solidus_core 2.11.1 → 3.0.0.rc2

data/lib/spree/core/class_constantizer.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/module'
+
 module Spree
   module Core
     module ClassConstantizer

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

@@ -22,20 +22,7 @@ module Spree
           class_attribute :unauthorized_redirect
           self.unauthorized_redirect = -> do
             flash[:error] = I18n.t('spree.authorization_failure')
-            if Spree::Config.redirect_back_on_unauthorized
-              redirect_back(fallback_location: "/unauthorized")
-            else
-              Spree::Deprecation.warn <<-WARN.strip_heredoc, caller
-                Having Spree::Config.redirect_back_on_unauthorized set
-                to `false` is deprecated and will not be supported in Solidus 3.0.
-
-                Please change this configuration to `true` and be sure that your
-                application does not break trying to redirect back when there is
-                an unauthorized access.
-              WARN
-
-              redirect_to "/unauthorized"
-            end
+            redirect_back(fallback_location: "/unauthorized")
           end
 
           rescue_from CanCan::AccessDenied do

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

@@ -11,23 +11,8 @@ module Spree
 
         included do
           helper_method :current_order
-          helper_method :simple_current_order
         end
 
-        def simple_current_order
-          return @simple_current_order if @simple_current_order
-
-          @simple_current_order = find_order_by_token_or_user
-
-          if @simple_current_order
-            @simple_current_order.last_ip_address = ip_address
-            return @simple_current_order
-          else
-            @simple_current_order = Spree::Order.new(current_order_params)
-          end
-        end
-        deprecate simple_current_order: :current_order, deprecator: Spree::Deprecation
-
         # The current incomplete order from the guest_token for use in cart and during checkout
         def current_order(options = {})
           should_create = options[:create_order_if_necessary] || false
@@ -84,16 +69,11 @@ module Spree
           current_order_params.merge(last_ip_address: ip_address)
         end
 
-        def find_order_by_token_or_user(options = {}, with_adjustments = false)
+        def find_order_by_token_or_user(options = {})
           should_lock = options[:lock] || false
 
           # Find any incomplete orders for the guest_token
-          if with_adjustments
-            Spree::Deprecation.warn "The second argument to find_order_by_token_or_user is deprecated, and will be removed in a future version."
-            order = Spree::Order.incomplete.includes(:adjustments).lock(should_lock).find_by(current_order_params)
-          else
-            order = Spree::Order.incomplete.lock(should_lock).find_by(current_order_params)
-          end
+          order = Spree::Order.incomplete.lock(should_lock).find_by(current_order_params)
 
           # Find any incomplete orders for the current user
           if order.nil? && try_spree_current_user

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

@@ -64,60 +64,6 @@ module Spree
       params
     end
 
-    # This method handles the awkwardness of how the html forms are currently
-    # set up for frontend.
-    #
-    # This method expects a params hash in the format of:
-    #
-    #  {
-    #    order: {
-    #      existing_card: '123',
-    #      ...other params...
-    #    },
-    #    cvc_confirm: '456', # optional
-    #    ...other params...
-    #  }
-    #
-    # And this method modifies the params into the format of:
-    #
-    #  {
-    #    order: {
-    #      payments_attributes: [
-    #        {
-    #          source_attributes: {
-    #            existing_card_id: '123',
-    #            verification_value: '456',
-    #          },
-    #        },
-    #      ]
-    #      ...other params...
-    #    },
-    #    ...other params...
-    #  }
-    #
-    def move_existing_card_into_payments_attributes(params)
-      return params if params[:order].blank?
-
-      card_id = params[:order][:existing_card].presence
-      cvc_confirm = params[:cvc_confirm].presence
-
-      return params if card_id.nil?
-
-      params[:order][:payments_attributes] = [
-        {
-          source_attributes: {
-            existing_card_id: card_id,
-            verification_value: cvc_confirm
-          }
-        }
-      ]
-
-      params[:order].delete(:existing_card)
-      params.delete(:cvc_confirm)
-
-      params
-    end
-
     # This method handles the awkwardness of how the html forms are currently
     # set up for frontend.
     #

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/deprecation'
-
 module Spree
   module Core
     module ControllerHelpers
@@ -9,18 +7,12 @@ module Spree
         extend ActiveSupport::Concern
 
         included do
-          helper_method :current_currency
           helper_method :current_pricing_options
         end
 
         def current_pricing_options
           Spree::Config.pricing_options_class.from_context(self)
         end
-
-        def current_currency
-          current_pricing_options.currency
-        end
-        deprecate current_currency: :current_pricing_options, deprecator: Spree::Deprecation
       end
     end
   end

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

@@ -30,10 +30,6 @@ module Spree
           ]
         end
 
-        def permitted_checkout_attributes
-          permitted_attributes.checkout_attributes
-        end
-
         def permitted_checkout_address_attributes
           permitted_attributes.checkout_address_attributes
         end

data/lib/spree/core/engine.rb

@@ -56,49 +56,13 @@ module Spree
       end
 
       config.after_initialize do
-        if Spree::Config.raise_with_invalid_currency == true
-          Spree::Deprecation.warn(
-            'Spree::Config.raise_with_invalid_currency set to true is ' \
-            'deprecated. Please note that by switching this value, ' \
-            'Spree::LineItem::CurrencyMismatch will not be raised anymore.',
-            caller
-          )
-        end
-        if Spree::Config.consider_actionless_promotion_active == true
-          Spree::Deprecation.warn(
-            'Spree::Config.consider_actionless_promotion_active set to true is ' \
-            'deprecated. Please note that by switching this value, ' \
-            'promotions with no actions will be considered active.',
-            caller
-          )
-        end
-        if Spree::Config.run_order_validations_on_order_updater != true
-          Spree::Deprecation.warn(
-            'Spree::Config.run_order_validations_on_order_updater set to false is ' \
-            'deprecated and will not be possibile in Solidus 3.0. Please switch this ' \
-            'value to true and check that everything works as expected.',
-            caller
-          )
-        end
-
-        if Spree::Config.use_legacy_address_state_validator != false
-          Spree::Deprecation.warn(<<~DEPRECATION.squish, caller)
-            Spree::Config.use_legacy_address_state_validator set to true has been
-            deprecated and will be removed in Solidus 3.0. The Spree::Address state
-            validation has been extracted into a configurable external class.
-            Switch Spree::Config.use_legacy_address_state_validator to true to start
-            using the external validation class.
-          DEPRECATION
-        end
-      end
-
-      # Load in mailer previews for apps to use in development.
-      # We need to make sure we call `Preview.all` before requiring our
-      # previews, otherwise any previews the app attempts to add need to be
-      # manually required.
-      if Rails.env.development?
-        initializer "spree.mailer_previews" do
+        # Load in mailer previews for apps to use in development.
+        # We need to make sure we call `Preview.all` before requiring our
+        # previews, otherwise any previews the app attempts to add need to be
+        # manually required.
+        if Rails.env.development? || Rails.env.test?
           ActionMailer::Preview.all
+
           Dir[root.join("lib/spree/mailer_previews/**/*_preview.rb")].each do |file|
             require_dependency file
           end

data/lib/spree/core/environment_extension.rb

@@ -22,15 +22,6 @@ module Spree
           end
         end
       end
-
-      def add_class(name)
-        Spree::Deprecation.warn(
-          'This method is deprecated. ' \
-          "Please use `#{self.class}.add_class_set(#{name.inspect})` instead.",
-          caller,
-        )
-        singleton_class.send(:add_class_set, name)
-      end
     end
   end
 end

data/lib/spree/core/product_filters.rb

@@ -153,46 +153,6 @@ module Spree
           labels: brands.sort.map { |key| [key, key] }
         }
       end
-
-      # Provide filtering on the immediate children of a taxon
-      #
-      # This doesn't fit the pattern of the examples above, so there's a few changes.
-      # Firstly, it uses an existing scope which was not built for filtering - and so
-      # has no need of a conditions mapping, and secondly, it has a mapping of name
-      # to the argument type expected by the other scope.
-      #
-      # This technique is useful for filtering on objects (by passing ids) or with a
-      # scope that can be used directly (eg. testing only ever on a single property).
-      #
-      # This scope selects products in any of the active taxons or their children.
-      #
-      def self.taxons_below(taxon)
-        Spree::Deprecation.warn "taxons_below is deprecated in solidus_core. Please add it to your own application to continue using it."
-        return Spree::Core::ProductFilters.all_taxons if taxon.nil?
-        {
-          name:   'Taxons under ' + taxon.name,
-          scope:  :taxons_id_in_tree_any,
-          labels: taxon.children.sort_by(&:position).map { |element| [element.name, element.id] },
-          conds:  nil
-        }
-      end
-
-      # Filtering by the list of all taxons
-      #
-      # Similar idea as above, but we don't want the descendants' products, hence
-      # it uses one of the auto-generated scopes from Ransack.
-      #
-      # idea: expand the format to allow nesting of labels?
-      def self.all_taxons
-        Spree::Deprecation.warn "all_taxons is deprecated in solidus_core. Please add it to your own application to continue using it."
-        taxons = Spree::Taxonomy.all.flat_map { |element| [element.root] + element.root.descendants }
-        {
-          name:   'All taxons',
-          scope:  :taxons_id_equals_any,
-          labels: taxons.sort_by(&:name).map { |element| [element.name, element.id] },
-          conds:  nil # not needed
-        }
-      end
     end
   end
 end

data/lib/spree/core/role_configuration.rb

@@ -31,20 +31,6 @@ module Spree
 
     attr_accessor :roles
 
-    class << self
-      def instance
-        Spree::Deprecation.warn "Spree::RoleConfiguration.instance is DEPRECATED use Spree::Config.roles instead"
-        Spree::Config.roles
-      end
-
-      # Yields the instance of the singleton, used for configuration
-      # @yieldparam instance [Spree::RoleConfiguration]
-      def configure
-        Spree::Deprecation.warn "Spree::RoleConfiguration.configure is deprecated. Call Spree::Config.roles.assign_permissions instead"
-        yield(Spree::Config.roles)
-      end
-    end
-
     # Given a CanCan::Ability, and a user, determine what permissions sets can
     # be activated on the ability, then activate them.
     #

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

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'spree/deprecation'
-
 module Spree
   module Core
     module Search
@@ -16,17 +14,6 @@ module Spree
           prepare(params)
         end
 
-        def current_currency=(currency)
-          self.pricing_options = Spree::Config.pricing_options_class.new(
-            pricing_options.desired_attributes.merge(currency: currency)
-          )
-        end
-
-        def current_currency
-          pricing_options.currency
-        end
-        deprecate :current_currency, :current_currency=, deprecator: Spree::Deprecation
-
         def retrieve_products
           @products = get_base_scope
           curr_page = @properties[:page] || 1
@@ -37,19 +24,6 @@ module Spree
           @products = @products.page(curr_page).per(@properties[:per_page])
         end
 
-        def method_missing(name)
-          if @properties.key?(name)
-            Spree::Deprecation.warn "Accessing Searcher's #{name} property using #{self.class.name}##{name} is deprecated without replacement"
-            @properties[name]
-          else
-            super
-          end
-        end
-
-        def respond_to_missing?(name)
-          @properties.key?(name) || super(name)
-        end
-
         protected
 
         def get_base_scope

data/lib/spree/core/state_machines.rb

@@ -68,17 +68,8 @@ module Spree
 
       def order
         @order ||= begin
-          if Spree::Config.use_legacy_order_state_machine
-            Spree::Deprecation.warn(
-              "Spree::Order state machine defined in Spree::Order::Checkout is deprecated. " \
-              "Future versions of Solidus will use Spree::Core::StateMachines::Order}",
-              caller
-            )
-            'Spree::Order::Checkout'
-          else
-            require 'spree/core/state_machines/order'
-            'Spree::Core::StateMachines::Order'
-          end
+          require 'spree/core/state_machines/order'
+          'Spree::Core::StateMachines::Order'
         end
 
         @order.constantize

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "2.11.1"
+  VERSION = "3.0.0.rc2"
 
   def self.solidus_version
     VERSION

data/lib/spree/event.rb

@@ -29,20 +29,6 @@ module Spree
       end
     end
 
-    # @deprecated Loads all Solidus' core and application's event subscribers files.
-    # The latter are loaded automatically only when the preference
-    # Spree::Config.events.autoload_subscribers is set to a truthy value.
-    #
-    # Files must be placed under the directory `app/subscribers` and their
-    # name must end with `_subscriber.rb`.
-    #
-    # Loading the files has the side effect of adding their module to the
-    # list in Spree::Event.subscribers.
-    def require_subscriber_files
-      Spree::Deprecation.warn("#{self}.require_subscriber_files is deprecated and will be removed in Solidus 3.0.", caller)
-      subscriber_registry.send(:require_subscriber_files)
-    end
-
     # Subscribe to an event with the given name. The provided block is executed
     # every time the subscribed event is fired.
     #
@@ -114,23 +100,6 @@ module Spree
       Spree::Config.events.adapter
     end
 
-    # The suffix used for namespacing Solidus events, defaults to
-    # `.spree`
-    #
-    # @see Spree::Event::Configuration#suffix
-    def suffix
-      Spree::Deprecation.warn "This method is deprecated and will be removed. Please use Event::Adapters::ActiveSupportNotifications#suffix"
-      Spree::Config.events.suffix
-    end
-
-    # @deprecated
-    # @!attribute [r] subscribers
-    #   @return [Array<Spree::Event::Subscriber>] A list of subscribers used to support class reloading for Spree::Event::Subscriber instances
-    def subscribers
-      Spree::Deprecation.warn("`#{self}.subscribers` is deprecated. Please use `#{self}.subscriber_registry` instead.", caller)
-      Spree::Config.events.subscribers
-    end
-
     # @!attribute [r] subscribers
     #   @return <Spree::Event::SubscriberRegistry> The registry for supporting class reloading for Spree::Event::Subscriber instances
     def subscriber_registry

data/lib/spree/event/configuration.rb

@@ -7,11 +7,6 @@ module Spree
         @subscriber_registry ||= Spree::Event::SubscriberRegistry.new
       end
 
-      def subscribers
-        Spree::Deprecation.warn("`Spree::Config.events.subscribers` is deprecated. Please use `Spree::Config.events.subscriber_registry`.", caller)
-        subscriber_registry.send(:registry).keys.map { |module_name| module_name.constantize }
-      end
-
       attr_writer :adapter, :suffix, :autoload_subscribers
 
       def autoload_subscribers