jsonnet 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b21144880989556e02da3a182e6d527b7038aa090917a9f52563c77533348736
-  data.tar.gz: 5326728e4f910249f23cd7f26ccebab4630da2f13dc3f1a9d1bb15e000aaffc2
+  metadata.gz: d4340172a08a949087e54c213842fe9a3ee445ec9149bc39f8dc56371d2199f6
+  data.tar.gz: 1e068cb049eda5218e0a49984bd581e22147f3d98f4db11a2d0fb082490e5001
 SHA512:
-  metadata.gz: 8423047526b7bcda8f25501bfa8b937cf585786982d477053445230877b4dc7ea0cff3d398abcc6cdacddbc8387611a187f9760ae7290034dbb4b157768cd833
-  data.tar.gz: 36f6a67d475dbddbc356fe42a9d164af6dabdf7d9be49dfb19b127413f24e0458aa7c8ae3306100a9f1f031b933a0346874137fb1589555bc35cc6625d291728
+  metadata.gz: 9d532a2079abd6d4612f0f14bed63ed245302478251dedff199f02572a5e7f5400c07c76f9bf649da67607ad1c904cc49089a3c481614a90d36163427dd91e01
+  data.tar.gz: d2d41cca8cab085b6fe38fda48886706bb2f8876ff1f4e557e9310fd955b11f5784001f11c93c3bb509bfb6df542fced240733cd64478e3bf69c5ae21cbf094d

data/.github/workflows/ruby.yml

@@ -14,7 +14,7 @@ jobs:
     name: Test
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1']
+        ruby-version: ['3.0', '3.1', '3.2', '3.3']
         os: ['ubuntu-latest', 'macos-latest']
     runs-on: ${{ matrix.os }}
 

data/README.md

@@ -63,7 +63,7 @@ gem install jsonnet -- --use-system-libraries
 
 Load the library with `require "jsonnet"`
 
