solidus_core 2.11.10 → 3.0.2

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,41 +56,6 @@ 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 false to start
-            using the external validation class.
-          DEPRECATION
-        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

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/validators/email.rb

@@ -16,7 +16,7 @@ module Spree
 
     def validate_each(record, attribute, value)
       unless EMAIL_REGEXP.match? value
-        record.errors.add(attribute, :invalid, { value: value }.merge!(options))
+        record.errors.add(attribute, :invalid, **{ value: value }.merge!(options))
       end
     end
   end

data/lib/spree/core/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Spree
-  VERSION = "2.11.10"
+  VERSION = "3.0.2"
 
   def self.solidus_version
     VERSION

data/lib/spree/core.rb

@@ -1,6 +1,14 @@
 # frozen_string_literal: true
 
-require 'rails/all'
+require "action_controller/railtie"
+require "action_mailer/railtie"
+require "action_view/railtie"
+require "active_job/railtie"
+require "active_model/railtie"
+require "active_record/railtie"
+require "active_storage/engine"
+require "sprockets/railtie"
+
 require 'acts_as_list'
 require 'awesome_nested_set'
 require 'cancan'
@@ -9,12 +17,10 @@ require 'kaminari/activerecord'
 require 'mail'
 require 'monetize'
 require 'paperclip'
-require 'paranoia'
 require 'ransack'
 require 'state_machines-activerecord'
 
 require 'spree/deprecation'
-require 'spree/paranoia_deprecations'
 
 # This is required because ActiveModel::Validations#invalid? conflicts with the
 # invalid state of a Payment. In the future this should be removed.
@@ -47,9 +53,6 @@ module Spree
 
   module Core
     class GatewayError < RuntimeError; end
-
-    include ActiveSupport::Deprecation::DeprecatedConstantAccessor
-    deprecate_constant 'DestroyWithOrdersError', ActiveRecord::DeleteRestrictionError, deprecator: Spree::Deprecation
   end
 end
 
@@ -61,7 +64,6 @@ require 'spree/core/environment_extension'
 require 'spree/core/environment/calculators'
 require 'spree/core/environment/promotions'
 require 'spree/core/environment'
-require 'spree/promo/environment'
 require 'spree/migrations'
 require 'spree/migration_helpers'
 require 'spree/event'
@@ -75,7 +77,6 @@ require 'spree/permitted_attributes'
 require 'spree/core/importer'
 require 'spree/core/permalinks'
 require 'spree/core/product_duplicator'
-require 'spree/core/current_store'
 require 'spree/core/controller_helpers/auth'
 require 'spree/core/controller_helpers/common'
 require 'spree/core/controller_helpers/current_host'

data/lib/spree/deprecation.rb

@@ -3,7 +3,7 @@
 require 'active_support/deprecation'
 
 module Spree
-  Deprecation = ActiveSupport::Deprecation.new('3.0', 'Solidus')
+  Deprecation = ActiveSupport::Deprecation.new('4.0', 'Solidus')
 
   # This DeprecatedInstanceVariableProxy transforms instance variable to
   # deprecated instance variable.

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

data/lib/spree/event/subscriber.rb

@@ -59,14 +59,6 @@ module Spree
       #     end
       #   end
       def event_action(method_name, event_name: nil)
-        mattr_writer "#{method_name}_handler"
-
-        define_method "#{method_name}_handler" do
-          Spree::Deprecation.warn("#{name}.#{method_name}_handler and #{name}.#{method_name}_handler= from the old events mapping interface are deprecated. Please use the new mapping stored in Spree::Event.subscribers.", caller)
-
-          class_variable_get("@@#{method_name}_handler")
-        end
-
         event_actions[method_name] = (event_name || method_name).to_s
       end
 
@@ -89,16 +81,6 @@ module Spree
       def deactivate(event_action_name = nil)
         Spree::Event.subscriber_registry.deactivate_subscriber(self, event_action_name)
       end
