brianmario-yajl-ruby 0.5.10 → 0.5.11

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.5.11 (July 14th, 2009)
+* fixing a bug Aman found with to_json on non-primitive Ruby objects and double-quoting in the JSON compat API
+
 ## 0.5.10 (July 13th, 2009)
 * Bugfix for the JSON gem compatibility API's default Object#to_json helper
 

data/VERSION.yml

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

data/ext/yajl_ext.c

@@ -562,28 +562,6 @@ static VALUE rb_yajl_encoder_set_progress_cb(VALUE self, VALUE callback) {
 
 // JSON Gem compatibility
 
-/*
- * Document-class: Object
- */
-/*
- * Document-method: to_json
- *
- * call-seq: to_json(encoder=Yajl::Encoder.new)
- *
- * +encoder+ is an existing Yajl::Encoder used to encode JSON
- *
- * Encodes an instance of Object to JSON
- */
-static VALUE rb_yajl_json_ext_object_to_json(int argc, VALUE * argv, VALUE self) {
-    VALUE rb_encoder;
-    rb_scan_args(argc, argv, "01", &rb_encoder);
-    if (rb_encoder == Qnil) {
-        rb_encoder = rb_yajl_encoder_new(0, NULL, cEncoder);
-    }
-    VALUE str = rb_funcall(self, intern_to_s, 0);
-    return rb_yajl_encoder_encode(1, &str, rb_encoder);
-}
-
 /*
  * Document-class: Hash
  */
@@ -763,7 +741,6 @@ static VALUE rb_yajl_json_ext_nil_to_json(int argc, VALUE * argv, VALUE self) {
  * Enables the JSON gem compatibility API
  */
 static VALUE rb_yajl_encoder_enable_json_gem_ext(VALUE klass) {
-    rb_define_method(rb_cObject, "to_json", rb_yajl_json_ext_object_to_json, -1);
     rb_define_method(rb_cHash, "to_json", rb_yajl_json_ext_hash_to_json, -1);
     rb_define_method(rb_cArray, "to_json", rb_yajl_json_ext_array_to_json, -1);
     rb_define_method(rb_cFixnum, "to_json", rb_yajl_json_ext_fixnum_to_json, -1);

data/ext/yajl_ext.h

@@ -71,7 +71,6 @@ static VALUE rb_yajl_encoder_set_progress_cb(VALUE self, VALUE callback);
 static void yajl_encoder_wrapper_free(void * wrapper);
 static void yajl_encoder_wrapper_mark(void * wrapper);
 
-static VALUE rb_yajl_json_ext_object_to_json(int argc, VALUE * argv, VALUE self);
 static VALUE rb_yajl_json_ext_hash_to_json(int argc, VALUE * argv, VALUE self);
 static VALUE rb_yajl_json_ext_array_to_json(int argc, VALUE * argv, VALUE self);
 static VALUE rb_yajl_json_ext_fixnum_to_json(int argc, VALUE * argv, VALUE self);

data/lib/yajl/json_gem/encoding.rb

@@ -5,6 +5,13 @@ require 'yajl' unless defined?(Yajl::Parser)
 # extension that can be included when this file is.
 Yajl::Encoder.enable_json_gem_compatability
 
+# Our fallback to_json definition
+class Object
+  def to_json(*args, &block)
+    to_s
+  end
+end
+
 module JSON
   def self.generate(obj, opts={})
     begin

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.10"
+  VERSION = "0.5.11"
   
   class Parser
     # A helper method for parse-and-forget use-cases

data/spec/json_gem_compatibility/compatibility_spec.rb

@@ -19,7 +19,7 @@ describe "JSON Gem compatability API" do
   end
   
   it "should mixin #to_json on base objects after compatability has been enabled" do
-    Yajl::Encoder.enable_json_gem_compatability
+    require 'yajl/json_gem'
     d = Dummy.new
     
     d.respond_to?(:to_json).should be_true
@@ -34,8 +34,6 @@ describe "JSON Gem compatability API" do
   end
   
   it "should require yajl/json_gem to enable the compatability API" do
-    require 'yajl/json_gem'
-    
     defined?(JSON).should be_true
     
     JSON.respond_to?(:parse).should be_true
@@ -55,16 +53,16 @@ describe "JSON Gem compatability API" do
   
   it "should encode arbitrary classes via their default to_json method" do
     d = Dummy.new
-    d.to_json.should == "\"#{d.to_s}\""
+    d.to_json.should == "#{d.to_s}"
     
     t = Time.now
-    t.to_json.should == "\"#{t.to_s}\""
+    t.to_json.should == "#{t.to_s}"
     
     da = Date.today
-    da.to_json.should == "\"#{da.to_s}\""
+    da.to_json.should == "#{da.to_s}"
     
     dt = DateTime.new
-    dt.to_json.should == "\"#{dt.to_s}\""
+    dt.to_json.should == "#{dt.to_s}"
   end
   
   context "ported tests for Unicode" do

data/yajl-ruby.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.5.10"
+  s.version = "0.5.11"
 
   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-13}
+  s.date = %q{2009-07-14}
   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: brianmario-yajl-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.5.10
+  version: 0.5.11
 platform: ruby
 authors: 
 - Brian Lopez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-13 00:00:00 -07:00
+date: 2009-07-14 00:00:00 -07:00
 default_executable: 
 dependencies: []