ffi-yajl 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22f963e220dde27e277e387e7dfba256859da2c8
-  data.tar.gz: d52391f8a6449ce89cbe3bb39a03cec421769967
+  metadata.gz: 948084f681256d2d301e01415ce82e335f1bee52
+  data.tar.gz: f749ab5a3e388d3c069825b00cd37c30796db6d9
 SHA512:
-  metadata.gz: bf8965e64e5122273aea126fa4e6d284537e9680d298b4c6a24ff6a0c41f5540a2b22d6fb7181a6df80455909c05e943b55437aec7b54f041f5e99784b821970
-  data.tar.gz: 094122dadd975df2181a4fc51a6462086e37d6800ed05888f9b3c6591493ea3171c02d0b1bc1bd14122af4ec193bd569aafbd8b5dca4b136b17605f9c7a1a1e9
+  metadata.gz: fda05bb34154de35d5b9f2a9d3f3625267a2dd35ad3e048243a8cbf904397ae001462bbeb449e2d83d00564291a47152dff4414d36a217d7fdaf0bef5a288543
+  data.tar.gz: 9c47d061b3055164397a98666cf34786ff0341c0ccccb9fdb95655927150af3adbedc9d6ffcace61883cfb3f39e45102ee3fc990891cc5b4769de86f044a7f93

data/README.md

@@ -36,16 +36,30 @@ could support non-MRI rubies) and we also needed some bug fixes in
 yajl2, but the maintainer wasn't able to devote enough time to the
 project to make these updates in a timeframe that worked for us.
 
+## Yajl Library Packaging
+
+This library prefers to use the embedded yajl 2.x C library packaged in the
+libyajl2 gem.  In order to use the operating system yajl library (which must be
+yajl 2.x) the environment variable `USE_SYSTEM_LIBYAJL2` can be set before
+installing or bundling libyajl2.  This will force the libyajl2 gem to skip
+compiling its embedded library and the ffi-yajl gem will fallback to using the
+system yajl library.
+
 ## Thanks
 
-This was initially going to be a clean rewrite of an ffi ruby wrapper around yajl2, but as it progressed more and more code was
-pulled in from brianmario's existing yajl-ruby gem, particularly all the c extension code, lots of specs and the benchmarks.  And the
-process of writing this would have been much more difficult without being able to draw heavily from already solved problems in
+This was initially going to be a clean rewrite of an ffi ruby wrapper around
+yajl2, but as it progressed more and more code was pulled in from brianmario's
+existing yajl-ruby gem, particularly all the c extension code, lots of specs
+and the benchmarks.  And the process of writing this would have been much more
+difficult without being able to draw heavily from already solved problems in
 yajl-ruby.
 
 ## License
 
