yajl-ruby 0.8.2 → 0.8.3

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.8.3 (August 16th, 2011)
+* fix bug where Yajl::HttpStream wouldn't pass through a user-specified socket
+* fix incorrect Ruby initialization hook method name
+* Bump bundled YAJL version to 1.0.12
+* fix to correctly symbolize multibyte characters on 1.9
+* add `:headers` option to Yajl::HttpStream for user-specified arbitrary headers
+
 ## 0.8.2 (March 22nd, 2011)
 * define RSTRING_NOT_MODIFIED for rbx to prevent string caching, making things A LOT faster (100x)
 

data/README.rdoc

@@ -19,13 +19,9 @@ You can read more info at the project's website http://lloyd.github.com/yajl or
 
 == How to install
 
-First make sure you've got Gemcutter in your sources list:
+Go ahead and install it as usual:
 
- gem sources -a http://gemcutter.org
-
-Then go ahead and install it as usual:
-
- sudo gem install yajl-ruby
+ gem install yajl-ruby
 
 == Example of use
 
@@ -137,7 +133,7 @@ Since yajl-ruby does everything using streams, you simply need to pass the objec
 
 This allows you to encode JSON as a stream, writing directly to a socket
 
- socket = TCPSocket.new(192.168.1.101, 9000)
+ socket = TCPSocket.new('192.168.1.101', 9000)
  hash = {:foo => 12425125, :bar => "some string", ... }
  encoder = Yajl::Encoder.new
  Yajl::Encoder.encode(hash, socket)
@@ -145,14 +141,14 @@ This allows you to encode JSON as a stream, writing directly to a socket
 Or what if you wanted to compress the stream over the wire?
 
  require 'yajl/gzip'
- socket = TCPSocket.new(192.168.1.101, 9000)
+ socket = TCPSocket.new('192.168.1.101', 9000)
  hash = {:foo => 12425125, :bar => "some string", ... }
  Yajl::Gzip::StreamWriter.encode(hash, socket)
 
 Or what about encoding multiple objects to JSON over the same stream?
 This example will encode and send 50 JSON objects over the same stream, continuously.
 
- socket = TCPSocket.new(192.168.1.101, 9000)
+ socket = TCPSocket.new('192.168.1.101', 9000)
  encoder = Yajl::Encoder.new
  50.times do
    hash = {:current_time => Time.now.to_f, :foo => 12425125}
@@ -327,4 +323,4 @@ I've had a lot of inspiration, and a lot of help. Thanks to everyone who's been
 * Luke Redpath
 * Neil Berkman
 * Pavel Valodzka
-* Rob Sharp
+* Rob Sharp

data/ext/yajl/api/yajl_version.h

@@ -5,7 +5,7 @@
 
 #define YAJL_MAJOR 1
 #define YAJL_MINOR 0
-#define YAJL_MICRO 11
+#define YAJL_MICRO 12
 
 #define YAJL_VERSION ((YAJL_MAJOR * 10000) + (YAJL_MINOR * 100) + YAJL_MICRO)
 

data/ext/yajl/yajl_encode.c

@@ -89,7 +89,7 @@ yajl_string_encode2(const yajl_print_t print,
         }
         if (escaped != NULL) {
             print(ctx, (const char *) (str + beg), end - beg);
-            print(ctx, escaped, strlen(escaped));
+            print(ctx, escaped, (unsigned int)strlen(escaped));
             beg = ++end;
         } else {
             ++end;
@@ -179,12 +179,19 @@ void yajl_string_decode(yajl_buf buf, const unsigned char * str,
                     
                     Utf32toUtf8(codepoint, utf8Buf);
                     unescaped = utf8Buf;
+
+                    if (codepoint == 0) {
+                        yajl_buf_append(buf, unescaped, 1);
+                        beg = ++end;
+                        continue;
+                    }
+
                     break;
                 }
                 default:
                     assert("this should never happen" == NULL);
             }
