solidus_core 2.11.10 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8eb3e5a4b41af8809472fc7d7875fd2be9101bc2673b2d289bc32e5f6bc0cabc
-  data.tar.gz: 48aac9f88550bbaa4ce69271426877fed50459b23c5fe3109bed565e553fe0b3
+  metadata.gz: 41166c504ad4a467ac0d444551669efca2f6ff36b8083b11483ca1d6953c838e
+  data.tar.gz: f9c8abd6767eb3aaecf807d1e360defbb57ba7af0590d88b6019f0cd8bf2f1b1
 SHA512:
-  metadata.gz: 7b3adaf152c0e1a8bf34de8bf8577a8a369e51a6acb0215b558f055a1235b1b7499e50778cc040cf08221ee98d79df07d72b9112f61ad3158dd226b5c8af73e1
-  data.tar.gz: dd950b0d62311e85c9e72cea449650b04d9388c2443e1dbb187bc885bf24f128338fb96e0b0b5eb177b9b444c2bb738b8d59d6bfdb298eb774b7391367e15b2d
+  metadata.gz: 5f9384ee4d463107d31e2cff1670ee587e7c2ad61795f11d1120bb69049fcc0bec3f04a0edee1e10e4c951a5b287cd9b93986c4194b87303e1a2a1ee38a7062a
+  data.tar.gz: 6d924bbc21a024712b1579c6bb73390904b456fc4671f1dc15b17de255d2f543b7cdcd2a4484e005444be085041a98819c6b3d2a1d55469305ce5b85108327e3

data/Rakefile

@@ -14,8 +14,12 @@ DummyApp::RakeTasks.new(
   lib_name: 'solidus_core'
 )
 
-require 'yard'
-YARD::Rake::YardocTask.new
+require 'yard/rake/yardoc_task'
+YARD::Rake::YardocTask.new(:yard)
+# The following workaround can be removed
+# once https://github.com/lsegal/yard/pull/1457 is merged.
+task('yard:require') { require 'yard' }
+task yard: 'yard:require'
 
 namespace :spec do
   task :isolated do

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/controllers/spree/base_controller.rb

@@ -4,7 +4,7 @@ require 'cancan'
 require_dependency 'spree/core/controller_helpers/strong_parameters'
 
 class Spree::BaseController < ApplicationController
-  include Spree::Core::ControllerHelpers::CurrentHost
+  include ActiveStorage::SetCurrent
   include Spree::Core::ControllerHelpers::Auth
   include Spree::Core::ControllerHelpers::Common
   include Spree::Core::ControllerHelpers::PaymentParameters

data/app/helpers/spree/base_helper.rb

@@ -130,7 +130,7 @@ module Spree
     end
 
     def display_price(product_or_variant)
-      product_or_variant.price_for(current_pricing_options).to_html
+      product_or_variant.price_for_options(current_pricing_options)&.money&.to_html
     end
 
     def pretty_time(time, format = :long)

data/app/helpers/spree/products_helper.rb

@@ -38,7 +38,7 @@ module Spree
                   .with_prices(current_pricing_options)
                   .all? { |variant_with_prices| variant_with_prices.price_same_as_master?(current_pricing_options) }
 
-      variant.price_for(current_pricing_options).to_html
+      variant.price_for_options(current_pricing_options)&.money&.to_html
     end
 
     # Converts line breaks in product description into <p> tags.
@@ -68,7 +68,7 @@ module Spree
     # @return [String] a cache invalidation key for products
     def cache_key_for_products
       count = @products.count
-      max_updated_at = (@products.maximum(:updated_at) || Date.today).to_s(:number)
+      max_updated_at = Spree::RailsCompatibility.to_fs((@products.maximum(:updated_at) || Date.today), :number)
       "#{I18n.locale}/#{current_pricing_options.cache_key}/spree/products/all-#{params[:page]}-#{max_updated_at}-#{count}"
     end
   end

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

@@ -4,14 +4,16 @@ require 'mini_magick'
 
 module Spree
   module ActiveStorageAdapter
-    # Decorares AtiveStorage attachment to add methods exptected by Solidus'
+    # Decorates ActiveStorage attachment to add methods expected by Solidus'
     # Paperclip-oriented attachment support.
     class Attachment
       delegate_missing_to :@attachment
 
+      attr_reader :attachment
+
       def initialize(attachment, styles: {})
         @attachment = attachment
-        @styles = normalize_styles(styles)
+        @transformations = styles_to_transformations(styles)
       end
 
       def exists?
@@ -27,11 +29,13 @@ module Spree
       end
 
       def variant(style = nil)
-        size = style_to_size(style)
-        @attachment.variant(
-          resize_to_limit: size,
-          strip: true
-        ).processed
+        transformation = @transformations[style] || default_transformation(width, height)
+
+        @attachment.variant({
+          saver: {
+            strip: true
+          }
+        }.merge(transformation)).processed
       end
 
       def height
@@ -55,14 +59,29 @@ module Spree
         analyze unless analyzed?
 
         @attachment.metadata
+      rescue ActiveStorage::FileNotFoundError => error
+        logger.error("#{error} - Image id: #{attachment.record.id} is corrupted or cannot be found")
+
+        { identified: nil, width: nil, height: nil, analyzed: true }
       end
 
-      def normalize_styles(styles)
-        styles.transform_values { |v| v.split('x') }
+      def styles_to_transformations(styles)
+        styles.transform_values(&method(:imagemagick_to_image_processing_definition))
+      end
+
+      def imagemagick_to_image_processing_definition(definition)
+        width_height = definition.split('x').map(&:to_i)
+
+        case definition[-1].to_sym
+        when :^
+          { resize_to_fill: width_height }
+        else
+          default_transformation(*width_height)
+        end
       end
 
-      def style_to_size(style)
-        @styles.fetch(style&.to_sym) { [width, height] }
+      def default_transformation(width, height)
+        { resize_to_limit: [width, height] }
       end
     end
   end

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

@@ -10,7 +10,7 @@ module Spree
     included do
       next if Rails.gem_version >= Gem::Version.new('6.1.0.alpha')
 
-      abort <<~MESSAGE
+      raise <<~MESSAGE
         Configuration Error: Solidus ActiveStorage attachment adpater requires Rails >= 6.1.0.
 
         Spree::Config.image_attachment_module preference is set to #{Spree::Config.image_attachment_module}

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

@@ -5,20 +5,49 @@ module Spree
     extend ActiveSupport::Concern
 
     included do
-      has_one :default_price,
-        -> { with_discarded.currently_valid.with_default_attributes },
-        class_name: 'Spree::Price',
-        inverse_of: :variant,
-        dependent: :destroy,
-        autosave: true
+      delegate :display_price, :display_amount, :price, to: :default_price, allow_nil: true
+      delegate :price=, to: :default_price_or_build
+
+      # @see Spree::Variant::PricingOptions.default_price_attributes
+      def self.default_price_attributes
+        Spree::Config.default_pricing_options.desired_attributes
+      end
+    end
+
+    # Returns `#prices` prioritized for being considered as default price
+    #
+    # @deprecated
+    # @return [ActiveRecord::Relation<Spree::Price>]
+    def currently_valid_prices
+      prices.currently_valid
     end
+    deprecate :currently_valid_prices, deprecator: Spree::Deprecation
 
-    def find_or_build_default_price
-      default_price || build_default_price(Spree::Config.default_pricing_options.desired_attributes)
+    # Returns {#default_price} or builds it from {Spree::Variant.default_price_attributes}
+    #
+    # @return [Spree::Price, nil]
+    # @see Spree::Variant.default_price_attributes
+    def default_price_or_build
+      default_price ||
+        prices.build(self.class.default_price_attributes)
     end
 
-    delegate :display_price, :display_amount, :price, to: :find_or_build_default_price
-    delegate :price=, to: :find_or_build_default_price
+    # Select from {#prices} the one to be considered as the default
+    #
+    # This method works with the in-memory association, so non-persisted prices
+    # are taken into account.
+    #
+    # A price is a candidate to be considered as the default when it meets
+    # {Spree::Variant.default_price_attributes} criteria. When more than one candidate is
+    # found, non-persisted records take preference. When more than one persisted
+    # candidate exists, the one most recently updated is taken or, in case of
+    # race condition, the one with higher id.
+    #
+    # @return [Spree::Price, nil]
+    # @see Spree::Variant.default_price_attributes
+    def default_price
+      price_selector.price_for_options(Spree::Config.default_pricing_options)
+    end
 
     def has_default_price?
       default_price.present? && !default_price.discarded?

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

@@ -3,8 +3,28 @@
 module Spree::RansackableAttributes
   extend ActiveSupport::Concern
   included do
-    class_attribute :whitelisted_ransackable_associations
-    class_attribute :whitelisted_ransackable_attributes
+    class_attribute :allowed_ransackable_associations, default: []
+    class_attribute :allowed_ransackable_attributes, default: []
+
+    def self.whitelisted_ransackable_associations
+      Spree::Deprecation.deprecation_warning(:whitelisted_ransackable_associations, 'use allowed_ransackable_associations instead')
+      allowed_ransackable_associations
+    end
+
+    def self.whitelisted_ransackable_associations=(new_value)
+      Spree::Deprecation.deprecation_warning(:whitelisted_ransackable_associations=, 'use allowed_ransackable_associations= instead')
+      self.allowed_ransackable_associations = new_value
+    end
+
+    def self.whitelisted_ransackable_attributes
+      Spree::Deprecation.deprecation_warning(:whitelisted_ransackable_attributes, 'use allowed_ransackable_attributes instead')
+      allowed_ransackable_attributes
+    end
+
+    def self.whitelisted_ransackable_attributes=(new_value)
+      Spree::Deprecation.deprecation_warning(:whitelisted_ransackable_attributes=, 'use allowed_ransackable_attributes= instead')
+      self.allowed_ransackable_attributes = new_value
+    end
 
     class_attribute :default_ransackable_attributes
     self.default_ransackable_attributes = %w[id]
@@ -12,11 +32,11 @@ module Spree::RansackableAttributes
 
   class_methods do
     def ransackable_associations(*_args)
-      whitelisted_ransackable_associations || []
+      allowed_ransackable_associations
     end
 
     def ransackable_attributes(*_args)
-      default_ransackable_attributes | (whitelisted_ransackable_attributes || [])
+      default_ransackable_attributes | allowed_ransackable_attributes
     end
   end
 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

@@ -37,34 +37,9 @@ module Spree
 
       has_one :default_user_ship_address, ->{ default_shipping }, class_name: 'Spree::UserAddress', foreign_key: 'user_id'
       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)
+      accepts_nested_attributes_for :ship_address
+      accepts_nested_attributes_for :bill_address
     end
 
     # saves address in address book
@@ -132,12 +107,19 @@ module Spree
       return new_address unless new_address.valid?
 
       first_one = user_addresses.empty?
+      user_address = prepare_user_address(new_address)
 
       if address_attributes[:id].present? && new_address.id != address_attributes[:id]
+        if ship_address&.id == address_attributes[:id].to_i
+          user_addresses.mark_default(user_address, address_type: :shipping)
+        end
+
+        if bill_address&.id == address_attributes[:id].to_i
+          user_addresses.mark_default(user_address, address_type: :billing)
+        end
         remove_from_address_book(address_attributes[:id])
       end
 
-      user_address = prepare_user_address(new_address)
       user_addresses.mark_default(user_address, address_type: address_type) if default || first_one
 
       if persisted?
@@ -157,15 +139,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
@@ -19,24 +18,22 @@ module Spree
       has_many :stock_locations, through: :user_stock_locations
 
       has_many :spree_orders, foreign_key: "user_id", class_name: "Spree::Order"
-      has_many :orders, foreign_key: "user_id", class_name: "Spree::Order", dependent: :restrict_with_exception
+      has_many :orders, foreign_key: "user_id", class_name: "Spree::Order"
 
       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
 
       after_create :auto_generate_spree_api_key
+      before_destroy :check_for_deletion
 
       include Spree::RansackableAttributes unless included_modules.include?(Spree::RansackableAttributes)
 
-      ransack_alias :firstname_or_lastname, :addresses_firstname_or_addresses_lastname
-      self.whitelisted_ransackable_associations = %w[addresses spree_roles]
-      self.whitelisted_ransackable_attributes = %w[firstname_or_lastname id email created_at]
+      ransack_alias :name, :addresses_name
+      self.allowed_ransackable_associations = %w[addresses spree_roles]
+      self.allowed_ransackable_attributes = %w[name id email created_at]
     end
 
     def wallet
@@ -68,11 +65,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 }.
@@ -85,5 +77,38 @@ module Spree
         currency: currency,
       )
     end
+
+    # Restrict to delete users with existing orders
+    #
+    # Override this in your user model class to add another logic.
+    #
+    # Ie. to allow to delete users with incomplete orders add:
+    #
+    #   orders.complete.none?
+    #
+    def can_be_deleted?
+      orders.none?
+    end
+
+    # Updates the roles in keeping with the given ability's permissions
+    #
+    # Roles that are not accessible to the given ability will be ignored. It
+    # also ensure not to remove non accessible roles when assigning new
+    # accessible ones.
+    #
+    # @param given_roles [Spree::Role]
+    # @param ability [Spree::Ability]
+    def update_spree_roles(given_roles, ability:)
+      accessible_roles = Spree::Role.accessible_by(ability)
+      non_accessible_roles = Spree::Role.all - accessible_roles
+      new_accessible_roles = given_roles - non_accessible_roles
+      self.spree_roles = spree_roles - accessible_roles + new_accessible_roles
+    end
+
+    private
+
+    def check_for_deletion
+      raise ActiveRecord::DeleteRestrictionError unless can_be_deleted?
+    end
   end
 end

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)