solidus_core 2.11.17 → 3.0.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b3a6c05e492d60c9690e028991c934d4a2aa33788de045110a62b28924bbcb
-  data.tar.gz: 79213862902521b83cfa4dc56c9f6c59bc79cd6c73920145a53b1a67d3cb1eb2
+  metadata.gz: 35ced6fd29e1822a14a86b637243c871d373b2ead2d575e7737d0fa35907a48d
+  data.tar.gz: ab72677886bf4ce7c2ba48dbe711fe73aa5e1193d990fb4d7cd872035e247f33
 SHA512:
-  metadata.gz: 18eac571ddd52378a9b186a8f18f8eccb7c0825e9d966926106ccfc07e25792ce0d4081b22175e671638bd1ccf98fd5292328887fa5872075690ddd3c1488fba
-  data.tar.gz: b2c25455b49e633a5b9388d92d2dd6d4bbc22a394f8c8d2eb81deb3e0c04e5fdc8e9a7916f9b4dfe97df2724f0607eb8b3fcaf9542e54e441752efdcf74d91a0
+  metadata.gz: 1b18d6067bfbe97ce226fd82fb9a48da5e16eadeef3ac3b758c7d159dc079aef8880396a2acb9c0e23f98953d331f8161ba3271f780c21de04c1f9e501b1136b
+  data.tar.gz: 5cc4ad46294a842daa2850e785d08dbfa4f01b28f5806449457fb498898c557866590ed7d332888d6c5fae72ae1ee81fbf3d4fa1ead5aa682af226debce6a890

data/app/assets/javascripts/spree.js.erb

@@ -22,21 +22,6 @@ Spree.pathFor = function(path) {
   return locationOrigin + Spree.mountedAt() + path;
 };
 
