ffi-yajl 0.0.1-universal-java → 3.0.1

data/ext/ffi_yajl/ext/parser/extconf.rb

@@ -1,29 +1,86 @@
-require 'mkmf'
+# rubocop:disable Style/GlobalVars
+require "mkmf"
+require "rubygems"
+require "libyajl2"
 
-# the customer is always right, ruby is always compiled to be stupid
-$CFLAGS = ENV['CFLAGS'] if ENV['CFLAGS']
-$LDFLAGS = ENV['LDFLAGS'] if ENV['LDFLAGS']
-RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+RbConfig::MAKEFILE_CONFIG["CC"] = ENV["CC"] if ENV["CC"]
 
-# search our gem root first to pick up libyajl2 that we vendored
-gem_root = File.expand_path(File.join(File.dirname(__FILE__), "../../../.."))
-$CFLAGS = "-I#{gem_root}/include -L#{gem_root}/lib #{$CFLAGS}"
-$LDFLAGS = "-L#{gem_root}/lib #{$CFLAGS}"
+# pick up the vendored libyajl2 out of the libyajl2 gem
+$CFLAGS = "-I#{Libyajl2.include_path} #{$CFLAGS}"
+$LDFLAGS = "-L#{Libyajl2.opt_path} #{$LDFLAGS}"
+
+# remove "-Wl,--no-undefined" flag if existent to allow for loading with dlopen
+$LDFLAGS.slice!("-Wl,--no-undefined")
 
-puts gem_root
 puts $CFLAGS
 puts $LDFLAGS
 
 # except if you're doing an unoptimized gcc install we're going to help you out a bit
-if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/
+if RbConfig::MAKEFILE_CONFIG["CC"] =~ /gcc|clang/
   $CFLAGS << " -O3" unless $CFLAGS[/-O\d/]
   # how many people realize that -Wall is a compiler-specific flag???
   # apparently not many based on reading lots of shitty extconf.rb's out there
   $CFLAGS << " -Wall"
 end
 
-$LDFLAGS << " -lyajl"
+def windows?
+  !!(RUBY_PLATFORM =~ /mswin|mingw|cygwin|windows/)
+end
+
+def macos?
+  !!(RUBY_PLATFORM =~ /darwin/)
+end
+
+def clang?
+  cc_version = `#{RbConfig.expand("$(CC) --version")}`
+  cc_version.match?(/clang/i)
+end
+
+# XCode 14 warns if `-Wl,-undefined dynamic_lookup` is specified, and as
+# a result Ruby interpreters compiled under XCode 14 no longer specify
+# this flag by default in DLDFLAGS. Let's specify the list of dynamic symbols
+# here to avoid compilation failures.
+if clang? && macos?
+  symfile = File.join(__dir__, "../dlopen/yajl.sym")
+  dynamic_symbols = File.readlines(symfile)
+  dynamic_symbols.each do |sym|
+    $DLDFLAGS << " -Wl,-U,#{sym.strip}"
+  end
+end
+
+if windows?
+  # include our libyajldll.a definitions on windows in the libyajl2 gem
+  $libs = "#{$libs} -lyajldll"
+end
+
+# NOTE: find_library has the side effect of adding -lyajl to the flags which we are deliberately
+# avoiding doing with the libyajl2-gem (allowing it to be lazily loaded with dlopen)
+if !windows? && !find_header("yajl/yajl_tree.h")
+  puts "libyajl2 headers not found in libyajl2-gem, searching for system libraries..."
+
+  HEADER_DIRS = [
+    "/opt/local/include",                   # MacPorts
+    "/usr/local/include",                   # /usr/local
+    RbConfig::CONFIG["includedir"],         # Ruby
+    "/usr/include",                         # (default)
+  ].freeze
+
+  LIB_DIRS = [
+    "/opt/local/lib",                       # MacPorts
+    "/usr/local/lib",                       # /usr/local + Homebrew
+    RbConfig::CONFIG["libdir"],             # Ruby
+    "/usr/lib",                             # (default)
+  ].freeze
+
+  # add --with-yajl-dir, --with-yajl-include, --with-yajl-lib
+  dir_config("yajl", HEADER_DIRS, LIB_DIRS)
+
+  # here we use find_library in order to deliberately link with -lyajl as a useful side-effect
+  unless find_header("yajl/yajl_tree.h") && find_library("yajl", "yajl_complete_parse")
+    abort "libyajl2 is missing.  please install libyajl2"
+  end
+end
 
