yajl-ruby 0.7.0 → 0.7.1

data/.gitignore

@@ -5,4 +5,5 @@ benchmark/subjects/contacts.*
 *.dylib
 *.bundle
 TODO.txt
-tmp/*
+tmp/*
+pkg/*

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.7.1 (February 17th, 2010)
+* revert a patch made to bundled Yajl enabling optional quoting of strings that broke binary API compatibility
+
 ## 0.7.0 (February 5th, 2010)
 * ensure utf8 encoding is set on relevant strings during parse/encode in 1.9
 

data/VERSION.yml

@@ -2,4 +2,4 @@
 :major: 0
 :minor: 7
 :build: 
-:patch: 0
+:patch: 1

data/ext/api/yajl_gen.h

@@ -132,10 +132,9 @@ extern "C" {
                                              unsigned int len);
     yajl_gen_status YAJL_API yajl_gen_string(yajl_gen hand,
                                              const unsigned char * str,
-                                             unsigned int len,
-                                             int quote);
+                                             unsigned int len);
     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_bool(yajl_gen hand, int boolean);
     yajl_gen_status YAJL_API yajl_gen_map_open(yajl_gen hand);
     yajl_gen_status YAJL_API yajl_gen_map_close(yajl_gen hand);
     yajl_gen_status YAJL_API yajl_gen_array_open(yajl_gen hand);

data/ext/yajl_ext.c

@@ -132,7 +132,6 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
     const unsigned char * buffer;
     const char * cptr;
     unsigned int len;
-    int quote_strings = 1;
     
     if (io != Qnil || w->on_progress_callback != Qnil) {
         status = yajl_gen_get_buf(w->encoder, &buffer, &len);
@@ -194,17 +193,16 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
             break;
         case T_STRING:
             cptr = RSTRING_PTR(obj);
-            status = yajl_gen_string(w->encoder, (const unsigned char *)cptr, (unsigned int)strlen(cptr), 1);
+            status = yajl_gen_string(w->encoder, (const unsigned char *)cptr, (unsigned int)strlen(cptr));
             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);
             }
             cptr = RSTRING_PTR(str);
-            status = yajl_gen_string(w->encoder, (const unsigned char *)cptr, (unsigned int)strlen(cptr), quote_strings);
+            status = yajl_gen_string(w->encoder, (const unsigned char *)cptr, (unsigned int)strlen(cptr));
             break;
     }
 }

data/ext/yajl_gen.c

@@ -216,21 +216,13 @@ 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, int quote)
+                unsigned int len)
 {
     ENSURE_VALID_STATE; INSERT_SEP; INSERT_WHITESPACE;
-    if (quote) {
-        g->print(g->ctx, "\"", 1);
-        yajl_string_encode2(g->print, g->ctx, str, len);
-        g->print(g->ctx, "\"", 1);
-    } else {
-        g->print(g->ctx, (const char *)str, len);
-    }
-    
+    g->print(g->ctx, "\"", 1);
+    yajl_string_encode2(g->print, g->ctx, str, len);
+    g->print(g->ctx, "\"", 1);
     
-    APPENDED_ATOM;
-    FINAL_NEWLINE;
-    return yajl_gen_status_ok;
     
     APPENDED_ATOM;
     FINAL_NEWLINE;

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.7.0"
+  VERSION = "0.7.1"
   
   # For compatibility, has the same signature of Yajl::Parser.parse
   def self.load(str_or_io, options={}, read_bufsize=nil, &block)

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/yajl-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.7.0"
+  s.version = "0.7.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Lopez", "Lloyd Hilaiel"]
-  s.date = %q{2010-02-05}
+  s.date = %q{2010-02-17}
   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.7.0
+  version: 0.7.1
 platform: ruby
 authors: 
 - Brian Lopez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-05 00:00:00 -08:00
+date: 2010-02-17 00:00:00 -08:00
 default_executable: 
 dependencies: []