-Given that this draws heavily from the yajl-ruby sources, and could be considered a derivative work, the MIT License from that
-project has been preserved and this source code has deliberately not been dual licensed under Chef's typical Apache License.
-See the [LICENSE](https://github.com/chef/ffi-yajl/blob/master/LICENSE) file in this project.
+Given that this draws heavily from the yajl-ruby sources, and could be
+considered a derivative work, the MIT License from that project has been
+preserved and this source code has deliberately not been dual licensed under
+Chef's typical Apache License.  See the
+[LICENSE](https://github.com/chef/ffi-yajl/blob/master/LICENSE) file in this
+project.
 

data/Rakefile

@@ -51,6 +51,13 @@ Rake::ExtensionTask.new do |ext|
   ext.gem_spec = spec
 end
 
+Rake::ExtensionTask.new do |ext|
+  ext.name = 'dlopen'
+  ext.lib_dir = 'lib/ffi_yajl/ext'
+  ext.ext_dir = 'ext/ffi_yajl/ext/dlopen'
+  ext.gem_spec = spec
+end
+
 #
 # test tasks
 #

data/ext/ffi_yajl/ext/dlopen/dlopen.c

@@ -0,0 +1,40 @@
+#include <ruby.h>
+
+#if defined(HAVE_DLFCN_H)
+# include <dlfcn.h>
+#ifndef RTLD_LAZY
+#define RTLD_LAZY 0
+#endif
+#ifndef RTLD_GLOBAL
+#define RTLD_GLOBAL 0
+#endif
+#ifndef RTLD_NOW
+#define RTLD_NOW 0
+#endif
+#else
+# if defined(_WIN32)
+#   include <windows.h>
+#   define dlopen(name,flag) ((void*)LoadLibrary(name))
+#   define dlerror() strerror(rb_w32_map_errno(GetLastError()))
+#   define dlsym(handle,name) ((void*)GetProcAddress((handle),(name)))
+#   define RTLD_LAZY -1
+#   define RTLD_NOW  -1
+#   define RTLD_GLOBAL -1
+# endif
+#endif
+
+static VALUE mFFI_Yajl, mDlopen, mExt;
+
+static VALUE mDlopen_dlopen(VALUE self, VALUE file) {
+  if (dlopen(RSTRING_PTR(file), RTLD_NOW|RTLD_GLOBAL) == NULL) {
+    rb_raise(rb_eArgError, "%s", dlerror());
+  }
+  return Qnil;
+}
+
+void Init_dlopen() {
+  mFFI_Yajl = rb_define_module("FFI_Yajl");
+  mExt = rb_define_module_under(mFFI_Yajl, "Ext");
+  mDlopen = rb_define_module_under(mExt, "Dlopen");
+  rb_define_method(mDlopen, "dlopen", mDlopen_dlopen, 1);
+}

data/ext/ffi_yajl/ext/dlopen/extconf.rb

@@ -0,0 +1,15 @@
+require 'mkmf'
+require 'rubygems'
+
+RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
+
+puts $CFLAGS
+puts $LDFLAGS
+
+have_header("dlfcn.h")
+
+have_library("dl", "dlopen")
+
+dir_config 'dlopen'
+
+create_makefile 'ffi_yajl/ext/dlopen'

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

@@ -2,7 +2,7 @@
 #include <yajl/yajl_gen.h>
 
 static VALUE mFFI_Yajl, mExt, mEncoder, mEncoder2, cEncodeError;
-static VALUE cDate, cTime, cDateTime;
+static VALUE cDate, cTime, cDateTime, cStringIO;
 static VALUE cYajl_Gen;
 
 /* FIXME: the json gem does a whole bunch of indirection around monkeypatching...  not sure if we need to as well... */
@@ -295,11 +295,8 @@ static VALUE rb_cString_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   return Qnil;
 }
 
-/* calls #to_s on an object to encode it */
-static VALUE object_to_s_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
+static VALUE string_ffi_yajl(VALUE str, 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;
@@ -312,6 +309,13 @@ static VALUE object_to_s_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   return Qnil;
 }
 
+/* calls #to_s on an object to encode it */
+static VALUE object_to_s_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
+  ID sym_to_s = rb_intern("to_s");
+  VALUE str = rb_funcall(self, sym_to_s, 0);
+  return string_ffi_yajl(str, rb_yajl_gen, state);
+}
+
 static VALUE rb_cSymbol_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   return object_to_s_ffi_yajl(self, rb_yajl_gen, state);
 }
@@ -321,19 +325,15 @@ static VALUE rb_cDate_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
 }
 
 static VALUE rb_cTime_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
-  yajl_gen_status status;
   ID sym_strftime = rb_intern("strftime");
   VALUE str = rb_funcall(self, sym_strftime, 1, rb_str_new2("%Y-%m-%d %H:%M:%S %z"));
-  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(yajl_gen, (unsigned char *)cptr, len)
-  );
+  return string_ffi_yajl(str, rb_yajl_gen, state);
+}
 
-  return Qnil;
+static VALUE rb_cStringIO_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
+  ID sym_read = rb_intern("read");
+  VALUE str = rb_funcall(self, sym_read, 0);
+  return string_ffi_yajl(str, rb_yajl_gen, state);
 }
 
 static VALUE rb_cDateTime_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
