Cleaning up code - letting yajl do more heavy lifting for us. Also removing version change since that will occur during release.

2 files changed, 6 insertions, 3 deletions

diff --git a/lib/ffi_yajl/ffi/encoder.rb b/lib/ffi_yajl/ffi/encoder.rb
index 3724e49..8177f5f 100644
--- a/lib/ffi_yajl/ffi/encoder.rb
+++ b/lib/ffi_yajl/ffi/encoder.rb
@@ -203,10 +203,13 @@ class Object
   def ffi_yajl(yajl_gen, state)
     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
-      json = "\"#{to_s}\""
+      str = self.to_s
+      status = FFI_Yajl.yajl_gen_string(yajl_gen, str, str.bytesize)
     end
-    if ( status = FFI_Yajl.yajl_gen_number(yajl_gen, json, json.bytesize) ) != 0
+    if ( status ) != 0
       FFI_Yajl::Encoder.raise_error_for_status(status)
     end
   end
diff --git a/lib/ffi_yajl/version.rb b/lib/ffi_yajl/version.rb
index b175d87..2f55c2b 100644
--- a/lib/ffi_yajl/version.rb
+++ b/lib/ffi_yajl/version.rb
@@ -1,3 +1,3 @@
 module FFI_Yajl
-  VERSION = "1.1.1"
+  VERSION = "1.1.0"
 end