solidus_core 4.6.2 → 4.7.0

data/app/models/spree/tax_rate.rb

@@ -19,12 +19,12 @@ module Spree
     belongs_to :zone, class_name: "Spree::Zone", inverse_of: :tax_rates, optional: true
 
     has_many :tax_rate_tax_categories,
-      class_name: 'Spree::TaxRateTaxCategory',
+      class_name: "Spree::TaxRateTaxCategory",
       dependent: :destroy,
       inverse_of: :tax_rate
     has_many :tax_categories,
       through: :tax_rate_tax_categories,
-      class_name: 'Spree::TaxCategory',
+      class_name: "Spree::TaxCategory",
       inverse_of: :tax_rates
 
     has_many :adjustments, as: :source
@@ -37,12 +37,12 @@ module Spree
     # Finds all tax rates whose zones match a given address
     scope :for_address, ->(address) { joins(:zone).merge(Spree::Zone.for_address(address)) }
     scope :for_country,
-          ->(country) { for_address(Spree::Tax::TaxLocation.new(country:)) }
+      ->(country) { for_address(Spree::Tax::TaxLocation.new(country:)) }
     scope :active, -> do
       table = arel_table
       time = Time.current
-      where(table[:starts_at].eq(nil).or(table[:starts_at].lt(time))).
-        where(table[:expires_at].eq(nil).or(table[:expires_at].gt(time)))
+      where(table[:starts_at].eq(nil).or(table[:starts_at].lt(time)))
+        .where(table[:expires_at].eq(nil).or(table[:expires_at].gt(time)))
     end
 
     # Finds geographically matching tax rates for a tax zone.

data/app/models/spree/tax_rate_tax_category.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class TaxRateTaxCategory < Spree::Base
-    belongs_to :tax_rate, class_name: 'Spree::TaxRate', inverse_of: :tax_rate_tax_categories, optional: true
-    belongs_to :tax_category, class_name: 'Spree::TaxCategory', inverse_of: :tax_rate_tax_categories, optional: true
+    belongs_to :tax_rate, class_name: "Spree::TaxRate", inverse_of: :tax_rate_tax_categories, optional: true
+    belongs_to :tax_category, class_name: "Spree::TaxCategory", inverse_of: :tax_rate_tax_categories, optional: true
   end
 end

data/app/models/spree/taxon/active_storage_attachment.rb

@@ -6,8 +6,8 @@ module Spree::Taxon::ActiveStorageAttachment
 
   included do
     has_attachment :icon,
-                   styles: Spree::Config.taxon_image_styles,
-                   default_style: Spree::Config.taxon_image_style_default
+      styles: Spree::Config.taxon_image_styles,
+      default_style: Spree::Config.taxon_image_style_default
     validate :icon_is_an_image
   end
 end

data/app/models/spree/taxon/paperclip_attachment.rb

@@ -7,12 +7,12 @@ module Spree::Taxon::PaperclipAttachment
     has_attached_file :icon,
       styles: Spree::Config.taxon_image_styles,
       default_style: Spree::Config.taxon_image_style_default,
-      url: '/spree/taxons/:id/:style/:basename.:extension',
-      path: ':rails_root/public/spree/taxons/:id/:style/:basename.:extension',
-      default_url: '/assets/default_taxon.png'
+      url: "/spree/taxons/:id/:style/:basename.:extension",
+      path: ":rails_root/public/spree/taxons/:id/:style/:basename.:extension",
+      default_url: "/assets/default_taxon.png"
 
     validates_attachment :icon,
-      content_type: { content_type: Spree::Config.allowed_image_mime_types }
+      content_type: {content_type: Spree::Config.allowed_image_mime_types}
   end
 
   def icon_present?

data/app/models/spree/taxon.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
-require 'spree/core/product_filters'
-
 module Spree
   class Taxon < Spree::Base
     extend FriendlyId
+
     friendly_id :permalink, use: :history, slug_column: :permalink
 
     acts_as_nested_set dependent: :destroy
 
