yajl-ruby 0.8.3 → 1.0.0

data/.gitignore

@@ -8,4 +8,5 @@ TODO.txt
 tmp/*
 pkg/*
 vendor/gems
-Gemfile.lock
+Gemfile.lock
+.rbx

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 1.0.0 (September 13th, 2011)
+* add deprecation notice for Yajl's Bzip2 support
+* add deprecation notice for Yajl's Deflate support
+* add deprecation notice for Yajl's Gzip support
+* add deprecation notice for Yajl's JSON gem compatibility API
+* add deprecation notice for Yajl::HttpStream
+* change the path the extension is copied into to be 'lib/yajl'
+* remove 'ext' from the loadpath
+
 ## 0.8.3 (August 16th, 2011)
 * fix bug where Yajl::HttpStream wouldn't pass through a user-specified socket
 * fix incorrect Ruby initialization hook method name

data/{README.rdoc → README.md}

@@ -1,10 +1,10 @@
-= YAJL C Bindings for Ruby
+# YAJL C Bindings for Ruby
 
 This gem is a C binding to the excellent YAJL JSON parsing and generation library.
 
 You can read more info at the project's website http://lloyd.github.com/yajl or check out its code at http://github.com/lloyd/yajl.
 
-== Features
+## Features
 
 * JSON parsing and encoding directly to and from an IO stream (file, socket, etc) or String. Compressed stream parsing and encoding supported for Bzip2, Gzip and Deflate.
 * Parse and encode *multiple* JSON objects to and from streams or strings continuously.
@@ -17,94 +17,111 @@ You can read more info at the project's website http://lloyd.github.com/yajl or
 * ~1.5x faster than Marshal.load
 * ~2x faster than Marshal.dump
 
-== How to install
+## How to install
 
 Go ahead and install it as usual:
 
- gem install yajl-ruby
+```
+gem install yajl-ruby
+```
 
-== Example of use
+## Example of use
 
 NOTE: I'm building up a collection of small examples in the examples (http://github.com/brianmario/yajl-ruby/tree/master/examples) folder.
 
 First, you're probably gonna want to require it:
 
- require 'yajl'
+``` ruby
+require 'yajl'
+```
 
-=== Parsing
+### Parsing
 
 Then maybe parse some JSON from:
 
 a File IO
 
- json = File.new('test.json', 'r')
- parser = Yajl::Parser.new
- hash = parser.parse(json)
+``` ruby
+json = File.new('test.json', 'r')
+parser = Yajl::Parser.new
+hash = parser.parse(json)
+```
 
 or maybe a StringIO
 
- json = StringIO.new("...some JSON...")
- parser = Yajl::Parser.new
- hash = parser.parse(json)
+``` ruby
+json = StringIO.new("...some JSON...")
+parser = Yajl::Parser.new
+hash = parser.parse(json)
+```
 
 or maybe STDIN
 
- cat someJsonFile.json | ruby -ryajl -e "puts Yajl::Parser.parse(STDIN).inspect"
-
+```
+cat someJsonFile.json | ruby -ryajl -e "puts Yajl::Parser.parse(STDIN).inspect"
+```
 
 Or lets say you didn't have access to the IO object that contained JSON data, but instead
 only had access to chunks of it at a time. No problem!
 
 (Assume we're in an EventMachine::Connection instance)
 
- def post_init
-    @parser = Yajl::Parser.new(:symbolize_keys => true)
- end
+``` ruby
+def post_init
+   @parser = Yajl::Parser.new(:symbolize_keys => true)
+end
 
- def object_parsed(obj)
-    puts "Sometimes one pays most for the things one gets for nothing. - Albert Einstein"
-    puts obj.inspect
-  end
-
- def connection_completed
-   # once a full JSON object has been parsed from the stream
-   # object_parsed will be called, and passed the constructed object
-   @parser.on_parse_complete = method(:object_parsed)
+def object_parsed(obj)
+   puts "Sometimes one pays most for the things one gets for nothing. - Albert Einstein"
+   puts obj.inspect
  end
 
- def receive_data(data)
-   # continue passing chunks
-   @parser << data
- end
+def connection_completed
+  # once a full JSON object has been parsed from the stream
+  # object_parsed will be called, and passed the constructed object
+  @parser.on_parse_complete = method(:object_parsed)
+end
+
+def receive_data(data)
+  # continue passing chunks
+  @parser << data
+end
+```
 
 Or if you don't need to stream it, it'll just return the built object from the parse when it's done.
- NOTE: if there are going to be multiple JSON strings in the input, you *must* specify a block or callback as this
- is how yajl-ruby will hand you (the caller) each object as it's parsed off the input.
+NOTE: if there are going to be multiple JSON strings in the input, you *must* specify a block or callback as this
+is how yajl-ruby will hand you (the caller) each object as it's parsed off the input.
 
- obj = Yajl::Parser.parse(str_or_io)
+``` ruby
+obj = Yajl::Parser.parse(str_or_io)
+```
 
 Or how about a JSON API HTTP request?
 This actually makes a request using a raw TCPSocket, then parses the JSON body right off the socket. While it's being received over the wire!
 
- require 'uri'
- require 'yajl/http_stream'
+``` ruby
+require 'uri'
+require 'yajl/http_stream'
 
- url = URI.parse("http://search.twitter.com/search.json?q=engineyard")
- results = Yajl::HttpStream.get(url)
+url = URI.parse("http://search.twitter.com/search.json?q=engineyard")
+results = Yajl::HttpStream.get(url)
+```
 
 Or do the same request, with Gzip and Deflate output compression support (also supports Bzip2, if loaded):
 (this does the same raw socket Request, but transparently parses the compressed response body)
 
- require 'uri'
- require 'yajl/gzip'
- require 'yajl/deflate'
- require 'yajl/http_stream'
+``` ruby
+require 'uri'
+require 'yajl/gzip'
+require 'yajl/deflate'
+require 'yajl/http_stream'
 
- url = URI.parse("http://search.twitter.com/search.json?q=engineyard")
- results = Yajl::HttpStream.get(url)
+url = URI.parse("http://search.twitter.com/search.json?q=engineyard")
+results = Yajl::HttpStream.get(url)
+```
 
 Since yajl-ruby parses JSON as a stream, supporting API's like Twitter's Streaming API are a piece-of-cake.
-You can simply supply a block to Yajl::HttpStream.get, which is used as the callback for when a JSON object has been
+You can simply supply a block to `Yajl::HttpStream.get`, which is used as the callback for when a JSON object has been
 unserialized off the stream. For the case of this Twitter Streaming API call, the callback gets fired a few times a second (depending on your connection speed).
 The code below is all that's needed to make the request and stream unserialized Ruby hashes off the response, continuously.
 You'll note that I've enabled the :symbolize_keys parser option as well. Doing so is much more efficient for parsing JSON streams with
@@ -112,86 +129,100 @@ lots of repetitive keys - for things like result sets or multiple API requests -
 This is because Ruby will reuse (and never GC) its symbol table. Be that as it may, if you want to parse JSON strings with random key names
 it's much better to leave string keys enabled (the default), so they can get GC'd later.
 
- require 'uri'
- require 'yajl/http_stream'
+``` ruby
+require 'uri'
+require 'yajl/http_stream'
 
- uri = URI.parse("http://#{username}:#{password}@stream.twitter.com/spritzer.json")
- Yajl::HttpStream.get(uri, :symbolize_keys => true) do |hash|
-   puts hash.inspect
- end
+uri = URI.parse("http://#{username}:#{password}@stream.twitter.com/spritzer.json")
+Yajl::HttpStream.get(uri, :symbolize_keys => true) do |hash|
+  puts hash.inspect
+end
+```
 
 Or how about parsing directly from a compressed file?
 
- require 'yajl/bzip2'
+``` ruby
+require 'yajl/bzip2'
 
- file = File.new('some.json.bz2', 'r')
- result = Yajl::Bzip2::StreamReader.parse(file)
+file = File.new('some.json.bz2', 'r')
+result = Yajl::Bzip2::StreamReader.parse(file)
+```
 
-=== Encoding
+### Encoding
 
 Since yajl-ruby does everything using streams, you simply need to pass the object to encode, and the IO to write the stream to (this happens in chunks).
 
 This allows you to encode JSON as a stream, writing directly to a socket
 
- socket = TCPSocket.new('192.168.1.101', 9000)
- hash = {:foo => 12425125, :bar => "some string", ... }
- encoder = Yajl::Encoder.new
- Yajl::Encoder.encode(hash, socket)
+``` ruby
+socket = TCPSocket.new('192.168.1.101', 9000)
+hash = {:foo => 12425125, :bar => "some string", ... }
+encoder = Yajl::Encoder.new
+Yajl::Encoder.encode(hash, socket)
+```
 
 Or what if you wanted to compress the stream over the wire?
 
- require 'yajl/gzip'
- socket = TCPSocket.new('192.168.1.101', 9000)
- hash = {:foo => 12425125, :bar => "some string", ... }
- Yajl::Gzip::StreamWriter.encode(hash, socket)
+``` ruby
+require 'yajl/gzip'
+socket = TCPSocket.new('192.168.1.101', 9000)
+hash = {:foo => 12425125, :bar => "some string", ... }
+Yajl::Gzip::StreamWriter.encode(hash, socket)
+```
 
 Or what about encoding multiple objects to JSON over the same stream?
 This example will encode and send 50 JSON objects over the same stream, continuously.
 
- socket = TCPSocket.new('192.168.1.101', 9000)
- encoder = Yajl::Encoder.new
- 50.times do
-   hash = {:current_time => Time.now.to_f, :foo => 12425125}
-   encoder.encode(hash, socket)
- end
-
-Using EventMachine and you want to encode and send in chunks?
-(Assume we're in an EventMachine::Connection instance)
-
- def post_init
-    # Passing a :terminator character will let us determine when the encoder
-    # is done encoding the current object
-    @encoder = Yajl::Encoder.new
-    motd_contents = File.read("/path/to/motd.txt")
-    status = File.read("/path/to/huge/status_file.txt")
-    @motd = {:motd => motd_contents, :system_status => status}
- end
-
- def connection_completed
-   # The encoder will do its best to hand you data in chunks that
-   # are around 8kb (but you may see some that are larger)
-   #
-   # It should be noted that you could have also assigned the _on_progress_ callback
-   # much like you can assign the _on_parse_complete_ callback with the parser class.
-   # Passing a block (like below) essentially tells the encoder to use that block
-   # as the callback normally assigned to _on_progress_.
-   #
-   # Send our MOTD and status
-   @encoder.encode(@motd) do |chunk|
-     if chunk.nil? # got our terminator, encoding is done
-       close_connection_after_writing
-     else
-       send_data(chunk)
-     end
-   end
- end
+``` ruby
+socket = TCPSocket.new('192.168.1.101', 9000)
+encoder = Yajl::Encoder.new
+50.times do
+  hash = {:current_time => Time.now.to_f, :foo => 12425125}
+  encoder.encode(hash, socket)
+end
+```
+
+Using `EventMachine` and you want to encode and send in chunks?
+(Assume we're in an `EventMachine::Connection` instance)
+
+``` ruby
+def post_init
+   # Passing a :terminator character will let us determine when the encoder
+   # is done encoding the current object
+   @encoder = Yajl::Encoder.new
+   motd_contents = File.read("/path/to/motd.txt")
+   status = File.read("/path/to/huge/status_file.txt")
+   @motd = {:motd => motd_contents, :system_status => status}
+end
+
+def connection_completed
+  # The encoder will do its best to hand you data in chunks that
+  # are around 8kb (but you may see some that are larger)
+  #
+  # It should be noted that you could have also assigned the _on_progress_ callback
+  # much like you can assign the _on_parse_complete_ callback with the parser class.
+  # Passing a block (like below) essentially tells the encoder to use that block
+  # as the callback normally assigned to _on_progress_.
+  #
+  # Send our MOTD and status
+  @encoder.encode(@motd) do |chunk|
+    if chunk.nil? # got our terminator, encoding is done
+      close_connection_after_writing
+    else
+      send_data(chunk)
+    end
+  end
+end
+```
 
 But to make things simple, you might just want to let yajl-ruby do all the hard work for you and just hand back
 a string when it's finished. In that case, just don't provide and IO or block (or assign the on_progress callback).
 
- str = Yajl::Encoder.encode(obj)
+``` ruby
+str = Yajl::Encoder.encode(obj)
+```
 
-You can also use Yajl::Bzip2::StreamWriter and Yajl::Deflate::StreamWriter. So you can pick whichever fits your CPU/bandwidth sweet-spot.
+You can also use `Yajl::Bzip2::StreamWriter` and `Yajl::Deflate::StreamWriter`. So you can pick whichever fits your CPU/bandwidth sweet-spot.
 
 === HTML Safety
 
@@ -199,39 +230,44 @@ If you plan on embedding the output from the encoder in the DOM, you'll want to
 
 Meaning the following should be perfectly safe:
 
- <script type="text/javascript">
-   var escaped_str = <%= Yajl::Encoder.encode("</script><script>alert('hi!');</script>", :html_safe => true) %>;
- </script>
+``` html
+<script type="text/javascript">
+  var escaped_str = <%= Yajl::Encoder.encode("</script><script>alert('hi!');</script>", :html_safe => true) %>;
+</script>
+```
 
 == JSON gem Compatibility API
 
 The JSON gem compatibility API isn't enabled by default. You have to explicitly require it like so:
 
- require 'yajl/json_gem'
+``` ruby
+require 'yajl/json_gem'
+```
 
-That's right, you can just replace "require 'json'" with the line above and you're done!
+That's right, you can just replace `"require 'json'"` with the line above and you're done!
 
 This will require yajl-ruby itself, as well as enable its JSON gem compatibility API.
 
 This includes the following API:
 
- JSON.parse, JSON.generate, JSON.pretty_generate, JSON.load, JSON.dump
- and all of the #to_json instance method overrides for Ruby's primitive objects
+JSON.parse, JSON.generate, JSON.pretty_generate, JSON.load, JSON.dump
+and all of the #to_json instance method overrides for Ruby's primitive objects
+
 
 Once the compatibility API is enabled, your existing or new project should work as if the JSON gem itself were being used. Only you'll be using Yajl ;)
 
 There are a lot more possibilities that I'd love to see other gems/plugins for someday.
 
 Some ideas:
+
 * parsing logs in JSON format
 * a Rails plugin - DONE! (http://github.com/technoweenie/yajl-rails)
 * official support in Rails 3 - DONE (http://github.com/rails/rails/commit/a96bf4ab5e73fccdafb78b99e8a122cc2172b505)
-** and is the default (if installed) - http://github.com/rails/rails/commit/63bb955a99eb46e257655c93dd64e86ebbf05651
+ * and is the default (if installed) - http://github.com/rails/rails/commit/63bb955a99eb46e257655c93dd64e86ebbf05651
 * Rack middleware (ideally the JSON body could be handed to the parser while it's still being received, this is apparently possible with Unicorn)
 * JSON API clients (http://github.com/brianmario/freckle-api)
-* ???
 
-== Benchmarks
+## Benchmarks
 
 After I finished implementation - this library performs close to the same as the current JSON.parse (C gem) does on small/medium files.
 
@@ -242,69 +278,69 @@ Since it's able to parse the stream in chunks, its memory requirements are very,
 
 Here's what parsing a 2.43MB JSON file off the filesystem 20 times looks like:
 
-=== Memory Usage
+### Memory Usage
 
-==== Average
+#### Average
 
 * Yajl::Parser#parse: 32MB
 * JSON.parse: 54MB
 * ActiveSupport::JSON.decode: 63MB
 
-==== Peak
+#### Peak
 
 * Yajl::Parser#parse: 32MB
 * JSON.parse: 57MB
 * ActiveSupport::JSON.decode: 67MB
 
-=== Parse Time
+### Parse Time
 
 * Yajl::Parser#parse: 4.54s
 * JSON.parse: 5.47s
 * ActiveSupport::JSON.decode: 64.42s
 
-=== Encode Time
+### Encode Time
 
 * Yajl::Encoder#encode: 3.59s
 * JSON#to_json: 6.2s
 * ActiveSupport::JSON.encode: 45.58s
 
-=== Compared to YAML
+### Compared to YAML
 
 NOTE: I converted the 2.4MB JSON file to YAML for this test.
 
-==== Parse Time (from their respective formats)
+#### Parse Time (from their respective formats)
 
 * Yajl::Parser#parse: 4.33s
 * JSON.parse: 5.37s
 * YAML.load: 19.47s
 
-==== Encode Time (to their respective formats)
+#### Encode Time (to their respective formats)
 
 * Yajl::Encoder#encode: 3.47s
 * JSON#to_json: 6.6s
 * YAML.dump(obj, io): 1309.93s
 
-=== Compared to Marshal.load/Marshal.dump
+### Compared to Marshal.load/Marshal.dump
 
 NOTE: I converted the 2.4MB JSON file to a Hash and a dump file from Marshal.dump for this test.
 
-==== Parse Time (from their respective formats)
+#### Parse Time (from their respective formats)
 
 * Yajl::Parser#parse: 4.54s
 * JSON.parse: 7.40s
 * Marshal.load: 7s
 
-==== Encode Time (to their respective formats)
+#### Encode Time (to their respective formats)
 
 * Yajl::Encoder#encode: 2.39s
 * JSON#to_json: 8.37s
 * Marshal.dump: 4.66s
 
-== Third Party Sources Bundled
+## Third Party Sources Bundled
 
 This project includes code from the BSD licensed yajl project, copyright 2007-2009 Lloyd Hilaiel
 
-== Special Thanks & Contributors
+## Special Thanks & Contributors
 
 For those of you using yajl-ruby out in the wild, please hit me up on Twitter (brianmario) or send me a message here on the Githubs describing the site and how you're using it. I'd love to get a list going!
 

data/benchmark/encode.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 

data/benchmark/encode_json_and_marshal.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 

data/benchmark/encode_json_and_yaml.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 

data/benchmark/http.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 

data/benchmark/parse.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 

data/benchmark/parse_json_and_marshal.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 

data/benchmark/parse_json_and_yaml.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 

data/benchmark/parse_stream.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 

data/examples/encoding/chunked_encoding.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 

data/examples/encoding/one_shot.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 

data/examples/encoding/to_an_io.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 

data/examples/http/twitter_search_api.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 

data/examples/http/twitter_stream_api.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 

data/examples/parsing/from_file.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 

data/examples/parsing/from_stdin.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 

data/examples/parsing/from_string.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../../lib')
 

data/ext/yajl/extconf.rb

@@ -1,8 +1,7 @@
-# encoding: UTF-8
 require 'mkmf'
 require 'rbconfig'
 
 $CFLAGS << ' -Wall -funroll-loops'
 $CFLAGS << ' -Wextra -O0 -ggdb3' if ENV['DEBUG']
 
-create_makefile("yajl")
+create_makefile('yajl/yajl')

data/ext/yajl/yajl_ext.c

@@ -187,11 +187,13 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
         default:
             if (rb_respond_to(obj, intern_to_json)) {
                 str = rb_funcall(obj, intern_to_json, 0);
+                Check_Type(str, T_STRING);
                 cptr = RSTRING_PTR(str);
                 len = RSTRING_LEN(str);
                 status = yajl_gen_number(w->encoder, cptr, len);
             } else {
                 str = rb_funcall(obj, intern_to_s, 0);
+                Check_Type(str, T_STRING);
                 cptr = RSTRING_PTR(str);
                 len = RSTRING_LEN(str);
                 status = yajl_gen_string(w->encoder, (const unsigned char *)cptr, len);

data/lib/yajl.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'yajl/yajl'
 
 # = Extras

data/lib/yajl/bzip2.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+puts "DEPRECATION WARNING: Yajl's Bzip2 support is going to be removed in 2.0"
 
 require 'yajl' unless defined?(Yajl::Parser)
 

data/lib/yajl/bzip2/stream_reader.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Yajl
   module Bzip2
     # This is a wrapper around Bzip::Reader to allow it's #read method to adhere

data/lib/yajl/bzip2/stream_writer.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Yajl
   module Bzip2
     # A wrapper around the Bzip2::Writer class for easier JSON stream encoding

data/lib/yajl/deflate.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+puts "DEPRECATION WARNING: Yajl's Deflate support is going to be removed in 2.0"
 
 require 'yajl' unless defined?(Yajl::Parser)
 require 'zlib' unless defined?(Zlib)

data/lib/yajl/deflate/stream_reader.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Yajl
   module Deflate
     # This is a wrapper around Zlib::Inflate, creating a #read method that adheres

data/lib/yajl/deflate/stream_writer.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Yajl
   module Deflate
     # A wrapper around the Zlib::Deflate class for easier JSON stream parsing

data/lib/yajl/gzip.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8
+puts "DEPRECATION WARNING: Yajl's Gzip support is going to be removed in 2.0"
 
 require 'yajl' unless defined?(Yajl::Parser)
 require 'zlib' unless defined?(Zlib)

data/lib/yajl/gzip/stream_reader.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Yajl
   module Gzip
     # This is a wrapper around Zlib::GzipReader to allow it's #read method to adhere

data/lib/yajl/gzip/stream_writer.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 module Yajl
   module Gzip
     # Wraper around the Zlib::GzipWriter class

data/lib/yajl/http_stream.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+puts "DEPRECATION WARNING: Yajl::HttpStream is going to be removed in 2.0"
+
 require 'socket'
 require 'yajl'
 require 'yajl/version' unless defined? Yajl::VERSION

data/lib/yajl/json_gem.rb

@@ -1,4 +1,5 @@
-# encoding: UTF-8
+puts "DEPRECATION WARNING: Yajl's JSON gem compatibility API is going to be removed in 2.0"
+
 require 'yajl' unless defined?(Yajl::Parser)
 require 'yajl/json_gem/parsing'
 require 'yajl/json_gem/encoding'

data/lib/yajl/json_gem/encoding.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'yajl' unless defined?(Yajl::Parser)
 
 # NOTE: this is probably temporary until I can split out the JSON compat C code into it's own

data/lib/yajl/json_gem/parsing.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require 'yajl' unless defined?(Yajl::Parser)
 
 module JSON

data/lib/yajl/version.rb

@@ -1,3 +1,3 @@
 module Yajl
-  VERSION = "0.8.3"
+  VERSION = '1.0.0'
 end

data/spec/encoding/encoding_spec.rb

@@ -7,6 +7,18 @@ class Dummy2
   end
 end
 
+class TheMindKiller
+  def to_json
+    @wait_i_dont_exist_this_is_a_horrible_mistake_dont_do_it_aiiiiiiiiieeeeeee
+  end
+end
+
+class TheMindKillerDuce
+  def to_s
+    @wait_i_dont_exist_this_is_a_horrible_mistake_dont_do_it_aiiiiiiiiieeeeeee
+  end
+end
+
 describe "Yajl JSON encoder" do
   FILES = Dir[File.dirname(__FILE__)+'/../../benchmark/subjects/*.json']
 
@@ -244,4 +256,16 @@ describe "Yajl JSON encoder" do
     unsafe_encoder = Yajl::Encoder.new
     unsafe_encoder.encode("</script>").should_not eql("\"<\\/script>\"")
   end
+
+  it "return value of #to_json must be a string" do
+    lambda {
+      Yajl::Encoder.encode(TheMindKiller.new)
+    }.should raise_error(TypeError)
+  end
+
+  it "return value of #to_s must be a string" do
+    lambda {
+      Yajl::Encoder.encode(TheMindKillerDuce.new)
+    }.should raise_error(TypeError)
+  end
 end

data/spec/global/global_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 describe "Yajl" do

data/spec/http/http_delete_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 begin
   require 'yajl/bzip2'

data/spec/http/http_error_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 begin
   require 'yajl/bzip2'

data/spec/http/http_get_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 begin
   require 'yajl/bzip2'

data/spec/http/http_post_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 begin
   require 'yajl/bzip2'

data/spec/http/http_put_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 begin
   require 'yajl/bzip2'

data/spec/http/http_stream_options_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 require 'yajl/http_stream'
 require 'socket'

data/spec/parsing/chunked_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 describe "Chunked parser" do

data/spec/parsing/fixtures_spec.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper.rb')
 
 describe "Parsing JSON Fixtures" do

data/spec/spec_helper.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/..')
 $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 

data/tasks/compile.rake

@@ -1,11 +1,10 @@
-gem 'rake-compiler', '>= 0.7.5'
-require "rake/extensiontask"
+require 'rake/extensiontask'
 
 def gemspec
   @clean_gemspec ||= eval(File.read(File.expand_path('../../yajl-ruby.gemspec', __FILE__)))
 end
 
-Rake::ExtensionTask.new("yajl", gemspec) do |ext|
+Rake::ExtensionTask.new('yajl', gemspec) do |ext|
   # automatically add build options to avoid need of manual input
   ext.cross_compile = true
   ext.cross_platform = ['x86-mingw32', 'x86-mswin32-60']
@@ -23,15 +22,14 @@ end
 Rake::Task[:spec].prerequisites << :compile
 
 file 'lib/yajl/yajl.rb' do |t|
-  name = gemspec.name
   File.open(t.name, 'wb') do |f|
     f.write <<-eoruby
 RUBY_VERSION =~ /(\\d+.\\d+)/
-require "#{name}/\#{$1}/#{name}"
+require "yajl/\#{$1}/yajl"
     eoruby
   end
 end
 
 if Rake::Task.task_defined?(:cross)
-  Rake::Task[:cross].prerequisites << "lib/yajl/yajl.rb"
+  Rake::Task[:cross].prerequisites << 'lib/yajl/yajl.rb'
 end

data/yajl-ruby.gemspec

@@ -7,12 +7,9 @@ Gem::Specification.new do |s|
   s.date = Time.now.utc.strftime("%Y-%m-%d")
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/yajl/extconf.rb"]
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
   s.files = `git ls-files`.split("\n")
   s.homepage = %q{http://github.com/brianmario/yajl-ruby}
-  s.require_paths = ["lib", "ext"]
+  s.require_paths = ["lib"]
   s.rubygems_version = %q{1.4.2}
   s.summary = %q{Ruby C bindings to the excellent Yajl JSON stream-based parser library.}
   s.test_files = `git ls-files spec examples`.split("\n")

metadata

@@ -1,99 +1,75 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: yajl-ruby
-version: !ruby/object:Gem::Version 
-  hash: 57
+version: !ruby/object:Gem::Version
+  version: 1.0.0
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 3
-  version: 0.8.3
 platform: ruby
-authors: 
+authors:
 - Brian Lopez
 - Lloyd Hilaiel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-16 00:00:00 -07:00
+date: 2011-09-16 00:00:00.000000000 -07:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake-compiler
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70167590495720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 0
-        - 7
-        - 5
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.5
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70167590495720
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70167590495220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activesupport
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70167590495220
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70167590494840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70167590494840
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70167590494380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *70167590494380
 description: 
 email: seniorlopez@gmail.com
 executables: []
-
-extensions: 
+extensions:
 - ext/yajl/extconf.rb
-extra_rdoc_files: 
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
 - .gitignore
 - .rspec
 - CHANGELOG.md
 - Gemfile
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - benchmark/encode.rb
 - benchmark/encode_json_and_marshal.rb
@@ -239,39 +215,29 @@ files:
 has_rdoc: true
 homepage: http://github.com/brianmario/yajl-ruby
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-- ext
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby C bindings to the excellent Yajl JSON stream-based parser library.
-test_files: 
+test_files:
 - examples/encoding/chunked_encoding.rb
 - examples/encoding/one_shot.rb
 - examples/encoding/to_an_io.rb