From 334154227ca4f0edef967a228d66194243910147 Mon Sep 17 00:00:00 2001 From: John Hawthorn Date: Mon, 16 Jan 2017 13:56:31 -0800 Subject: [PATCH] Revert "Deprecate Spree::Address#empty?" --- core/app/models/spree/address.rb | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/core/app/models/spree/address.rb b/core/app/models/spree/address.rb index 6e4890039a6..e7f990023b6 100644 --- a/core/app/models/spree/address.rb +++ b/core/app/models/spree/address.rb @@ -106,28 +106,19 @@ def ==(other_address) end def same_as?(other_address) - Spree::Deprecation.warn("Address#same_as? is deprecated. It's equivalent to Address.==", caller) + Spree::Deprecation.warn("Address.same_as? is deprecated. It's equivalent to Address.==", caller) self == other_address end def same_as(other_address) - Spree::Deprecation.warn("Address#same_as is deprecated. It's equivalent to Address.==", caller) + 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? { |_, v| v.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 - end - # @return [Hash] an ActiveMerchant compatible address hash def active_merchant_hash {