-    belongs_to :taxonomy, class_name: 'Spree::Taxonomy', inverse_of: :taxons
+    belongs_to :taxonomy, class_name: "Spree::Taxonomy", inverse_of: :taxons
     has_many :classifications, -> { order(:position) }, dependent: :delete_all, inverse_of: :taxon
     has_many :products, through: :classifications
 
@@ -17,11 +16,11 @@ module Spree
     after_update :update_child_permalinks, if: :saved_change_to_permalink?
 
     validates :name, presence: true
-    validates :name, uniqueness: { scope: :parent_id, message: :must_be_unique_under_same_parent }
-    validates :meta_keywords, length: { maximum: 255 }
-    validates :meta_description, length: { maximum: 255 }
-    validates :meta_title, length: { maximum: 255 }
-    validates :taxonomy_id, uniqueness: { scope: :parent_id, message: :can_have_only_one_root }, if: -> { root? }
+    validates :name, uniqueness: {scope: :parent_id, message: :must_be_unique_under_same_parent}
+    validates :meta_keywords, length: {maximum: 255}
+    validates :meta_description, length: {maximum: 255}
+    validates :meta_title, length: {maximum: 255}
+    validates :taxonomy_id, uniqueness: {scope: :parent_id, message: :can_have_only_one_root}, if: -> { root? }
 
     after_save :touch_ancestors_and_taxonomy
     after_touch :touch_ancestors_and_taxonomy
@@ -43,7 +42,7 @@ module Spree
     # Sets this taxons permalink to a valid url encoded string based on its
     # name and its parents permalink (if present.)
     def set_permalink
-      permalink_tail = permalink.present? ? permalink.split('/').last : name
+      permalink_tail = permalink.present? ? permalink.split("/").last : name
       self.permalink_part = Spree::Config.taxon_url_parametizer_class.parameterize(permalink_tail)
     end
 
@@ -75,7 +74,7 @@ module Spree
     def all_products
       scope = Product.joins(:taxons)
       scope.where(
-        spree_taxons: { id: self_and_descendants.select(:id) }
+        spree_taxons: {id: self_and_descendants.select(:id)}
       )
     end
 
@@ -109,14 +108,14 @@ module Spree
     end
 
     def permalink_part
-      permalink.split('/').last
+      permalink.split("/").last
     end
 
     def permalink_part=(value)
-      if parent.present?
-        self.permalink = "#{parent.permalink}/#{value}"
+      self.permalink = if parent.present?
+        "#{parent.permalink}/#{value}"
       else
-        self.permalink = value
+        value
       end
     end
 
@@ -129,13 +128,13 @@ module Spree
     # override for {FriendlyId::Slugged#normalize_friendly_id} method,
     # to control over the slug format
     def normalize_friendly_id(value)
-      return '' if value.blank?
+      return "" if value.blank?
 
-      parts = value.to_s.split('/')
+      parts = value.to_s.split("/")
       last_word = parts.pop
       corrected_last_word = Spree::Config.taxon_url_parametizer_class.parameterize(last_word)
 
-      (parts << corrected_last_word).join('/')
+      (parts << corrected_last_word).join("/")
     end
 
     private

data/app/models/spree/taxon_brand_selector.rb

@@ -10,9 +10,9 @@ module Spree
 
     def call
       product.taxons
-             .joins(:taxonomy)
-             .where(spree_taxonomies: { name: BRANDS_TAXONOMY_NAME })
-             .first
+        .joins(:taxonomy)
+        .where(spree_taxonomies: {name: BRANDS_TAXONOMY_NAME})
+        .first
     end
 
     private

data/app/models/spree/unauthorized_redirect_handler.rb

@@ -11,7 +11,7 @@ module Spree
 
     # This method is responsible for handling unauthorized redirects
     def call
-      flash[:error] = I18n.t('spree.authorization_failure')
+      flash[:error] = I18n.t("spree.authorization_failure")
       redirect_back(fallback_location: "/unauthorized")
     end
 

data/app/models/spree/unit_cancel.rb

@@ -4,8 +4,8 @@
 # The reason specifies why it was canceled.
 # This class should encapsulate logic related to canceling inventory after order complete
 class Spree::UnitCancel < Spree::Base
