ffi-yajl 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b3576aa3b630817425565c2e7f18e03a6bf3144
-  data.tar.gz: 0ba4867aafcbd1b5ed11e5aac09fb949d7fc28e2
+  metadata.gz: c235f85b05fe53002a80aabdbb3fcb9eaef46055
+  data.tar.gz: b4c886b8c0bdf41a77f1c38b5a7387031b063f2f
 SHA512:
-  metadata.gz: 0437fb83e17971e61d8b07cc539de3184a7a5718471deeb91ffa57eac960519ab4429de20b944b9cb087ffee6138346c7e1cb2652ed62d8c794d7ca01f5e688f
-  data.tar.gz: ddf01b4b3eeac328bdd8226acbc40648615f09ad6ab8662192e3774ee02c97203b65a61e78f69e8356e9c619fc5f6cac7191ed8b2ac5bd946618e3a10696cabb
+  metadata.gz: 3bbddb072b8f2da7e76eac038af416adfadbb765d077bdd54a794246d71bd8051726a5ebb3f4e4178e260ee7cde3f299d16bde585b276432bcdb98cca1a570ea
+  data.tar.gz: de43d07a727f67bb6c4d1816b813fc2c79531fb65e97e778b0ba41f424feaa3e25fcf7d3b99104c60f672b3e0da91c11a246af2ec1c6059a33bd5e4048b6821b

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

@@ -2,6 +2,7 @@
 #include <yajl/yajl_gen.h>
 
 static VALUE mFFI_Yajl, mExt, mEncoder, mEncoder2, cEncodeError;
+static VALUE cDate, cTime, cDateTime;
 static VALUE cYajl_Gen;
 
 /* FIXME: the json gem does a whole bunch of indirection around monkeypatching...  not sure if we need to as well... */
@@ -62,7 +63,6 @@ int rb_cHash_ffi_yajl_callback(VALUE key, VALUE val, VALUE extra) {
   VALUE state = rb_hash_aref(extra, rb_str_new2("state"));
   VALUE rb_yajl_gen = rb_hash_aref(extra, rb_str_new2("yajl_gen"));
 
-
   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);
@@ -227,7 +227,8 @@ static VALUE rb_cString_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   return Qnil;
 }
 
-static VALUE rb_cSymbol_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
+/* calls #to_s on an object to encode it */
+static VALUE object_to_s_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);
@@ -241,6 +242,32 @@ static VALUE rb_cSymbol_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   return Qnil;
 }
 
+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);
+}
+
+static VALUE rb_cDate_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
+  return object_to_s_ffi_yajl(self, rb_yajl_gen, 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 Qnil;
+}
+
+static VALUE rb_cDateTime_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
+  return object_to_s_ffi_yajl(self, rb_yajl_gen, 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");
@@ -265,6 +292,10 @@ void Init_encoder() {
   cYajl_Gen = rb_define_class_under(mEncoder, "YajlGen", rb_cObject);
   rb_define_method(mEncoder, "do_yajl_encode", mEncoder_do_yajl_encode, 3);
 
+  cDate = rb_define_class("Date", rb_cObject);
+  cTime = rb_define_class("Time", rb_cObject);
+  cDateTime = rb_define_class("DateTime", cDate);
+
   rb_define_method(rb_cHash, "ffi_yajl", rb_cHash_ffi_yajl, 2);
   rb_define_method(rb_cArray, "ffi_yajl", rb_cArray_ffi_yajl, 2);
   rb_define_method(rb_cNilClass, "ffi_yajl", rb_cNilClass_ffi_yajl, 2);
@@ -275,6 +306,8 @@ void Init_encoder() {
   rb_define_method(rb_cFloat, "ffi_yajl", rb_cFloat_ffi_yajl, 2);
   rb_define_method(rb_cString, "ffi_yajl", rb_cString_ffi_yajl, 2);
   rb_define_method(rb_cSymbol, "ffi_yajl", rb_cSymbol_ffi_yajl, 2);
+  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(rb_cObject, "ffi_yajl", rb_cObject_ffi_yajl, 2);
 }
-

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

@@ -8,6 +8,9 @@ RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 $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 $CFLAGS
 puts $LDFLAGS
 

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

@@ -8,6 +8,9 @@ RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 $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 $CFLAGS
 puts $LDFLAGS
 

data/lib/ffi_yajl/ext.rb

@@ -4,28 +4,62 @@ require 'ffi_yajl/encoder'
 require 'ffi_yajl/parser'
 require 'ffi'
 require 'libyajl2'
-begin
-  require 'fiddle'
-rescue LoadError
-end
 
 module FFI_Yajl
   # 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")
   libpath = File.expand_path(File.join(Libyajl2.opt_path, libname))
   libpath.gsub!(/dylib/, 'bundle')
   libpath = ::FFI.map_library_name("yajl") unless File.exist?(libpath)
-  if defined?(Fiddle) && Fiddle.respond_to?(:dlopen)
-    ::Fiddle.dlopen(libpath)
-  else
-    # deliberately convoluted delayed require here to avoid deprecation
-    # warning from requiring dl
+
+  #
+  # 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
+
+  def self.try_dl_dlopen(libpath)
     require 'dl'
     if defined?(DL) && DL.respond_to?(:dlopen)
       ::DL.dlopen(libpath)
+      true
     else
-      raise "cannot find dlopen in either DL or Fiddle, cannot proceed"
+      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  Config::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 vi Fiddle, DL or FFI, what am I supposed to do?"
   end
 
   class Parser
@@ -38,4 +72,3 @@ module FFI_Yajl
     include FFI_Yajl::Ext::Encoder
   end
 end
-

data/lib/ffi_yajl/ffi/encoder.rb

@@ -171,6 +171,33 @@ class String
   end
 end
 
+class Date
+  def ffi_yajl(yajl_gen, state)
+    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
+  end
+end
+
+class Time
+  def ffi_yajl(yajl_gen, state)
+    str = self.strftime "%Y-%m-%d %H:%M:%S %z"
+    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 DateTime
+  def ffi_yajl(yajl_gen, state)
+    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
+  end
+end
+
 # I feel dirty
 class Object
   def ffi_yajl(yajl_gen, state)
@@ -180,4 +207,3 @@ class Object
     end
   end
 end
-

data/lib/ffi_yajl/json_gem.rb

@@ -101,6 +101,24 @@ class NilClass
   end
 end
 
+class Date
+  def to_json(*opts, &block)
+    FFI_Yajl::Encoder.encode(self, *opts)
+  end
+end
+
+class Time
+  def to_json(*opts, &block)
+    FFI_Yajl::Encoder.encode(self, *opts)
+  end
+end
+
+class DateTime
+  def to_json(*opts, &block)
+    FFI_Yajl::Encoder.encode(self, *opts)
+  end
+end
+
 module ::Kernel
   def JSON(object, opts = {})
     if object.respond_to? :to_s
@@ -118,4 +136,3 @@ class Object
     end
   end
 end
-

data/lib/ffi_yajl/version.rb

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

data/spec/ffi_yajl/encoder_spec.rb

@@ -1,6 +1,7 @@
 # encoding: UTF-8
 
 require 'spec_helper'
+require 'date'
 
 describe "FFI_Yajl::Encoder" do
 
@@ -60,4 +61,30 @@ describe "FFI_Yajl::Encoder" do
     end
   end
 
+  it "can encode Date objects" do
+    ruby = Date.parse('2001-02-03')
+    expect(encoder.encode(ruby)).to eq( %q{"2001-02-03"} )
+  end
+
+  context "when encoding Time objects in UTC timezone" do
+    before do
+      @saved_tz = ENV['TZ']
+      ENV['TZ'] = 'UTC'
+    end
+
+    after do
+      ENV['TZ'] = @saved_tz
+    end
+
+    it "encodes them correctly" do
+      ruby = Time.local(2001, 02, 02, 21, 05, 06)
+      expect(encoder.encode(ruby)).to eq( %q{"2001-02-02 21:05:06 +0000"} )
+    end
+  end
+
+  it "can encode DateTime objects" do
+    ruby = DateTime.parse('2001-02-03T04:05:06.1+07:00')
+    expect(encoder.encode(ruby)).to eq( %q{"2001-02-03T04:05:06+07:00"} )
+  end
+
 end

data/spec/ffi_yajl/json_gem_spec.rb

@@ -4,6 +4,7 @@
 # Kinda looks like they stole it from the JSON gem.  I updated the syntax a lot.
 
 require 'spec_helper'
+require 'date'
 
 class Dummy; end
 
@@ -148,19 +149,30 @@ describe "JSON Gem Compat API" do
         expect(d.to_json).to eq( %Q{"#{d.to_s}"} )
       end
 
-      it "encodes Time values correctly" do
-        t = Time.new
-        expect(t.to_json).to eq( %Q{"#{t.to_s}"} )
+      context "when encoding Time objects in UTC timezone" do
+        before do
+          @saved_tz = ENV['TZ']
+          ENV['TZ'] = 'UTC'
+        end
+
+        after do
+          ENV['TZ'] = @saved_tz
+        end
+
+        it "encodes Time values correctly" do
+          t = Time.local(2001, 02, 02, 21, 05, 06)
+          expect(t.to_json).to eq( %Q{"2001-02-02 21:05:06 +0000"} )
+        end
       end
 
       it "encodes Date values correctly" do
-        da = Date.new
-        expect(da.to_json).to eq( %Q{"#{da.to_s}"} )
+        da = Date.parse('2001-02-03')
+        expect(da.to_json).to eq( %Q{"2001-02-03"} )
       end
 
       it "encodes DateTime values correctly" do
-        dt = DateTime.new
-        expect(dt.to_json).to eq( %Q{"#{dt.to_s}"} )
+        dt = DateTime.parse('2001-02-03T04:05:06.1+07:00')
+        expect(dt.to_json).to eq( %Q{"2001-02-03T04:05:06+07:00"} )
       end
     end
 
@@ -230,7 +242,6 @@ describe "JSON Gem Compat API" do
       it_behaves_like "handles encoding and parsing correctly"
     end
 
-
     context "when dealing with common UTF-8 symbols" do
       let(:ruby) { [ "© ≠ €! \01" ] }
       let(:json) { "[\"© ≠ €! \\u0001\"]" }
@@ -277,7 +288,6 @@ describe "JSON Gem Compat API" do
     end
   end
 
-
     context "when encoding basic types with #to_json" do
       it "Array#to_json should work" do
         expect([ "a", "b", "c" ].to_json).to eq(%Q{["a","b","c"]})

metadata

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