brianmario-yajl-ruby 0.4.6 → 0.4.7

data/lib/yajl/http_stream.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 require 'socket' unless defined?(Socket)
-require 'yajl.rb' unless defined?(Yajl::Stream)
+require 'yajl' unless defined?(Yajl::Stream)
 
 module Yajl
   # == Yajl::HttpStream

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.4.6"
+  VERSION = "0.4.7"
   
   # == Yajl::Chunked
   #

data/spec/encoding/encoding_spec.rb

@@ -0,0 +1,23 @@
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+
+describe "Yajl JSON encoder" do
+  FILES = Dir[File.dirname(__FILE__)+'/../../benchmark/subjects/*.json']
+  
+  FILES.each do |file|
+    it "should encode #{File.basename(file)}" do
+      input = File.new(File.expand_path(file), 'r')
+      hash = Yajl::Stream.parse(input)
+      
+      io = StringIO.new
+      output = Yajl::Stream.encode(hash, io)
+      io.rewind
+      hash2 = Yajl::Stream.parse(io)
+      
+      io.close
+      input.close
+      
+      hash.should == hash2
+    end
+  end
+end

data/spec/http/http_spec.rb

@@ -0,0 +1,98 @@
+# encoding: UTF-8
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
+require 'yajl/bzip2'
+require 'yajl/gzip'
+require 'yajl/deflate'
+require 'yajl/http_stream'
+
+def parse_off_headers(io)
+  io.each_line do |line|
+    if line == "\r\n" # end of the headers
+      break
+    end
+  end
+end
+
+describe "Yajl HTTP GET request" do
+  before(:all) do
+    @raw = File.new(File.expand_path(File.dirname(__FILE__) + '/fixtures/http.raw.dump'), 'r')
+    @bzip2 = File.new(File.expand_path(File.dirname(__FILE__) + '/fixtures/http.bzip2.dump'), 'r')
+    @deflate = File.new(File.expand_path(File.dirname(__FILE__) + '/fixtures/http.deflate.dump'), 'r')
+    @gzip = File.new(File.expand_path(File.dirname(__FILE__) + '/fixtures/http.gzip.dump'), 'r')
+    
+    parse_off_headers(@raw)
+    @raw_template_hash = Yajl::Stream.parse(@raw)
+    @raw.rewind
+  end
+  
+  after(:all) do
+    @raw.close unless @raw.closed?
+    @bzip2.close unless @bzip2.closed?
+    @deflate.close unless @deflate.closed?
+    @gzip.close unless @gzip.closed?
+  end
+  
+  after(:each) do
+    GC.start
+  end
+  
+  it "should parse a raw response" do
+    file = File.expand_path(File.dirname(__FILE__) + '/http/http.raw.dump')
+    uri = 'file://'+file
+    
+    TCPSocket.should_receive(:new).and_return(@raw)
+    @raw.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)
+    
+    @raw_template_hash.should == Yajl::HttpStream.get(uri)
+  end
+  
+  it "should parse a bzip2 compressed response" do
+    file = File.expand_path(File.dirname(__FILE__) + '/http/http.bzip2.dump')
+    uri = 'file://'+file
+    
+    TCPSocket.should_receive(:new).and_return(@bzip2)
+    @bzip2.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)
+    
+    @raw_template_hash.should == Yajl::HttpStream.get(uri)
+  end
+  
+  it "should parse a deflate compressed response" do
+    file = File.expand_path(File.dirname(__FILE__) + '/http/http.deflate.dump')
+    uri = 'file://'+file
+    
+    TCPSocket.should_receive(:new).and_return(@deflate)
+    @deflate.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)
+    
+    @raw_template_hash.should == Yajl::HttpStream.get(uri)
+  end
+  
+  it "should parse a gzip compressed response" do
+    file = File.expand_path(File.dirname(__FILE__) + '/http/http.gzip.dump')
+    uri = 'file://'+file
+    
+    TCPSocket.should_receive(:new).and_return(@gzip)
+    @gzip.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)
+    
+    @raw_template_hash.should == Yajl::HttpStream.get(uri)
+  end
+end

data/spec/{active_support_spec.rb → parsing/active_support_spec.rb}

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 describe "ActiveSupport test cases" do
   TESTS = {

data/spec/{fixtures_spec.rb → parsing/fixtures_spec.rb}

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 describe "Parsing JSON Fixtures" do
   fixtures = File.join(File.dirname(__FILE__), 'fixtures/*.json')

data/spec/{one_off_spec.rb → parsing/one_off_spec.rb}

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require File.expand_path(File.dirname(__FILE__) + '/spec_helper.rb')
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 describe "One-off JSON examples" do
   it "should parse 23456789012E666 and return Infinity" do

data/yajl-ruby.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.4.6"
+  s.version = "0.4.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Brian Lopez"]
-  s.date = %q{2009-05-17}
+  s.authors = ["Brian Lopez", "Lloyd Hilaiel"]
+  s.date = %q{2009-05-18}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
@@ -33,10 +33,25 @@ Gem::Specification.new do |s|
      "benchmark/subjects/ohai.json",
      "benchmark/subjects/twitter_search.json",
      "benchmark/subjects/unicode.json",