-  SHORT_SHIP = 'Short Ship'
-  DEFAULT_REASON = 'Cancel'
+  SHORT_SHIP = "Short Ship"
+  DEFAULT_REASON = "Cancel"
 
   belongs_to :inventory_unit, optional: true
   has_one :adjustment, as: :source, dependent: :destroy
@@ -22,7 +22,7 @@ class Spree::UnitCancel < Spree::Base
       source: self,
       amount:,
       order: inventory_unit.order,
-      label: "#{I18n.t('spree.cancellation')} - #{reason}",
+      label: "#{I18n.t("spree.cancellation")} - #{reason}",
       finalized: true
     )
 
@@ -47,6 +47,6 @@ class Spree::UnitCancel < Spree::Base
   end
 
   def quantity_of_line_item(line_item)
-    BigDecimal(line_item.inventory_units.not_canceled.reject(&:original_return_item).size)
+    BigDecimal(line_item.inventory_units.not_canceled.count { |element| !element.original_return_item })
   end
 end

data/app/models/spree/user_address.rb

@@ -5,8 +5,8 @@ module Spree
     belongs_to :user, class_name: UserClassHandle.new, foreign_key: "user_id", inverse_of: :user_addresses
     belongs_to :address, class_name: "Spree::Address"
 
-    validates :address_id, uniqueness: { scope: :user_id }
-    validates :user_id, uniqueness: { conditions: -> { default_shipping }, message: :default_address_exists, if: :default? }
+    validates :address_id, uniqueness: {scope: :user_id}
+    validates :user_id, uniqueness: {conditions: -> { default_shipping }, message: :default_address_exists, if: :default?}
 
     scope :with_address_values, ->(address_attributes) do
       joins(:address).merge(
@@ -25,6 +25,6 @@ module Spree
       all
     }
 
-    default_scope -> { order([default: :desc, updated_at: :desc]) }
+    default_scope -> { order([{default: :desc, updated_at: :desc}]) }
   end
 end

data/app/models/spree/user_last_url_storer/rules/authentication_rule.rb

@@ -20,15 +20,13 @@ module Spree
 
         def disallowed_urls(controller)
           @disallowed_urls ||= {}
-          @disallowed_urls[controller.controller_name] ||= begin
-            [].tap do |disallowed_urls|
-              AUTHENTICATION_ROUTES.each do |route|
-                if controller.respond_to?(route)
-                  disallowed_urls << controller.send(route)
-                end
+          @disallowed_urls[controller.controller_name] ||= [].tap do |disallowed_urls|
+            AUTHENTICATION_ROUTES.each do |route|
+              if controller.respond_to?(route)
+                disallowed_urls << controller.send(route)
               end
-            end.map! { |url| url[/\/\w+$/] }
-          end
+            end
+          end.map! { |url| url[/\/\w+$/] }
         end
       end
     end

data/app/models/spree/user_last_url_storer.rb

@@ -34,7 +34,7 @@ module Spree
     def store_location
       return if self.class.rules.any? { |rule| rule.match? controller }
 
-      session[:spree_user_return_to] = request.fullpath.gsub('//', '/')
+      session[:spree_user_return_to] = request.fullpath.gsub("//", "/")
     end
 
     private

data/app/models/spree/variant/price_selector.rb

@@ -45,7 +45,7 @@ module Spree
           [
             price.country_iso.nil? ? 0 : 1,
             price.updated_at || Time.zone.now,
-            price.id || Float::INFINITY,
+            price.id || Float::INFINITY
           ]
         end.reverse
       end

data/app/models/spree/variant/scopes.rb

@@ -11,7 +11,7 @@ module Spree
           }
 
           scope :by_stock_location, ->(stock_location_id) {
-            joins(:stock_locations).where(spree_stock_locations: { id: stock_location_id })
+            joins(:stock_locations).where(spree_stock_locations: {id: stock_location_id})
           }
 
           class << self
@@ -24,19 +24,19 @@ module Spree
               option_types = Spree::OptionType.table_name
 
               option_type_conditions = case option_type
