jsonnet 0.5.1 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92c5f9344c4b31e1c183acd4e12b5bd596540a13c938a4eb938f0759a754adce
-  data.tar.gz: db67d7972db0f962419dafb2b8ae8fdcd2bd7e3847f6315379a4fdaa1843b3f4
+  metadata.gz: 21fb3547860dbf786a960705f8ec154f2068b07679091020da431fd1b407a4fd
+  data.tar.gz: 7860579f2f6931a3635ccae64de7c2de558644e6833e302b6511efb00f494a17
 SHA512:
-  metadata.gz: 3b2b912c43980ad07bb4e40c1f467c67b919c80552b6c51984699f9127a645b099e5f43e60bfe2574634d8ba8e9b2116106511ee54880eae2e876aead524169f
-  data.tar.gz: 1aac5b2c3b9047242184d613a26730a4418abbcb35008f1a91c71279d95a6747952c46b39b5720c25ced447e3a325d1b2aef7d7de92fe11775c3033bc734368b
+  metadata.gz: b1abbd8abe2a2670b366bd249ed92106d06c55e43db8c3ffd4c263c7151b985361a653f8d032782e0a5a3900af0e26d3f2a6a761246669463fbc0d22999df498
+  data.tar.gz: 59e92b2680be878b8dfeb29c876aa877eaa22562ee5e60a4deb98f24b8e7cf27702f1e3b78404f31f21be1e6d0475e606e90398805f1b92d20bcdbcdd1ef7b7d

data/.github/workflows/ruby.yml

@@ -0,0 +1,45 @@
+name: Run Unit Tests
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  test:
+    name: Test
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1', '3.2']
+        os: ['ubuntu-latest', 'macos-latest']
+    runs-on: ${{ matrix.os }}
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rake test
+
+  test-with-system-lib:
+    name: Test with system library
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.1
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Prepare libjsonnet
+      run: sudo apt install libjsonnet-dev
+    - name: Run tests
+      run: env JSONNET_USE_SYSTEM_LIBRARIES=1 bundle exec rake test

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);

data/ext/jsonnet/extconf.rb

@@ -77,12 +77,13 @@ unless using_system_libraries?
   $LIBPATH = ["#{recipe.path}/lib"] | $LIBPATH
   $CPPFLAGS << " -I#{recipe.path}/include"
 
-  # jsonnet_wrap extension must be linked with c++ stdlib because
-  # the C++ library Rapid YAML is being statically linked.
-  rbconfig = RbConfig::MAKEFILE_CONFIG
-  if rbconfig['LDSHAREDXX']
-    rbconfig['LDSHARED'] = rbconfig['LDSHAREDXX']
-  end
+end
+
+# jsonnet_wrap extension must be linked with c++ stdlib because
+# the C++ library Rapid YAML is being statically linked.
+rbconfig = RbConfig::MAKEFILE_CONFIG
+if rbconfig['LDSHAREDXX']
+  rbconfig['LDSHARED'] = rbconfig['LDSHAREDXX']
 end
 
 abort 'libjsonnet.h not found' unless have_header('libjsonnet.h')

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.1"
+  VERSION = "0.5.3"
 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')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsonnet
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.3
 platform: ruby
 authors:
 - Yuki Yugui Sonoda
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-24 00:00:00.000000000 Z
+date: 2023-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mini_portile2
@@ -89,6 +89,7 @@ extensions:
 extra_rdoc_files: []
 files:
 - ".clang-format"
+- ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".travis.yml"
 - Gemfile