Skip to content

Ruby 2.6 Compatibility #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jqr wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Ruby 2.6 Compatibility #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
971462d
Run against latest Ruby 2.6.
jqr Mar 20, 2025
bf4b178
Adjust Decimal values to match old BigDecimal behavior from specs.
jqr Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ruby-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.2
2.6.10
18 changes: 15 additions & 3 deletions lib/frodata/properties/decimal.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ class Decimal < FrOData::Property
# Returns the property value, properly typecast
# @return [BigDecimal,nil]
def value
if (@value.nil? || @value.empty?) && (strict? && allows_nil?)
if (@value.nil? || (@value.respond_to?(:empty?) && @value.empty?)) && (strict? && allows_nil?)
nil
else
BigDecimal(@value)
Expand All @@ -15,8 +15,9 @@ def value
# Sets the property value
# @params new_value something BigDecimal() can parse
def value=(new_value)
validate(BigDecimal(new_value.to_s))
@value = new_value.to_s
cleaned_value = clean_value(new_value)
validate(BigDecimal(cleaned_value))
@value = cleaned_value
end

# The FrOData type name
Expand All @@ -32,6 +33,17 @@ def url_value

private

# Single pass cleaning a value to make it into a number based on the
# specs in decimal_spec.rb.
def clean_value(value)
BigDecimal(value) # Trigger any underlying exceptions.
value
rescue ArgumentError
clean_value = value.to_s.sub(/[^.[:digit:]].*/, "")
clean_value = "0" if clean_value.bytesize == 0
clean_value
end

def validate(value)
if value > max_value || value < min_value || value.precs.first > 29
validation_error "Value is outside accepted range: #{min_value} to #{max_value}, or has more than 29 significant digits"
Expand Down