-                                       when OptionType then { "#{option_types}.name" => option_type.name }
-                                       when String     then { "#{option_types}.name" => option_type }
-                                       else { "#{option_types}.id" => option_type }
-                                       end
+              when OptionType then {"#{option_types}.name" => option_type.name}
+              when String then {"#{option_types}.name" => option_type}
+              else {"#{option_types}.id" => option_type}
+              end
 
               relation = joins(option_values: :option_type).where(option_type_conditions)
 
               option_values.each do |option_value|
                 option_value_conditions = case option_value
-                                          when OptionValue then { "#{Spree::OptionValue.table_name}.name" => option_value.name }
-                                          when String      then { "#{Spree::OptionValue.table_name}.name" => option_value }
-                                          else { "#{Spree::OptionValue.table_name}.id" => option_value }
-                                          end
+                when OptionValue then {"#{Spree::OptionValue.table_name}.name" => option_value.name}
+                when String then {"#{Spree::OptionValue.table_name}.name" => option_value}
+                else {"#{Spree::OptionValue.table_name}.id" => option_value}
+                end
                 relation = relation.where(option_value_conditions)
               end
 

data/app/models/spree/variant.rb

@@ -30,15 +30,15 @@ module Spree
 
     # Consider that not all platforms digest structured data in the same way,
     # you might have to modify the output on the frontend or in feeds accordingly.
-    enum :condition, { damaged: "damaged", new: "new", refurbished: "refurbished", used: "used" }, prefix: true
+    enum :condition, {damaged: "damaged", new: "new", refurbished: "refurbished", used: "used"}, prefix: true
 
-    belongs_to :product, -> { with_discarded }, touch: true, class_name: 'Spree::Product', inverse_of: :variants_including_master, optional: false
-    belongs_to :tax_category, class_name: 'Spree::TaxCategory', optional: true
+    belongs_to :product, -> { with_discarded }, touch: true, class_name: "Spree::Product", inverse_of: :variants_including_master, optional: false
+    belongs_to :tax_category, class_name: "Spree::TaxCategory", optional: true
     belongs_to :shipping_category, class_name: "Spree::ShippingCategory", optional: true
 
     delegate :name, :description, :slug, :available_on, :discontinue_on, :discontinued?,
-             :meta_description, :meta_keywords,
-             to: :product
+      :meta_description, :meta_keywords,
+      to: :product
     delegate :tax_category, :tax_category_id, to: :product, prefix: true
     delegate :shipping_category, :shipping_category_id,
       to: :product, prefix: true
@@ -60,7 +60,7 @@ module Spree
 
     has_many :prices,
       -> { with_discarded },
-      class_name: 'Spree::Price',
+      class_name: "Spree::Price",
       dependent: :destroy,
       inverse_of: :variant,
       autosave: true
@@ -72,9 +72,9 @@ module Spree
     validates :product, presence: true
     validate :check_price
 
-    validates :cost_price, numericality: { greater_than_or_equal_to: 0, allow_nil: true }
-    validates :price,      numericality: { greater_than_or_equal_to: 0, allow_nil: true }
-    validates :sku, uniqueness: { allow_blank: true, case_sensitive: true, conditions: -> { where(deleted_at: nil) }, if: :enforce_unique_sku? }
+    validates :cost_price, numericality: {greater_than_or_equal_to: 0, allow_nil: true}
+    validates :price, numericality: {greater_than_or_equal_to: 0, allow_nil: true}
+    validates :sku, uniqueness: {allow_blank: true, case_sensitive: true, conditions: -> { where(deleted_at: nil) }, if: :enforce_unique_sku?}
 
     after_create :create_stock_items
     after_create :set_master_out_of_stock, unless: :is_master?
@@ -85,7 +85,7 @@ module Spree
     after_destroy :destroy_option_values_variants
 
     scope :template_variants, -> do
