brianmario-yajl-ruby 0.4.4 → 0.4.5

data/ext/extconf.rb

@@ -1,11 +1,13 @@
 # encoding: UTF-8
 require 'mkmf'
+require 'rbconfig'
+
 dir_config('yajl')
 have_header('yajl/yajl_parse.h')
 have_header('yajl/yajl_gen.h')
 
 if have_library("yajl")
-  create_makefile("yajl")
+  create_makefile("yajl_ext")
 else
   puts "Yajl not found, maybe try manually specifying --with-yajl-dir to find it?"
 end

data/ext/yajl.c

@@ -44,6 +44,66 @@ void set_static_value(void * ctx, VALUE val) {
     }
 }
 
+void encode_part(yajl_gen hand, VALUE obj, VALUE io) {
+    VALUE str, outBuff, otherObj;
+    int objLen;
+    int idx = 0;
+    const unsigned char * buffer;
+    unsigned int len;
+    yajl_gen_get_buf(hand, &buffer, &len);
+    outBuff = rb_str_new((const char *)buffer, len);
+    rb_io_write(io, outBuff);
+    yajl_gen_clear(hand);
+    
+    switch (TYPE(obj)) {
+        case T_HASH:
+            yajl_gen_map_open(hand);
+            
+            // TODO: itterate through keys in the hash
+            VALUE keys = rb_funcall(obj, intern_keys, 0);
+            VALUE entry;
+            for(idx=0; idx<RARRAY_LEN(keys); idx++) {
+                entry = rb_ary_entry(keys, idx);
+                // the key
+                encode_part(hand, entry, io);
+                // the value
+                encode_part(hand, rb_hash_aref(obj, entry), io);
+            }
+            
+            yajl_gen_map_close(hand);
+            break;
+        case T_ARRAY:
+            yajl_gen_array_open(hand);
+            for(idx=0; idx<RARRAY_LEN(obj); idx++) {
+                otherObj = rb_ary_entry(obj, idx);
+                encode_part(hand, otherObj, io);
+            }
+            yajl_gen_array_close(hand);
+            break;
+        case T_NIL:
+            yajl_gen_null(hand);
+            break;
+        case T_TRUE:
+            yajl_gen_bool(hand, 1);
+            break;
+        case T_FALSE:
+            yajl_gen_bool(hand, 0);
+            break;
+        case T_FIXNUM:
+        case T_FLOAT:
+        case T_BIGNUM:
+            str = rb_funcall(obj, intern_to_s, 0);
+            objLen = RSTRING_LEN(str);
+            yajl_gen_number(hand, RSTRING_PTR(str), (unsigned int)objLen);
+            break;
+        default:
+            str = rb_funcall(obj, intern_to_s, 0);
+            objLen = RSTRING_LEN(str);
+            yajl_gen_string(hand, (const unsigned char *)RSTRING_PTR(str), (unsigned int)objLen);
+            break;
+    }
+}
+
 static int found_null(void * ctx) {
     set_static_value(ctx, Qnil);
     check_and_fire_callback(ctx);
@@ -150,7 +210,7 @@ static VALUE t_parse(VALUE self, VALUE io) {
     // allocate our parser
     streamParser = yajl_alloc(&callbacks, &cfg, NULL, (void *)context);
     
-    VALUE parsed = rb_str_new("", readBufferSize);
+    VALUE parsed = rb_str_new2("");
     VALUE rbufsize = INT2FIX(readBufferSize);
     
     // now parse from the IO
@@ -179,11 +239,33 @@ static VALUE t_parse(VALUE self, VALUE io) {
     return rb_ary_pop(context);
 }
 
-void Init_yajl() {
+static VALUE t_encode(VALUE self, VALUE obj, VALUE io) {
+  yajl_gen_config conf = {0, " "};
+  yajl_gen hand;
+  yajl_status stat;
+  const unsigned char * buffer;
+  unsigned int len;
+  VALUE outBuff;
+  
+  hand = yajl_gen_alloc(&conf, NULL);
+  encode_part(hand, obj, io);
+  
+  // just make sure we output the remaining buffer
+  yajl_gen_get_buf(hand, &buffer, &len);
+  outBuff = rb_str_new((const char *)buffer, len);
+  rb_io_write(io, outBuff);
+  
+  yajl_gen_clear(hand);
+  yajl_gen_free(hand);
+  return Qnil;
+}
+
+void Init_yajl_ext() {
     mYajl = rb_define_module("Yajl");
     
     mStream = rb_define_module_under(mYajl, "Stream");
     rb_define_module_function(mStream, "parse", t_parse, 1);
+    rb_define_module_function(mStream, "encode", t_encode, 2);
     
     mChunked = rb_define_module_under(mYajl, "Chunked");
     rb_define_module_function(mChunked, "parse_some", t_parseSome, 1);
@@ -197,4 +279,6 @@ void Init_yajl() {
     intern_eof = rb_intern("eof?");
     intern_respond_to = rb_intern("respond_to?");
     intern_call = rb_intern("call");
+    intern_keys = rb_intern("keys");
+    intern_to_s = rb_intern("to_s");
 }

data/ext/yajl.h

@@ -5,7 +5,7 @@
 #define READ_BUFSIZE 4096
 
 static VALUE cParseError, mYajl, mStream, mChunked;
-static ID intern_io_read, intern_eof, intern_respond_to, intern_call;
+static ID intern_io_read, intern_eof, intern_respond_to, intern_call, intern_keys, intern_to_s;
 static int readBufferSize = READ_BUFSIZE;
 static yajl_parser_config cfg = {1, 1};
 
@@ -43,3 +43,4 @@ static yajl_callbacks callbacks = {
 static VALUE t_setParseComplete(VALUE self, VALUE callback);
 static VALUE t_parseSome(VALUE self, VALUE string);
 static VALUE t_parse(VALUE self, VALUE io);
+static VALUE t_encode(VALUE self, VALUE obj, VALUE io);

data/lib/yajl/bzip2/stream_writer.rb

@@ -0,0 +1,11 @@
+# encoding: UTF-8
+module Yajl
+  module Bzip2
+    # === Yajl::Bzip2::StreamWriter
+    class StreamWriter < ::Bzip2::Writer
+      def self.encode(obj, io)
+        Yajl::Stream.encode(obj, new(io))
+      end
+    end
+  end
+end

data/lib/yajl/bzip2.rb

@@ -5,6 +5,7 @@ require 'yajl.rb' unless defined?(Yajl::Stream)
 begin
   require 'bzip2' unless defined?(Bzip2)
   require 'yajl/bzip2/stream_reader.rb'
+  require 'yajl/bzip2/stream_writer.rb'
 rescue LoadError => e
   raise "Unable to load the bzip2 library. Is the bzip2-ruby gem installed?"
 end

data/lib/yajl/deflate/stream_writer.rb

@@ -0,0 +1,16 @@
+# encoding: UTF-8
+module Yajl
+  module Deflate
+    # === Yajl::Deflate::StreamWriter
+    class StreamWriter < ::Zlib::Deflate
+      def write(str)
+        deflate(str)
+        str.size unless str.nil?
+      end
+      
+      def self.encode(obj, io)
+        Yajl::Stream.encode(obj, new(io))
+      end
+    end
+  end
+end

data/lib/yajl/deflate.rb

@@ -2,4 +2,5 @@
 
 require 'yajl.rb' unless defined?(Yajl::Stream)
 require 'zlib' unless defined?(Zlib)
-require 'yajl/deflate/stream_reader.rb'
+require 'yajl/deflate/stream_reader.rb'
+require 'yajl/deflate/stream_writer.rb'

data/lib/yajl/gzip/stream_writer.rb

@@ -0,0 +1,11 @@
+# encoding: UTF-8
+module Yajl
+  module Gzip
+    # === Yajl::Gzip::StreamWriter
+    class StreamWriter < ::Zlib::GzipWriter
+      def self.encode(obj, io)
+        Yajl::Stream.encode(obj, new(io))
+      end
+    end
+  end
+end

data/lib/yajl/gzip.rb

@@ -2,4 +2,5 @@
 
 require 'yajl.rb' unless defined?(Yajl::Stream)
 require 'zlib' unless defined?(Zlib)
-require 'yajl/gzip/stream_reader.rb'
+require 'yajl/gzip/stream_reader.rb'
+require 'yajl/gzip/stream_writer.rb'

data/lib/yajl/http_stream.rb

@@ -28,11 +28,12 @@ module Yajl
       user_agent = opts.has_key?(['User-Agent']) ? opts['User-Agent'] : "Yajl::HttpStream #{Yajl::VERSION}"
       
       socket = TCPSocket.new(uri.host, uri.port)
-      request = "GET #{uri.path}#{uri.query ? "?"+uri.query : nil} HTTP/1.0\r\n"
+      request = "GET #{uri.path}#{uri.query ? "?"+uri.query : nil} HTTP/1.1\r\n"
       request << "Host: #{uri.host}\r\n"
       request << "Authorization: Basic #{[userinfo].pack('m')}\r\n" unless uri.userinfo.nil?
       request << "User-Agent: #{user_agent}\r\n"
       request << "Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8\r\n"
+      request << "Connection: close\r\n"
       encodings = []
       encodings << "bzip2" if defined?(Yajl::Bzip2)
       encodings << "gzip" if defined?(Yajl::Gzip)
@@ -61,21 +62,25 @@ module Yajl
         end
       end
       
-      content_type = response_head[:headers]["Content-Type"].split('; ')
-      content_type = content_type.first
-      if ALLOWED_MIME_TYPES.include?(content_type)
-        case response_head[:headers]["Content-Encoding"]
-        when "gzip"
-          return Yajl::Gzip::StreamReader.parse(socket)
-        when "deflate"
-          return Yajl::Deflate::StreamReader.parse(socket, -Zlib::MAX_WBITS)
-        when "bzip2"
-          return Yajl::Bzip2::StreamReader.parse(socket)
+      if response_head[:headers]["Transfer-Encoding"] == 'chunked'
+        raise Exception, "Chunked responses not supported yet (I'm working on this)"
+      else
+        content_type = response_head[:headers]["Content-Type"].split('; ')
+        content_type = content_type.first
+        if ALLOWED_MIME_TYPES.include?(content_type)
+          case response_head[:headers]["Content-Encoding"]
+          when "gzip"
+            return Yajl::Gzip::StreamReader.parse(socket)
+          when "deflate"
+            return Yajl::Deflate::StreamReader.parse(socket, -Zlib::MAX_WBITS)
+          when "bzip2"
+            return Yajl::Bzip2::StreamReader.parse(socket)
+          else
+            return Yajl::Stream.parse(socket)
+          end
         else
-          return Yajl::Stream.parse(socket)
+          raise InvalidContentType, "The response MIME type #{content_type}"
         end
-      else
-        raise InvalidContentType, "The response MIME type #{content_type}"
       end
     ensure
       socket.close

data/lib/yajl.rb

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require 'yajl.bundle'
+require 'yajl_ext'
 
 # = Extras
 # We're not going to load these auotmatically, because you might not need them ;)
@@ -13,7 +13,7 @@ require 'yajl.bundle'
 #
 # Ruby bindings to the excellent Yajl (Yet Another JSON Parser) ANSI C library.
 module Yajl
-  VERSION = "0.4.4"
+  VERSION = "0.4.5"
   
   # == Yajl::Chunked
   #

data/yajl-ruby.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.4.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Lopez"]
-  s.date = %q{2009-05-12}
+  s.date = %q{2009-05-17}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
@@ -20,9 +20,15 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "VERSION.yml",
+     "benchmark/encode.rb",
+     "benchmark/encode_json_and_marshal.rb",
+     "benchmark/encode_json_and_yaml.rb",
      "benchmark/http.rb",
-     "benchmark/stream.rb",
+     "benchmark/parse.rb",
+     "benchmark/parse_json_and_marshal.rb",
+     "benchmark/parse_json_and_yaml.rb",
      "benchmark/subjects/contacts.json",
+     "benchmark/subjects/contacts.yml",
      "benchmark/subjects/item.json",
      "benchmark/subjects/ohai.json",
      "benchmark/subjects/twitter_search.json",
@@ -34,10 +40,13 @@ Gem::Specification.new do |s|
      "lib/yajl.rb",
      "lib/yajl/bzip2.rb",
      "lib/yajl/bzip2/stream_reader.rb",
+     "lib/yajl/bzip2/stream_writer.rb",
      "lib/yajl/deflate.rb",
      "lib/yajl/deflate/stream_reader.rb",
+     "lib/yajl/deflate/stream_writer.rb",
      "lib/yajl/gzip.rb",
      "lib/yajl/gzip/stream_reader.rb",
+     "lib/yajl/gzip/stream_writer.rb",
      "lib/yajl/http_stream.rb",
      "spec/active_support_spec.rb",
      "spec/fixtures/fail.15.json",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brianmario-yajl-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors: 
 - Brian Lopez
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-12 00:00:00 -07:00
+date: 2009-05-17 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -29,9 +29,15 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION.yml
+- benchmark/encode.rb
+- benchmark/encode_json_and_marshal.rb
+- benchmark/encode_json_and_yaml.rb
 - benchmark/http.rb
-- benchmark/stream.rb
+- benchmark/parse.rb
+- benchmark/parse_json_and_marshal.rb
+- benchmark/parse_json_and_yaml.rb
 - benchmark/subjects/contacts.json
+- benchmark/subjects/contacts.yml
 - benchmark/subjects/item.json
 - benchmark/subjects/ohai.json
 - benchmark/subjects/twitter_search.json
@@ -43,10 +49,13 @@ files:
 - lib/yajl.rb
 - lib/yajl/bzip2.rb
 - lib/yajl/bzip2/stream_reader.rb
+- lib/yajl/bzip2/stream_writer.rb
 - lib/yajl/deflate.rb
 - lib/yajl/deflate/stream_reader.rb
+- lib/yajl/deflate/stream_writer.rb
 - lib/yajl/gzip.rb
 - lib/yajl/gzip/stream_reader.rb
+- lib/yajl/gzip/stream_writer.rb
 - lib/yajl/http_stream.rb
 - spec/active_support_spec.rb
 - spec/fixtures/fail.15.json