-Spree.url = function(uri, query) {
-  if (console && console.warn) {
-    console.warn('Spree.url is deprecated, and will be removed from a future Solidus version.');
-  }
-  if (uri.path === undefined) {
-    uri = new Uri(uri);
-  }
-  if (query) {
-    $.each(query, function(key, value) {
-      return uri.addQueryParam(key, value);
-    });
-  }
-  return uri;
-};
-
 Spree.ajax = function(url, options) {
   if (typeof url === "object") {
     options = url;
@@ -51,42 +36,6 @@ Spree.ajax = function(url, options) {
   return $.ajax(url, options);
 };
 
-/**
- * @deprecated Spree.routes will be removed in a future release. Please use Spree.pathFor instead.
- * See: https://github.com/solidusio/solidus/issues/3405
- */
-Spree.routesDeprecationProxy = {
-  get: function(obj, prop) {
-    <% if Rails.env != "production" %>
-      console.log("Spree.routes is deprecated, please use pathFor instead. See: https://github.com/solidusio/solidus/issues/3405");
-    <% end %>
-
-    return obj[prop]
-  },
-
-  set: function(obj, prop, value) {
-    <% if Rails.env != "production" %>
-      console.log("Spree.routes is deprecated, please use pathFor instead. See: https://github.com/solidusio/solidus/issues/3405");
-    <% end %>
-
-    obj[prop] = value
-    return value;
-  }
-};
-
-var frontend_routes = {
-  states_search: Spree.pathFor('api/states'),
-  apply_coupon_code: function(order_id) {
-    return Spree.pathFor("api/orders/" + order_id + "/coupon_codes");
-  }
-}
-
-if(typeof Proxy == "function") {
-  Spree.routes = new Proxy(frontend_routes, Spree.routesDeprecationProxy);
-} else {
-  Spree.routes = frontend_routes
-}
-
 Spree.getJSON = function(url, data, success) {
   if (typeof data === 'function') {
     success = data;

data/app/helpers/spree/store_helper.rb

@@ -8,16 +8,5 @@ module Spree
     def store_menu?
       %w{thank_you}.exclude? params[:action]
     end
-
-    def cache_key_for_taxons
-      Spree::Deprecation.warn <<-WARN.strip_heredoc
-        cache_key_for_taxons is deprecated. Rails >= 5 has built-in support for collection cache keys.
-        Instead in your view use:
-        cache [I18n.locale, @taxons] do
-      WARN
-      max_updated_at = @taxons.maximum(:updated_at).to_i
-      parts = [@taxon.try(:id), max_updated_at].compact.join("-")
-      "#{I18n.locale}/taxons/#{parts}"
-    end
   end
 end

data/app/mailers/spree/carton_mailer.rb

@@ -11,11 +11,7 @@ module Spree
     # @option options resend [Boolean] indicates whether the email is a 'resend' (e.g.
     #   triggered by the admin "resend" button)
     # @return [Mail::Message]
-    #
-    # Note: The signature of this method has changed. The new (non-deprecated)
-    # signature is:
-    #   def shipped_email(carton:, order:, resend: false)
-    def shipped_email(options, _deprecated_options = {})
+    def shipped_email(options)
       @order = options.fetch(:order)
       @carton = options.fetch(:carton)
       @manifest = @carton.manifest_for_order(@order)

data/app/models/concerns/spree/active_storage_adapter/attachment.rb

@@ -9,9 +9,11 @@ module Spree
     class Attachment
       delegate_missing_to :@attachment
 
+      DEFAULT_SIZE = '100%'
+
       def initialize(attachment, styles: {})
         @attachment = attachment
-        @styles = normalize_styles(styles)
+        @styles = styles
       end
 
       def exists?
@@ -19,20 +21,20 @@ module Spree
       end
 
       def filename
-        blob&.filename.to_s
+        blob.filename.to_s
       end
 
       def url(style = nil)
-        variant(style)&.url
+        variant(style).url
       end
 
       def variant(style = nil)
-        size = style_to_size(style)
+        size = style_to_size(style&.to_sym)
         @attachment.variant(
-          resize_to_limit: size,
-          saver: {
-            strip: true
-          }
+          resize: size,
+          strip: true,
+          'auto-orient': true,
+          colorspace: 'sRGB',
         ).processed
       end
 
@@ -59,12 +61,8 @@ module Spree
         @attachment.metadata
       end
 
-      def normalize_styles(styles)
-        styles.transform_values { |v| v.split('x').map(&:to_i) }
-      end
-
       def style_to_size(style)
-        @styles.fetch(style&.to_sym) { [width, height] }
+        @styles.fetch(style) { DEFAULT_SIZE }
       end
     end
   end

data/app/models/concerns/spree/active_storage_adapter.rb

@@ -107,8 +107,6 @@ module Spree
 
     def url(style = default_style)
       attachment.url(style)
-    rescue ActiveStorage::FileNotFoundError
-      "noimage/#{style}.png"
     end
 
     def destroy_attachment(_name)

data/app/models/concerns/spree/adjustment_source.rb

@@ -2,21 +2,6 @@
 
 module Spree
   module AdjustmentSource
-    def deals_with_adjustments_for_deleted_source
-      Spree::Deprecation.warn "AdjustmentSource#deals_with_adjustments_for_deleted_source is deprecated. Please use AdjustmentSource#remove_adjustments_from_incomplete_orders instead."
-
-      remove_adjustments_from_incomplete_orders
-
-      # The following is deprecated. As source_type without a source_id isn't
-      # much better than a source_id that doesn't exist.  In Solidus itself the
-      # relevant classes use `acts_as_paranoid` so it is useful to keep the
-      # source_id around.
-      adjustments.
-        joins(:order).
-        merge(Spree::Order.complete).
-        update_all(source_id: nil, updated_at: Time.current)
-    end
-
     def remove_adjustments_from_incomplete_orders
       adjustments.
         joins(:order).

data/app/models/concerns/spree/calculated_adjustments.rb

@@ -10,24 +10,6 @@ module Spree
       validates :calculator, presence: true
     end
 
-    class_methods do
-      def calculators
-        Spree::Deprecation.warn("Calling .calculators is deprecated. Please access through Rails.application.config.spree.calculators")
-
-        spree_calculators.send model_name_without_spree_namespace
-      end
-
-      private
-
-      def model_name_without_spree_namespace
-        to_s.tableize.tr('/', '_').sub('spree_', '')
-      end
-
-      def spree_calculators
-        Spree::Config.environment.calculators
-      end
-    end
-
     def calculator_type
       calculator.class.to_s if calculator
     end

data/app/models/concerns/spree/soft_deletable.rb

@@ -7,12 +7,10 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      acts_as_paranoid
-      include Spree::ParanoiaDeprecations::InstanceMethods
-      extend Spree::ParanoiaDeprecations::ClassMethods
-
       include Discard::Model
       self.discard_column = :deleted_at
+
+      default_scope { kept }
     end
   end
 end

data/app/models/concerns/spree/user_address_book.rb

@@ -39,34 +39,6 @@ module Spree
       has_one :ship_address, through: :default_user_ship_address, source: :address
     end
 
-    def default_address
-      Spree::Deprecation.warn "#default_address is deprecated. Please start using #ship_address."
-      ship_address
-    end
-
-    def default_user_address
-      Spree::Deprecation.warn "#default_user_address is deprecated. Please start using #default_user_ship_address."
-      default_user_ship_address
-    end
-
-    def default_address=(address)
-      Spree::Deprecation.warn(
-        "#default_address= does not take Spree::Config.automatic_default_address into account and is deprecated. " \
-        "Please use #ship_address=."
-      )
-
-      self.ship_address = address if address
-    end
-
-    def default_address_attributes=(attributes)
-      # see "Nested Attributes Examples" section of http://apidock.com/rails/ActionView/Helpers/FormHelper/fields_for
-      # this #{fieldname}_attributes= method works with fields_for in the views
-      # even without declaring accepts_nested_attributes_for
-      Spree::Deprecation.warn "#default_address_attributes= is deprecated. Please use #ship_address_attributes=."
-
-      self.default_address = Spree::Address.immutable_merge(ship_address, attributes)
-    end
-
     # saves address in address book
     # sets address to the default if automatic_default_address is set to true
     # if address is nil, does nothing and returns nil
@@ -157,15 +129,6 @@ module Spree
       user_address.address
     end
 
-    def mark_default_address(address)
-      Spree::Deprecation.warn(
-        "#mark_default_address is deprecated and it sets the ship_address only. " \
-        "Please use #mark_default_ship_address."
-      )
-
-      mark_default_ship_address(address)
-    end
-
     def mark_default_ship_address(address)
       user_addresses.mark_default(user_addresses.find_by(address: address))
     end

data/app/models/concerns/spree/user_methods.rb

@@ -7,7 +7,6 @@ module Spree
     include Spree::UserApiAuthentication
     include Spree::UserReporting
     include Spree::UserAddressBook
-    include Spree::UserPaymentSource
 
     included do
       extend Spree::DisplayMoney
@@ -24,9 +23,6 @@ module Spree
       has_many :store_credits, -> { includes(:credit_type) }, foreign_key: "user_id", class_name: "Spree::StoreCredit"
       has_many :store_credit_events, through: :store_credits
 
-      money_methods :total_available_store_credit
-      deprecate display_total_available_store_credit: :display_available_store_credit_total, deprecator: Spree::Deprecation
-
       has_many :credit_cards, class_name: "Spree::CreditCard", foreign_key: :user_id
       has_many :wallet_payment_sources, foreign_key: 'user_id', class_name: 'Spree::WalletPaymentSource', inverse_of: :user
 
@@ -34,9 +30,9 @@ module Spree
 
       include Spree::RansackableAttributes unless included_modules.include?(Spree::RansackableAttributes)
 
-      ransack_alias :firstname_or_lastname, :addresses_firstname_or_addresses_lastname
+      ransack_alias :name, :addresses_name
       self.whitelisted_ransackable_associations = %w[addresses spree_roles]
-      self.whitelisted_ransackable_attributes = %w[firstname_or_lastname id email created_at]
+      self.whitelisted_ransackable_attributes = %w[name id email created_at]
     end
 
     def wallet
@@ -68,11 +64,6 @@ module Spree
       last_order unless last_order.try!(:completed?)
     end
 
-    def total_available_store_credit
-      store_credits.reload.to_a.sum(&:amount_remaining)
-    end
-    deprecate total_available_store_credit: :available_store_credit_total, deprecator: Spree::Deprecation
-
     def available_store_credit_total(currency:)
       store_credits.to_a.
         select { |credit| credit.currency == currency }.

data/app/models/spree/ability.rb

@@ -14,13 +14,6 @@ module Spree
 
     attr_reader :user
 
-    CUSTOM_ALIASES_MAP = {
-      delete: :destroy,
-      display: :read,
-      new_action: :create,
-      read: :show
-    }.freeze
-
     # Allows us to go beyond the standard cancan initialize method which makes it difficult for engines to
     # modify the default +Ability+ of an application.  The +ability+ argument must be a class that includes
     # the +CanCan::Ability+ module.  The registered ability should behave properly as a stand-alone class
@@ -40,38 +33,8 @@ module Spree
       register_extension_abilities
     end
 
-    def can?(action, *args)
-      super(normalize_action(action), *args)
-    end
-
-    def model_adapter(model_class, action)
-      super(model_class, normalize_action(action))
-    end
-
     private
 
-    def normalize_action(action)
-      return action unless Spree::Config.use_custom_cancancan_actions
-
-      normalized_action = CUSTOM_ALIASES_MAP.fetch(action, action)
-
-      if action == :read
-        Spree::Deprecation.warn <<~WARN, caller(3)
-          The behavior of CanCanCan `:read` action alias will be changing in Solidus 3.0.
-          The current alias is: `:show, :to => :read`,
-          the new alias will be compliant with CanCanCan's default: `index, :show, :to => :read`
-        WARN
-      elsif CUSTOM_ALIASES_MAP.key? action
-        Spree::Deprecation.warn <<~WARN, caller(3)
-          Calling CanCanCan alias action #{action.inspect} is deprecated.
-          In Solidus 3.0 non-standard CanCanCan action aliases will be replaced with default ones,
-          please replace with #{normalized_action.inspect}.
-        WARN
-      end
-
-      normalized_action
-    end
-
     # Before, this was the only way to extend this ability. Permission sets have been added since.
     # It is recommended to use them instead for extension purposes if possible.
     def register_extension_abilities

data/app/models/spree/address/name.rb

@@ -2,29 +2,11 @@
 
 module Spree
   class Address
-    # Provides a value object to help transitioning from legacy
-    # firstname and lastname fields to a unified name field.
+    # Provides a value object to help splitting and joining
+    # name fields
     class Name
       attr_reader :first_name, :last_name, :value
 
-      # Creates an instance of Spree::Address::Name parsing input attributes.
-      # @param attributes [Hash] an hash possibly containing name-related
-      #   attributes (name, firstname, lastname, first_name, last_name)
-      # @return [Spree::Address::Name] the object created
-      def self.from_attributes(attributes)
-        params = attributes.with_indifferent_access
-
-        if params[:name].present?
-          Spree::Address::Name.new(params[:name])
-        elsif params[:firstname].present?
-          Spree::Address::Name.new(params[:firstname], params[:lastname])
-        elsif params[:first_name].present?
-          Spree::Address::Name.new(params[:first_name], params[:last_name])
-        else
-          Spree::Address::Name.new
-        end
-      end
-
       def initialize(*components)
         @value = components.join(' ').strip
         initialize_name_components(components)

data/app/models/spree/address.rb

@@ -14,45 +14,24 @@ module Spree
     belongs_to :country, class_name: "Spree::Country", optional: true
     belongs_to :state, class_name: "Spree::State", optional: true
 
-    validates :address1, :city, :country_id, presence: true
+    validates :address1, :city, :country_id, :name, presence: true
     validates :zipcode, presence: true, if: :require_zipcode?
     validates :phone, presence: true, if: :require_phone?
 
-    validate :validate_name
-
     validate do
-      if Spree::Config.use_legacy_address_state_validator
-        begin
-          @silence_state_deprecations = true
-          state_validate
-          validate_state_matches_country
-        ensure
-          @silence_state_deprecations = false
-        end
-      else
-        self.class.state_validator_class.new(self).perform
-      end
+      self.class.state_validator_class.new(self).perform
     end
 
-    alias_attribute :first_name, :firstname
-    alias_attribute :last_name, :lastname
-    alias_attribute :full_name, :name
-
-    DB_ONLY_ATTRS = %w(id updated_at created_at)
-    TAXATION_ATTRS = %w(state_id country_id zipcode)
-    LEGACY_NAME_ATTRS = %w(firstname lastname full_name)
+    self.ignored_columns = %w(firstname lastname)
+    DB_ONLY_ATTRS = %w(id updated_at created_at).freeze
+    TAXATION_ATTRS = %w(state_id country_id zipcode).freeze
 
-    self.whitelisted_ransackable_attributes = %w[firstname lastname]
+    self.whitelisted_ransackable_attributes = %w[name]
 
     scope :with_values, ->(attributes) do
       where(value_attributes(attributes))
     end
 
-    Spree::Deprecation.deprecate_methods(
-      Spree::Address,
-      LEGACY_NAME_ATTRS.product([:name]).to_h
-    )
-
     # @return [Address] an address with default attributes
     def self.build_default(*args, &block)
       where(country: Spree::Country.default).build(*args, &block)
@@ -84,24 +63,7 @@ module Spree
     # @return [Hash] hash of attributes contributing to value equality with optional merge
     def self.value_attributes(base_attributes, merge_attributes = {})
       base = base_attributes.stringify_keys.merge(merge_attributes.stringify_keys)
-      base.delete("name") unless Spree::Config.use_combined_first_and_last_name_in_address
-
-      name_from_attributes = Spree::Address::Name.from_attributes(base)
-      if base['firstname'].presence || base['first_name'].presence
-        base['firstname'] = name_from_attributes.first_name
-      end
-      if base['lastname'].presence || base['last_name'].presence
-        base['lastname'] = name_from_attributes.last_name
-      end
-
-      virtual_name = name_from_attributes.value
-      if base['name'].blank? && virtual_name.present?
-        base['name'] = virtual_name
-      end
-
-      excluded_attributes = DB_ONLY_ATTRS + %w(first_name last_name)
-
-      base.except(*excluded_attributes)
+      base.except(*DB_ONLY_ATTRS)
     end
 
     # @return [Hash] hash of attributes contributing to value equality
@@ -127,36 +89,7 @@ module Spree
     # @return [Boolean] true if the two addresses have the same address fields
     def ==(other_address)
       return false unless other_address && other_address.respond_to?(:value_attributes)
-      if Spree::Config.use_combined_first_and_last_name_in_address
-        value_attributes.except(*LEGACY_NAME_ATTRS) == other_address.value_attributes.except(*LEGACY_NAME_ATTRS)
-      else
-        value_attributes == other_address.value_attributes
-      end
-    end
-
-    # @deprecated Do not use this. Use Address.== instead.
-    def same_as?(other_address)
-      Spree::Deprecation.warn("Address#same_as? is deprecated. It's equivalent to Address.==", caller)
-      self == other_address
-    end
-
-    # @deprecated Do not use this. Use Address.== instead.
-    def same_as(other_address)
-      Spree::Deprecation.warn("Address#same_as is deprecated. It's equivalent to Address.==", caller)
-      self == other_address
-    end
-
-    # @deprecated Do not use this
-    def empty?
-      Spree::Deprecation.warn("Address#empty? is deprecated.", caller)
-      attributes.except('id', 'created_at', 'updated_at', 'country_id').all? { |_, value| value.nil? }
-    end
-
-    # This exists because the default Object#blank?, checks empty? if it is
-    # defined, and we have defined empty.
-    # This should be removed once empty? is removed
-    def blank?
-      false
+      value_attributes == other_address.value_attributes
     end
 
     # @return [Hash] an ActiveMerchant compatible address hash
@@ -203,117 +136,5 @@ module Spree
     def country_iso
       country && country.iso
     end
-
-    before_save :set_name_from_firstname_and_lastname
-
-    def set_name_from_firstname_and_lastname
-      name_from_firstname_and_lastname = Spree::Address::Name.from_attributes(attributes.except(:name, 'name'))
-
-      if read_attribute(:name).blank? && name_from_firstname_and_lastname.present?
-        write_attribute(:name, name_from_firstname_and_lastname)
-      end
-    end
-
-    # @return [String] the full name on this address
-    def name
-      self[:name] || begin
-        Spree::Address::Name.new(
-          read_attribute(:firstname),
-          read_attribute(:lastname)
-        ).value
-      end
-    end
-
-    def name=(value)
-      return if value.nil?
-
-      write_attribute(:name, value)
-      name_from_value = Spree::Address::Name.new(value)
-      write_attribute(:firstname, name_from_value.first_name)
-      write_attribute(:lastname, name_from_value.last_name)
-    end
-
-    def as_json(options = {})
-      if Spree::Config.use_combined_first_and_last_name_in_address
-        super(options.merge(except: LEGACY_NAME_ATTRS)).tap do |hash|
-          hash['name'] = name
-        end
-      else
-        super
-      end
-    end
-
-    private
-
-    def validate_name
-      return if name.present?
-
-      name_attribute = if Spree::Config.use_combined_first_and_last_name_in_address
-        :name
-      else
-        :firstname
-      end
-      errors.add(name_attribute, :blank)
-    end
-
-    def state_validate
-      unless @silence_state_deprecations
-        Spree::Deprecation.warn \
-          "#{self.class}#state_validate private method has been deprecated" \
-          " and will be removed in Solidus v3." \
-          " Check https://github.com/solidusio/solidus/pull/3129 for more details.",
-          caller
-      end
-
-      # Skip state validation without country (also required)
-      # or when disabled by preference
-      return if country.blank? || !Spree::Config[:address_requires_state]
-      return unless country.states_required
-
-      # ensure associated state belongs to country
-      if state.present?
-        if state.country == country
-          self.state_name = nil # not required as we have a valid state and country combo
-        elsif state_name.present?
-          self.state = nil
-        else
-          errors.add(:state, :invalid)
-        end
-      end
-
-      # ensure state_name belongs to country without states, or that it matches a predefined state name/abbr
-      if state_name.present?
-        if country.states.present?
-          states = country.states.with_name_or_abbr(state_name)
-
-          if states.size == 1
-            self.state = states.first
-            self.state_name = nil
-          else
-            errors.add(:state, :invalid)
-          end
-        end
-      end
-
-      # ensure at least one state field is populated
-      errors.add :state, :blank if state.blank? && state_name.blank?
-    end
-
-    def validate_state_matches_country
-      unless @silence_state_deprecations
-        Spree::Deprecation.warn \
-          "#{self.class}#validate_state_matches_country private method has been deprecated" \
-          " and will be removed in Solidus v3." \
-          " Check https://github.com/solidusio/solidus/pull/3129 for more details.",
-          caller
-      end
-
-      return unless country
-
-      self.state = nil if country.states.empty?
-      if state && state.country != country
-        errors.add(:state, :does_not_match_country)
-      end
-    end
   end
 end