yajl-ruby 0.6.7 → 0.6.8

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.6.8 (January 1st, 2010)
+* A couple of small performance patches
+* Allow passing a string to Yajl::HttpStream methods instead of only a URI
+
 ## 0.6.7 (December 4th, 2009)
 * Bump internal version constant to the proper value (doh!)
 * Bring over latest from Yajl upstream

data/VERSION.yml

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

data/examples/encoding/chunked_encoding.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
-require 'rubygems'
 require 'yajl'
 
 obj = {

data/examples/encoding/one_shot.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
-require 'rubygems'
 require 'yajl'
 
 obj = {

data/examples/encoding/to_an_io.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
-require 'rubygems'
 require 'yajl'
 
 obj = {

data/examples/http/twitter_search_api.rb

@@ -1,7 +1,6 @@
 # encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
-require 'rubygems'
 require 'yajl/http_stream'
 require 'uri'
 

data/examples/http/twitter_stream_api.rb

@@ -1,7 +1,6 @@
 # encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
-require 'rubygems'
 require 'yajl/gzip'
 require 'yajl/deflate'
 require 'yajl/http_stream'

data/examples/parsing/from_file.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
-require 'rubygems'
 require 'yajl'
 
 unless file = ARGV[0]

data/examples/parsing/from_stdin.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
-require 'rubygems'
 require 'yajl'
 
 # Usage: cat benchmark/subjects/item.json | ruby examples/from_stdin.rb

data/examples/parsing/from_string.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
+$LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 
-require 'rubygems'
 require 'yajl'
 require 'stringio'
 
@@ -9,7 +9,5 @@ unless string = ARGV[0]
   exit(0)
 end
 
-json = StringIO.new(string)
-
-hash = Yajl::Parser.parse(json)
+hash = Yajl::Parser.parse(string)
 puts hash.inspect

data/ext/extconf.rb

@@ -2,7 +2,7 @@
 require 'mkmf'
 require 'rbconfig'
 
-$CFLAGS << ' -Wall'
+$CFLAGS << ' -Wall -funroll-loops'
 # $CFLAGS << ' -O0 -ggdb'
 
 create_makefile("yajl_ext")

data/ext/yajl_ext.c

@@ -23,6 +23,31 @@
 
 #include "yajl_ext.h"
 
+inline const char * strnchr(const char * s, size_t count, char c) {
+    for (; count-- && *s != '\0'; ++s) {
+        if (*s == c) {
+            return s;
+        }
+    }
+    return NULL;
+}
+
+inline double strntod(const char * s, size_t count) {
+    char buf[count+1];
+    memcpy(buf, s, count);
+    buf[count] = 0;
+    
+    return strtod(buf, NULL);
+}
+
+inline VALUE rb_cstrn2inum(const char * s, size_t count) {
+    char buf[count+1];
+    memcpy(buf, s, count);
+    buf[count] = 0;
+    
+    return rb_cstr2inum(buf, 10);
+}
+
 /* Helpers for building objects */
 inline void yajl_check_and_fire_callback(void * ctx) {
     yajl_parser_wrapper * wrapper;
@@ -226,15 +251,13 @@ static int yajl_found_boolean(void * ctx, int boolean) {
 }
 
 static int yajl_found_number(void * ctx, const char * numberVal, unsigned int numberLen) {
-    char buf[numberLen+1];
-    memcpy(buf, numberVal, numberLen);
-    buf[numberLen] = 0;
-
-    if (strchr(buf, '.') || strchr(buf, 'e') || strchr(buf, 'E')) {
-        yajl_set_static_value(ctx, rb_float_new(strtod(buf, NULL)));
+    if (strnchr(numberVal, numberLen, '.') ||
+        strnchr(numberVal, numberLen, 'e') ||
+        strnchr(numberVal, numberLen, 'E')) {
+        yajl_set_static_value(ctx, rb_float_new(strntod(numberVal, numberLen)));
     }
     else {
-        yajl_set_static_value(ctx, rb_cstr2inum(buf, 10));
+        yajl_set_static_value(ctx, rb_cstrn2inum(numberVal, numberLen));
     }
     return 1;
 }

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

data/lib/yajl/http_stream.rb

@@ -76,6 +76,10 @@ module Yajl
     
     protected
       def self.request(method, uri, opts = {}, &block)
+        if uri.is_a?(String)
+          uri = URI.parse(uri)
+        end
+        
         user_agent = opts.has_key?('User-Agent') ? opts.delete(['User-Agent']) : "Yajl::HttpStream #{Yajl::VERSION}"
         if method == "POST" || method == "PUT"
           content_type = opts.has_key?('Content-Type') ? opts.delete(['Content-Type']) : "application/x-www-form-urlencoded"
@@ -86,6 +90,9 @@ module Yajl
         end
 
         socket = opts.has_key?(:socket) ? opts.delete(:socket) : TCPSocket.new(uri.host, uri.port)
+        trap("INT") {
+          return
+        }
         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?
@@ -162,7 +169,7 @@ module Yajl
           end
         end
       ensure
-        socket.close unless socket.closed?
+        socket.close if !socket.nil? and !socket.closed?
       end
 
   private

data/spec/http/http_delete_spec.rb

@@ -40,11 +40,6 @@ describe "Yajl HTTP DELETE request" do
     @uri = 'file://'+File.expand_path(File.dirname(__FILE__) + "/fixtures/http/http.#{format}.dump")
     TCPSocket.should_receive(:new).and_return(@request)
     @request.should_receive(:write)
-    @uri.should_receive(:host).at_least(2).times
-    @uri.should_receive(:port)
-    @uri.should_receive(:path)
-    @uri.should_receive(:query)
-    @uri.should_receive(:userinfo)
   end
   
   it "should parse a raw response" do
@@ -54,6 +49,8 @@ describe "Yajl HTTP DELETE request" do
   
   it "should parse a raw response using instance method" do
     prepare_mock_request_dump :raw
+    @uri.should_receive(:host)
+    @uri.should_receive(:port)
     stream = Yajl::HttpStream.new
     @template_hash.should == stream.delete(@uri)
   end

data/spec/http/http_get_spec.rb

@@ -41,11 +41,6 @@ describe "Yajl HTTP GET request" do
     @uri = 'file://'+File.expand_path(File.dirname(__FILE__) + "/fixtures/http/http.#{format}.dump")
     TCPSocket.should_receive(:new).and_return(@request)
     @request.should_receive(:write)
-    @uri.should_receive(:host).at_least(2).times
-    @uri.should_receive(:port)
-    @uri.should_receive(:path)
-    @uri.should_receive(:query)
-    @uri.should_receive(:userinfo)
   end
   
   it "should parse a raw response" do
@@ -60,12 +55,16 @@ describe "Yajl HTTP GET request" do
   
   it "should parse a raw response using instance method" do
     prepare_mock_request_dump :raw
+    @uri.should_receive(:host)
+    @uri.should_receive(:port)
     stream = Yajl::HttpStream.new
     @template_hash.should == stream.get(@uri)
   end
   
   it "should parse a chunked response using instance method" do
     prepare_mock_request_dump :chunked
+    @uri.should_receive(:host)
+    @uri.should_receive(:port)
     stream = Yajl::HttpStream.new
     stream.get(@uri) do |obj|
       obj.should eql(@chunked_body)

data/spec/http/http_post_spec.rb

@@ -43,11 +43,6 @@ describe "Yajl HTTP POST request" do
     @uri = 'file://'+File.expand_path(File.dirname(__FILE__) + "/fixtures/http/http.#{format}.dump")
     TCPSocket.should_receive(:new).and_return(@request)
     @request.should_receive(:write)
-    @uri.should_receive(:host).at_least(2).times
-    @uri.should_receive(:port)
-    @uri.should_receive(:path)
-    @uri.should_receive(:query)
-    @uri.should_receive(:userinfo)
   end
 
   it "should parse a raw response" do
@@ -57,6 +52,8 @@ describe "Yajl HTTP POST request" do
 
   it "should parse a raw response using instance method" do
     prepare_mock_request_dump :raw
+    @uri.should_receive(:host)
+    @uri.should_receive(:port)
     stream = Yajl::HttpStream.new
     @template_hash.should == stream.post(@uri, @body)
   end

data/spec/http/http_put_spec.rb

@@ -42,11 +42,6 @@ describe "Yajl HTTP PUT request" do
     @uri = 'file://'+File.expand_path(File.dirname(__FILE__) + "/fixtures/http/http.#{format}.dump")
     TCPSocket.should_receive(:new).and_return(@request)
     @request.should_receive(:write)
-    @uri.should_receive(:host).at_least(2).times
-    @uri.should_receive(:port)
-    @uri.should_receive(:path)
-    @uri.should_receive(:query)
-    @uri.should_receive(:userinfo)
   end
   
   it "should parse a raw response" do
@@ -56,6 +51,8 @@ describe "Yajl HTTP PUT request" do
 
   it "should parse a raw response using instance method" do
     prepare_mock_request_dump :raw
+    @uri.should_receive(:host)
+    @uri.should_receive(:port)
     stream = Yajl::HttpStream.new
     @template_hash.should == stream.put(@uri, @body)
   end

data/yajl-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.6.7"
+  s.version = "0.6.8"
 
   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-12-04}
+  s.date = %q{2010-01-01}
   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.6.7
+  version: 0.6.8
 platform: ruby
 authors: 
 - Brian Lopez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 -08:00
+date: 2010-01-01 00:00:00 -08:00
 default_executable: 
 dependencies: []