Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Fix: whitespace alone clears a nullable number or boolean setting

Damian Legawiecfab8bd70dc08
diff --git a/spree/core/lib/spree/core/preferences/preferable.rb b/spree/core/lib/spree/core/preferences/preferable.rb
index a3e934898b..39ae5bb1a3 100644
--- a/spree/core/lib/spree/core/preferences/preferable.rb
+++ b/spree/core/lib/spree/core/preferences/preferable.rb
@@ -349,8 +349,12 @@ module Spree::Preferences::Preferable
end
end
- def blank_preference_value?(value)
- value.nil? || (value.respond_to?(:empty?) && value.empty?)
+ # Whitespace alone is no number or boolean, so for those it is blank too; a
+ # string keeps it.
+ def blank_preference_value?(value, type = nil)
+ return true if value.nil? || (value.respond_to?(:empty?) && value.empty?)
+
+ %i[integer boolean].include?(type) && value.is_a?(String) && value.strip.empty?
end
def convert_preference_value(value, type, nullable: false)
@@ -374,14 +378,14 @@ module Spree::Preferences::Preferable
decimal_value ||= 0 unless nullable
decimal_value.nil? ? nil : Spree::Money::Rounding.parse_decimal(decimal_value)
when :integer
- if blank_preference_value?(value)
+ if blank_preference_value?(value, :integer)
nullable ? nil : 0
else
INTEGER_TYPE.cast(value) || 0
end
when :boolean
# An explicit false is kept: it is neither nil nor empty.
- if blank_preference_value?(value)
+ if blank_preference_value?(value, :boolean)
nullable ? nil : false
else
BOOLEAN_TYPE.cast(value)
diff --git a/spree/core/spec/models/spree/preferences/preferable_spec.rb b/spree/core/spec/models/spree/preferences/preferable_spec.rb
index bfb37b6e36..3254cd61fe 100644
--- a/spree/core/spec/models/spree/preferences/preferable_spec.rb
+++ b/spree/core/spec/models/spree/preferences/preferable_spec.rb
@@ -489,6 +489,14 @@ describe Spree::Preferences::Preferable, type: :model do
expect(record.preferred_limit).to eq(42)
end
+ it 'treats whitespace alone as unset for a nullable number' do
+ preferable_class.preference :cap, :integer, default: 5, nullable: true
+
+ record.set_preference(:cap, ' ')
+
+ expect(record.preferences[:cap]).to be_nil
+ end
+
it 'refuses to expose a name that is not a preference or is already a method' do
expect { preferable_class.exposes_preferences :not_declared }.to raise_error(ArgumentError, /no preference/)
expect { preferable_class.exposes_preferences :flavor }.to raise_error(ArgumentError, /a method of that name exists/)