-dir_config 'parser'
+dir_config "parser"
 
-create_makefile 'ffi_yajl/ext/parser'
+create_makefile "ffi_yajl/ext/parser"

data/ext/ffi_yajl/ext/parser/parser.c

@@ -9,42 +9,54 @@ static rb_encoding *utf8Encoding;
 static VALUE mFFI_Yajl, mExt, mParser, cParseError;
 
 typedef struct {
-  VALUE finished;
-  VALUE stack;
-  VALUE key_stack;
-  VALUE key;
+  VALUE self;
+  int symbolizeKeys;
+  int uniqueKeyChecking;
 } CTX;
 
 void set_value(CTX *ctx, VALUE val) {
-  long len = RARRAY_LEN(ctx->stack);
-  VALUE last = rb_ary_entry(ctx->stack, len-1);
+  VALUE stack = rb_ivar_get(ctx->self, rb_intern("stack"));
+  VALUE key = rb_ivar_get(ctx->self, rb_intern("key"));
+  long len = RARRAY_LEN(stack);
+  VALUE last = rb_ary_entry(stack, len-1);
   switch (TYPE(last)) {
     case T_ARRAY:
       rb_ary_push(last, val);
       break;
     case T_HASH:
-      rb_hash_aset(last, ctx->key, val);
+      if ( ctx->uniqueKeyChecking ) {
+        ID sym_has_key = rb_intern("has_key?");
+        if ( rb_funcall(last, sym_has_key, 1, key) == Qtrue ) {
+          rb_raise(cParseError, "repeated key: %s", RSTRING_PTR(key));
+        }
+      }
+      rb_hash_aset(last, key, val);
       break;
     default:
+      rb_ary_push(stack, val);
       break;
   }
 }
 
 void set_key(CTX *ctx, VALUE key) {
-  ctx->key = key;
+  rb_ivar_set(ctx->self, rb_intern("key"), key);
 }
 
 void start_object(CTX *ctx, VALUE obj) {
-  rb_ary_push(ctx->key_stack, ctx->key);
-  rb_ary_push(ctx->stack, obj);
+  VALUE key_stack = rb_ivar_get(ctx->self, rb_intern("key_stack"));
+  VALUE key       = rb_ivar_get(ctx->self, rb_intern("key"));
+  VALUE stack     = rb_ivar_get(ctx->self, rb_intern("stack"));
+
+  rb_ary_push(key_stack, key);
+  rb_ary_push(stack, obj);
 }
 
 void end_object(CTX *ctx) {
-  ctx->key = rb_ary_pop(ctx->key_stack);
-  if ( RARRAY_LEN(ctx->stack) > 1 ) {
-    set_value(ctx, rb_ary_pop(ctx->stack));
-  } else {
-    ctx->finished = rb_ary_pop(ctx->stack);
+  VALUE key_stack = rb_ivar_get(ctx->self, rb_intern("key_stack"));
+  VALUE stack = rb_ivar_get(ctx->self, rb_intern("stack"));
+  rb_ivar_set(ctx->self, rb_intern("key"), rb_ary_pop(key_stack));
+  if ( RARRAY_LEN(stack) > 1 ) {
+    set_value(ctx, rb_ary_pop(stack));
   }
 }
 
@@ -69,7 +81,7 @@ int double_callback(void *ctx, double doubleVal) {
 }
 
 int number_callback(void *ctx, const char *numberVal, size_t numberLen) {
-  char buf[numberLen+1];
+  char *buf = (char *)malloc(numberLen+1);
   buf[numberLen] = 0;
   memcpy(buf, numberVal, numberLen);
   if (memchr(buf, '.', numberLen) ||
@@ -79,21 +91,14 @@ int number_callback(void *ctx, const char *numberVal, size_t numberLen) {
   } else {
     set_value(ctx, rb_cstr2inum(buf, 10));
   }
+  free(buf);
   return 1;
 }
 
 int string_callback(void *ctx, const unsigned char *stringVal, size_t stringLen) {
-  char buf[stringLen+1];
-  VALUE str;
-#ifdef HAVE_RUBY_ENCODING_H
-  rb_encoding *default_internal_enc;
-#endif
-
-  buf[stringLen] = 0;
-  memcpy(buf, stringVal, stringLen);
-  str = rb_str_new2(buf);
+  VALUE str = rb_str_new((const char *)stringVal, stringLen);
 #ifdef HAVE_RUBY_ENCODING_H
-  default_internal_enc = rb_default_internal_encoding();
+  rb_encoding *default_internal_enc = rb_default_internal_encoding();
   rb_enc_associate(str, utf8Encoding);
   if (default_internal_enc) {
     str = rb_str_export_to_enc(str, default_internal_enc);
@@ -109,23 +114,30 @@ int start_map_callback(void *ctx) {
 }
 
 int map_key_callback(void *ctx, const unsigned char *stringVal, size_t stringLen) {
-  char buf[stringLen+1];
-  VALUE str;
+  VALUE key;
 #ifdef HAVE_RUBY_ENCODING_H
   rb_encoding *default_internal_enc;
 #endif
 
-  buf[stringLen] = 0;
-  memcpy(buf, stringVal, stringLen);
-  str = rb_str_new2(buf);
+  if ( ((CTX *)ctx)->symbolizeKeys ) {
 #ifdef HAVE_RUBY_ENCODING_H
-  default_internal_enc = rb_default_internal_encoding();
-  rb_enc_associate(str, utf8Encoding);
-  if (default_internal_enc) {
-    str = rb_str_export_to_enc(str, default_internal_enc);
-  }
+    ID id = rb_intern3((const char *)stringVal, stringLen, utf8Encoding);
+    key = ID2SYM(id);
+#else
+    VALUE str = rb_str_new((const char *)stringVal, stringLen);
+    key = rb_str_intern(str);
+#endif
+  } else {
+    key = rb_str_new((const char *)stringVal, stringLen);
+#ifdef HAVE_RUBY_ENCODING_H
+    default_internal_enc = rb_default_internal_encoding();
+    rb_enc_associate(key, utf8Encoding);
+    if (default_internal_enc) {
+      key = rb_str_export_to_enc(key, default_internal_enc);
+    }
 #endif
-  set_key(ctx,str);
+  }
+  set_key(ctx, key);
   return 1;
 }
 
@@ -158,16 +170,46 @@ static yajl_callbacks callbacks = {
   end_array_callback,
 };
 
-static VALUE mParser_do_yajl_parse(VALUE self, VALUE str, VALUE opts) {
+int get_opts_key(VALUE self, const char *key) {
+  VALUE opts = rb_iv_get(self, "@opts");
+  if (TYPE(opts) != T_HASH) {
+    rb_raise(rb_eTypeError, "opts is not a valid hash");
+  }
+  return rb_hash_aref(opts, ID2SYM(rb_intern(key))) == Qtrue;
+}
+
+static VALUE mParser_do_yajl_parse(VALUE self, VALUE str, VALUE yajl_opts) {
   yajl_handle hand;
   yajl_status stat;
   unsigned char *err;
-  CTX ctx;
+  volatile CTX ctx;
+
+  rb_ivar_set(self, rb_intern("key"), Qnil);
+  rb_ivar_set(self, rb_intern("stack"), rb_ary_new());
+  rb_ivar_set(self, rb_intern("key_stack"), rb_ary_new());
+
+  ctx.self = self;
+  ctx.symbolizeKeys = get_opts_key(self, "symbolize_keys");
+  ctx.uniqueKeyChecking = get_opts_key(self, "unique_key_checking");
 
-  ctx.stack = rb_ary_new();
-  ctx.key_stack = rb_ary_new();
+  hand = yajl_alloc(&callbacks, NULL, (void *)&ctx);
+
+  if (rb_hash_aref(yajl_opts, ID2SYM(rb_intern("yajl_allow_comments"))) == Qtrue) {
+    yajl_config(hand, yajl_allow_comments, 1);
+  }
+  if (rb_hash_aref(yajl_opts, ID2SYM(rb_intern("yajl_dont_validate_strings"))) == Qtrue) {
+    yajl_config(hand, yajl_dont_validate_strings, 1);
+  }
+  if (rb_hash_aref(yajl_opts, ID2SYM(rb_intern("yajl_allow_trailing_garbage"))) == Qtrue) {
+    yajl_config(hand, yajl_allow_trailing_garbage, 1);
+  }
+  if (rb_hash_aref(yajl_opts, ID2SYM(rb_intern("yajl_allow_multiple_values"))) == Qtrue) {
+    yajl_config(hand, yajl_allow_multiple_values, 1);
+  }
+  if (rb_hash_aref(yajl_opts, ID2SYM(rb_intern("yajl_allow_partial_values"))) == Qtrue) {
+    yajl_config(hand, yajl_allow_partial_values, 1);
+  }
 
-  hand = yajl_alloc(&callbacks, NULL, &ctx);
   if ((stat = yajl_parse(hand, (unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str))) != yajl_status_ok) {
     err = yajl_get_error(hand, 1, (unsigned char *)RSTRING_PTR(str), RSTRING_LEN(str));
     goto raise;
@@ -177,7 +219,7 @@ static VALUE mParser_do_yajl_parse(VALUE self, VALUE str, VALUE opts) {
     goto raise;
   }
   yajl_free(hand);
-  return ctx.finished;
+  return rb_ary_pop(rb_ivar_get(self, rb_intern("stack")));
 
 raise:
   if (hand) {
@@ -196,4 +238,3 @@ void Init_parser() {
   utf8Encoding = rb_utf8_encoding();
 #endif
 }
-

data/lib/ffi_yajl/benchmark/encode.rb

@@ -1,135 +1,82 @@
 # Portions Originally Copyright (c) 2008-2011 Brian Lopez - http://github.com/brianmario
 # See MIT-LICENSE
 
-require 'rubygems'
-require 'benchmark'
-require 'stringio'
+require "rubygems" unless defined?(Gem)
+require "benchmark" unless defined?(Benchmark)
+require "stringio" unless defined?(StringIO)
 if !defined?(RUBY_ENGINE) || RUBY_ENGINE !~ /jruby/
-  if ENV['FORCE_FFI_YAJL'] != 'ext'
-    begin
-      require 'yajl'
-    rescue Exception
-      puts "INFO: yajl-ruby not installed"
-    end
-  else
-    puts "INFO: skipping yajl-ruby because we're using the C extension"
+  begin
+    require "yajl"
+  rescue LoadError
+    puts "INFO: yajl-ruby not installed"
   end
 else
   puts "INFO: skipping yajl-ruby on jruby"
 end
-require 'ffi_yajl'
+require_relative "../../ffi_yajl"
 begin
-  require 'json'
-rescue Exception
+  require "json" unless defined?(JSON)
+rescue LoadError
   puts "INFO: json gem not installed"
 end
 begin
-  require 'psych'
-rescue Exception
-  puts "INFO: psych gem not installed"
-end
-begin
-  require 'active_support'
-rescue Exception
-  puts "INFO: active_support gem not installed"
-end
-begin
-  require 'oj'
-rescue Exception
+  require "oj"
+rescue LoadError
   puts "INFO: oj gem not installed"
 end
 
 module FFI_Yajl
   class Benchmark
     class Encode
-
       def run
-        #filename = ARGV[0] || 'benchmark/subjects/ohai.json'
+        # filename = ARGV[0] || 'benchmark/subjects/ohai.json'
         filename = File.expand_path(File.join(File.dirname(__FILE__), "subjects", "ohai.json"))
-        hash = File.open(filename, 'rb') { |f| FFI_Yajl::Parser.parse(f.read) }
+        hash = File.open(filename, "rb") { |f| FFI_Yajl::Parser.parse(f.read) }
 
         times = ARGV[1] ? ARGV[1].to_i : 1000
         puts "Starting benchmark encoding #{filename} #{times} times\n\n"
-        ::Benchmark.bmbm { |x|
-
-          x.report("FFI_Yajl::Encoder.encode (to a String)") {
-            times.times {
-              output = FFI_Yajl::Encoder.encode(hash)
-            }
-          }
+        ::Benchmark.bmbm do |x|
+          x.report("FFI_Yajl::Encoder.encode (to a String)") do
+            times.times { FFI_Yajl::Encoder.encode(hash) }
+          end
 
           ffi_string_encoder = FFI_Yajl::Encoder.new
-          x.report("FFI_Yajl::Encoder#encode (to a String)") {
-            times.times {
-              output = ffi_string_encoder.encode(hash)
-            }
-          }
+          x.report("FFI_Yajl::Encoder#encode (to a String)") do
+            times.times { ffi_string_encoder.encode(hash) }
+          end
 
           if defined?(Oj)
-            x.report("Oj.dump (to a String)") {
-              times.times {
-                output = Oj.dump(hash)
-              }
-            }
+            x.report("Oj.dump (to a String)") do
+              times.times { Oj.dump(hash) }
+            end
           end
 
           if defined?(Yajl::Encoder)
-            x.report("Yajl::Encoder.encode (to a String)") {
-              times.times {
-                output = Yajl::Encoder.encode(hash)
-              }
-            }
+            x.report("Yajl::Encoder.encode (to a String)") do
+              times.times { Yajl::Encoder.encode(hash) }
+            end
 
             io_encoder = Yajl::Encoder.new
-            x.report("Yajl::Encoder#encode (to an IO)") {
-              times.times {
-                io_encoder.encode(hash, StringIO.new)
-              }
-            }
+            x.report("Yajl::Encoder#encode (to an IO)") do
+              times.times { io_encoder.encode(hash, StringIO.new) }
+            end
 
             string_encoder = Yajl::Encoder.new
-            x.report("Yajl::Encoder#encode (to a String)") {
-              times.times {
-                output = string_encoder.encode(hash)
-              }
-            }
+            x.report("Yajl::Encoder#encode (to a String)") do
+              times.times { string_encoder.encode(hash) }
+            end
           end
 
           if defined?(JSON)
-            x.report("JSON.generate") {
-              times.times {
-                JSON.generate(hash)
-              }
-            }
-          end
-          if defined?(Psych)
-            x.report("Psych.to_json") {
-              times.times {
-                Psych.to_json(hash)
-              }
-            }
-            if defined?(Psych::JSON::Stream)
-              x.report("Psych::JSON::Stream") {
-                times.times {
-                  io = StringIO.new
-                  stream = Psych::JSON::Stream.new io
-                  stream.start
-                  stream.push hash
-                  stream.finish
-                }
-              }
+            x.report("JSON.generate") do
+              times.times { JSON.generate(hash) }
+            end
+            x.report("JSON.fast_generate") do
+              times.times { JSON.fast_generate(hash) }
             end
           end
-          if defined?(ActiveSupport::JSON)
-            x.report("ActiveSupport::JSON.encode") {
-              times.times {
-                ActiveSupport::JSON.encode(hash)
-              }
-            }
-          end
-        }
+        end
       end
     end
   end
-
 end

data/lib/ffi_yajl/benchmark/encode_json_and_marshal.rb

@@ -1,42 +1,42 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/..")
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
 
-require 'rubygems'
-require 'benchmark'
-require 'yajl'
-require 'stringio'
+require "rubygems" unless defined?(Gem)
+require "benchmark" unless defined?(Benchmark)
+require "yajl"
+require "stringio" unless defined?(StringIO)
 begin
-  require 'json'
+  require "json" unless defined?(JSON)
 rescue LoadError
 end
 
 times = ARGV[0] ? ARGV[0].to_i : 1000
-filename = 'benchmark/subjects/ohai.json'
-json = File.new(filename, 'r')
+filename = "benchmark/subjects/ohai.json"
+json = File.new(filename, "r")
 hash = Yajl::Parser.new.parse(json)
 json.close
 
 puts "Starting benchmark encoding #{filename} #{times} times\n\n"
-Benchmark.bmbm { |x|
+Benchmark.bmbm do |x|
   encoder = Yajl::Encoder.new
-  x.report {
+  x.report do
     puts "Yajl::Encoder#encode"
-    times.times {
+    times.times do
       encoder.encode(hash, StringIO.new)
-    }
-  }
+    end
+  end
   if defined?(JSON)
-    x.report {
+    x.report do
       puts "JSON's #to_json"
-      times.times {
+      times.times do
         JSON.generate(hash)
-      }
-    }
+      end
+    end
   end
-  x.report {
+  x.report do
     puts "Marshal.dump"
-    times.times {
+    times.times do
       Marshal.dump(hash)
-    }
-  }
-}
+    end
+  end
+end

data/lib/ffi_yajl/benchmark/encode_json_and_yaml.rb

@@ -1,53 +1,47 @@
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
-$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/..")
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + "/../lib")
 
-require 'rubygems'
-require 'benchmark'
-require 'yajl'
+require "rubygems" unless defined?(Gem)
+require "benchmark" unless defined?(Benchmark)
+require "yajl"
 begin
-  require 'json'
+  require "json" unless defined?(JSON)
 rescue LoadError
 end
-require 'yaml'
+require "yaml" unless defined?(YAML)
 
 # JSON Section
-filename = 'benchmark/subjects/ohai.json'
-json = File.new(filename, 'r')
+filename = "benchmark/subjects/ohai.json"
+json = File.new(filename, "r")
 hash = Yajl::Parser.new.parse(json)
 json.close
 
 times = ARGV[0] ? ARGV[0].to_i : 1000
 puts "Starting benchmark encoding #{filename} into JSON #{times} times\n\n"
-Benchmark.bmbm { |x|
+Benchmark.bmbm do |x|
   encoder = Yajl::Encoder.new
-  x.report {
+  x.report do
     puts "Yajl::Encoder#encode"
-    times.times {
-      encoder.encode(hash, StringIO.new)
-    }
-  }
+    times.times { encoder.encode(hash, StringIO.new) }
+  end
   if defined?(JSON)
-    x.report {
+    x.report do
       puts "JSON's #to_json"
-      times.times {
-        JSON.generate(hash)
-      }
-    }
+      times.times { JSON.generate(hash) }
+    end
   end
-}
+end
 
 # YAML Section
-filename = 'benchmark/subjects/ohai.yml'
-yml = File.new(filename, 'r')
+filename = "benchmark/subjects/ohai.yml"
+yml = File.new(filename, "r")
 data = YAML.load_stream(yml)
 yml.close
 
 puts "Starting benchmark encoding #{filename} into YAML #{times} times\n\n"
-Benchmark.bmbm { |x|
-  x.report {
+Benchmark.bmbm do |x|
+  x.report do
     puts "YAML.dump"
-    times.times {
-      YAML.dump(data, StringIO.new)
-    }
-  }
-}
+    times.times { YAML.dump(data, StringIO.new) }
+  end
+end