Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,12 @@ matrix:
rvm: 2.5.1
- os: osx
rvm: 2.5.1
- os: linux
rvm: 2.6.6
- os: osx
rvm: 2.6.6
- os: linux
rvm: 2.7.1
- os: osx
rvm: 2.7.1
fast_finish: true
8 changes: 4 additions & 4 deletions jsonnet.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ Gem::Specification.new do |spec|

spec.add_runtime_dependency "mini_portile2", ">= 2.2.0"

spec.add_development_dependency "bundler", "~> 1.7"
spec.add_development_dependency "rake", "~> 10.0"
spec.add_development_dependency "test-unit", "~> 3.1.3"
spec.add_development_dependency "rake-compiler", "~> 0.9.5"
spec.add_development_dependency "bundler", ">= 1.7"
spec.add_development_dependency "rake", ">= 10.0"
spec.add_development_dependency "test-unit", ">= 3.1.3"
spec.add_development_dependency "rake-compiler", ">= 0.9.5"
end
26 changes: 16 additions & 10 deletions lib/jsonnet/vm.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ class << self
# @see #evaluate
def evaluate(snippet, options = {})
snippet_check = ->(key, value) { key.to_s.match(/^filename|multi$/) }
snippet_options = options.select &snippet_check
vm_options = options.reject &snippet_check
new(vm_options).evaluate(snippet, snippet_options)
snippet_options = options.select(&snippet_check)
vm_options = options.reject(&snippet_check)
new(vm_options).evaluate(snippet, **snippet_options)
end

##
Expand All @@ -30,9 +30,9 @@ def evaluate(snippet, options = {})
# @see #evaluate_file
def evaluate_file(filename, options = {})
file_check = ->(key, value) { key.to_s.match(/^encoding|multi$/) }
file_options = options.select &file_check
vm_options = options.reject &file_check
new(vm_options).evaluate_file(filename, file_options)
file_options = options.select(&file_check)
vm_options = options.reject(&file_check)
new(vm_options).evaluate_file(filename, **file_options)
end
end

Expand Down Expand Up @@ -94,8 +94,11 @@ def evaluate_file(filename, encoding: Encoding.default_external, multi: false)
# @yieldparam [String] rel a relative or absolute path to the file to be imported
# @yieldreturn [Array<String>] a pair of the content of the imported file and
# its path.
def handle_import
self.import_callback = to_method(Proc.new)
def handle_import(&block)
if block.nil?
raise ArgumentError, 'handle_import requires a block'
end
self.import_callback = to_method(block)
nil
end

Expand All @@ -112,8 +115,11 @@ def handle_import
# Also all the positional optional parameters of the body are interpreted
# as required parameters. And the body cannot have keyword, rest or
# keyword rest paramters.
def define_function(name, body = nil)
body = body ? body.to_proc : Proc.new
def define_function(name, body = nil, &block)
body = body ? body.to_proc : block
if body.nil?
raise ArgumentError, 'define_function requires a body argument or a block'
end
params = body.parameters.map.with_index do |(type, name), i|
raise ArgumentError, "rest or keyword parameters are not allowed: #{type}" \
unless [:req, :opt].include? type
Expand Down
2 changes: 1 addition & 1 deletion test/test_jsonnet.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class TestJsonnet < Test::Unit::TestCase
private

def example_jsonnet_file
example = Tempfile.open("example.jsonnet") do |f|
Tempfile.open("example.jsonnet") do |f|
f.write %<
local myvar = 1;
{
Expand Down