-      left_joins(product: { option_types: :option_values }).where(is_master: true).where.not(spree_option_values: { id: nil }).reorder(nil).distinct
+      left_joins(product: {option_types: :option_values}).where(is_master: true).where.not(spree_option_values: {id: nil}).reorder(nil).distinct
     end
     scope :non_template_variants, -> { where.not(id: template_variants) }
 
@@ -101,7 +101,7 @@ module Spree
       return all unless Spree::Config.track_inventory_levels
       in_stock_variants = joins(:stock_items).where(Spree::StockItem.arel_table[:count_on_hand].gt(0).or(arel_table[:track_inventory].eq(false)))
       if stock_locations.present?
-        in_stock_variants = in_stock_variants.where(spree_stock_items: { stock_location_id: stock_locations.map(&:id) })
+        in_stock_variants = in_stock_variants.where(spree_stock_items: {stock_location_id: stock_locations.map(&:id)})
       end
       in_stock_variants.distinct
     end
@@ -132,16 +132,16 @@ module Spree
     # @return [ActiveRecord::Relation]
     def self.with_prices(pricing_options = Spree::Config.default_pricing_options)
       where(
-        Spree::Price.
-          where(Spree::Variant.arel_table[:id].eq(Spree::Price.arel_table[:variant_id])).
+        Spree::Price
+          .where(Spree::Variant.arel_table[:id].eq(Spree::Price.arel_table[:variant_id])).
           # This next clause should just be `where(pricing_options.search_arguments)`, but ActiveRecord
           # generates invalid SQL, so the SQL here is written manually.
           where(
             "spree_prices.currency = ? AND (spree_prices.country_iso IS NULL OR spree_prices.country_iso = ?)",
             pricing_options.search_arguments[:currency],
             pricing_options.search_arguments[:country_iso].compact
-          ).
-          arel.exists
+          )
+          .arel.exists
       )
     end
 
@@ -200,12 +200,12 @@ module Spree
     #
     # @return [Fixnum]
     def on_backorder
-      inventory_units.with_state('backordered').size
+      inventory_units.with_state("backordered").size
     end
 
     # @return [Boolean] true if this variant can be backordered
     def is_backorderable?
-      Spree::Stock::Quantifier.new(self).backorderable?
+      Spree::Config.stock.quantifier_class.new(self).backorderable?
     end
 
     # Creates a sentence out of the variant's (sorted) option values.
@@ -220,7 +220,7 @@ module Spree
         "#{ov.option_type.presentation}: #{ov.presentation}"
       end
 
-      values.to_sentence({ words_connector: ", ", two_words_connector: ", " })
+      values.to_sentence({words_connector: ", ", two_words_connector: ", "})
     end
 
     # Determines the name of an Exchange variant.
@@ -235,7 +235,7 @@ module Spree
     #
     # @return [String] the generated name
     def descriptive_name
-      is_master? ? name + ' - Master' : name + ' - ' + options_text
+      is_master? ? name + " - Master" : name + " - " + options_text
     end
 
     # Returns whether this variant has been deleted. Provided as a method of
@@ -315,7 +315,7 @@ module Spree
 
     def price_same_as_master?(pricing_options = Spree::Config.default_pricing_options)
       diff = price_difference_from_master(pricing_options)
-      diff && diff.zero?
+      diff&.zero?
     end
 
     # Generates a friendly name and sku string.
@@ -345,7 +345,7 @@ module Spree
     #   check inventory in all available StockLocations.
     # @return [Boolean] true if the desired quantity can be supplied
     def can_supply?(quantity = 1, stock_location = nil)
-      Spree::Stock::Quantifier.new(self, stock_location).can_supply?(quantity)
+      Spree::Config.stock.quantifier_class.new(self, stock_location).can_supply?(quantity)
     end
 
     # Fetches the on-hand quantity of the variant.
@@ -355,7 +355,7 @@ module Spree
     #   check inventory in all available StockLocations.
     # @return [Fixnum] the number currently on-hand
     def total_on_hand(stock_location = nil)
-      Spree::Stock::Quantifier.new(self, stock_location).total_on_hand
+      Spree::Config.stock.quantifier_class.new(self, stock_location).total_on_hand
     end
 
     # Shortcut method to determine if inventory tracking is enabled for this
