brianmario-yajl-ruby 0.6.1 → 0.6.3

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.6.3 (August 25th, 2009)
+* Fixed a bug in the JSON gem compatibility API where strings weren't being properly escaped
+
+## 0.6.2 (August 25th, 2009)
+* Fixed a bug surfaced by an existing library providing a to_json method, and Yajl would double-quote the values provided
+
 ## 0.6.1 (August 20th, 2009)
 * Fixed a bug in Yajl::HttpStream where responses contained multiple JSON strings but weren't Transfer-Encoding: chunked (thanks @dacort!)
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 6
-:patch: 1
+:patch: 3
 :major: 0

data/benchmark/encode_json_and_yaml.rb

@@ -30,7 +30,7 @@ Benchmark.bm { |x|
 }
 
 # YAML Section
-filename = 'benchmark/subjects/contacts.yml'
+filename = 'benchmark/subjects/ohai.yml'
 yml = File.new(filename, 'r')
 data = YAML.load_stream(yml)
 yml.close

data/benchmark/parse_json_and_yaml.rb

@@ -35,7 +35,7 @@ Benchmark.bm { |x|
 json.close
 
 # YAML section
-filename = 'benchmark/subjects/contacts.yml'
+filename = 'benchmark/subjects/ohai.yml'
 yaml = File.new(filename, 'r')
 
 # warm up the filesystem

data/ext/api/yajl_gen.h

@@ -96,7 +96,8 @@ extern "C" {
                                              unsigned int len);
     yajl_gen_status YAJL_API yajl_gen_string(yajl_gen hand,
                                              const unsigned char * str,
-                                             unsigned int len);
+                                             unsigned int len,
+                                             int quote);
     yajl_gen_status YAJL_API yajl_gen_null(yajl_gen hand);
     yajl_gen_status YAJL_API yajl_gen_bool(yajl_gen hand, int boolean);    
     yajl_gen_status YAJL_API yajl_gen_map_open(yajl_gen hand);

data/ext/yajl_ext.c

@@ -79,6 +79,7 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
     int idx = 0;
     const unsigned char * buffer;
     unsigned int len;
+    int quote_strings = 1;
     
     if (io != Qnil || w->on_progress_callback != Qnil) {
         status = yajl_gen_get_buf(w->encoder, &buffer, &len);
@@ -135,15 +136,16 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
             status = yajl_gen_number(w->encoder, RSTRING_PTR(str), (unsigned int)RSTRING_LEN(str));
             break;
         case T_STRING:
-            status = yajl_gen_string(w->encoder, (const unsigned char *)RSTRING_PTR(obj), (unsigned int)RSTRING_LEN(obj));
+            status = yajl_gen_string(w->encoder, (const unsigned char *)RSTRING_PTR(obj), (unsigned int)RSTRING_LEN(obj), 1);
             break;
         default:
             if (rb_respond_to(obj, intern_to_json)) {
                 str = rb_funcall(obj, intern_to_json, 0);
+                quote_strings = 0; // this lets us append on to the buffer without Yajl quoting it again
             } else {
                 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));
+            status = yajl_gen_string(w->encoder, (const unsigned char *)RSTRING_PTR(str), (unsigned int)RSTRING_LEN(str), quote_strings);
             break;
     }
 }

data/ext/yajl_gen.c

@@ -190,12 +190,17 @@ yajl_gen_number(yajl_gen g, const char * s, unsigned int l)
 
 yajl_gen_status
 yajl_gen_string(yajl_gen g, const unsigned char * str,
-                unsigned int len)
+                unsigned int len, int quote)
 {
     ENSURE_VALID_STATE; INSERT_SEP; INSERT_WHITESPACE;
-    yajl_buf_append(g->buf, "\"", 1);
-    yajl_string_encode(g->buf, str, len);
-    yajl_buf_append(g->buf, "\"", 1);
+    if (quote) {
+        yajl_buf_append(g->buf, "\"", 1);
+        yajl_string_encode(g->buf, str, len);
+        yajl_buf_append(g->buf, "\"", 1);
+    } else {
+        yajl_buf_append(g->buf, str, len);
+    }
+    
     APPENDED_ATOM;
     FINAL_NEWLINE;
     return yajl_gen_status_ok;

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

data/lib/yajl/json_gem/encoding.rb

@@ -8,7 +8,7 @@ Yajl::Encoder.enable_json_gem_compatability
 # Our fallback to_json definition
 class Object
   def to_json(*args, &block)
-    to_s
+    "\"#{to_s}\""
   end
 end
 

data/spec/encoding/encoding_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 class Dummy2
   def to_json
-    "hawtness"
+    '"hawtness"'
   end
 end
 

data/spec/json_gem_compatibility/compatibility_spec.rb

@@ -53,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

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.6.1"
+  s.version = "0.6.3"
 
   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-08-20}
+  s.date = %q{2009-08-25}
   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.6.1
+  version: 0.6.3
 platform: ruby
 authors: 
 - Brian Lopez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-20 00:00:00 -07:00
+date: 2009-08-25 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -162,7 +162,6 @@ files:
 - yajl-ruby.gemspec
 has_rdoc: false
 homepage: http://github.com/brianmario/yajl-ruby
-licenses: 
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -184,7 +183,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: yajl-ruby
-rubygems_version: 1.3.5
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 3
 summary: Ruby C bindings to the excellent Yajl JSON stream-based parser library.