-            yajl_buf_append(buf, unescaped, strlen(unescaped));
+            yajl_buf_append(buf, unescaped, (unsigned int)strlen(unescaped));
             beg = ++end;
         } else {
             end++;

data/ext/yajl/yajl_ext.c

@@ -286,7 +286,12 @@ static int yajl_found_hash_key(void * ctx, const unsigned char * stringVal, unsi
         char buf[stringLen+1];
         memcpy(buf, stringVal, stringLen);
         buf[stringLen] = 0;
-        yajl_set_static_value(ctx, ID2SYM(rb_intern(buf)));
+        VALUE stringEncoded = rb_str_new2(buf);
+#ifdef HAVE_RUBY_ENCODING_H
+        rb_enc_associate(stringEncoded, rb_utf8_encoding());
+#endif
+
+        yajl_set_static_value(ctx, ID2SYM(rb_to_id(stringEncoded)));
     } else {
         keyStr = rb_str_new((const char *)stringVal, stringLen);
 #ifdef HAVE_RUBY_ENCODING_H

data/ext/yajl/yajl_ext.h

@@ -132,4 +132,4 @@ static VALUE rb_yajl_json_ext_false_to_json(int argc, VALUE * argv, VALUE self);
 static VALUE rb_yajl_json_ext_nil_to_json(int argc, VALUE * argv, VALUE self);
 static VALUE rb_yajl_encoder_enable_json_gem_ext(VALUE klass);
 
-void Init_yajl_ext();
+void Init_yajl();

data/ext/yajl/yajl_gen.c

@@ -91,13 +91,32 @@ yajl_gen_alloc2(const yajl_print_t callback,
     }
 
     g = (yajl_gen) YA_MALLOC(afs, sizeof(struct yajl_gen_t));
+    if (!g) return NULL;
+
     memset((void *) g, 0, sizeof(struct yajl_gen_t));
     /* copy in pointers to allocation routines */
     memcpy((void *) &(g->alloc), (void *) afs, sizeof(yajl_alloc_funcs));
 
     if (config) {
+        const char *indent = config->indentString;
         g->pretty = config->beautify;
-        g->indentString = config->indentString ? config->indentString : "  ";
+        g->indentString = config->indentString;
+        if (indent) {
+          for (; *indent; indent++) {
+            if (*indent != '\n'
+                && *indent != '\v'
+                && *indent != '\f'
+                && *indent != '\t'
+                && *indent != '\r'
+                && *indent != ' ') {
+              g->indentString = NULL;
+              break;
+            }
+          }
+        }
+        if (!g->indentString) {
+          g->indentString = "  ";
+        }
         g->htmlSafe = config->htmlSafe;
     }
 
@@ -134,15 +153,17 @@ yajl_gen_free(yajl_gen g)
         if (g->state[g->depth] != yajl_gen_map_val) {                   \
             unsigned int _i;                                            \
             for (_i=0;_i<g->depth;_i++)                                 \
-                g->print(g->ctx, g->indentString,                       \
-                         strlen(g->indentString));                      \
+                g->print(g->ctx,                                        \
+                         g->indentString,                               \
+                         (unsigned int)strlen(g->indentString));        \
         }                                                               \
     }
 
 #define ENSURE_NOT_KEY \
-    if (g->state[g->depth] == yajl_gen_map_key) {   \
-        return yajl_gen_keys_must_be_strings;       \
-    }                                               \
+    if (g->state[g->depth] == yajl_gen_map_key ||       \
+        g->state[g->depth] == yajl_gen_map_start)  {    \
+        return yajl_gen_keys_must_be_strings;           \
+    }                                                   \
 
 /* check that we're not complete, or in error state.  in a valid state
  * to be generating */
@@ -156,6 +177,9 @@ yajl_gen_free(yajl_gen g)
 #define INCREMENT_DEPTH \
     if (++(g->depth) >= YAJL_MAX_DEPTH) return yajl_max_depth_exceeded;
 
+#define DECREMENT_DEPTH \
+    if (--(g->depth) >= YAJL_MAX_DEPTH) return yajl_gen_error;
+
 #define APPENDED_ATOM \
     switch (g->state[g->depth]) {                   \
         case yajl_gen_map_start:                    \
@@ -180,7 +204,7 @@ yajl_gen_integer(yajl_gen g, long int number)
     char i[32];
     ENSURE_VALID_STATE; ENSURE_NOT_KEY; INSERT_SEP; INSERT_WHITESPACE;
     sprintf(i, "%ld", number);
-    g->print(g->ctx, i, strlen(i));
+    g->print(g->ctx, i, (unsigned int)strlen(i));
     APPENDED_ATOM;
     FINAL_NEWLINE;
     return yajl_gen_status_ok;
@@ -200,7 +224,7 @@ yajl_gen_double(yajl_gen g, double number)
     if (isnan(number) || isinf(number)) return yajl_gen_invalid_number;
     INSERT_SEP; INSERT_WHITESPACE;
     sprintf(i, "%.20g", number);
-    g->print(g->ctx, i, strlen(i));
+    g->print(g->ctx, i, (unsigned int)strlen(i));
     APPENDED_ATOM;
     FINAL_NEWLINE;
     return yajl_gen_status_ok;
@@ -245,7 +269,7 @@ yajl_gen_bool(yajl_gen g, int boolean)
     const char * val = boolean ? "true" : "false";
 
 	ENSURE_VALID_STATE; ENSURE_NOT_KEY; INSERT_SEP; INSERT_WHITESPACE;
-    g->print(g->ctx, val, strlen(val));
+    g->print(g->ctx, val, (unsigned int)strlen(val));
     APPENDED_ATOM;
     FINAL_NEWLINE;
     return yajl_gen_status_ok;
@@ -268,7 +292,8 @@ yajl_gen_status
 yajl_gen_map_close(yajl_gen g)
 {
     ENSURE_VALID_STATE; 
-    (g->depth)--;
+    DECREMENT_DEPTH;
+    
     if (g->pretty) g->print(g->ctx, "\n", 1);
     APPENDED_ATOM;
     INSERT_WHITESPACE;
@@ -293,8 +318,8 @@ yajl_gen_status
 yajl_gen_array_close(yajl_gen g)
 {
     ENSURE_VALID_STATE;
+    DECREMENT_DEPTH;
     if (g->pretty) g->print(g->ctx, "\n", 1);
-    (g->depth)--;
     APPENDED_ATOM;
     INSERT_WHITESPACE;
     g->print(g->ctx, "]", 1);

data/ext/yajl/yajl_parser.c

@@ -111,9 +111,9 @@ yajl_render_error_string(yajl_handle hand, const unsigned char * jsonText,
         text[i] = 0;
         {
             char * newStr = (char *)
-                YA_MALLOC(&(hand->alloc), (strlen((char *) str) +
-                                           strlen((char *) text) +
-                                           strlen(arrow) + 1));
+                YA_MALLOC(&(hand->alloc), (unsigned int)(strlen((char *) str) +
+                                                         strlen((char *) text) +
+                                                         strlen(arrow) + 1));
             newStr[0] = 0;
             strcat((char *) newStr, (char *) str);
             strcat((char *) newStr, text);

data/lib/yajl/http_stream.rb

@@ -90,31 +90,42 @@ module Yajl
           uri = URI.parse(uri)
         end
 
-        user_agent = opts.has_key?('User-Agent') ? opts.delete(['User-Agent']) : "Yajl::HttpStream #{Yajl::VERSION}"
+        default_headers = {
+          "User-Agent" => opts["User-Agent"] || "Yajl::HttpStream #{Yajl::VERSION}",
+          "Accept" => "*/*",
+          "Accept-Charset" => "utf-8"
+        }
+
         if method == "POST" || method == "PUT"
-          content_type = opts.has_key?('Content-Type') ? opts.delete(['Content-Type']) : "application/x-www-form-urlencoded"
+          default_headers["Content-Type"] = opts["Content-Type"] || "application/x-www-form-urlencoded"
           body = opts.delete(:body)
           if body.is_a?(Hash)
             body = body.keys.collect {|param| "#{URI.escape(param.to_s)}=#{URI.escape(body[param].to_s)}"}.join('&')
           end
+          default_headers["Content-Length"] = body.length
         end
 
-        socket = opts.has_key?(:socket) ? opts.delete(:socket) : TCPSocket.new(uri.host, uri.port)
-        request = "#{method} #{uri.path}#{uri.query ? "?"+uri.query : nil} HTTP/1.1\r\n"
-        request << "Host: #{uri.host}\r\n"
-        request << "Authorization: Basic #{[uri.userinfo].pack('m').strip!}\r\n" unless uri.userinfo.nil?
-        request << "User-Agent: #{user_agent}\r\n"
-        request << "Accept: */*\r\n"
-        if method == "POST" || method == "PUT"
-          request << "Content-Length: #{body.length}\r\n"
-          request << "Content-Type: #{content_type}\r\n"
+        unless uri.userinfo.nil?
+          default_headers["Authorization"] = "Basic #{[uri.userinfo].pack('m').strip!}\r\n"
         end
+
         encodings = []
         encodings << "bzip2" if defined?(Yajl::Bzip2)
         encodings << "gzip" if defined?(Yajl::Gzip)
         encodings << "deflate" if defined?(Yajl::Deflate)
-        request << "Accept-Encoding: #{encodings.join(',')}\r\n" if encodings.any?
-        request << "Accept-Charset: utf-8\r\n\r\n"
+        if encodings.any?
+          default_headers["Accept-Encoding"] = "#{encodings.join(',')}\r\n"
+        end
+
+        headers = default_headers.merge(opts[:headers] || {})
+
+        socket = opts.delete(:socket) || TCPSocket.new(uri.host, uri.port)
+        request = "#{method} #{uri.path}#{uri.query ? "?"+uri.query : nil} HTTP/1.1\r\n"
+        request << "Host: #{uri.host}\r\n"
+        headers.each do |k, v|
+          request << "#{k}: #{v}\r\n"
+        end
+        request << "\r\n"
         if method == "POST" || method == "PUT"
           request << body
         end
@@ -190,6 +201,8 @@ module Yajl
   private
     # Initialize socket and add it to the opts
     def initialize_socket(uri, opts = {})
+      return if opts[:socket]
+
       @socket = TCPSocket.new(uri.host, uri.port)
       opts.merge!({:socket => @socket})
       @intentional_termination = false

data/lib/yajl/version.rb

@@ -1,3 +1,3 @@
 module Yajl
-  VERSION = "0.8.2"
+  VERSION = "0.8.3"
 end

data/spec/http/http_stream_options_spec.rb

@@ -0,0 +1,28 @@
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+require 'yajl/http_stream'
+require 'socket'
+
+describe "Passing options to HttpStream instance methods" do
+  before(:all) do
+    @stream = Yajl::HttpStream.new
+  end
+
+  it "should not create a new socket it one is provided" do
+    TCPSocket.should_not_receive(:new)
+    options = {:socket => :my_provided_socket}
+
+    @stream.send(:initialize_socket, URI.parse("http://google.com"), options)
+
+    options[:socket].should == :my_provided_socket
+  end
+
+  it "should create a new socket if one is not provided" do
+    TCPSocket.should_receive(:new).with("google.com", 80).and_return( :tcp_socket )
+    options = {}
+
+    @stream.send(:initialize_socket, URI.parse("http://google.com"), options)
+
+    options[:socket].should == :tcp_socket
+  end
+end

data/spec/parsing/one_off_spec.rb

@@ -40,10 +40,14 @@ describe "One-off JSON examples" do
     Yajl::Parser.parse(io).should == {"key" => 1234}
   end
 
-  it "should parse using it's class method, from an IO with symbolized keys" do
+  it "should parse using it's class method, from a string with symbolized keys" do
     Yajl::Parser.parse('{"key": 1234}', :symbolize_keys => true).should == {:key => 1234}
   end
 
+  it "should parse using it's class method, from a utf-8 string with multibyte characters, with symbolized keys" do
+    Yajl::Parser.parse('{"日本語": 1234}', :symbolize_keys => true).should == {:"日本語" => 1234}
+  end
+
   it "should parse using it's class method, from a string" do
     Yajl::Parser.parse('{"key": 1234}').should == {"key" => 1234}
   end
@@ -78,4 +82,4 @@ describe "One-off JSON examples" do
       Yajl::Parser.parse('{"key": "value"}').values.first.encoding.should eql(Encoding.default_internal)
     end
   end
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: yajl-ruby
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 8
-  - 2
-  version: 0.8.2
+  - 3
+  version: 0.8.3
 platform: ruby
 authors: 
 - Brian Lopez
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-23 00:00:00 -07:00
+date: 2011-08-16 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -168,6 +168,7 @@ files:
 - spec/http/http_get_spec.rb
 - spec/http/http_post_spec.rb
 - spec/http/http_put_spec.rb
+- spec/http/http_stream_options_spec.rb
 - spec/json_gem_compatibility/compatibility_spec.rb
 - spec/parsing/active_support_spec.rb
 - spec/parsing/chunked_spec.rb
@@ -293,6 +294,7 @@ test_files:
 - spec/http/http_get_spec.rb
 - spec/http/http_post_spec.rb
 - spec/http/http_put_spec.rb
+- spec/http/http_stream_options_spec.rb
 - spec/json_gem_compatibility/compatibility_spec.rb
 - spec/parsing/active_support_spec.rb
 - spec/parsing/chunked_spec.rb