If an object does not have .to_json, we no longer try to call it

2 files changed, 22 insertions, 1 deletions

diff --git a/lib/ffi_yajl/ffi/encoder.rb b/lib/ffi_yajl/ffi/encoder.rb
index 3df366c..a493158 100644
--- a/lib/ffi_yajl/ffi/encoder.rb
+++ b/lib/ffi_yajl/ffi/encoder.rb
@@ -201,7 +201,11 @@ end
 # I feel dirty
 class Object
   def ffi_yajl(yajl_gen, state)
-    json = self.to_json(state[:json_opts])
+    if self.respond_to?(:to_json)
+      json = self.to_json(state[:json_opts])
+    else
+      json = self.to_s
+    end
     if ( status = FFI_Yajl.yajl_gen_number(yajl_gen, json, json.bytesize) ) != 0
       FFI_Yajl::Encoder.raise_error_for_status(status)
     end
diff --git a/spec/ffi_yajl/encoder_spec.rb b/spec/ffi_yajl/encoder_spec.rb
index f658d95..f89e3a1 100644
--- a/spec/ffi_yajl/encoder_spec.rb
+++ b/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