-     "benchmark/subjects/yelp.json",
+     "ext/api/yajl_common.h",
+     "ext/api/yajl_gen.h",
+     "ext/api/yajl_parse.h",
      "ext/extconf.rb",
      "ext/yajl.c",
-     "ext/yajl.h",
+     "ext/yajl_alloc.c",
+     "ext/yajl_alloc.h",
+     "ext/yajl_buf.c",
+     "ext/yajl_buf.h",
+     "ext/yajl_bytestack.h",
+     "ext/yajl_encode.c",
+     "ext/yajl_encode.h",
+     "ext/yajl_ext.c",
+     "ext/yajl_ext.h",
+     "ext/yajl_gen.c",
+     "ext/yajl_lex.c",
+     "ext/yajl_lex.h",
+     "ext/yajl_parser.c",
+     "ext/yajl_parser.h",
      "lib/yajl.rb",
      "lib/yajl/bzip2.rb",
      "lib/yajl/bzip2/stream_reader.rb",
@@ -48,70 +63,72 @@ Gem::Specification.new do |s|
      "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",
-     "spec/fixtures/fail.16.json",
-     "spec/fixtures/fail.17.json",
-     "spec/fixtures/fail.26.json",
-     "spec/fixtures/fail11.json",
-     "spec/fixtures/fail12.json",
-     "spec/fixtures/fail13.json",
-     "spec/fixtures/fail14.json",
-     "spec/fixtures/fail19.json",
-     "spec/fixtures/fail20.json",
-     "spec/fixtures/fail21.json",
-     "spec/fixtures/fail22.json",
-     "spec/fixtures/fail23.json",
-     "spec/fixtures/fail24.json",
-     "spec/fixtures/fail25.json",
-     "spec/fixtures/fail27.json",
-     "spec/fixtures/fail28.json",
-     "spec/fixtures/fail3.json",
-     "spec/fixtures/fail4.json",
-     "spec/fixtures/fail5.json",
-     "spec/fixtures/fail6.json",
-     "spec/fixtures/fail9.json",
-     "spec/fixtures/pass.array.json",
-     "spec/fixtures/pass.codepoints_from_unicode_org.json",
-     "spec/fixtures/pass.contacts.json",
-     "spec/fixtures/pass.db100.xml.json",
-     "spec/fixtures/pass.db1000.xml.json",
-     "spec/fixtures/pass.dc_simple_with_comments.json",
-     "spec/fixtures/pass.deep_arrays.json",
-     "spec/fixtures/pass.difficult_json_c_test_case.json",
-     "spec/fixtures/pass.difficult_json_c_test_case_with_comments.json",
-     "spec/fixtures/pass.doubles.json",
-     "spec/fixtures/pass.empty_array.json",
-     "spec/fixtures/pass.empty_string.json",
-     "spec/fixtures/pass.escaped_bulgarian.json",
-     "spec/fixtures/pass.escaped_foobar.json",
-     "spec/fixtures/pass.item.json",
-     "spec/fixtures/pass.json-org-sample1.json",
-     "spec/fixtures/pass.json-org-sample2.json",
-     "spec/fixtures/pass.json-org-sample3.json",
-     "spec/fixtures/pass.json-org-sample4-nows.json",
-     "spec/fixtures/pass.json-org-sample4.json",
-     "spec/fixtures/pass.json-org-sample5.json",
-     "spec/fixtures/pass.map-spain.xml.json",
-     "spec/fixtures/pass.ns-invoice100.xml.json",
-     "spec/fixtures/pass.ns-soap.xml.json",
-     "spec/fixtures/pass.numbers-fp-4k.json",
-     "spec/fixtures/pass.numbers-fp-64k.json",
-     "spec/fixtures/pass.numbers-int-4k.json",
-     "spec/fixtures/pass.numbers-int-64k.json",
-     "spec/fixtures/pass.twitter-search.json",
-     "spec/fixtures/pass.twitter-search2.json",
-     "spec/fixtures/pass.unicode.json",
-     "spec/fixtures/pass.yelp.json",
-     "spec/fixtures/pass1.json",
-     "spec/fixtures/pass2.json",
-     "spec/fixtures/pass3.json",
-     "spec/fixtures_spec.rb",
-     "spec/http/http.bzip2.dump",
-     "spec/http/http.deflate.dump",
-     "spec/http/http.gzip.dump",
-     "spec/http/http.raw.dump",
-     "spec/one_off_spec.rb",
+     "spec/encoding/encoding_spec.rb",
+     "spec/http/fixtures/http.bzip2.dump",
+     "spec/http/fixtures/http.deflate.dump",
+     "spec/http/fixtures/http.gzip.dump",
+     "spec/http/fixtures/http.raw.dump",
+     "spec/http/http_spec.rb",
+     "spec/parsing/active_support_spec.rb",
+     "spec/parsing/fixtures/fail.15.json",
+     "spec/parsing/fixtures/fail.16.json",
+     "spec/parsing/fixtures/fail.17.json",
+     "spec/parsing/fixtures/fail.26.json",
+     "spec/parsing/fixtures/fail11.json",
+     "spec/parsing/fixtures/fail12.json",
+     "spec/parsing/fixtures/fail13.json",
+     "spec/parsing/fixtures/fail14.json",
+     "spec/parsing/fixtures/fail19.json",
+     "spec/parsing/fixtures/fail20.json",
+     "spec/parsing/fixtures/fail21.json",
+     "spec/parsing/fixtures/fail22.json",
+     "spec/parsing/fixtures/fail23.json",
+     "spec/parsing/fixtures/fail24.json",
+     "spec/parsing/fixtures/fail25.json",
+     "spec/parsing/fixtures/fail27.json",
+     "spec/parsing/fixtures/fail28.json",
+     "spec/parsing/fixtures/fail3.json",
+     "spec/parsing/fixtures/fail4.json",
+     "spec/parsing/fixtures/fail5.json",
+     "spec/parsing/fixtures/fail6.json",
+     "spec/parsing/fixtures/fail9.json",
+     "spec/parsing/fixtures/pass.array.json",
+     "spec/parsing/fixtures/pass.codepoints_from_unicode_org.json",
+     "spec/parsing/fixtures/pass.contacts.json",
+     "spec/parsing/fixtures/pass.db100.xml.json",
+     "spec/parsing/fixtures/pass.db1000.xml.json",
+     "spec/parsing/fixtures/pass.dc_simple_with_comments.json",
+     "spec/parsing/fixtures/pass.deep_arrays.json",
+     "spec/parsing/fixtures/pass.difficult_json_c_test_case.json",
+     "spec/parsing/fixtures/pass.difficult_json_c_test_case_with_comments.json",
+     "spec/parsing/fixtures/pass.doubles.json",
+     "spec/parsing/fixtures/pass.empty_array.json",
+     "spec/parsing/fixtures/pass.empty_string.json",
+     "spec/parsing/fixtures/pass.escaped_bulgarian.json",
+     "spec/parsing/fixtures/pass.escaped_foobar.json",
+     "spec/parsing/fixtures/pass.item.json",
+     "spec/parsing/fixtures/pass.json-org-sample1.json",
+     "spec/parsing/fixtures/pass.json-org-sample2.json",
+     "spec/parsing/fixtures/pass.json-org-sample3.json",
+     "spec/parsing/fixtures/pass.json-org-sample4-nows.json",
+     "spec/parsing/fixtures/pass.json-org-sample4.json",
+     "spec/parsing/fixtures/pass.json-org-sample5.json",
+     "spec/parsing/fixtures/pass.map-spain.xml.json",
+     "spec/parsing/fixtures/pass.ns-invoice100.xml.json",
+     "spec/parsing/fixtures/pass.ns-soap.xml.json",
+     "spec/parsing/fixtures/pass.numbers-fp-4k.json",
+     "spec/parsing/fixtures/pass.numbers-fp-64k.json",
+     "spec/parsing/fixtures/pass.numbers-int-4k.json",
+     "spec/parsing/fixtures/pass.numbers-int-64k.json",
+     "spec/parsing/fixtures/pass.twitter-search.json",
+     "spec/parsing/fixtures/pass.twitter-search2.json",
+     "spec/parsing/fixtures/pass.unicode.json",
+     "spec/parsing/fixtures/pass.yelp.json",
+     "spec/parsing/fixtures/pass1.json",
+     "spec/parsing/fixtures/pass2.json",
+     "spec/parsing/fixtures/pass3.json",
+     "spec/parsing/fixtures_spec.rb",
+     "spec/parsing/one_off_spec.rb",
      "spec/spec_helper.rb",
      "yajl-ruby.gemspec"
   ]
@@ -121,9 +138,11 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.3}
   s.summary = %q{Ruby C bindings to the excellent Yajl JSON stream-based parser library.}
   s.test_files = [
-    "spec/active_support_spec.rb",
-     "spec/fixtures_spec.rb",
-     "spec/one_off_spec.rb",
+    "spec/encoding/encoding_spec.rb",
+     "spec/http/http_spec.rb",
+     "spec/parsing/active_support_spec.rb",
+     "spec/parsing/fixtures_spec.rb",
+     "spec/parsing/one_off_spec.rb",
      "spec/spec_helper.rb"
   ]