ffi-yajl 0.0.2-universal-java → 0.0.3-universal-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a82a3a5ac433463f78e468ed4f6f12d57047e847
-  data.tar.gz: ac9aa998c59d3e92ea1b69a2eb2dc8370c189deb
+  metadata.gz: daf6de7794be628881f188aedebb67c615815e37
+  data.tar.gz: 6e97fbc2c9949ad9cda706001f91284ac5bb9a71
 SHA512:
-  metadata.gz: b802c373b6b67a0388510095a47ee937c9b040646f17895e87138d5ddca85a9a8c18f6c3d552bbfebeaa7b6c44c570e7ec61be62dccedef008cc5bda16d4ca18
-  data.tar.gz: 51ab0c3759c595ed85df07141a729edaa96c8d63f7bf016aa5c1cd2f7cf5e7e74de91d43419ae1872b2970e84e320d466654da2ef1db76c1af06767d663105c2
+  metadata.gz: 9b54009176b09579945529773a556f0a81830586bcd54c012f6fbf6dd8b6b36bb13587178b1bcf0291e168b5390e2a937b47bcb938d9a783dd672739238c22cf
+  data.tar.gz: d7ea87b526f45207613503615900929be5b2fedb90a3582f3461d3e67e82e78fe9b3880bbb39475eebdddf0303a44c029581ee2235de164e8cbe3c3aba410646

data/README.md

@@ -3,7 +3,7 @@
 
 ## TODO
 
-- test both ffi and ext on platforms that support both (MRI, rbx)
+- fix int conversion issue in chef specs in c extension
 
 ## BUILD NOTES
 
@@ -13,4 +13,3 @@
 ## KNOWN BUGS
 
 - 'rake compile' broken on mac, only tested to work on linux (ubuntu)
-- C Extension segfaults on ruby 1.8.7, so the ffi mode is forced for RUBY_VERSION < 1.9

data/Rakefile

@@ -9,14 +9,30 @@ end
 
 require 'ffi_yajl/version'
 
-desc "Run all specs in spec directory"
-RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = FileList['spec/**/*_spec.rb']
+desc "Run all specs against both extensions"
+task :spec do
+  Rake::Task["spec:ffi"].invoke
+  Rake::Task["spec:ext"].invoke
+end
+
+namespace :spec do
+  desc "Run all specs against ffi extension"
+  RSpec::Core::RakeTask.new(:ffi) do |t|
+    ENV['FORCE_FFI_YAJL'] = "ffi"
+    t.pattern = FileList['spec/**/*_spec.rb']
+  end
+  if !defined?(RUBY_ENGINE) || RUBY_ENGINE !~ /jruby/
+    desc "Run all specs again c extension"
+    RSpec::Core::RakeTask.new(:ext) do |t|
+      ENV['FORCE_FFI_YAJL'] = "ext"
+      t.pattern = FileList['spec/**/*_spec.rb']
+    end
+  end
 end
 
 desc "Build it and ship it"
 task :ship => [:clean, :gem] do
-  sh("git tag #{Mixlib::ShellOut::VERSION}")
+  sh("git tag #{FFI_Yajl::VERSION}")
   sh("git push --tags")
   Dir[File.expand_path("../pkg/*.gem", __FILE__)].reverse.each do |built_gem|
     sh("gem push #{built_gem}")

data/ext/ffi_yajl/ext/encoder/encoder.c

@@ -2,16 +2,12 @@
 #include <yajl/yajl_gen.h>
 
 static VALUE mFFI_Yajl, mExt, mEncoder, mEncoder2, cEncodeError;
+static VALUE cYajl_Gen;
 
 /* FIXME: the json gem does a whole bunch of indirection around monkeypatching...  not sure if we need to as well... */
 
 #define CHECK_STATUS(call) \
-      if ((status = (call)) != yajl_gen_status_ok) { rb_funcall(mEncoder2, rb_intern("raise_error_for_status"), 1, status); }
-
-typedef struct {
-  VALUE json_opts;
-  int processing_key;
-} ffi_state_t;
+      if ((status = (call)) != yajl_gen_status_ok) { rb_funcall(mEncoder2, rb_intern("raise_error_for_status"), 1, INT2FIX(status)); }
 
 static VALUE mEncoder_do_yajl_encode(VALUE self, VALUE obj, VALUE yajl_gen_opts) {
   ID sym_ffi_yajl = rb_intern("ffi_yajl");
@@ -21,9 +17,10 @@ static VALUE mEncoder_do_yajl_encode(VALUE self, VALUE obj, VALUE yajl_gen_opts)
   yajl_gen yajl_gen;
   const unsigned char *buf;
   size_t len;
-  ffi_state_t state;
+  VALUE state;
   VALUE ret;
   VALUE indent_string;
+  VALUE rb_yajl_gen;
 
   yajl_gen = yajl_gen_alloc(NULL);
 
@@ -41,9 +38,13 @@ static VALUE mEncoder_do_yajl_encode(VALUE self, VALUE obj, VALUE yajl_gen_opts)
     yajl_gen_config(yajl_gen, yajl_gen_indent_string, " ");
   }
 
-  state.processing_key = 0;
+  state = rb_hash_new();
+
+  rb_hash_aset(state, rb_str_new2("processing_key"), Qfalse);
 
-  rb_funcall(obj, sym_ffi_yajl, 2, yajl_gen, (VALUE) &state);
+  rb_yajl_gen = Data_Wrap_Struct(cYajl_Gen, NULL, NULL, yajl_gen);
+
+  rb_funcall(obj, sym_ffi_yajl, 2, rb_yajl_gen, state);
 
   yajl_gen_get_buf(yajl_gen, &buf, &len);
 
@@ -54,177 +55,201 @@ static VALUE mEncoder_do_yajl_encode(VALUE self, VALUE obj, VALUE yajl_gen_opts)
   return ret;
 }
 
-typedef struct {
-  VALUE yajl_gen;
-  ffi_state_t *state;
-} ffs_extra_t;
-
 int rb_cHash_ffi_yajl_callback(VALUE key, VALUE val, VALUE extra) {
-  ffs_extra_t *extra_p = (ffs_extra_t *)extra;
   ID sym_ffi_yajl = rb_intern("ffi_yajl");
+  VALUE state = rb_hash_aref(extra, rb_str_new2("state"));
+  VALUE rb_yajl_gen = rb_hash_aref(extra, rb_str_new2("yajl_gen"));
 
-  extra_p->state->processing_key = 1;
-  rb_funcall(key, sym_ffi_yajl, 2, extra_p->yajl_gen, extra_p->state);
-  extra_p->state->processing_key = 0;
-  rb_funcall(val, sym_ffi_yajl, 2, extra_p->yajl_gen, extra_p->state);
+
+  rb_hash_aset(state, rb_str_new2("processing_key"), Qtrue);
+  rb_funcall(key, sym_ffi_yajl, 2, rb_yajl_gen, state);
+  rb_hash_aset(state, rb_str_new2("processing_key"), Qfalse);
+
+  rb_funcall(val, sym_ffi_yajl, 2, rb_yajl_gen, state);
 
   return 0;
 }
 
-static VALUE rb_cHash_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) {
+static VALUE rb_cHash_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   yajl_gen_status status;
-  ffs_extra_t extra;
+  VALUE extra;
+  struct yajl_gen_t *yajl_gen;
+  Data_Get_Struct(rb_yajl_gen, struct yajl_gen_t, yajl_gen);
+
+  extra = rb_hash_new();  /* FIXME: reduce garbage */
+
+  rb_hash_aset(extra, rb_str_new2("yajl_gen"), rb_yajl_gen);
 
-  extra.yajl_gen = yajl_gen;
-  extra.state = (ffi_state_t *)state;
+  rb_hash_aset(extra, rb_str_new2("state"), state);
 
   CHECK_STATUS(
-    yajl_gen_map_open((struct yajl_gen_t *) yajl_gen)
+    yajl_gen_map_open(yajl_gen)
   );
-  rb_hash_foreach(self, rb_cHash_ffi_yajl_callback, (VALUE) &extra);
+  rb_hash_foreach(self, rb_cHash_ffi_yajl_callback, extra);
   CHECK_STATUS(
-    yajl_gen_map_close((struct yajl_gen_t *) yajl_gen)
+    yajl_gen_map_close(yajl_gen)
   );
 
   return Qnil;
 }
 
-static VALUE rb_cArray_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) {
+static VALUE rb_cArray_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   yajl_gen_status status;
   ID sym_ffi_yajl = rb_intern("ffi_yajl");
   long i;
   VALUE val;
+  struct yajl_gen_t *yajl_gen;
+  Data_Get_Struct(rb_yajl_gen, struct yajl_gen_t, yajl_gen);
 
   CHECK_STATUS(
-    yajl_gen_array_open((struct yajl_gen_t *) yajl_gen)
+    yajl_gen_array_open(yajl_gen)
   );
   for(i=0; i<RARRAY_LEN(self); i++) {
     val = rb_ary_entry(self, i);
-    rb_funcall(val, sym_ffi_yajl, 2, yajl_gen, state);
+    rb_funcall(val, sym_ffi_yajl, 2, rb_yajl_gen, state);
   }
   CHECK_STATUS(
-    yajl_gen_array_close((struct yajl_gen_t *) yajl_gen)
+    yajl_gen_array_close(yajl_gen)
   );
 
   return Qnil;
 }
 