@@ -392,7 +392,7 @@ module Spree
     end
 
     def set_master_out_of_stock
-      if product.master && product.master.in_stock?
+      if product.master&.in_stock?
         product.master.stock_items.update_all(backorderable: false)
         product.master.stock_items.each(&:reduce_count_on_hand_to_zero)
       end
@@ -405,7 +405,7 @@ module Spree
 
     def check_price
       if price.nil? && Spree::Config[:require_master_price] && is_master?
-        errors.add :price, 'Must supply price for variant or master.price for product.'
+        errors.add :price, "Must supply price for variant or master.price for product."
       end
     end
 
@@ -441,4 +441,4 @@ module Spree
   end
 end
 
-require_dependency 'spree/variant/scopes'
+require_dependency "spree/variant/scopes"

data/app/models/spree/variant_property_rule.rb

@@ -15,9 +15,9 @@ module Spree
   class VariantPropertyRule < Spree::Base
     belongs_to :product, touch: true
 
-    has_many :values, class_name: 'Spree::VariantPropertyRuleValue', dependent: :destroy
+    has_many :values, class_name: "Spree::VariantPropertyRuleValue", dependent: :destroy
     has_many :properties, through: :values
-    has_many :conditions, class_name: 'Spree::VariantPropertyRuleCondition', dependent: :destroy
+    has_many :conditions, class_name: "Spree::VariantPropertyRuleCondition", dependent: :destroy
     has_many :option_values, through: :conditions
 
     accepts_nested_attributes_for :values, allow_destroy: true, reject_if: lambda { |val| val[:property_name].blank? }

data/app/models/spree/variant_property_rule_condition.rb

@@ -5,6 +5,6 @@ module Spree
     belongs_to :option_value, optional: true
     belongs_to :variant_property_rule, touch: true, optional: true
 
-    validates :option_value_id, uniqueness: { scope: :variant_property_rule_id }
+    validates :option_value_id, uniqueness: {scope: :variant_property_rule_id}
   end
 end

data/app/models/spree/wallet/add_payment_sources_to_wallet.rb

@@ -16,10 +16,10 @@ class Spree::Wallet::AddPaymentSourcesToWallet
     if !order.temporary_payment_source && order.user
       # select valid sources
       payments = order.payments.valid
-      sources = payments.map(&:source).
-        uniq.
-        compact.
-        select { |payment| payment.try(:reusable?) }
+      sources = payments.map(&:source)
+        .uniq
+        .compact
+        .select { |payment| payment.try(:reusable?) }
 
       # add valid sources to wallet and optionally set a default
       if sources.any?

data/app/models/spree/wallet/default_payment_builder.rb

@@ -17,7 +17,7 @@ class Spree::Wallet::DefaultPaymentBuilder
     if default && order.payments.where(source_type: default.payment_source_type).none?
       Spree::Payment.new(
         payment_method: default.payment_source.payment_method,
-        source: default.payment_source,
+        source: default.payment_source
       )
     end
   end

data/app/models/spree/wallet_payment_source.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class WalletPaymentSource < Spree::Base
-    belongs_to :user, class_name: Spree::UserClassHandle.new, foreign_key: 'user_id', inverse_of: :wallet_payment_sources, optional: true
+    belongs_to :user, class_name: Spree::UserClassHandle.new, foreign_key: "user_id", inverse_of: :wallet_payment_sources, optional: true
     belongs_to :payment_source, polymorphic: true, inverse_of: :wallet_payment_sources, optional: true
 
     validates :user, presence: true
@@ -27,7 +27,7 @@ module Spree
       return unless payment_source.present?
 
       if payment_source.respond_to?(:user_id) &&
-         payment_source.user_id != user_id
+          payment_source.user_id != user_id
         errors.add(:payment_source, :not_owned_by_user)
       end
     end

data/app/models/spree/zone.rb

@@ -13,7 +13,7 @@ module Spree
     has_many :shipping_method_zones, dependent: :destroy
     has_many :shipping_methods, through: :shipping_method_zones
 
