Skip to content

Validate function argument contracts #66

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
OskarEichler wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Validate function argument contracts #66

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
41 changes: 28 additions & 13 deletions lib/jmespath/nodes/function.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,11 @@ def call(args)
haystack = args[0]
needle = Util.as_json(args[1])
if haystack.respond_to?(:to_str)
haystack.to_str.include?(needle)
if needle.respond_to?(:to_str)
haystack.to_str.include?(needle.to_str)
else
return maybe_raise Errors::InvalidTypeError, 'contains expects a string needle for a string'
end
elsif haystack.respond_to?(:to_ary)
haystack.to_ary.any? { |e| Util.as_json(e) == needle }
else
Expand Down Expand Up @@ -402,17 +406,20 @@ class SumFunction < Function
FUNCTIONS['sum'] = self

def call(args)
if args.count == 1 && args.first.respond_to?(:to_ary)
args.first.to_ary.inject(0) do |sum, n|
if Numeric === n
sum + n
else
return maybe_raise Errors::InvalidTypeError, 'function sum() expects values to be numeric'
end
end
else
if args.count != 1
return maybe_raise Errors::InvalidArityError, 'function sum() expects one argument'
end
unless args.first.respond_to?(:to_ary)
return maybe_raise Errors::InvalidTypeError, 'function sum() expects an array'
end

args.first.to_ary.inject(0) do |sum, n|
if Numeric === n
sum + n
else
return maybe_raise Errors::InvalidTypeError, 'function sum() expects values to be numeric'
end
end
end
end

Expand Down Expand Up @@ -616,7 +623,11 @@ def call(args)
return maybe_raise Errors::InvalidArityError, msg
end
args.inject({}) do |h, v|
h.merge(v)
if v.respond_to?(:to_hash)
h.merge(v.to_hash)
else
return maybe_raise Errors::InvalidTypeError, 'function merge() expects object arguments'
end
end
end
end
Expand All @@ -625,8 +636,8 @@ class ReverseFunction < Function
FUNCTIONS['reverse'] = self

def call(args)
if args.count == 0
msg = 'function reverse() expects 1 or more arguments'
if args.count != 1
msg = 'function reverse() expects one argument'
return maybe_raise Errors::InvalidArityError, msg
end
value = args.first
Expand All @@ -645,6 +656,10 @@ class ToArrayFunction < Function
FUNCTIONS['to_array'] = self

def call(args)
if args.count != 1
return maybe_raise Errors::InvalidArityError, 'function to_array() expects one argument'
end

value = args.first
value.respond_to?(:to_ary) ? value.to_ary : [value]
end
Expand Down