-static VALUE rb_cNilClass_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) {
+static VALUE rb_cNilClass_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   yajl_gen_status status;
+  struct yajl_gen_t *yajl_gen;
+  Data_Get_Struct(rb_yajl_gen, struct yajl_gen_t, yajl_gen);
   CHECK_STATUS(
-    yajl_gen_null((struct yajl_gen_t *) yajl_gen)
+    yajl_gen_null(yajl_gen)
   );
   return Qnil;
 }
 
-static VALUE rb_cTrueClass_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) {
+static VALUE rb_cTrueClass_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   yajl_gen_status status;
+  struct yajl_gen_t *yajl_gen;
+  Data_Get_Struct(rb_yajl_gen, struct yajl_gen_t, yajl_gen);
   CHECK_STATUS(
-    yajl_gen_bool((struct yajl_gen_t *) yajl_gen, 1)
+    yajl_gen_bool(yajl_gen, 1)
   );
   return Qnil;
 }
 
-static VALUE rb_cFalseClass_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) {
+static VALUE rb_cFalseClass_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   yajl_gen_status status;
+  struct yajl_gen_t *yajl_gen;
+  Data_Get_Struct(rb_yajl_gen, struct yajl_gen_t, yajl_gen);
   CHECK_STATUS(
-    yajl_gen_bool((struct yajl_gen_t *) yajl_gen, 0)
+    yajl_gen_bool(yajl_gen, 0)
   );
   return Qnil;
 }
 
-static VALUE rb_cFixnum_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) {
+static VALUE rb_cFixnum_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   yajl_gen_status status;
   ID sym_to_s = rb_intern("to_s");
   VALUE str = rb_funcall(self, sym_to_s, 0);
   char *cptr = RSTRING_PTR(str);
   int len = RSTRING_LEN(str);
+  struct yajl_gen_t *yajl_gen;
+  Data_Get_Struct(rb_yajl_gen, struct yajl_gen_t, yajl_gen);
 
   if (memcmp(cptr, "NaN", 3) == 0 || memcmp(cptr, "Infinity", 8) == 0 || memcmp(cptr, "-Infinity", 9) == 0) {
     rb_raise(cEncodeError, "'%s' is an invalid number", cptr);
   }
-  if ( ((ffi_state_t *)state)->processing_key ) {
+  if ( rb_hash_aref(state, rb_str_new2("processing_key")) == Qtrue ) {
     CHECK_STATUS(
-      yajl_gen_string((struct yajl_gen_t *) yajl_gen, (unsigned char *)cptr, len)
+      yajl_gen_string(yajl_gen, (unsigned char *)cptr, len)
     );
   } else {
     CHECK_STATUS(
-      yajl_gen_integer((struct yajl_gen_t *) yajl_gen, NUM2INT(self))
+      yajl_gen_integer(yajl_gen, NUM2INT(self))
     );
   }
   return Qnil;
 }
 
-static VALUE rb_cBignum_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) {
+static VALUE rb_cBignum_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   yajl_gen_status status;
   ID sym_to_s = rb_intern("to_s");
   VALUE str = rb_funcall(self, sym_to_s, 0);
   char *cptr = RSTRING_PTR(str);
   int len = RSTRING_LEN(str);
+  struct yajl_gen_t *yajl_gen;
+  Data_Get_Struct(rb_yajl_gen, struct yajl_gen_t, yajl_gen);
   if (memcmp(cptr, "NaN", 3) == 0 || memcmp(cptr, "Infinity", 8) == 0 || memcmp(cptr, "-Infinity", 9) == 0) {
     rb_raise(cEncodeError, "'%s' is an invalid number", cptr);
   }
-  if ( ((ffi_state_t *)state)->processing_key ) {
+  if ( rb_hash_aref(state, rb_str_new2("processing_key")) == Qtrue ) {
     CHECK_STATUS(
-      yajl_gen_string((struct yajl_gen_t *) yajl_gen, (unsigned char *)cptr, len)
+      yajl_gen_string(yajl_gen, (unsigned char *)cptr, len)
     );
   } else {
     CHECK_STATUS(
-      yajl_gen_number((struct yajl_gen_t *) yajl_gen, cptr, len)
+      yajl_gen_number(yajl_gen, cptr, len)
     );
   }
   return Qnil;
 }
 
-static VALUE rb_cFloat_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) {
+static VALUE rb_cFloat_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   yajl_gen_status status;
   ID sym_to_s = rb_intern("to_s");
   VALUE str = rb_funcall(self, sym_to_s, 0);
   char *cptr = RSTRING_PTR(str);
   int len = RSTRING_LEN(str);
+  struct yajl_gen_t *yajl_gen;
+  Data_Get_Struct(rb_yajl_gen, struct yajl_gen_t, yajl_gen);
   if (memcmp(cptr, "NaN", 3) == 0 || memcmp(cptr, "Infinity", 8) == 0 || memcmp(cptr, "-Infinity", 9) == 0) {
     rb_raise(cEncodeError, "'%s' is an invalid number", cptr);
   }
-  if ( ((ffi_state_t *)state)->processing_key ) {
+  if ( rb_hash_aref(state, rb_str_new2("processing_key")) == Qtrue ) {
     CHECK_STATUS(
-      yajl_gen_string((struct yajl_gen_t *) yajl_gen, (unsigned char *)cptr, len)
+      yajl_gen_string(yajl_gen, (unsigned char *)cptr, len)
     );
   } else {
     CHECK_STATUS(
-      yajl_gen_number((struct yajl_gen_t *) yajl_gen, cptr, len)
+      yajl_gen_number(yajl_gen, cptr, len)
     );
   }
   return Qnil;
 }
 
-static VALUE rb_cString_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) {
+static VALUE rb_cString_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   yajl_gen_status status;
+  struct yajl_gen_t *yajl_gen;
+  Data_Get_Struct(rb_yajl_gen, struct yajl_gen_t, yajl_gen);
   CHECK_STATUS(
-    yajl_gen_string((struct yajl_gen_t *) yajl_gen, (unsigned char *)RSTRING_PTR(self), RSTRING_LEN(self))
+    yajl_gen_string(yajl_gen, (unsigned char *)RSTRING_PTR(self), RSTRING_LEN(self))
   );
   return Qnil;
 }
 