-
-      def subscribe!
-        Spree::Deprecation.warn("#{self}.subscribe! is deprecated. Please use `#{self}.activate`.", caller)
-        activate
-      end
-
-      def unsubscribe!
-        Spree::Deprecation.warn("#{self}.unsubscribe! is deprecated. Please use `#{self}.deactivate`.", caller)
-        deactivate
-      end
     end
   end
 end

data/lib/spree/event/subscriber_registry.rb

@@ -35,7 +35,9 @@ module Spree
             subscription = Spree::Event.subscribe(event_name) { |event| subscriber.send(event_action, event) }
 
             # deprecated mappings, to be removed when Solidus 2.10 is not supported anymore:
-            subscriber.send("#{event_action}_handler=", subscription)
+            if subscriber.respond_to?("#{event_action}_handler=")
+              subscriber.send("#{event_action}_handler=", subscription)
+            end
 
             registry[subscriber.name][event_action] = subscription
           end

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/i18n.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require 'i18n'
-require 'active_support/core_ext/array/extract_options'
-require 'action_view'
 
 module Spree
   def self.i18n_available_locales
@@ -11,29 +9,9 @@ module Spree
     end
   end
 
-  class TranslationHelperWrapper # :nodoc:
-    include ActionView::Helpers::TranslationHelper
-  end
-
   # This value is used as a count for the pluralization helpers related to I18n
   # ex: Spree::Order.model_name.human(count: Spree::I18N_GENERIC_PLURAL)
   # Related to Solidus issue #1164, this is needed to avoid problems with
   # some pluralization calculators
   I18N_GENERIC_PLURAL = 2.1
-
-  class << self
-    # Add spree namespace and delegate to Rails TranslationHelper for some nice
-    # extra functionality. e.g return reasonable strings for missing translations
-
-    def translate(key, options = {})
-      Spree::Deprecation.warn <<-WARN.squish
-        Spree.t & Spree.translate have been deprecated.
-        Instead use I18n.t('spree.your_translation_key')
-      WARN
-      options[:scope] = [:spree, *options[:scope]]
-      TranslationHelperWrapper.new.translate(key, **options)
-    end
-
-    alias_method :t, :translate
-  end
 end

data/lib/spree/money.rb

@@ -6,7 +6,6 @@ module Spree
   class Money
     include Comparable
     DifferentCurrencyError = Class.new(StandardError)
-    RUBY_NUMERIC_STRING = /\A-?\d+(\.\d+)?\z/
 
     class <<self
       attr_accessor :default_formatting_rules
@@ -37,15 +36,8 @@ module Spree
         @money = amount
       else
         currency = (options[:currency] || Spree::Config[:currency])
-        if amount.to_s =~ RUBY_NUMERIC_STRING
-          @money = Monetize.from_string(amount, currency)
-        else
-          @money = Spree::Money.parse_to_money(amount, currency)
-          Spree::Deprecation.warn <<-WARN.squish, caller
-            Spree::Money was initialized with #{amount.inspect}, which will not be supported in the future.
-            Instead use Spree::Money.new(#{@money.to_s.inspect}, options) or Spree::Money.parse(#{amount.inspect})
-          WARN
-        end
+
+        @money = Monetize.from_string(amount, currency)
       end
       @options = Spree::Money.default_formatting_rules.merge(options)
     end
@@ -80,14 +72,7 @@ module Spree
     def to_html(options = { html_wrap: true })
       output = format(options)
       # Maintain compatibility by checking html option renamed to html_wrap.
-      if options[:html] || options[:html] == false
-        Spree::Deprecation.warn <<-WARN.squish, caller
-          Spree::Money#to_html called with Spree::Money#to_html(html: #{options[:html].inspect}),
-          which will not be supported in the future.
-          Instead use :html_wrap e.g. Spree::Money#to_html(html_wrap: #{options[:html].inspect})
-        WARN
-      end
-      if options[:html_wrap] || options[:html]
+      if options[:html_wrap]
         output = output.html_safe
       end
       output