@@ -373,6 +373,7 @@ void Init_encoder() {
   cDate = rb_define_class("Date", rb_cObject);
   cTime = rb_define_class("Time", rb_cObject);
   cDateTime = rb_define_class("DateTime", cDate);
+  cStringIO = rb_define_class("StringIO", rb_cData);
 
   rb_define_method(rb_cHash, "ffi_yajl", rb_cHash_ffi_yajl, 2);
   rb_define_method(rb_cArray, "ffi_yajl", rb_cArray_ffi_yajl, 2);
@@ -387,5 +388,6 @@ void Init_encoder() {
   rb_define_method(cDate, "ffi_yajl", rb_cDate_ffi_yajl, 2);
   rb_define_method(cTime, "ffi_yajl", rb_cTime_ffi_yajl, 2);
   rb_define_method(cDateTime, "ffi_yajl", rb_cDateTime_ffi_yajl, 2);
+  rb_define_method(cStringIO, "ffi_yajl", rb_cStringIO_ffi_yajl, 2);
   rb_define_method(rb_cObject, "ffi_yajl", rb_cObject_ffi_yajl, 2);
 }

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

@@ -11,6 +11,7 @@ static VALUE mFFI_Yajl, mExt, mParser, cParseError;
 typedef struct {
   VALUE self;
   int symbolizeKeys;
+  int uniqueKeyChecking;
 } CTX;
 
 void set_value(CTX *ctx, VALUE val) {
@@ -23,6 +24,12 @@ void set_value(CTX *ctx, VALUE val) {
       rb_ary_push(last, val);
       break;
     case T_HASH:
+      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:
@@ -163,7 +170,7 @@ static yajl_callbacks callbacks = {
   end_array_callback,
 };
 
-int get_opts_key(VALUE self, char *key) {
+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");
@@ -182,6 +189,7 @@ static VALUE mParser_do_yajl_parse(VALUE self, VALUE str, VALUE yajl_opts) {
 
   ctx.self = self;
   ctx.symbolizeKeys = get_opts_key(self, "symbolize_keys");
+  ctx.uniqueKeyChecking = get_opts_key(self, "unique_key_checking");
 
   hand = yajl_alloc(&callbacks, NULL, (void *)&ctx);
 

data/lib/ffi_yajl/benchmark.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2015 Lamont Granquist
+# Copyright (c) 2015 Chef Software, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'ffi_yajl/benchmark/encode.rb'
 require 'ffi_yajl/benchmark/encode_profile.rb'

data/lib/ffi_yajl/encoder.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2015 Lamont Granquist
+# Copyright (c) 2015 Chef Software, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module FFI_Yajl
   class EncodeError < StandardError; end

data/lib/ffi_yajl/ext.rb

@@ -1,71 +1,37 @@
+# Copyright (c) 2015 Lamont Granquist
+# Copyright (c) 2015 Chef Software, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'rubygems'
 
 require 'ffi_yajl/encoder'
 require 'ffi_yajl/parser'
-require 'ffi'
-require 'libyajl2'
-require 'ffi_yajl/platform'
+require 'ffi_yajl/ext/dlopen'
+require 'ffi_yajl/map_library_name'
 
 module FFI_Yajl
-  extend FFI_Yajl::Platform
-
-  # FIXME: DRY with ffi_yajl/ffi.rb
-  # FIXME: extract map_library_name from FFI and stop requiring it at the top level
-  #        so that the C-library can be installed without FFI
-  libname = ::FFI.map_library_name("yajl")
-  # awful windows patch, but there is an open issue to entirely replace FFI.map_library_name already
-  libname = "libyajl.so" if windows?
-  libpath = File.expand_path(File.join(Libyajl2.opt_path, libname))
-  libpath.gsub!(/dylib/, 'bundle')
-  libpath = ::FFI.map_library_name("yajl") unless File.exist?(libpath)
-
-  #
-  # FFS, what exactly was so wrong with DL.dlopen that ruby had to get rid of it???
-  #
-
-  def self.try_fiddle_dlopen(libpath)
-    require 'fiddle'
-    if defined?(Fiddle) && Fiddle.respond_to?(:dlopen)
-      ::Fiddle.dlopen(libpath)
-      true
-    else
-      false
-    end
-  rescue LoadError
-    return false
-  end
+  extend FFI_Yajl::MapLibraryName
+  extend FFI_Yajl::Ext::Dlopen
 
-  def self.try_dl_dlopen(libpath)
-    require 'dl'
-    if defined?(DL) && DL.respond_to?(:dlopen)
-      ::DL.dlopen(libpath)
-      true
-    else
-      false
-    end
-  rescue LoadError
-    return false
-  end
-
-  def self.try_ffi_dlopen(libpath)
-    require 'ffi'
-    require 'rbconfig'
-    extend ::FFI::Library
-    ffi_lib 'dl'
-    attach_function 'dlopen', :dlopen, [:string, :int], :void
-    if  RbConfig::CONFIG['host_os'] =~ /linux/i
-      dlopen libpath, 0x102  # linux: RTLD_GLOBAL | RTLD_NOW
-    else
-      dlopen libpath, 0
-    end
-    true
-  rescue LoadError
-    return false
-  end
-
-  unless try_fiddle_dlopen(libpath) || try_dl_dlopen(libpath) || try_ffi_dlopen(libpath)
-    raise "cannot find dlopen via Fiddle, DL or FFI, what am I supposed to do?"
-  end
+  dlopen_yajl_library
 
   class Parser
     require 'ffi_yajl/ext/parser'

data/lib/ffi_yajl/ffi/encoder.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2015 Lamont Granquist
+# Copyright (c) 2015 Chef Software, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'ffi_yajl/ffi'
 
@@ -206,6 +227,15 @@ class String
   end
 end
 
+class StringIO
+  def ffi_yajl(yajl_gen, state)
+    str = self.read
+    if ( status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize) ) != 0
+      FFI_Yajl::Encoder.raise_error_for_status(status)
+    end
+  end
+end
+
 class Date
   def ffi_yajl(yajl_gen, state)
     str = self.to_s

data/lib/ffi_yajl/ffi/parser.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2015 Lamont Granquist
+# Copyright (c) 2015 Chef Software, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'ffi_yajl/ffi'
 
@@ -9,6 +30,9 @@ module FFI_Yajl
           case stack.last
           when Hash
             raise FFI_Yajl::ParseError.new("internal error: missing key in parse") if key.nil?
+            if @opts[:unique_key_checking] && stack.last.has_key?(key)
+              raise FFI_Yajl::ParseError.new("repeated key: #{key}")
+            end
             stack.last[key] = val
           when Array
             stack.last.push(val)

data/lib/ffi_yajl/ffi.rb

@@ -1,23 +1,44 @@
+# Copyright (c) 2015 Lamont Granquist
+# Copyright (c) 2015 Chef Software, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 require 'rubygems'
 
 require 'libyajl2'
-require 'ffi'
+begin
+  require 'ffi'
+rescue LoadError
+  $stderr.puts "FATAL: to use the ffi extension instead of the compiled C extension, the ffi gem must be installed"
+  $stderr.puts "       (it is optional, so you must include it in your bundle manually)"
+  exit 1
+end
+
+require 'ffi_yajl/map_library_name'
 
 module FFI_Yajl
   extend ::FFI::Library
 
-  libname = ::FFI.map_library_name("yajl")
-  # XXX: need to replace ::FFI.map_library_name here as well
-  libname = "libyajl.so" if libname == "yajl.dll"
-  libpath = File.expand_path(File.join(Libyajl2.opt_path, libname))
-  libpath.gsub!(/dylib/, 'bundle')
-
-  if File.file?(libpath)
-    # use our vendored version of libyajl2 if we find it installed
-    ffi_lib libpath
-  else
-    ffi_lib 'yajl'
-  end
+  extend FFI_Yajl::MapLibraryName
+
+  ffi_open_yajl_library
 
   class YajlCallbacks < ::FFI::Struct
     layout :yajl_null, :pointer,

data/lib/ffi_yajl/map_library_name.rb

@@ -0,0 +1,110 @@
+# Copyright (c) 2015 Lamont Granquist
+# Copyright (c) 2015 Chef Software, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'libyajl2'
+
+# Mixin for use in finding the right yajl library on the system.  The 'caller'
+# needs to also mixin either the FFI module or the DLopen module.  Those are
+# deliberately not mixed in to avoid loading the dlopen module in the ffi
+# codepath (which fails on jruby which does not have that C extension).
+
+module FFI_Yajl
+  module MapLibraryName
+
+    private
+
+    # Stub for tests to override the host_os
+    #
+    # @api private
+    # @return Array<String> lower case ruby host_os string
+    def host_os
+      RbConfig::CONFIG['host_os'].downcase
+    end
+
+    # Array of yajl library names on the platform.  Some platforms like Windows
+    # and Mac may have different names/extensions.
+    #
+    # @api private
+    # @return Array<String> Array of yajl library names for platform
+    def library_names
+      case host_os
+      when /mingw|mswin/
+        [ "libyajl.so", "yajl.dll" ]
+      when /cygwin/
+        [ "libyajl.so", "cygyajl.dll" ]
+      when /darwin/
+        [ "libyajl.bundle", "libyajl.dylib" ]
+      else
+        [ "libyajl.so" ]
+      end
+    end
+
+    # Array of yajl library names prepended with the libyajl2 path to use to
+    # load those directly and bypass the system libyajl by default.  Since
+    # these are full paths, this API checks to ensure that the file exists on
+    # the filesystem.  May return an empty array.
+    #
+    # @api private
+    # @return Array<String> Array of full paths to libyajl2 gem libraries
+    def expanded_library_names
+      library_names.map do |libname|
+        pathname = File.expand_path(File.join(Libyajl2.opt_path, libname))
+        pathname if File.file?(pathname)
+      end.compact
+    end
+
+    # Iterate across the expanded library names in the libyajl2-gem and then
+    # attempt to load the system libraries.  Uses the native dlopen extension
+    # that ships in this gem.
+    #
+    # @api private
+    def dlopen_yajl_library
+      found = false
+      ( expanded_library_names + library_names ).each do |libname|
+        begin
+          dlopen(libname)
+          found = true
+          break
+        rescue ArgumentError
+        end
+      end
+      raise "cannot find yajl library for platform" unless found
+    end
+
+    # Iterate across the expanded library names in the libyajl2-gem and attempt
+    # to load them.  If they are missing just use `ffi_lib 'yajl'` to accept
+    # the FFI default algorithm to find the library.
+    #
+    # @api private
+    def ffi_open_yajl_library
+      found = false
+      expanded_library_names.each do |libname|
+        begin
+          ffi_lib libname
+          found = true
+        rescue LoadError
+        end
+      end
+      ffi_lib 'yajl' unless found
+    end
+  end
+end

data/lib/ffi_yajl/parser.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2015 Lamont Granquist
+# Copyright (c) 2015 Chef Software, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 module FFI_Yajl
   class ParseError < StandardError; end
@@ -54,6 +75,8 @@ module FFI_Yajl
       yajl_opts[:yajl_allow_multiple_values]  = @opts[:allow_multiple_values]
       yajl_opts[:yajl_allow_partial_values]   = @opts[:allow_partial_values]
 
+      yajl_opts[:unique_key_checking]         = @opts[:unique_key_checking]
+
       # XXX: bug-compat with ruby-yajl
       return nil if str == ""
 

data/lib/ffi_yajl/platform.rb

@@ -1,3 +1,25 @@
+# Copyright (c) 2015 Lamont Granquist
+# Copyright (c) 2015 Chef Software, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 module FFI_Yajl
   module Platform
     def windows?

data/lib/ffi_yajl/version.rb

@@ -1,3 +1,25 @@
+# Copyright (c) 2015 Lamont Granquist
+# Copyright (c) 2015 Chef Software, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 module FFI_Yajl
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

data/lib/ffi_yajl.rb

@@ -1,3 +1,24 @@
+# Copyright (c) 2015 Lamont Granquist
+# Copyright (c) 2015 Chef Software, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #
 # Precedence:
@@ -19,10 +40,6 @@ 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'

data/spec/ffi_yajl/encoder_spec.rb

@@ -1,4 +1,25 @@
 # encoding: UTF-8
+# Copyright (c) 2015 Lamont Granquist
+# Copyright (c) 2015 Chef Software, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'spec_helper'
 require 'date'
@@ -110,6 +131,11 @@ describe "FFI_Yajl::Encoder" do
     expect(encoder.encode(ruby)).to eq( %q{"2001-02-03"} )
   end
 
+  it "can encode StringIOs" do
+    ruby = { "foo" => StringIO.new('THING') }
+    expect(encoder.encode(ruby)).to eq("{\"foo\":\"THING\"}")
+  end
+
   context "when encoding Time objects in UTC timezone" do
     before do
       @saved_tz = ENV['TZ']

data/spec/ffi_yajl/map_library_name_spec.rb

@@ -0,0 +1,117 @@
+# Copyright (c) 2015 Lamont Granquist
+# Copyright (c) 2015 Chef Software, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'spec_helper'
+
+class Test
+  extend FFI_Yajl::MapLibraryName
+end
+
+host_os_library_name_mapping = {
+  "mingw"    => [ "libyajl.so", "yajl.dll" ],
+  "mswin"    => [ "libyajl.so", "yajl.dll" ],
+  "cygwin"   => [ "libyajl.so", "cygyajl.dll" ],
+  "darwin"   => [ "libyajl.bundle", "libyajl.dylib" ],
+  "solaris2" => [ "libyajl.so" ],
+  "linux"    => [ "libyajl.so" ],
+  "aix"      => [ "libyajl.so" ],
+  "hpux"     => [ "libyajl.so" ],
+  "netbsd"   => [ "libyajl.so" ],
+  "openbsd"  => [ "libyajl.so" ],
+  "freebsd"  => [ "libyajl.so" ],
+}
+
+describe "FFI_Yajl::MapLibraryName" do
+  let(:libyajl2_opt_path) { "/libyajl2/lib" }
+  before do
+    allow(Libyajl2).to receive(:opt_path).and_return(libyajl2_opt_path)
+  end
+
+  host_os_library_name_mapping.each do |host_os, library_names|
+
+    context "#library_names" do
+      it "maps #{host_os} correctly" do
+        allow(Test).to receive(:host_os).and_return(host_os)
+        expect(Test.send(:library_names)).to eq(library_names)
+      end
+    end
+
+    context "#expanded_library_names" do
+      it "maps #{host_os} correctly" do
+        allow(Test).to receive(:host_os).and_return(host_os)
+        expanded_library_names = []
+        library_names.each do |library_name|
+          path = File.expand_path(File.join(libyajl2_opt_path, library_name))
+          expanded_library_names.push(path)
+          expect(File).to receive(:file?).with(path).and_return(true)
+        end
+        expect(Test.send(:expanded_library_names)).to eq(expanded_library_names)
+      end
+    end
+
+    context "#dlopen_yajl_library" do
+      it "should call dlopen against an expanded library name if it finds it on #{host_os}" do
+        allow(Test).to receive(:host_os).and_return(host_os)
+        library_names.each do |library_name|
+          path = File.expand_path(File.join(libyajl2_opt_path, library_name))
+          allow(File).to receive(:file?).with(path).and_return(true)
+          allow(Test).to receive(:dlopen).with(path).and_return(nil)
+        end
+        Test.send(:dlopen_yajl_library)
+      end
+      it "if dlopen calls all raise it should still use the short names on #{host_os}" do
+        allow(Test).to receive(:host_os).and_return(host_os)
+        library_names.each do |library_name|
+          path = File.expand_path(File.join(libyajl2_opt_path, library_name))
+          allow(File).to receive(:file?).with(path).and_return(true)
+          allow(Test).to receive(:dlopen).with(path).and_raise(ArgumentError)
+        end
+        allow(Test).to receive(:dlopen).with(library_names.first).and_return(nil)
+        Test.send(:dlopen_yajl_library)
+      end
+    end
+
+    context "ffi_open_yajl_library" do
+      it "should call ffi_lib against an expanded library name if it finds it on #{host_os}" do
+        allow(Test).to receive(:host_os).and_return(host_os)
+        library_names.each do |library_name|
+          path = File.expand_path(File.join(libyajl2_opt_path, library_name))
+          allow(File).to receive(:file?).with(path).and_return(true)
+          allow(Test).to receive(:ffi_lib).with(path).and_return(nil)
+        end
+        Test.send(:ffi_open_yajl_library)
+      end
+
+      it "if dlopen calls all raise it should still use 'yajl' on #{host_os}" do
+        allow(Test).to receive(:host_os).and_return(host_os)
+        library_names.each do |library_name|
+          path = File.expand_path(File.join(libyajl2_opt_path, library_name))
+          allow(File).to receive(:file?).with(path).and_return(true)
+          allow(Test).to receive(:ffi_lib).with(path).and_raise(LoadError)
+        end
+        allow(Test).to receive(:ffi_lib).with('yajl').and_return(nil)
+        Test.send(:ffi_open_yajl_library)
+      end
+    end
+
+  end
+end

data/spec/ffi_yajl/parser_spec.rb

@@ -1,4 +1,25 @@
 # encoding: UTF-8
+# Copyright (c) 2015 Lamont Granquist
+# Copyright (c) 2015 Chef Software, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 require 'spec_helper'
 
@@ -453,7 +474,9 @@ describe "FFI_Yajl::Parser" do
       end
     end
 
-    context "when parsing big floats", :ruby_gte_193 => true do
+    # NOTE: parsing floats with 8 million digits on windows has some kind of huge
+    #       perf issues likely in ruby and/or the underlying windows libs
+    context "when parsing big floats", :ruby_gte_193 => true, :unix_only => true do
       let(:json) { '[0.' + '1' * 2**23 + ']' }
 
       it "parses" do
@@ -469,6 +492,21 @@ describe "FFI_Yajl::Parser" do
         expect{ parser }.not_to raise_error
       end
     end
+
+    context "should ignore repeated keys by default" do
+      let(:json) { '{"foo":"bar","foo":"baz"}' }
+      it "should replace the first hash key with the second" do
+        expect(parser).to eql( "foo" => "baz" )
+      end
+    end
+
+    context "should raise an exception for repeated keys" do
+      let(:json) { '{"foo":"bar","foo":"baz"}' }
+      let(:options) { { :unique_key_checking => true } }
+      it "should raise" do
+        expect{ parser }.to raise_error(FFI_Yajl::ParseError)
+      end
+    end
   end
 
   context "when options are set to empty hash" do

data/spec/spec_helper.rb

@@ -1,8 +1,40 @@
+# Copyright (c) 2015 Lamont Granquist
+# Copyright (c) 2015 Chef Software, Inc.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 $: << File.expand_path(File.join(File.dirname( __FILE__ ), "../lib"))
 
+# load yajl-ruby into the same process (tests that both c-libs can be
+# linked in the same process).  this should work, see:
+# http://stackoverflow.com/questions/3232822/linking-with-multiple-versions-of-a-library
+begin
+  require 'yajl'
+rescue LoadError
+  # yajl can't be installed on jruby
+end
+
 require 'ffi_yajl'
 
 RSpec.configure do |c|
+  c.filter_run_excluding :unix_only => true unless RUBY_PLATFORM !~ /mswin|mingw|windows/
   c.filter_run_excluding :ruby_gte_19 => true unless RUBY_VERSION.to_f >= 1.9
   c.filter_run_excluding :ruby_gte_193 => true unless RUBY_VERSION.to_f >= 2.0 || RUBY_VERSION =~ /^1\.9\.3/
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-yajl
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Lamont Granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-17 00:00:00.000000000 Z
+date: 2015-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -81,33 +81,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: libyajl2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: libyajl2
+  name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
+        version: '1.5'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.5'
 description: Ruby FFI wrapper around YAJL 2.x
 email: lamont@getchef.com
 executables:
@@ -115,6 +115,7 @@ executables:
 extensions:
 - ext/ffi_yajl/ext/encoder/extconf.rb
 - ext/ffi_yajl/ext/parser/extconf.rb
+- ext/ffi_yajl/ext/dlopen/extconf.rb
 extra_rdoc_files:
 - README.md
 - LICENSE
@@ -123,6 +124,8 @@ files:
 - README.md
 - Rakefile
 - bin/ffi-yajl-bench
+- ext/ffi_yajl/ext/dlopen/dlopen.c
+- ext/ffi_yajl/ext/dlopen/extconf.rb
 - ext/ffi_yajl/ext/encoder/encoder.c
 - ext/ffi_yajl/ext/encoder/extconf.rb
 - ext/ffi_yajl/ext/parser/extconf.rb
@@ -154,10 +157,12 @@ files:
 - lib/ffi_yajl/ffi.rb
 - lib/ffi_yajl/ffi/encoder.rb
 - lib/ffi_yajl/ffi/parser.rb
+- lib/ffi_yajl/map_library_name.rb
 - lib/ffi_yajl/parser.rb
 - lib/ffi_yajl/platform.rb
 - lib/ffi_yajl/version.rb
 - spec/ffi_yajl/encoder_spec.rb
+- spec/ffi_yajl/map_library_name_spec.rb
 - spec/ffi_yajl/parser_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/chef/ffi-yajl
@@ -180,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Ruby FFI wrapper around YAJL 2.x