ffi-yajl 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f424af28e01cb3f1253f61010285bd3811b7a76e
-  data.tar.gz: 1008ba36c8873d22d35a50de9fc03a8efb26c803
+  metadata.gz: a8b85bcd696b335e58ae66d7d6152d8c82712d64
+  data.tar.gz: 97199ad459ab9d164231563dc91fe26d4923c22f
 SHA512:
-  metadata.gz: 0094f0e84b108549bf70bc2f4e5e37509ca3a06498201e8a26034f0d2142e52dc023656cd8abab5946d607dce10cec4d080fe50810b3c654662499d11717b1ff
-  data.tar.gz: de12c5a201956bcb7b35d5ca71b99e515063c94b181cabe698f9969075dd5c4cb180ded3fba81c8e97dbfa12db88a6d1da15fd0952bc3f622ea0df9c73246ac6
+  metadata.gz: 32dca551da8cd71f0674033e1816d65eb3b245291dd4b63d5431248ae43f6ba4e407019030cbd46f20a81cd632315c9e03c4056d6891ef66aed6f5699ad2e64a
+  data.tar.gz: c4e9a16d122714c1446e82993ac4b979aaf4ad0373b1110581ac5fb683c767908ae90dace4aafb1d89456c858945e62004bae3975c92d8de5e6695c169b6b077

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

@@ -78,19 +78,30 @@ static VALUE rb_cHash_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   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 */
+  if ( rb_hash_aref(state, rb_str_new2("processing_key")) == Qtrue ) {
+    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);
+
+    CHECK_STATUS(
+      yajl_gen_string(yajl_gen, (unsigned char *)cptr, len)
+    );
+  } else {
+    extra = rb_hash_new();  /* FIXME: reduce garbage */
 
-  rb_hash_aset(extra, rb_str_new2("yajl_gen"), rb_yajl_gen);
+    rb_hash_aset(extra, rb_str_new2("yajl_gen"), rb_yajl_gen);
 
-  rb_hash_aset(extra, rb_str_new2("state"), state);
+    rb_hash_aset(extra, rb_str_new2("state"), state);
 
-  CHECK_STATUS(
-    yajl_gen_map_open(yajl_gen)
-  );
-  rb_hash_foreach(self, rb_cHash_ffi_yajl_callback, extra);
-  CHECK_STATUS(
-    yajl_gen_map_close(yajl_gen)
-  );
+    CHECK_STATUS(
+      yajl_gen_map_open(yajl_gen)
+    );
+    rb_hash_foreach(self, rb_cHash_ffi_yajl_callback, extra);
+    CHECK_STATUS(
+      yajl_gen_map_close(yajl_gen)
+    );
+  }
 
   return Qnil;
 }
@@ -103,16 +114,27 @@ static VALUE rb_cArray_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   struct yajl_gen_t *yajl_gen;
   Data_Get_Struct(rb_yajl_gen, struct yajl_gen_t, yajl_gen);
 
-  CHECK_STATUS(
-    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, rb_yajl_gen, state);
+  if ( rb_hash_aref(state, rb_str_new2("processing_key")) == Qtrue ) {
+    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);
+
+    CHECK_STATUS(
+      yajl_gen_string(yajl_gen, (unsigned char *)cptr, len)
+    );
+  } else {
+    CHECK_STATUS(
+      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, rb_yajl_gen, state);
+    }
+    CHECK_STATUS(
+      yajl_gen_array_close(yajl_gen)
+    );
   }
-  CHECK_STATUS(
-    yajl_gen_array_close(yajl_gen)
-  );
 
   return Qnil;
 }
@@ -121,9 +143,22 @@ 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(yajl_gen)
-  );
+
+  if ( rb_hash_aref(state, rb_str_new2("processing_key")) == Qtrue ) {
+    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);
+
+    CHECK_STATUS(
+      yajl_gen_string(yajl_gen, (unsigned char *)cptr, len)
+    );
+  } else {
+    CHECK_STATUS(
+      yajl_gen_null(yajl_gen)
+    );
+  }
+
   return Qnil;
 }
 