-You can evaluate a string of Jsonnet using `Jsonnet.parse`
+You can evaluate a string of Jsonnet using `Jsonnet.evaluate`
 
 ```
 irb(main):002:0> Jsonnet.evaluate('{ foo: "bar" }')

data/ext/jsonnet/callbacks.c

@@ -11,6 +11,14 @@
  */
 #define RUBYJSONNET_GLOBAL_ESCAPE_MAGIC "\x07\x03\x0c:rubytag:\x07\x03\x0c:"
 
+/* Copied from vm_core.h in Ruby. State variables in global escapes have
+ * this value when an exception is raised.
+ *
+ * TODO(yugui) Find a better way to distinguish "raise" from "throw".
+ * It is not a very good idea to depend on the implementation details of Ruby.
+ */
+#define RUBY_TAG_RAISE 0x6
+
 /*
  * callback support in VM
  */
@@ -44,9 +52,9 @@ invoke_callback(VALUE args)
 static VALUE
 rescue_callback(int state, const char *fmt, ...)
 {
-    VALUE err = rb_errinfo();
-    if (rb_obj_is_kind_of(err, rb_eException)) {
-	VALUE msg = rb_protect(rubyjsonnet_format_exception, rb_errinfo(), NULL);
+    if (state == RUBY_TAG_RAISE) {
+	VALUE err = rb_errinfo();
+	VALUE msg = rb_protect(rubyjsonnet_format_exception, err, NULL);
 	if (msg == Qnil) {
 	    va_list ap;
 	    va_start(ap, fmt);
@@ -96,9 +104,15 @@ rubyjsonnet_jump_tag(const char *exc_mesg)
     return 0;
 }
 
+#ifdef HAVE_JSONNET_IMPORT_CALLBACK_0_19
+static int
+import_callback_entrypoint(void *ctx, const char *base, const char *rel, char **found_here,
+			   char **buf, size_t *buflen)
+#else
 static char *
 import_callback_entrypoint(void *ctx, const char *base, const char *rel, char **found_here,
 			   int *success)
+#endif
 {
     struct jsonnet_vm_wrap *const vm = (struct jsonnet_vm_wrap *)ctx;
     int state;
@@ -115,14 +129,24 @@ import_callback_entrypoint(void *ctx, const char *base, const char *rel, char **
 
     if (state) {
 	VALUE msg = rescue_callback(state, "cannot import %s from %s", rel, base);
+#ifdef HAVE_JSONNET_IMPORT_CALLBACK_0_19
+	*buf = rubyjsonnet_str_to_ptr(vm->vm, msg, buflen);
+	return 1;
+#else
 	*success = 0;
 	return rubyjsonnet_str_to_cstr(vm->vm, msg);
+#endif
     }
 
     result = rb_Array(result);
-    *success = 1;
     *found_here = rubyjsonnet_str_to_cstr(vm->vm, rb_ary_entry(result, 1));
+#ifdef HAVE_JSONNET_IMPORT_CALLBACK_0_19
+    *buf = rubyjsonnet_str_to_ptr(vm->vm, rb_ary_entry(result, 0), buflen);
+    return 0;
+#else
+    *success = 1;
     return rubyjsonnet_str_to_cstr(vm->vm, rb_ary_entry(result, 0));
+#endif
 }
 
 /*

data/ext/jsonnet/extconf.rb

@@ -13,8 +13,8 @@ unless using_system_libraries?
   require 'mini_portile2'
   message "Using mini_portile version #{MiniPortile::VERSION}\n"
 
-  recipe = MiniPortile.new('jsonnet', 'v0.18.0')
-  recipe.files = ['https://github.com/google/jsonnet/archive/v0.18.0.tar.gz']
+  recipe = MiniPortile.new('jsonnet', 'v0.20.0')
+  recipe.files = ['https://github.com/google/jsonnet/archive/v0.20.0.tar.gz']
   class << recipe
     CORE_OBJS = %w[
       desugarer.o formatter.o lexer.o libjsonnet.o parser.o pass.o static_analysis.o string_utils.o vm.o
@@ -89,4 +89,21 @@ end
 abort 'libjsonnet.h not found' unless have_header('libjsonnet.h')
 abort 'libjsonnet not found' unless have_library('jsonnet')
 have_header('libjsonnet_fmt.h')
+
+import_callback_0_19 = checking_for checking_message('JsonnetImportCallback >= v0.19.0') do
+  try_compile(<<SRC, '-Werror=incompatible-pointer-types')
+#include <libjsonnet.h>
+
+int f(void *ctx, const char *base, const char *rel, char **found_here, char **buf, size_t *buflen);
+
+int main() {
+  jsonnet_import_callback(NULL, f, NULL);
+  return 0;
+}
+SRC
+end
+if import_callback_0_19
+  $defs.push('-DHAVE_JSONNET_IMPORT_CALLBACK_0_19')
+end
+
 create_makefile('jsonnet/jsonnet_wrap')

data/ext/jsonnet/helpers.c

@@ -34,6 +34,13 @@ rubyjsonnet_assert_asciicompat(VALUE str)
 
 /**
  * Allocates a C string whose content is equal to \c str with jsonnet_realloc.
+ *
+ * Note that this function does not allow NUL characters in the string.
+ * You should use rubyjsonnet_str_to_ptr() if you want to handle NUL characters.
+ *
+ * @param[in] vm a Jsonnet VM
+ * @param[in] str a String-like object
+ * @return the allocated C string
  */
 char *
 rubyjsonnet_str_to_cstr(struct JsonnetVm *vm, VALUE str)
@@ -44,6 +51,25 @@ rubyjsonnet_str_to_cstr(struct JsonnetVm *vm, VALUE str)
     return buf;
 }
 
+/**
+ * Allocates a byte sequence whose content is equal to \c str with jsonnet_realloc.
+ *
+ * @param[in] vm a Jsonnet VM
+ * @param[in] str a String-like object
+ * @param[out] buflen the length of the allocated buffer
+ * @return the allocated buffer
+ */
+char *
+rubyjsonnet_str_to_ptr(struct JsonnetVm *vm, VALUE str, size_t *buflen)
+{
+    StringValue(str);
+    size_t len = RSTRING_LEN(str);
+    char *buf = jsonnet_realloc(vm, NULL, len);
+    memcpy(buf, RSTRING_PTR(str), len);
+    *buflen = len;
+    return buf;
+}
+
 /**
  * @return a human readable string which contains the class name of the
  *   exception and its message. It might be nil on failure

data/ext/jsonnet/ruby_jsonnet.h

@@ -33,6 +33,7 @@ struct JsonnetJsonValue *rubyjsonnet_obj_to_json(struct JsonnetVm *vm, VALUE obj
 
 rb_encoding *rubyjsonnet_assert_asciicompat(VALUE str);
 char *rubyjsonnet_str_to_cstr(struct JsonnetVm *vm, VALUE str);
+char *rubyjsonnet_str_to_ptr(struct JsonnetVm *vm, VALUE str, size_t *buflen);
 VALUE rubyjsonnet_format_exception(VALUE exc);
 int rubyjsonnet_jump_tag(const char *exc_mesg);
 

data/ext/jsonnet/vm.c

@@ -59,16 +59,15 @@ rubyjsonnet_obj_to_vm(VALUE wrap)
 }
 
 static VALUE
-vm_s_new(int argc, const VALUE *argv, VALUE klass)
+vm_s_allocate(VALUE klass)
 {
     struct jsonnet_vm_wrap *vm;
-    VALUE self = TypedData_Make_Struct(cVM, struct jsonnet_vm_wrap, &jsonnet_vm_type, vm);
+    VALUE self = TypedData_Make_Struct(klass, struct jsonnet_vm_wrap, &jsonnet_vm_type, vm);
     vm->vm = jsonnet_make();
     vm->import_callback = Qnil;
     vm->native_callbacks.len = 0;
     vm->native_callbacks.contexts = NULL;
 
-    rb_obj_call_init(self, argc, argv);
     return self;
 }
 
@@ -81,11 +80,10 @@ vm_free(void *ptr)
 
     for (i = 0; i < vm->native_callbacks.len; ++i) {
 	struct native_callback_ctx *ctx = vm->native_callbacks.contexts[i];
-	RB_REALLOC_N(ctx, struct native_callback_ctx, 0);
+	xfree(ctx);
     }
-    RB_REALLOC_N(vm->native_callbacks.contexts, struct native_callback_ctx *, 0);
-
-    RB_REALLOC_N(vm, struct jsonnet_vm_wrap, 0);
+    xfree(vm->native_callbacks.contexts);
+    xfree(vm);
 }
 
 static void
@@ -390,7 +388,7 @@ void
 rubyjsonnet_init_vm(VALUE mJsonnet)
 {
     cVM = rb_define_class_under(mJsonnet, "VM", rb_cObject);
-    rb_define_singleton_method(cVM, "new", vm_s_new, -1);
+    rb_define_alloc_func(cVM, vm_s_allocate);
     rb_define_private_method(cVM, "eval_file", vm_evaluate_file, 3);
     rb_define_private_method(cVM, "eval_snippet", vm_evaluate, 3);
     rb_define_private_method(cVM, "fmt_file", vm_fmt_file, 2);

data/lib/jsonnet/version.rb

@@ -1,3 +1,3 @@
 module Jsonnet
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/test/test_vm.rb

@@ -54,7 +54,6 @@ class TestVM < Test::Unit::TestCase
     end
   end
 
-
   test 'Jsonnet::VM#evaluate evaluates snippet' do
     vm = Jsonnet::VM.new
     result = vm.evaluate(<<-EOS, filename: 'example.snippet')
@@ -288,6 +287,26 @@ class TestVM < Test::Unit::TestCase
     assert_equal expected, JSON.parse(result)
   end
 
+  test "Jsonnet::VM#import_callback allows NUL char in Jsonnet v0.19 or later" do
+    return unless Jsonnet.libversion >= "v0.19"
+
+    example_str = "\x0\x1".force_encoding(Encoding::BINARY)
+
+    vm = Jsonnet::VM.new
+    vm.import_callback = ->(base, rel) {
+      case [base, rel]
+      when ['/path/to/base/', 'foo.bin']
+        return "\x0\x1".force_encoding(Encoding::BINARY), '/path/to/base/foo.bin'
+      else
+        raise Errno::ENOENT, "#{rel} at #{base}"
+      end
+    }
+    result = vm.evaluate(<<-EOS, filename: "/path/to/base/example.jsonnet")
+      importbin "foo.bin"
+    EOS
+    assert_equal [0, 1], JSON.parse(result)
+  end
+
   test "Jsonnet::VM#evaluate returns an error if customized import callback raises an exception" do
     vm = Jsonnet::VM.new
     called = false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonnet
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Yuki Yugui Sonoda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-24 00:00:00.000000000 Z
+date: 2024-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Jsonnet library