yajl-ruby 0.7.1 → 0.7.2

data/lib/yajl/deflate/stream_writer.rb

@@ -3,13 +3,13 @@ module Yajl
   module Deflate
     # A wrapper around the Zlib::Deflate class for easier JSON stream parsing
     class StreamWriter < ::Zlib::Deflate
-      
+
       # A helper method to allow use similar to IO#write
       def write(str)
         deflate(str)
         str.size unless str.nil?
       end
-      
+
       # A helper method for one-off encoding to a deflate-compressed stream
       #
       # Look up Yajl::Encoder#encode for parameter documentation

data/lib/yajl/gzip/stream_reader.rb

@@ -4,16 +4,6 @@ module Yajl
     # This is a wrapper around Zlib::GzipReader to allow it's #read method to adhere
     # to the IO spec, allowing for two parameters (length, and buffer)
     class StreamReader < ::Zlib::GzipReader
-      
-      # Wrapper method to allow use similar to IO#read
-      def read(len=nil, buffer=nil)
-        unless buffer.nil?
-          buffer.replace super(len)
-          return buffer
-        end
-        super(len)
-      end
-      
       # Helper method for one-off parsing from a gzip-compressed stream
       #
       # See Yajl::Parser#parse for parameter documentation

data/lib/yajl/http_stream.rb

@@ -7,24 +7,24 @@ module Yajl
   # This module is for making HTTP requests to which the response bodies (and possibly requests in the near future)
   # are streamed directly into Yajl.
   class HttpStream
-    
+
     # This Exception is thrown when an HTTP response isn't in ALLOWED_MIME_TYPES
     # and therefore cannot be parsed.
     class InvalidContentType < Exception; end
     class HttpError < StandardError
-      
+
       attr_reader :message, :headers
-      
+
       def initialize(message, headers)
         @message = message
         @headers = headers
       end
     end
-    
+
     # The mime-type we expect the response to be. If it's anything else, we can't parse it
     # and an InvalidContentType is raised.
     ALLOWED_MIME_TYPES = ["application/json", "text/plain"]
-    
+
     # Makes a basic HTTP GET request to the URI provided
     def self.get(uri, opts = {}, &block)
       request("GET", uri, opts, &block)
@@ -42,7 +42,7 @@ module Yajl
     def self.post(uri, body, opts = {}, &block)
       request("POST", uri, opts.merge({:body => body}), &block)
     end
-    
+
     # Makes a basic HTTP POST request to the URI provided allowing the user to terminate the connection
     def post(uri, body, opts = {}, &block)
       initialize_socket(uri, opts)
@@ -55,7 +55,7 @@ module Yajl
     def self.put(uri, body, opts = {}, &block)
       request("PUT", uri, opts.merge({:body => body}), &block)
     end
-    
+
     # Makes a basic HTTP PUT request to the URI provided allowing the user to terminate the connection
     def put(uri, body, opts = {}, &block)
       initialize_socket(uri, opts)
@@ -82,13 +82,13 @@ module Yajl
       @intentional_termination = true
       @socket.close
     end
-    
+
     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"
@@ -140,11 +140,11 @@ module Yajl
             end
           end
         end
-        
+
         if (response_head[:code] != 200)
-          raise HttpError.new("Code 200 expected got #{response_head[:code]}", response_head[:headers]) 
+          raise HttpError.new("Code 200 expected got #{response_head[:code]}", response_head[:headers])
         end
-        
+
         parser = Yajl::Parser.new(opts)
         parser.on_parse_complete = block if block_given?
         if response_head[:headers]["Transfer-Encoding"] == 'chunked'

data/lib/yajl/json_gem/encoding.rb

@@ -8,14 +8,14 @@ Yajl::Encoder.enable_json_gem_compatability
 # Our fallback to_json definition
 class Object
   def to_json(*args, &block)
-    "\"#{to_s}\""
+    to_s.dump
   end
 end
 
 module JSON
   class JSONError < StandardError; end unless defined?(JSON::JSONError)
   class GeneratorError < JSONError; end unless defined?(JSON::GeneratorError)
-  
+
   def self.generate(obj, opts={})
     begin
       options_map = {}
@@ -28,7 +28,7 @@ module JSON
       raise JSON::GeneratorError, e.message
     end
   end
-  
+
   def self.pretty_generate(obj, opts={})
     begin
       options_map = {}
@@ -39,7 +39,7 @@ module JSON
       raise JSON::GeneratorError, e.message
     end
   end
-  
+
   def self.dump(obj, io=nil, *args)
     begin
       Yajl::Encoder.encode(obj, io)

data/lib/yajl/json_gem/parsing.rb

@@ -4,11 +4,11 @@ require 'yajl' unless defined?(Yajl::Parser)
 module JSON
   class JSONError < StandardError; end unless defined?(JSON::JSONError)
   class ParserError < JSONError; end unless defined?(JSON::ParserError)
-  
+
   def self.default_options
     @default_options ||= {:symbolize_keys => false}
   end
-   
+
   def self.parse(str, opts=JSON.default_options)
     begin
       Yajl::Parser.parse(str, opts)
@@ -16,7 +16,7 @@ module JSON
       raise JSON::ParserError, e.message
     end
   end
-  
+
   def self.load(input, *args)
     begin
       Yajl::Parser.parse(input, default_options)

data/spec/encoding/encoding_spec.rb

@@ -3,13 +3,13 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 class Dummy2
   def to_json
-    "hawtness"
+    "hawtness".dump
   end
 end
 
 describe "Yajl JSON encoder" do
   FILES = Dir[File.dirname(__FILE__)+'/../../benchmark/subjects/*.json']
-  
+
   FILES.each do |file|
      it "should encode #{File.basename(file)} to an IO" do
        # we don't care about testing the stream subject as it has multiple JSON strings in it
@@ -27,7 +27,7 @@ describe "Yajl JSON encoder" do
        end
      end
    end
-   
+
    FILES.each do |file|
      it "should encode #{File.basename(file)} and return a String" do
        # we don't care about testing the stream subject as it has multiple JSON strings in it
@@ -42,7 +42,7 @@ describe "Yajl JSON encoder" do
        end
      end
    end
-   
+
    FILES.each do |file|
      it "should encode #{File.basename(file)} call the passed block, passing it a String" do
        # we don't care about testing the stream subject as it has multiple JSON strings in it
@@ -60,7 +60,7 @@ describe "Yajl JSON encoder" do
        end
      end
    end
-  
+
   it "should encode with :pretty turned on and a single space indent, to an IO" do
     output = "{\n \"foo\": 1234\n}"
     obj = {:foo => 1234}
@@ -70,7 +70,7 @@ describe "Yajl JSON encoder" do
     io.rewind
     io.read.should == output
   end
-  
+
   it "should encode with :pretty turned on and a single space indent, and return a String" do
     output = "{\n \"foo\": 1234\n}"
     obj = {:foo => 1234}
@@ -78,7 +78,7 @@ describe "Yajl JSON encoder" do
     output = encoder.encode(obj)
     output.should == output
   end
-  
+
   it "should encode with :pretty turned on and a tab character indent, to an IO" do
     output = "{\n\t\"foo\": 1234\n}"
     obj = {:foo => 1234}
@@ -88,7 +88,7 @@ describe "Yajl JSON encoder" do
     io.rewind
     io.read.should == output
   end
-  
+
   it "should encode with :pretty turned on and a tab character indent, and return a String" do
     output = "{\n\t\"foo\": 1234\n}"
     obj = {:foo => 1234}
@@ -96,7 +96,7 @@ describe "Yajl JSON encoder" do
     output = encoder.encode(obj)
     output.should == output
   end
-  
+
   it "should encode with it's class method with :pretty and a tab character indent options set, to an IO" do
     output = "{\n\t\"foo\": 1234\n}"
     obj = {:foo => 1234}
@@ -105,14 +105,14 @@ describe "Yajl JSON encoder" do
     io.rewind
     io.read.should == output
   end
-  
+
   it "should encode with it's class method with :pretty and a tab character indent options set, and return a String" do
     output = "{\n\t\"foo\": 1234\n}"
     obj = {:foo => 1234}
     output = Yajl::Encoder.encode(obj, :pretty => true, :indent => "\t")
     output.should == output
   end
-  
+
   it "should encode with it's class method with :pretty and a tab character indent options set, to a block" do
     output = "{\n\t\"foo\": 1234\n}"
     obj = {:foo => 1234}
@@ -122,7 +122,7 @@ describe "Yajl JSON encoder" do
     end
     output.should == output
   end
-  
+
   it "should encode multiple objects into a single stream, to an IO" do
     io = StringIO.new
     obj = {:foo => 1234}
@@ -134,7 +134,7 @@ describe "Yajl JSON encoder" do
     output = "{\"foo\":1234}{\"foo\":1234}{\"foo\":1234}{\"foo\":1234}{\"foo\":1234}"
     io.read.should == output
   end
-  
+
   it "should encode multiple objects into a single stream, and return a String" do
     obj = {:foo => 1234}
     encoder = Yajl::Encoder.new
@@ -145,37 +145,37 @@ describe "Yajl JSON encoder" do
     output = "{\"foo\":1234}{\"foo\":1234}{\"foo\":1234}{\"foo\":1234}{\"foo\":1234}"
     json_output.should == output
   end
-  
+
   it "should encode all map keys as strings" do
     Yajl::Encoder.encode({1=>1}).should eql("{\"1\":1}")
   end
-  
+
   it "should check for and call #to_json if it exists on custom objects" do
     d = Dummy2.new
     Yajl::Encoder.encode({:foo => d}).should eql('{"foo":"hawtness"}')
   end
-  
+
   it "should encode a hash where the key and value can be symbols" do
     Yajl::Encoder.encode({:foo => :bar}).should eql('{"foo":"bar"}')
   end
-  
+
   it "should encode using a newline or nil terminator" do
     Yajl::Encoder.new(:terminator => "\n").encode({:foo => :bar}).should eql("{\"foo\":\"bar\"}\n")
     Yajl::Encoder.new(:terminator => nil).encode({:foo => :bar}).should eql("{\"foo\":\"bar\"}")
   end
-  
+
   it "should encode using a newline or nil terminator, to an IO" do
     s = StringIO.new
     Yajl::Encoder.new(:terminator => "\n").encode({:foo => :bar}, s)
     s.rewind
     s.read.should eql("{\"foo\":\"bar\"}\n")
-    
+
     s = StringIO.new
     Yajl::Encoder.new(:terminator => nil).encode({:foo => :bar}, s)
     s.rewind
     s.read.should eql("{\"foo\":\"bar\"}")
   end
-  
+
   it "should encode using a newline or nil terminator, using a block" do
     s = StringIO.new
     Yajl::Encoder.new(:terminator => "\n").encode({:foo => :bar}) do |chunk|
@@ -183,7 +183,7 @@ describe "Yajl JSON encoder" do
     end
     s.rewind
     s.read.should eql("{\"foo\":\"bar\"}\n")
-    
+
     s = StringIO.new
     nilpassed = false
     Yajl::Encoder.new(:terminator => nil).encode({:foo => :bar}) do |chunk|
@@ -194,13 +194,13 @@ describe "Yajl JSON encoder" do
     s.rewind
     s.read.should eql("{\"foo\":\"bar\"}")
   end
-  
+
   it "should not encode NaN" do
     lambda {
       Yajl::Encoder.encode(0.0/0.0)
     }.should raise_error(Yajl::EncodeError)
   end
-  
+
   it "should not encode Infinity or -Infinity" do
     lambda {
       Yajl::Encoder.encode(1.0/0.0)

data/spec/global/global_spec.rb

@@ -10,41 +10,41 @@ describe "Yajl" do
     it "should be able to encode to a string" do
       Yajl.dump({:a => 1234}).should eql('{"a":1234}')
     end
-    
+
     it "should be able to encode to an IO" do
       io = StringIO.new
       Yajl.dump({:a => 1234}, io)
       io.rewind
-      io.read.should eql('{"a":1234}') 
+      io.read.should eql('{"a":1234}')
     end
-    
+
     it "should be able to encode with a block supplied" do
       Yajl.dump({:a => 1234}) do |chunk|
         chunk.should eql('{"a":1234}')
       end
     end
   end
-  
+
   context "load" do
     it "should exist as a class-method" do
       Yajl.should respond_to(:load)
     end
-  
+
     it "should be able to parse from a string" do
       Yajl.load('{"a":1234}').should eql({"a" => 1234})
     end
-    
+
     it "should be able to parse from an IO" do
       io = StringIO.new('{"a":1234}')
       Yajl.load(io).should eql({"a" => 1234})
     end
-    
+
     it "should be able to parse from a string with a block supplied" do
       Yajl.load('{"a":1234}') do |h|
         h.should eql({"a" => 1234})
       end
     end
-    
+
     it "should be able to parse from an IO with a block supplied" do
       io = StringIO.new('{"a":1234}')
       Yajl.load(io) do |h|

data/spec/http/http_delete_spec.rb

@@ -22,31 +22,31 @@ describe "Yajl HTTP DELETE request" do
     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')
   end
-  
+
   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)
   end
-  
+
   it "should parse a raw response" do
     prepare_mock_request_dump :raw
     @template_hash.should == Yajl::HttpStream.delete(@uri)
   end
-  
+
   it "should parse a raw response using instance method" do
     prepare_mock_request_dump :raw
     @uri.should_receive(:host)
@@ -54,12 +54,12 @@ describe "Yajl HTTP DELETE request" do
     stream = Yajl::HttpStream.new
     @template_hash.should == stream.delete(@uri)
   end
-  
+
   it "should parse a raw response and symbolize keys" do
     prepare_mock_request_dump :raw
     @template_hash_symbolized.should == Yajl::HttpStream.delete(@uri, :symbolize_keys => true)
   end
-  
+
   if defined?(Yajl::Bzip2::StreamReader)
     it "should parse a bzip2 compressed response" do
       prepare_mock_request_dump :bzip2
@@ -71,27 +71,27 @@ describe "Yajl HTTP DELETE request" do
       @template_hash_symbolized.should == Yajl::HttpStream.delete(@uri, :symbolize_keys => true)
     end
   end
-  
+
   it "should parse a deflate compressed response" do
     prepare_mock_request_dump :deflate
     @template_hash.should == Yajl::HttpStream.delete(@uri)
   end
-  
+
   it "should parse a deflate compressed response and symbolize keys" do
     prepare_mock_request_dump :deflate
     @template_hash_symbolized.should == Yajl::HttpStream.delete(@uri, :symbolize_keys => true)
   end
-  
+
   it "should parse a gzip compressed response" do
     prepare_mock_request_dump :gzip
     @template_hash.should == Yajl::HttpStream.delete(@uri)
   end
-  
+
   it "should parse a gzip compressed response and symbolize keys" do
     prepare_mock_request_dump :gzip
     @template_hash_symbolized.should == Yajl::HttpStream.delete(@uri, :symbolize_keys => true)
   end
-  
+
   it "should raise when an HTTP code that isn't 200 is returned" do
     prepare_mock_request_dump :error
     lambda { Yajl::HttpStream.delete(@uri) }.should raise_exception(Yajl::HttpStream::HttpError)