yajl-ruby 0.5.6 → 0.5.7

data/spec/http/http_spec.rb

@@ -15,80 +15,71 @@ 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')
+    raw = File.new(File.expand_path(File.dirname(__FILE__) + '/fixtures/http.raw.dump'), 'r')
+    parse_off_headers(raw)
+    @template_hash = Yajl::Parser.parse(raw)
+    
+    raw.rewind
+    parse_off_headers(raw)
+    @template_hash_symbolized = Yajl::Parser.parse(raw, :symbolize_keys => true)
+    
     @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::Parser.new.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?
+  after(:each) do
+    @file_path = nil
+  end
+  
+  def prepare_mock_request_dump(format=:raw)
+    @request = File.new(File.expand_path(File.dirname(__FILE__) + "/fixtures/http.#{format}.dump"), 'r')
+    @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
-    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)
+    prepare_mock_request_dump :raw
+    @template_hash.should == Yajl::HttpStream.get(@uri)
+  end
+  
+  it "should parse a raw response and symbolize keys" do
+    prepare_mock_request_dump :raw
+    @template_hash_symbolized.should == Yajl::HttpStream.get(@uri, :symbolize_keys => true)
   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)
+    prepare_mock_request_dump :bzip2
+    @template_hash.should == Yajl::HttpStream.get(@uri)
+  end
+  
+  it "should parse a bzip2 compressed response and symbolize keys" do
+    prepare_mock_request_dump :bzip2
+    @template_hash_symbolized.should == Yajl::HttpStream.get(@uri, :symbolize_keys => true)
   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)
+    prepare_mock_request_dump :deflate
+    @template_hash.should == Yajl::HttpStream.get(@uri)
+  end
+  
+  it "should parse a deflate compressed response and symbolize keys" do
+    prepare_mock_request_dump :deflate
+    @template_hash_symbolized.should == Yajl::HttpStream.get(@uri, :symbolize_keys => true)
   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)
+    prepare_mock_request_dump :gzip
+    @template_hash.should == Yajl::HttpStream.get(@uri)
+  end
+  
+  it "should parse a gzip compressed response and symbolize keys" do
+    prepare_mock_request_dump :gzip
+    @template_hash_symbolized.should == Yajl::HttpStream.get(@uri, :symbolize_keys => true)
   end
 end

data/spec/parsing/active_support_spec.rb

@@ -37,8 +37,7 @@ describe "ActiveSupport test cases" do
   TESTS.each do |json, expected|
     it "should be able to parse #{json} as an IO" do
       lambda {
-        parser = Yajl::Parser.new
-        parser.parse(StringIO.new(json)).should == expected
+        Yajl::Parser.parse(StringIO.new(json)).should == expected
       }.should_not raise_error(Yajl::ParseError)
     end
   end
@@ -46,23 +45,20 @@ describe "ActiveSupport test cases" do
   TESTS.each do |json, expected|
     it "should be able to parse #{json} as a string" do
       lambda {
-        parser = Yajl::Parser.new
-        parser.parse(json).should == expected
+        Yajl::Parser.parse(json).should == expected
       }.should_not raise_error(Yajl::ParseError)
     end
   end
 
   it "should fail parsing {: 1} as an IO" do
     lambda {
-      parser = Yajl::Parser.new
-      parser.parse(StringIO.new("{: 1}"))
+      Yajl::Parser.parse(StringIO.new("{: 1}"))
     }.should raise_error(Yajl::ParseError)
   end
   
   it "should fail parsing {: 1} as a string" do
     lambda {
-      parser = Yajl::Parser.new
-      parser.parse("{: 1}")
+      Yajl::Parser.parse("{: 1}")
     }.should raise_error(Yajl::ParseError)
   end
 end

data/spec/parsing/fixtures_spec.rb

@@ -10,8 +10,7 @@ describe "Parsing JSON Fixtures" do
   FAILED.each do |name, source|
     it "should not be able to parse #{File.basename(name)} as an IO" do
         lambda {
-          parser = Yajl::Parser.new
-          parser.parse(StringIO.new(source))
+          Yajl::Parser.parse(StringIO.new(source))
         }.should raise_error(Yajl::ParseError)
     end
   end
@@ -19,8 +18,7 @@ describe "Parsing JSON Fixtures" do
   FAILED.each do |name, source|
     it "should not be able to parse #{File.basename(name)} as a string" do
         lambda {
-          parser = Yajl::Parser.new
-          parser.parse(source)
+          Yajl::Parser.parse(source)
         }.should raise_error(Yajl::ParseError)
     end
   end
@@ -28,8 +26,7 @@ describe "Parsing JSON Fixtures" do
   PASSED.each do |name, source|
     it "should be able to parse #{File.basename(name)} as an IO" do
         lambda {
-          parser = Yajl::Parser.new
-          parser.parse(StringIO.new(source))
+          Yajl::Parser.parse(StringIO.new(source))
         }.should_not raise_error(Yajl::ParseError)
     end
   end
@@ -37,8 +34,7 @@ describe "Parsing JSON Fixtures" do
   PASSED.each do |name, source|
     it "should be able to parse #{File.basename(name)} as a string" do
         lambda {
-          parser = Yajl::Parser.new
-          parser.parse(source)
+          Yajl::Parser.parse(source)
         }.should_not raise_error(Yajl::ParseError)
     end
   end

data/spec/parsing/one_off_spec.rb

@@ -5,24 +5,21 @@ describe "One-off JSON examples" do
   it "should parse 23456789012E666 and return Infinity" do
     infinity = (1.0/0)
     silence_warnings do
-      parser = Yajl::Parser.new
-      parser.parse(StringIO.new('{"key": 23456789012E666}')).should == {"key" => infinity}
+      Yajl::Parser.parse(StringIO.new('{"key": 23456789012E666}')).should == {"key" => infinity}
     end
   end
   
   it "should not parse JSON with a comment, with :allow_comments set to false" do
-    parser = Yajl::Parser.new(:allow_comments => false)
     json = StringIO.new('{"key": /* this is a comment */ "value"}')
     lambda {
-      parser.parse(json)
+      Yajl::Parser.parse(json, :allow_comments => false)
     }.should raise_error(Yajl::ParseError)
   end
   
   it "should parse JSON with a comment, with :allow_comments set to true" do
-    parser = Yajl::Parser.new(:allow_comments => true)
     json = StringIO.new('{"key": /* this is a comment */ "value"}')
     lambda {
-      parser.parse(json)
+      Yajl::Parser.parse(json, :allow_comments => true)
     }.should_not raise_error(Yajl::ParseError)
   end
   
@@ -40,8 +37,7 @@ describe "One-off JSON examples" do
   end
   
   it "should parse using it's class method, from an IO with symbolized keys" do
-    parser = Yajl::Parser.new(:symbolize_keys => true)
-    parser.parse('{"key": 1234}').should == {:key => 1234}
+    Yajl::Parser.parse('{"key": 1234}', :symbolize_keys => true).should == {:key => 1234}
   end
   
   it "should parse using it's class method, from a string" do

data/spec/rcov.opts

@@ -0,0 +1,4 @@
+--exclude spec,gem
+--text-summary
+--spec-only
+--sort coverage --sort-reverse

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--format specdoc
+--colour

data/spec/spec_helper.rb

@@ -1,11 +1,6 @@
 # encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
-begin
-  require './yajl_ext'
-  require 'yajl'
-rescue LoadError
-  require 'yajl'
-end
-require 'stringio'
+require 'rubygems'
+require 'yajl'
 require 'active_support/core_ext/kernel/reporting'

data/yajl-ruby.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.5.6"
+  s.version = "0.5.7"
 
   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-06-19}
+  s.date = %q{2009-06-23}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
@@ -140,6 +140,8 @@ Gem::Specification.new do |s|
      "spec/parsing/fixtures/pass3.json",
      "spec/parsing/fixtures_spec.rb",
      "spec/parsing/one_off_spec.rb",
+     "spec/rcov.opts",
+     "spec/spec.opts",
      "spec/spec_helper.rb",
      "yajl-ruby.gemspec"
   ]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yajl-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.5.6
+  version: 0.5.7
 platform: ruby
 authors: 
 - Brian Lopez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-19 00:00:00 -07:00
+date: 2009-06-23 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -150,6 +150,8 @@ files:
 - spec/parsing/fixtures/pass3.json
 - spec/parsing/fixtures_spec.rb
 - spec/parsing/one_off_spec.rb
+- spec/rcov.opts
+- spec/spec.opts
 - spec/spec_helper.rb
 - yajl-ruby.gemspec
 has_rdoc: true