@@ -131,9 +166,22 @@ 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(yajl_gen, 1)
-  );
+
+  if ( rb_hash_aref(state, rb_str_new2("processing_key")) == Qtrue ) {
+    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);
+
+    CHECK_STATUS(
+      yajl_gen_string(yajl_gen, (unsigned char *)cptr, len)
+    );
+  } else {
+    CHECK_STATUS(
+      yajl_gen_bool(yajl_gen, 1)
+    );
+  }
+
   return Qnil;
 }
 
@@ -141,9 +189,22 @@ 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(yajl_gen, 0)
-  );
+
+  if ( rb_hash_aref(state, rb_str_new2("processing_key")) == Qtrue ) {
+    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);
+
+    CHECK_STATUS(
+      yajl_gen_string(yajl_gen, (unsigned char *)cptr, len)
+    );
+  } else {
+    CHECK_STATUS(
+      yajl_gen_bool(yajl_gen, 0)
+    );
+  }
+
   return Qnil;
 }
 
@@ -168,6 +229,7 @@ static VALUE rb_cFixnum_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
       yajl_gen_number(yajl_gen, cptr, len)
     );
   }
+
   return Qnil;
 }
 
@@ -179,6 +241,7 @@ static VALUE rb_cBignum_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   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);
   }
@@ -191,6 +254,7 @@ static VALUE rb_cBignum_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
       yajl_gen_number(yajl_gen, cptr, len)
     );
   }
+
   return Qnil;
 }
 
@@ -202,6 +266,7 @@ static VALUE rb_cFloat_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   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);
   }
@@ -214,6 +279,7 @@ static VALUE rb_cFloat_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
       yajl_gen_number(yajl_gen, cptr, len)
     );
   }
+
   return Qnil;
 }
 
@@ -221,9 +287,11 @@ 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(yajl_gen, (unsigned char *)RSTRING_PTR(self), RSTRING_LEN(self))
   );
+
   return Qnil;
 }
 
@@ -236,9 +304,11 @@ static VALUE object_to_s_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   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(yajl_gen, (unsigned char *)cptr, len)
   );
+
   return Qnil;
 }
 
@@ -258,9 +328,11 @@ static VALUE rb_cTime_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   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(yajl_gen, (unsigned char *)cptr, len)
   );
+
   return Qnil;
 }
 

data/ext/ffi_yajl/ext/encoder/extconf.rb

@@ -23,7 +23,7 @@ if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/
 end
 
 def windows?
-  !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+  !!(RUBY_PLATFORM =~ /mswin|mingw|cygwin|windows/)
 end
 
 if windows?

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

@@ -23,7 +23,7 @@ if RbConfig::MAKEFILE_CONFIG['CC'] =~ /gcc|clang/
 end
 
 def windows?
-  !!(RUBY_PLATFORM =~ /mswin|mingw|windows/)
+  !!(RUBY_PLATFORM =~ /mswin|mingw|cygwin|windows/)
 end
 
 if windows?

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

@@ -26,6 +26,7 @@ void set_value(CTX *ctx, VALUE val) {
       rb_hash_aset(last, key, val);
       break;
     default:
+      rb_ary_push(stack, val);
       break;
   }
 }
@@ -49,8 +50,6 @@ void end_object(CTX *ctx) {
   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));
-  } else {
-    rb_ivar_set(ctx->self, rb_intern("finished"), rb_ary_pop(stack));
   }
 }
 
@@ -211,7 +210,7 @@ static VALUE mParser_do_yajl_parse(VALUE self, VALUE str, VALUE yajl_opts) {
     goto raise;
   }
   yajl_free(hand);