-    validates :name, presence: true, uniqueness: { allow_blank: true, case_sensitive: true }
+    validates :name, presence: true, uniqueness: {allow_blank: true, case_sensitive: true}
     after_save :remove_defunct_members
 
     scope :with_member_ids, ->(state_ids, country_ids) do
@@ -22,11 +22,11 @@ module Spree
       else
         spree_zone_members_table = Spree::ZoneMember.arel_table
         matching_state =
-          spree_zone_members_table[:zoneable_type].eq("Spree::State").
-          and(spree_zone_members_table[:zoneable_id].in(state_ids))
+          spree_zone_members_table[:zoneable_type].eq("Spree::State")
+            .and(spree_zone_members_table[:zoneable_id].in(state_ids))
         matching_country =
-          spree_zone_members_table[:zoneable_type].eq("Spree::Country").
-          and(spree_zone_members_table[:zoneable_id].in(country_ids))
+          spree_zone_members_table[:zoneable_type].eq("Spree::Country")
+            .and(spree_zone_members_table[:zoneable_id].in(country_ids))
         joins(:zone_members).where(matching_state.or(matching_country)).distinct
       end
     end
@@ -39,8 +39,8 @@ module Spree
       end
     end
 
-    alias :members :zone_members
-    accepts_nested_attributes_for :zone_members, allow_destroy: true, reject_if: proc { |member| member['zoneable_id'].blank? }
+    alias_method :members, :zone_members
+    accepts_nested_attributes_for :zone_members, allow_destroy: true, reject_if: proc { |member| member["zoneable_id"].blank? }
 
     self.allowed_ransackable_attributes = %w[name description]
 
@@ -74,9 +74,9 @@ module Spree
 
       members.any? do |zone_member|
         case zone_member.zoneable_type
-        when 'Spree::Country'
+        when "Spree::Country"
           zone_member.zoneable_id == address.country_id
-        when 'Spree::State'
+        when "Spree::State"
           zone_member.zoneable_id == address.state_id
         else
           false
@@ -87,10 +87,10 @@ module Spree
     # convenience method for returning the countries contained within a zone
     def country_list
       @countries ||= case kind
-                     when 'country' then zoneables
-                     when 'state' then zoneables.collect(&:country)
-                     else []
-                     end.flatten.compact.uniq
+      when "country" then zoneables
+      when "state" then zoneables.collect(&:country)
+      else []
+      end.flatten.compact.uniq
     end
 
     def <=>(other)
@@ -104,7 +104,7 @@ module Spree
     end
 
     def country_ids
-      if kind == 'country'
+      if kind == "country"
         members.pluck(:zoneable_id)
       else
         []
@@ -112,7 +112,7 @@ module Spree
     end
 
     def state_ids
-      if kind == 'state'
+      if kind == "state"
         members.pluck(:zoneable_id)
       else
         []
@@ -120,18 +120,18 @@ module Spree
     end
 
     def country_ids=(ids)
-      set_zone_members(ids, 'Spree::Country')
+      set_zone_members(ids, "Spree::Country")
     end
 
     def state_ids=(ids)
-      set_zone_members(ids, 'Spree::State')
+      set_zone_members(ids, "Spree::State")
     end
 
     private
 
     def remove_defunct_members
       if zone_members.any?
-        zone_members.where('zoneable_id IS NULL OR zoneable_type != ?', "Spree::#{kind.classify}").destroy_all
+        zone_members.where("zoneable_id IS NULL OR zoneable_type != ?", "Spree::#{kind.classify}").destroy_all
       end
     end
 

data/app/models/spree/zone_member.rb

@@ -2,7 +2,7 @@
 
 module Spree
   class ZoneMember < Spree::Base
-    belongs_to :zone, class_name: 'Spree::Zone', counter_cache: true, inverse_of: :zone_members, optional: true
+    belongs_to :zone, class_name: "Spree::Zone", counter_cache: true, inverse_of: :zone_members, optional: true
     belongs_to :zoneable, polymorphic: true, optional: true
 
     delegate :name, to: :zoneable, allow_nil: true