yajl-ruby 0.5.9 → 0.5.10

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.5.10 (July 13th, 2009)
+* Bugfix for the JSON gem compatibility API's default Object#to_json helper
+
 ## 0.5.9 (July 9th, 2009)
 * Bugfix for Yajl::Encoder where encoding a hash like {:a => :b} would get stuck in an infinite loop
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 9
+:patch: 10
 :major: 0
 :minor: 5

data/ext/yajl_ext.c

@@ -136,10 +136,6 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
         case T_STRING:
             status = yajl_gen_string(w->encoder, (const unsigned char *)RSTRING_PTR(obj), (unsigned int)RSTRING_LEN(obj));
             break;
-        case T_SYMBOL:
-            str = rb_funcall(obj, intern_to_s, 0);
-            status = yajl_gen_string(w->encoder, (const unsigned char *)RSTRING_PTR(str), (unsigned int)RSTRING_LEN(str));
-            break;
         default:
             if (rb_respond_to(obj, intern_to_json)) {
                 str = rb_funcall(obj, intern_to_json, 0);
@@ -584,7 +580,8 @@ static VALUE rb_yajl_json_ext_object_to_json(int argc, VALUE * argv, VALUE self)
     if (rb_encoder == Qnil) {
         rb_encoder = rb_yajl_encoder_new(0, NULL, cEncoder);
     }
-    return rb_yajl_encoder_encode(1, &self, rb_encoder);
+    VALUE str = rb_funcall(self, intern_to_s, 0);
+    return rb_yajl_encoder_encode(1, &str, rb_encoder);
 }
 
 /*

data/lib/yajl.rb

@@ -13,7 +13,7 @@ require 'yajl_ext'
 #
 # Ruby bindings to the excellent Yajl (Yet Another JSON Parser) ANSI C library.
 module Yajl
-  VERSION = "0.5.9"
+  VERSION = "0.5.10"
   
   class Parser
     # A helper method for parse-and-forget use-cases

data/spec/json_gem_compatibility/compatibility_spec.rb

@@ -53,6 +53,20 @@ describe "JSON Gem compatability API" do
     JSON.default_options[:symbolize_keys] = default # ensure the rest of the test cases expect the default
   end
   
+  it "should encode arbitrary classes via their default to_json method" do
+    d = Dummy.new
+    d.to_json.should == "\"#{d.to_s}\""
+    
+    t = Time.now
+    t.to_json.should == "\"#{t.to_s}\""
+    
+    da = Date.today
+    da.to_json.should == "\"#{da.to_s}\""
+    
+    dt = DateTime.new
+    dt.to_json.should == "\"#{dt.to_s}\""
+  end
+  
   context "ported tests for Unicode" do
     it "should be able to encode and parse unicode" do
       pending if RUBY_VERSION.include?('1.9') # FIXME: Some string encoding problem with 1.9

data/yajl-ruby.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.5.9"
+  s.version = "0.5.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Lopez", "Lloyd Hilaiel"]
-  s.date = %q{2009-07-09}
+  s.date = %q{2009-07-13}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yajl-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.5.9
+  version: 0.5.10
 platform: ruby
 authors: 
 - Brian Lopez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-09 00:00:00 -07:00
+date: 2009-07-13 00:00:00 -07:00
 default_executable: 
 dependencies: []