ffi-yajl 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c235f85b05fe53002a80aabdbb3fcb9eaef46055
-  data.tar.gz: b4c886b8c0bdf41a77f1c38b5a7387031b063f2f
+  metadata.gz: f424af28e01cb3f1253f61010285bd3811b7a76e
+  data.tar.gz: 1008ba36c8873d22d35a50de9fc03a8efb26c803
 SHA512:
-  metadata.gz: 3bbddb072b8f2da7e76eac038af416adfadbb765d077bdd54a794246d71bd8051726a5ebb3f4e4178e260ee7cde3f299d16bde585b276432bcdb98cca1a570ea
-  data.tar.gz: de43d07a727f67bb6c4d1816b813fc2c79531fb65e97e778b0ba41f424feaa3e25fcf7d3b99104c60f672b3e0da91c11a246af2ec1c6059a33bd5e4048b6821b
+  metadata.gz: 0094f0e84b108549bf70bc2f4e5e37509ca3a06498201e8a26034f0d2142e52dc023656cd8abab5946d607dce10cec4d080fe50810b3c654662499d11717b1ff
+  data.tar.gz: de12c5a201956bcb7b35d5ca71b99e515063c94b181cabe698f9969075dd5c4cb180ded3fba81c8e97dbfa12db88a6d1da15fd0952bc3f622ea0df9c73246ac6

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

@@ -272,14 +272,20 @@ 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, json_opts);
-  CHECK_STATUS(
-    yajl_gen_number(yajl_gen, (char *)RSTRING_PTR(str), RSTRING_LEN(str))
-  );
+  if ( rb_respond_to(self, sym_to_json) ) {
+    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, json_opts);
+    CHECK_STATUS(
+      yajl_gen_number(yajl_gen, (char *)RSTRING_PTR(str), RSTRING_LEN(str))
+    );
+  } else {
+    object_to_s_ffi_yajl(self, rb_yajl_gen, state);
+  }
+
   return Qnil;
 }
 

data/lib/ffi_yajl/ext.rb

@@ -10,6 +10,8 @@ module FFI_Yajl
   # 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 libname == "yajl.dll"
   libpath = File.expand_path(File.join(Libyajl2.opt_path, libname))
   libpath.gsub!(/dylib/, 'bundle')
   libpath = ::FFI.map_library_name("yajl") unless File.exist?(libpath)
@@ -48,7 +50,7 @@ module FFI_Yajl
     extend ::FFI::Library
     ffi_lib 'dl'
     attach_function 'dlopen', :dlopen, [:string, :int], :void
-    if  Config::CONFIG['host_os'] =~ /linux/i
+    if  RbConfig::CONFIG['host_os'] =~ /linux/i
       dlopen libpath, 0x102  # linux: RTLD_GLOBAL | RTLD_NOW
     else
       dlopen libpath, 0

data/lib/ffi_yajl/ffi.rb

@@ -7,6 +7,8 @@ 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')
 

data/lib/ffi_yajl/ffi/encoder.rb

@@ -201,8 +201,15 @@ end
 # I feel dirty
 class Object
   def ffi_yajl(yajl_gen, state)
-    json = self.to_json(state[:json_opts])
-    if ( status = FFI_Yajl.yajl_gen_number(yajl_gen, json, json.bytesize) ) != 0
+    if self.respond_to?(:to_json)
+      json = self.to_json(state[:json_opts])
+      # #yajl_gen_number outputs a string without quotes around it
+      status = FFI_Yajl.yajl_gen_number(yajl_gen, json, json.bytesize)
+    else
+      str = self.to_s
+      status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize)
+    end
+    if ( status ) != 0
       FFI_Yajl::Encoder.raise_error_for_status(status)
     end
   end

data/lib/ffi_yajl/version.rb

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

data/spec/ffi_yajl/encoder_spec.rb

@@ -87,4 +87,21 @@ describe "FFI_Yajl::Encoder" do
     expect(encoder.encode(ruby)).to eq( %q{"2001-02-03T04:05:06+07:00"} )
   end
 
+  describe "testing .to_json for Objects" do
+    class NoToJson; end
+    class HasToJson
+      def to_json(*args)
+        "{}"
+      end
+    end
+
+    it "calls .to_s for objects without .to_json" do
+      expect(encoder.encode(NoToJson.new)).to match(/^"#<NoToJson:\w+>"$/)
+    end
+
+    it "calls .to_json for objects wit .to_json" do
+      expect(encoder.encode(HasToJson.new)).to eq("{}")
+    end
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi-yajl
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Lamont Granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake