yajl-ruby 0.6.3 → 0.6.4

data/spec/http/http_delete_spec.rb

@@ -1,6 +1,10 @@
 # encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
-require 'yajl/bzip2'
+begin
+  require 'yajl/bzip2'
+rescue
+  warn "Couldn't load yajl/bzip2, maybe you don't have bzip2-ruby installed? Continuing without running bzip2 specs."
+end
 require 'yajl/gzip'
 require 'yajl/deflate'
 require 'yajl/http_stream'
@@ -53,14 +57,16 @@ describe "Yajl HTTP DELETE request" do
     @template_hash_symbolized.should == Yajl::HttpStream.delete(@uri, :symbolize_keys => true)
   end
   
-  it "should parse a bzip2 compressed response" do
-    prepare_mock_request_dump :bzip2
-    @template_hash.should == Yajl::HttpStream.delete(@uri)
-  end
-  
-  it "should parse a bzip2 compressed response and symbolize keys" do
-    prepare_mock_request_dump :bzip2
-    @template_hash_symbolized.should == Yajl::HttpStream.delete(@uri, :symbolize_keys => true)
+  if defined?(Yajl::Bzip2::StreamReader)
+    it "should parse a bzip2 compressed response" do
+      prepare_mock_request_dump :bzip2
+      @template_hash.should == Yajl::HttpStream.delete(@uri)
+    end
+
+    it "should parse a bzip2 compressed response and symbolize keys" do
+      prepare_mock_request_dump :bzip2
+      @template_hash_symbolized.should == Yajl::HttpStream.delete(@uri, :symbolize_keys => true)
+    end
   end
   
   it "should parse a deflate compressed response" do

data/spec/http/http_get_spec.rb

@@ -1,6 +1,10 @@
 # encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
-require 'yajl/bzip2'
+begin
+  require 'yajl/bzip2'
+rescue
+  warn "Couldn't load yajl/bzip2, maybe you don't have bzip2-ruby installed? Continuing without running bzip2 specs."
+end
 require 'yajl/gzip'
 require 'yajl/deflate'
 require 'yajl/http_stream'
@@ -53,14 +57,16 @@ describe "Yajl HTTP GET request" do
     @template_hash_symbolized.should == Yajl::HttpStream.get(@uri, :symbolize_keys => true)
   end
   
-  it "should parse a bzip2 compressed response" do
-    prepare_mock_request_dump :bzip2
-    @template_hash.should == Yajl::HttpStream.get(@uri)
-  end
+  if defined?(Yajl::Bzip2::StreamReader)
+    it "should parse a bzip2 compressed response" do
+      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)
+    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
   end
   
   it "should parse a deflate compressed response" do

data/spec/http/http_post_spec.rb

@@ -1,6 +1,10 @@
 # encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
-require 'yajl/bzip2'
+begin
+  require 'yajl/bzip2'
+rescue
+  warn "Couldn't load yajl/bzip2, maybe you don't have bzip2-ruby installed? Continuing without running bzip2 specs."
+end
 require 'yajl/gzip'
 require 'yajl/deflate'
 require 'yajl/http_stream'
@@ -54,14 +58,16 @@ describe "Yajl HTTP POST request" do
     @template_hash_symbolized.should == Yajl::HttpStream.post(@uri, @body, :symbolize_keys => true)
   end
   
-  it "should parse a bzip2 compressed response" do
-    prepare_mock_request_dump :bzip2
-    @template_hash.should == Yajl::HttpStream.post(@uri, @body)
-  end
+  if defined?(Yajl::Bzip2::StreamReader)
+    it "should parse a bzip2 compressed response" do
+      prepare_mock_request_dump :bzip2
+      @template_hash.should == Yajl::HttpStream.post(@uri, @body)
+    end
   
-  it "should parse a bzip2 compressed response and symbolize keys" do
-    prepare_mock_request_dump :bzip2
-    @template_hash_symbolized.should == Yajl::HttpStream.post(@uri, @body, :symbolize_keys => true)
+    it "should parse a bzip2 compressed response and symbolize keys" do
+      prepare_mock_request_dump :bzip2
+      @template_hash_symbolized.should == Yajl::HttpStream.post(@uri, @body, :symbolize_keys => true)
+    end
   end
   
   it "should parse a deflate compressed response" do

data/spec/http/http_put_spec.rb

@@ -1,6 +1,10 @@
 # encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
-require 'yajl/bzip2'
+begin
+  require 'yajl/bzip2'
+rescue
+  warn "Couldn't load yajl/bzip2, maybe you don't have bzip2-ruby installed? Continuing without running bzip2 specs."
+end
 require 'yajl/gzip'
 require 'yajl/deflate'
 require 'yajl/http_stream'
@@ -54,14 +58,16 @@ describe "Yajl HTTP PUT request" do
     @template_hash_symbolized.should == Yajl::HttpStream.put(@uri, @body, :symbolize_keys => true)
   end
   
-  it "should parse a bzip2 compressed response" do
-    prepare_mock_request_dump :bzip2
-    @template_hash.should == Yajl::HttpStream.put(@uri, @body)
-  end
+  if defined?(Yajl::Bzip2::StreamReader)
+    it "should parse a bzip2 compressed response" do
+      prepare_mock_request_dump :bzip2
+      @template_hash.should == Yajl::HttpStream.put(@uri, @body)
+    end
   
-  it "should parse a bzip2 compressed response and symbolize keys" do
-    prepare_mock_request_dump :bzip2
-    @template_hash_symbolized.should == Yajl::HttpStream.put(@uri, @body, :symbolize_keys => true)
+    it "should parse a bzip2 compressed response and symbolize keys" do
+      prepare_mock_request_dump :bzip2
+      @template_hash_symbolized.should == Yajl::HttpStream.put(@uri, @body, :symbolize_keys => true)
+    end
   end
   
   it "should parse a deflate compressed response" do

data/spec/json_gem_compatibility/compatibility_spec.rb

@@ -65,6 +65,20 @@ describe "JSON Gem compatability API" do
     dt.to_json.should == "\"#{dt.to_s}\""
   end
   
+  it "should have the standard parsing and encoding exceptions mapped" do
+    JSON::JSONError.new.is_a?(StandardError).should be_true
+    JSON::ParserError.new.is_a?(JSON::JSONError).should be_true
+    JSON::GeneratorError.new.is_a?(JSON::JSONError).should be_true
+    
+    lambda {
+      JSON.parse("blah")
+    }.should raise_error(JSON::ParserError)
+    
+    lambda {
+      JSON.generate(0.0/0.0)
+    }.should raise_error(JSON::GeneratorError)
+  end
+  
   context "ported tests for Unicode" do
     it "should be able to encode and parse unicode" do
       pending if RUBY_VERSION.include?('1.9') # FIXME: Some string encoding problem with 1.9
@@ -159,7 +173,7 @@ describe "JSON Gem compatability API" do
       it "should not be able to parse #{File.basename(name)} as an IO" do
           lambda {
             JSON.parse(StringIO.new(source))
-          }.should raise_error(Yajl::ParseError)
+          }.should raise_error(JSON::ParserError)
       end
     end
 
@@ -167,7 +181,7 @@ describe "JSON Gem compatability API" do
       it "should not be able to parse #{File.basename(name)} as a string" do
           lambda {
             JSON.parse(source)
-          }.should raise_error(Yajl::ParseError)
+          }.should raise_error(JSON::ParserError)
       end
     end
 
@@ -175,7 +189,7 @@ describe "JSON Gem compatability API" do
       it "should be able to parse #{File.basename(name)} as an IO" do
           lambda {
             JSON.parse(StringIO.new(source))
-          }.should_not raise_error(Yajl::ParseError)
+          }.should_not raise_error(JSON::ParserError)
       end
     end
 
@@ -183,7 +197,7 @@ describe "JSON Gem compatability API" do
       it "should be able to parse #{File.basename(name)} as a string" do
           lambda {
             JSON.parse(source)
-          }.should_not raise_error(Yajl::ParseError)
+          }.should_not raise_error(JSON::ParserError)
       end
     end
   end

data/spec/parsing/one_off_spec.rb

@@ -24,11 +24,15 @@ describe "One-off JSON examples" do
   end
   
   it "should not parse invalid UTF8 with :check_utf8 set to true" do
-    pending "not sure how to write this test yet"
+    parser = Yajl::Parser.new(:check_utf8 => true)
+    lambda {
+      parser.parse("[\"#{"\201\203"}\"]")
+    }.should raise_error(Yajl::ParseError)
   end
   
   it "should parse invalid UTF8 with :check_utf8 set to false" do
-    pending "not sure how to write this test yet"
+    parser = Yajl::Parser.new(:check_utf8 => false)
+    puts parser.parse("[\"#{"\201\203"}\"]").inspect
   end
   
   it "should parse using it's class method, from an IO" do

data/yajl-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.6.3"
+  s.version = "0.6.4"
 
   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-08-25}
+  s.date = %q{2009-11-04}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
@@ -79,6 +79,7 @@ Gem::Specification.new do |s|
      "lib/yajl/json_gem/encoding.rb",
      "lib/yajl/json_gem/parsing.rb",
      "spec/encoding/encoding_spec.rb",
+     "spec/global/global_spec.rb",
      "spec/http/fixtures/http.bzip2.dump",
      "spec/http/fixtures/http.deflate.dump",
      "spec/http/fixtures/http.gzip.dump",
@@ -162,6 +163,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Ruby C bindings to the excellent Yajl JSON stream-based parser library.}
   s.test_files = [
     "spec/encoding/encoding_spec.rb",
+     "spec/global/global_spec.rb",
      "spec/http/http_delete_spec.rb",
      "spec/http/http_get_spec.rb",
      "spec/http/http_post_spec.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yajl-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors: 
 - Brian Lopez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-25 00:00:00 -07:00
+date: 2009-11-04 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -86,6 +86,7 @@ files:
 - lib/yajl/json_gem/encoding.rb
 - lib/yajl/json_gem/parsing.rb
 - spec/encoding/encoding_spec.rb
+- spec/global/global_spec.rb
 - spec/http/fixtures/http.bzip2.dump
 - spec/http/fixtures/http.deflate.dump
 - spec/http/fixtures/http.gzip.dump
@@ -191,6 +192,7 @@ specification_version: 3
 summary: Ruby C bindings to the excellent Yajl JSON stream-based parser library.
 test_files: 
 - spec/encoding/encoding_spec.rb
+- spec/global/global_spec.rb
 - spec/http/http_delete_spec.rb
 - spec/http/http_get_spec.rb
 - spec/http/http_post_spec.rb