-static VALUE rb_cSymbol_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) {
+static VALUE rb_cSymbol_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   yajl_gen_status status;
   ID sym_to_s = rb_intern("to_s");
   VALUE str = rb_funcall(self, sym_to_s, 0);
   char *cptr = RSTRING_PTR(str);
   int len = RSTRING_LEN(str);
+  struct yajl_gen_t *yajl_gen;
+  Data_Get_Struct(rb_yajl_gen, struct yajl_gen_t, yajl_gen);
   CHECK_STATUS(
-    yajl_gen_string((struct yajl_gen_t *) yajl_gen, (unsigned char *)cptr, len)
+    yajl_gen_string(yajl_gen, (unsigned char *)cptr, len)
   );
   return Qnil;
 }
 
-static VALUE rb_cObject_ffi_yajl(VALUE self, VALUE yajl_gen, VALUE state) {
+static VALUE rb_cObject_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   yajl_gen_status status;
   ID sym_to_json = rb_intern("to_json");
   VALUE str;
+  VALUE json_opts =  rb_hash_aref(state, rb_str_new2("json_opts"));
+  struct yajl_gen_t *yajl_gen;
+  Data_Get_Struct(rb_yajl_gen, struct yajl_gen_t, yajl_gen);
 
-  str = rb_funcall(self, sym_to_json, 1, ((ffi_state_t *)state)->json_opts);
+  str = rb_funcall(self, sym_to_json, 1, json_opts);
   CHECK_STATUS(
-    yajl_gen_number((struct yajl_gen_t *) yajl_gen, (char *)RSTRING_PTR(str), RSTRING_LEN(str))
+    yajl_gen_number(yajl_gen, (char *)RSTRING_PTR(str), RSTRING_LEN(str))
   );
   return Qnil;
 }
@@ -235,6 +260,7 @@ void Init_encoder() {
   cEncodeError = rb_define_class_under(mFFI_Yajl, "EncodeError", rb_eStandardError);
   mExt = rb_define_module_under(mFFI_Yajl, "Ext");
   mEncoder = rb_define_module_under(mExt, "Encoder");
+  cYajl_Gen = rb_define_class_under(mEncoder, "YajlGen", rb_cObject);
   rb_define_method(mEncoder, "do_yajl_encode", mEncoder_do_yajl_encode, 2);
 
   rb_define_method(rb_cHash, "ffi_yajl", rb_cHash_ffi_yajl, 2);

data/lib/ffi_yajl/ext.rb

@@ -3,10 +3,10 @@ require 'rubygems'
 require 'ffi_yajl/encoder'
 require 'ffi_yajl/parser'
 
-unless RUBY_VERSION.to_f >= 1.9
-  # segfaults on ruby 1.8 and this is an exceedingly low priority to fix, use ffi instead
-  raise NotImplementedError, "The C-extension is disabled on Ruby 1.8"
-end
+#unless RUBY_VERSION.to_f >= 1.9
+#  # segfaults on ruby 1.8 and this is an exceedingly low priority to fix, use ffi instead
+#  raise NotImplementedError, "The C-extension is disabled on Ruby 1.8"
+#end
 
 module FFI_Yajl
   class Parser

data/lib/ffi_yajl/version.rb

@@ -1,3 +1,3 @@
 module FFI_Yajl
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-yajl
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: universal-java
 authors:
 - Lamont Granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-11 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake