ffi-yajl 1.3.0-universal-java → 1.3.1-universal-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78b174d432e532e7ce493e825ab04fb81732d0e8
-  data.tar.gz: 97199ad459ab9d164231563dc91fe26d4923c22f
+  metadata.gz: b53bc9d9531949a27cb05b5877baa594e691362f
+  data.tar.gz: dc3398cacd981441353db287b91fccdbf24266f3
 SHA512:
-  metadata.gz: 417f7f79a50826cd7315ba893bfe01c3e16fc615a368af5c37b471de854ba036013deea0eb382fd3dcd50c81b2d32e322bcc9549c479c5b9c93daabd3cfb2802
-  data.tar.gz: c4e9a16d122714c1446e82993ac4b979aaf4ad0373b1110581ac5fb683c767908ae90dace4aafb1d89456c858945e62004bae3975c92d8de5e6695c169b6b077
+  metadata.gz: 46f5f8029d0ef32c8c904f38093e422bfb7fd61078245c20f58997498d09df24a5ee212dda38cf745f97c3757709c0a229d41fa0eb6bc4e4787a18ff4cd1703f
+  data.tar.gz: 5528506311181bc998ce071935157f74c027313fb43af831fae27253016f271c5ea8b66315959f885132dc7b1d45c5b7a1c4080b9ac9e729977df90b0b7deebe

data/Rakefile

@@ -22,7 +22,8 @@ end
 unix_gemspec = eval(File.read("ffi-yajl.gemspec"))
 
 task :clean do
-  sh "rm -rf pkg/* lib/ffi_yajl/ext/*"
+  sh "rm -f Gemfile.lock"
+  sh "rm -rf pkg/* tmp/* .bundle lib/ffi_yajl/ext/*"
 end
 
 desc "install the gem locally"

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

@@ -345,7 +345,7 @@ static VALUE rb_cObject_ffi_yajl(VALUE self, VALUE rb_yajl_gen, VALUE state) {
   ID sym_to_json = rb_intern("to_json");
   VALUE str;
 
-  if ( rb_respond_to(self, sym_to_json) ) {
+  if ( rb_hash_aref(state, rb_str_new2("processing_key")) != Qtrue && 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);

data/lib/ffi_yajl/ffi/encoder.rb

@@ -236,7 +236,7 @@ end
 # I feel dirty
 class Object
   def ffi_yajl(yajl_gen, state)
-    if self.respond_to?(:to_json)
+    if !state[:processing_key] && 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)

data/lib/ffi_yajl/version.rb

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

data/spec/ffi_yajl/encoder_spec.rb

@@ -47,6 +47,23 @@ describe "FFI_Yajl::Encoder" do
     expect(encoder.encode(ruby)).to eq('{"12345678901234567890":2}')
   end
 
+  it "encodes objects in keys as strings" do
+    o = Object.new
+    ruby = { o => 2 }
+    expect(encoder.encode(ruby)).to eq(%Q{{"#{o.to_s}":2}})
+  end
+
+  it "encodes an object in a key which has a #to_json method as strings" do
+    class Thing
+      def to_json(*a)
+        "{}"
+      end
+    end
+    o = Thing.new
+    ruby = { o => 2 }
+    expect(encoder.encode(ruby)).to eq(%Q{{"#{o.to_s}":2}})
+  end
+
   # XXX: 127 == YAJL_MAX_DEPTH hardcodedness, zero control for us, it isn't even a twiddleable #define
   it "raises an exception for deeply nested arrays" do
     root = []

metadata

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