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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
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.rbindex 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::Preferableendend- 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?enddef convert_preference_value(value, type, nullable: false)@@ -374,14 +378,14 @@ module Spree::Preferences::Preferabledecimal_value ||= 0 unless nullabledecimal_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 : 0elseINTEGER_TYPE.cast(value) || 0endwhen :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 : falseelseBOOLEAN_TYPE.cast(value)diff --git a/spree/core/spec/models/spree/preferences/preferable_spec.rb b/spree/core/spec/models/spree/preferences/preferable_spec.rbindex 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 doexpect(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' doexpect { 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/)