-  return rb_ivar_get(self, rb_intern("finished"));
+  return rb_ary_pop(rb_ivar_get(self, rb_intern("stack")));
 
 raise:
   if (hand) {
@@ -230,4 +229,3 @@ void Init_parser() {
   utf8Encoding = rb_utf8_encoding();
 #endif
 }
-

data/lib/ffi_yajl.rb

@@ -1,14 +1,33 @@
 
+#
+# Precedence:
+#
+# - The FORCE_FFI_YAJL env var takes precedence over everything else, the user
+#   theoretically knows best
+# - Java always gets ffi because jruby only supports ffi
+# - There is a conflict between loading libyajl 1.x and 2.x in the same VM
+#   process (on a fundamental basis, simply guru medidate about how the
+#   c-symbols work if you load both libs).  For some reason the ffi interface
+#   seems to work fine sometimes (i'm not sure how) so we fall back to that--
+#   this is much more likely to be converted into a raise than to have the warn
+#   dropped, so don't bother asking for that.
+# - Then we try the c-ext and rescue into ffi that fails
+#
 if ENV['FORCE_FFI_YAJL'] == "ext"
   require 'ffi_yajl/ext'
-elsif ENV['FORCE_FFI_YAJL'] == "ffi" || defined?(Yajl) || RUBY_VERSION.to_f < 1.9
-  # - can't dynlink our libyajl2 c-ext and Yajl's libyajl1 c-ext into the same binary
-  # - c-extension segfaults on ruby 1.8.7
+elsif ENV['FORCE_FFI_YAJL'] == "ffi"
+  require 'ffi_yajl/ffi'
+elsif RUBY_PLATFORM == "java"
+  require 'ffi_yajl/ffi'
+elsif defined?(Yajl)
+  warn "the ffi-yajl and yajl-ruby gems have incompatible C libyajl libs and should not be loaded in the same Ruby VM"
+  warn "falling back to ffi which might work (or might not, no promises)"
   require 'ffi_yajl/ffi'
 else
   begin
     require 'ffi_yajl/ext'
   rescue LoadError
+    warn "failed to load the ffi-yajl c-extension, falling back to ffi interface"
     require 'ffi_yajl/ffi'
   end
 end

data/lib/ffi_yajl/ext.rb

@@ -61,7 +61,7 @@ module FFI_Yajl
   end
 
   unless try_fiddle_dlopen(libpath) || try_dl_dlopen(libpath) || try_ffi_dlopen(libpath)
-    raise "cannot find dlopen vi Fiddle, DL or FFI, what am I supposed to do?"
+    raise "cannot find dlopen via Fiddle, DL or FFI, what am I supposed to do?"
   end
 
   class Parser

data/lib/ffi_yajl/ffi/encoder.rb

@@ -46,56 +46,91 @@ end
 
 class Hash
   def ffi_yajl(yajl_gen, state)
-    if ( status = FFI_Yajl.yajl_gen_map_open(yajl_gen) ) != 0
-      FFI_Yajl::Encoder.raise_error_for_status(status)
-    end
-    self.each do |key, value|
-      # Perf Fix: mutate state hash rather than creating new copy
-      state[:processing_key] = true
-      key.ffi_yajl(yajl_gen, state)
-      state[:processing_key] = false
-      value.ffi_yajl(yajl_gen, state)
-    end
-    if ( status = FFI_Yajl.yajl_gen_map_close(yajl_gen) ) != 0
-      FFI_Yajl::Encoder.raise_error_for_status(status)
+    if state[:processing_key]
+      str = self.to_s
+      if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
+        FFI_Yajl::Encoder.raise_error_for_status(status)
+      end
+    else
+      if ( status = FFI_Yajl.yajl_gen_map_open(yajl_gen) ) != 0
+        FFI_Yajl::Encoder.raise_error_for_status(status)
+      end
+      self.each do |key, value|
+        # Perf Fix: mutate state hash rather than creating new copy
+        state[:processing_key] = true
+        key.ffi_yajl(yajl_gen, state)
+        state[:processing_key] = false
+        value.ffi_yajl(yajl_gen, state)
+      end
+      if ( status = FFI_Yajl.yajl_gen_map_close(yajl_gen) ) != 0
+        FFI_Yajl::Encoder.raise_error_for_status(status)
+      end
     end
   end
 end
 
 class Array
   def ffi_yajl(yajl_gen, state)
-    if ( status = FFI_Yajl.yajl_gen_array_open(yajl_gen) ) != 0
-      FFI_Yajl::Encoder.raise_error_for_status(status)
-    end
-    self.each do |value|
-      value.ffi_yajl(yajl_gen, state)
-    end
-    if ( status = FFI_Yajl.yajl_gen_array_close(yajl_gen) ) != 0
-      FFI_Yajl::Encoder.raise_error_for_status(status)
+    if state[:processing_key]
+      str = self.to_s
+      if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
+        FFI_Yajl::Encoder.raise_error_for_status(status)
+      end
+    else
+      if ( status = FFI_Yajl.yajl_gen_array_open(yajl_gen) ) != 0
+        FFI_Yajl::Encoder.raise_error_for_status(status)
+      end
+      self.each do |value|
+        value.ffi_yajl(yajl_gen, state)
+      end
+      if ( status = FFI_Yajl.yajl_gen_array_close(yajl_gen) ) != 0
+        FFI_Yajl::Encoder.raise_error_for_status(status)
+      end
     end
   end
 end
 
 class NilClass
   def ffi_yajl(yajl_gen, state)
-    if ( status = FFI_Yajl.yajl_gen_null(yajl_gen) ) != 0
-      FFI_Yajl::Encoder.raise_error_for_status(status)
+    if state[:processing_key]
+      str = self.to_s
+      if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
+        FFI_Yajl::Encoder.raise_error_for_status(status)
+      end
+    else
+      if ( status = FFI_Yajl.yajl_gen_null(yajl_gen) ) != 0
+        FFI_Yajl::Encoder.raise_error_for_status(status)
+      end
     end
   end
 end
 
 class TrueClass
   def ffi_yajl(yajl_gen, state)
-    if ( status = FFI_Yajl.yajl_gen_bool(yajl_gen, 1) ) != 0
-      FFI_Yajl::Encoder.raise_error_for_status(status)
+    if state[:processing_key]
+      str = self.to_s
+      if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
+        FFI_Yajl::Encoder.raise_error_for_status(status)
+      end
+    else
+      if ( status = FFI_Yajl.yajl_gen_bool(yajl_gen, 1) ) != 0
+        FFI_Yajl::Encoder.raise_error_for_status(status)
+      end
     end
   end
 end
 
 class FalseClass
   def ffi_yajl(yajl_gen, state)
-    if ( status = FFI_Yajl.yajl_gen_bool(yajl_gen, 0) ) != 0
-      FFI_Yajl::Encoder.raise_error_for_status(status)
+    if state[:processing_key]
+      str = self.to_s
+      if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
+        FFI_Yajl::Encoder.raise_error_for_status(status)
+      end
+    else
+      if ( status = FFI_Yajl.yajl_gen_bool(yajl_gen, 0) ) != 0
+        FFI_Yajl::Encoder.raise_error_for_status(status)
+      end
     end
   end
 end

data/lib/ffi_yajl/ffi/parser.rb

@@ -13,15 +13,13 @@ module FFI_Yajl
           when Array
             stack.last.push(val)
           else
-            raise FFI_Yajl::ParseError.new("internal error: object not a hash or array")
+            stack.push(val)
           end
         end
 
         def stack_pop
           if stack.length > 1
             set_value( stack.pop )
-          else
-            @finished = stack.pop
           end
         end
 
@@ -138,11 +136,10 @@ module FFI_Yajl
           error = ::FFI_Yajl.yajl_get_error(yajl_handle, 1, str, str.bytesize)
           raise ::FFI_Yajl::ParseError.new(error)
         end
-        finished
+        stack.pop
       ensure
         ::FFI_Yajl.yajl_free(yajl_handle) if yajl_handle
       end
     end
   end
 end
-

data/lib/ffi_yajl/json_gem.rb

@@ -3,6 +3,8 @@
 
 require 'ffi_yajl' unless defined?(FFI_Yajl::Parser)
 
+warn "ffi-yajl/json_gem is deprecated, these monkeypatches will be dropped shortly"
+
 module JSON
   class JSONError < StandardError; end unless defined?(JSON::JSONError)
   class GeneratorError < JSONError; end unless defined?(JSON::GeneratorError)

data/lib/ffi_yajl/parser.rb

@@ -31,6 +31,8 @@ module FFI_Yajl
     end
 
     def parse(str)
+      raise FFI_Yajl::ParseError, "input must be a string or IO" unless str.is_a?(String) || str.respond_to?(:read)
+
       # initialization that we can do in pure ruby
       yajl_opts = {}
 

data/lib/ffi_yajl/version.rb

@@ -1,3 +1,3 @@
 module FFI_Yajl
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/spec/ffi_yajl/encoder_spec.rb

@@ -7,6 +7,31 @@ describe "FFI_Yajl::Encoder" do
 
   let(:encoder) { FFI_Yajl::Encoder.new }
 
+  it "encodes hashes in keys as strings", :ruby_gte_193 => true do
+    ruby = { {'a' => 'b'} => 2 }
+    expect(encoder.encode(ruby)).to eq('{"{\"a\"=>\"b\"}":2}')
+  end
+
+  it "encodes arrays in keys as strings", :ruby_gte_193 => true do
+    ruby = { [0,1] => 2 }
+    expect(encoder.encode(ruby)).to eq('{"[0, 1]":2}')
+  end
+
+  it "encodes nil in keys as strings" do
+    ruby = { nil => 2 }
+    expect(encoder.encode(ruby)).to eq('{"":2}')
+  end
+
+  it "encodes true in keys as strings" do
+    ruby = { true => 2 }
+    expect(encoder.encode(ruby)).to eq('{"true":2}')
+  end
+
+  it "encodes false in keys as strings" do
+    ruby = { false => 2 }
+    expect(encoder.encode(ruby)).to eq('{"false":2}')
+  end
+
   it "encodes fixnums in keys as strings" do
     ruby = { 1 => 2 }
     expect(encoder.encode(ruby)).to eq('{"1":2}')

data/spec/ffi_yajl/parser_spec.rb

@@ -14,6 +14,55 @@ describe "FFI_Yajl::Parser" do
       end
     end
 
+    context "when parsing nil" do
+      let(:json) { nil }
+      it "should not coredump ruby" do
+        expect{ parser }.to raise_error(FFI_Yajl::ParseError)
+      end
+    end
+
+    context "when parsing bare int" do
+      let(:json) { "1" }
+      it "should parse to the int value" do
+        expect( parser ).to eq(1)
+      end
+    end
+
+    context "when parsing bare string" do
+      let(:json) { '"a"' }
+      it "should parse to the string value" do
+        expect( parser ).to eq("a")
+      end
+    end
+
+    context "when parsing bare true" do
+      let(:json) { "true" }
+      it "should parse to the true value" do
+        expect( parser ).to eq(true)
+      end
+    end
+
+    context "when parsing bare false" do
+      let(:json) { "false" }
+      it "should parse to the false value" do
+        expect( parser ).to eq(false)
+      end
+    end
+
+    context "when parsing bare null" do
+      let(:json) { "null" }
+      it "should parse to the nil value" do
+        expect( parser ).to eq(nil)
+      end
+    end
+
+    context "when parsing bare float" do
+      let(:json) { "1.1" }
+      it "should parse to the a float" do
+        expect( parser ).to eq(1.1)
+      end
+    end
+
     context "when json has comments" do
       let(:json) { '{"key": /* this is a comment */ "value"}' }
 
@@ -482,4 +531,3 @@ describe "FFI_Yajl::Parser" do
     end
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-yajl
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Lamont Granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 description: Ruby FFI wrapper around YAJL 2.x
 email: lamont@getchef.com
 executables: