yajl-ruby 0.7.5 → 0.7.6

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.7.6 (May 1st, 2010)
+* use memcmp instead of strcmp for invalid Fixnum check
+* add a spec to verify unicode chars can be used as keys
+* twitter examples updated
+* only use -Wextra if ENV['DEBUG'] is set as gcc 3 doesn't know about it
+* fix chunked http encoding parse logic to further comply with the spec (thanks to Sebastian Cohnen <sebastian.cohnen@gmx.net>)
+* removed as_json checks and usage in encoder to prevent infinite loops
+** In Rails a lot of objects return self from the as_json method - which is wrong IMO - and needs to be fixed before this feature will work properly
+
 ## 0.7.5 (March 23rd, 2010)
 * check for existence of and use as_json method on custom objects
 * bugfix with read buffer when parsing from an IO (thanks to Pavel Valodzka <pavel@valodzka.name>)

data/README.rdoc

@@ -62,7 +62,7 @@ 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
+    @parser = Yajl::Parser.new(:symbolize_keys => true)
  end
 
  def object_parsed(obj)
@@ -165,7 +165,7 @@ Using EventMachine and you want to encode and send in chunks?
  def post_init
     # Passing a :terminator character will let us determine when the encoder
     # is done encoding the current object
-    @encoder = Yajl::Encoder.new(:terminator => nil)
+    @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}
@@ -216,15 +216,14 @@ Once the compatibility API is enabled, your existing or new project should work
 
 There are a lot more possibilities that I'd love to see other gems/plugins for someday.
 
-Some ideas are:
+Some ideas:
 * parsing logs in JSON format
 * a Rails plugin - DONE! (http://github.com/technoweenie/yajl-rails)
-* builtin support in Rails 3?
+* 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
 * Rack middleware (ideally the JSON body could be handed to the parser while it's still being received, this is apparently possible with Unicorn)
-* use with ohai - DONE! (http://github.com/opscode/ohai/commit/f89baccc3b9ab587d23e0b6257f6fedffe223c02)
-* JSON API clients (http://github.com/brianmario/crack, http://github.com/brianmario/freckle-api)
-* Patch Marshal#load and Marshal#dump to use JSON? ;)
-* etc...
+* JSON API clients (http://github.com/brianmario/freckle-api)
+* ???
 
 == Benchmarks
 
@@ -299,7 +298,7 @@ NOTE: I converted the 2.4MB JSON file to a Hash and a dump file from Marshal.dum
 
 This project includes code from the BSD licensed yajl project, copyright 2007-2009 Lloyd Hilaiel
 
-== Special Thanks
+== 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!
 
@@ -309,7 +308,13 @@ I've had a lot of inspiration, and a lot of help. Thanks to everyone who's been
 * Josh Ferguson - http://github.com/besquared - for peer-pressuring me into getting back into C; it worked ;) Also tons of support over IM
 * Jonathan Novak - http://github.com/cypriss - pointer-hacking help
 * Tom Smith - http://github.com/rtomsmith - pointer-hacking help
-* Rick http://github.com/technoweenie - for making an ActiveSupport patch with support for this library and teasing me that it might go into Rails 3. You sure lit a fire under my ass and I got a ton of work done because of it! :)
+* Rick Olson - http://github.com/technoweenie - for making an ActiveSupport patch with support for this library and teasing me that it might go into Rails 3. You sure lit a fire under my ass and I got a ton of work done because of it! :)
 * The entire Github Crew - http://github.com/ - my inspiration, time spent writing this, finding Yajl, So many-MANY other things wouldn't have been possible without this awesome service. I owe you guys some whiskey at Kilowatt.
-* benburkert - http://github.com/benburkert
+* Ben Burkert - http://github.com/benburkert
 * Aman Gupta - http://github.com/tmm1 - tons of suggestions and inspiration for the most recent features, and hopefully more to come ;)
+* Filipe Giusti
+* Jonathan George
+* Luke Redpath
+* Neil Berkman
+* Pavel Valodzka
+* Rob Sharp

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 7
-:patch: 5
+:patch: 6
 :build: 
 :major: 0

data/benchmark/parse.rb

@@ -7,7 +7,7 @@ begin
 rescue LoadError
 end
 begin
-  require 'active_support/json'
+  require 'active_support/all'
 rescue LoadError
   begin
     require 'active_support'

data/examples/http/twitter_search_api.rb

@@ -8,7 +8,5 @@ unless keywords = ARGV[0]
   puts "\nUsage: ruby examples/http/twitter_search_api.rb keyword\n\n"
   exit(0)
 end
-captured = 0
-uri = URI.parse("http://search.twitter.com/search.json?q=#{keywords}")
 
-puts Yajl::HttpStream.get(uri).inspect
+puts Yajl::HttpStream.get("http://search.twitter.com/search.json?q=#{keywords}").inspect

data/examples/http/twitter_stream_api.rb

@@ -11,7 +11,7 @@ unless (username = ARGV[0]) && (password = ARGV[1])
   exit(0)
 end
 captured = 0
-uri = URI.parse("http://#{username}:#{password}@stream.twitter.com/spritzer.json")
+uri = URI.parse("http://#{username}:#{password}@stream.twitter.com/1/statuses/sample.json")
 
 trap('INT') {
   puts "\n\nCaptured #{captured} objects from the stream"

data/ext/extconf.rb

@@ -2,7 +2,8 @@
 require 'mkmf'
 require 'rbconfig'
 
-$CFLAGS << ' -Wall -Wextra -funroll-loops'
+$CFLAGS << ' -Wall -funroll-loops'
+$CFLAGS << ' -Wextra' if ENV['DEBUG']
 # $CFLAGS << ' -O0 -ggdb'
 
 create_makefile("yajl_ext")

data/ext/yajl_ext.c

@@ -162,7 +162,7 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
             str = rb_funcall(obj, intern_to_s, 0);
             cptr = RSTRING_PTR(str);
             len = RSTRING_LEN(str);
-            if (strcmp(cptr, "NaN") == 0 || strcmp(cptr, "Infinity") == 0 || strcmp(cptr, "-Infinity") == 0) {
+            if (memcmp(cptr, "NaN", 3) == 0 || memcmp(cptr, "Infinity", 8) == 0 || memcmp(cptr, "-Infinity", 9) == 0) {
                 rb_raise(cEncodeError, "'%s' is an invalid number", cptr);
             }
             status = yajl_gen_number(w->encoder, cptr, len);
@@ -173,10 +173,7 @@ void yajl_encode_part(void * wrapper, VALUE obj, VALUE io) {
             status = yajl_gen_string(w->encoder, (const unsigned char *)cptr, len);
             break;
         default:
-            if (rb_respond_to(obj, intern_as_json)) {
-                obj = rb_funcall(obj, intern_as_json, 0);
-                yajl_encode_part(w, obj, io);
-            } else if (rb_respond_to(obj, intern_to_json)) {
+            if (rb_respond_to(obj, intern_to_json)) {
                 str = rb_funcall(obj, intern_to_json, 0);
                 cptr = RSTRING_PTR(str);
                 len = RSTRING_LEN(str);

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.7.5"
+  VERSION = "0.7.6"
 
   # For compatibility, has the same signature of Yajl::Parser.parse
   def self.load(str_or_io, options={}, read_bufsize=nil, &block)

data/lib/yajl/http_stream.rb

@@ -147,9 +147,12 @@ module Yajl
         if response_head[:headers]["Transfer-Encoding"] == 'chunked'
           if block_given?
             chunkLeft = 0
-            while !socket.eof? && (size = socket.gets.hex)
-              next if size == 0
+            while !socket.eof? && (line = socket.gets)
+              break if line.match /0.*?\r\n/
+              next if line == "\r\n"
+              size = line.hex
               json = socket.read(size)
+              next if json.nil?
               chunkLeft = size-json.size
               if chunkLeft == 0
                 parser << json

data/spec/encoding/encoding_spec.rb

@@ -7,12 +7,6 @@ class Dummy2
   end
 end
 
-class Dummy3
-  def as_json
-    {:hawtness => true}
-  end
-end
-
 describe "Yajl JSON encoder" do
   FILES = Dir[File.dirname(__FILE__)+'/../../benchmark/subjects/*.json']
 
@@ -161,11 +155,6 @@ describe "Yajl JSON encoder" do
     Yajl::Encoder.encode({:foo => d}).should eql('{"foo":{"hawtness":true}}')
   end
 
-  it "should check for and call #as_json if it exists on custom objects" do
-    d = Dummy3.new
-    Yajl::Encoder.encode(d).should eql('{"hawtness":true}')
-  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
@@ -220,4 +209,9 @@ describe "Yajl JSON encoder" do
       Yajl::Encoder.encode(-1.0/0.0)
     }.should raise_error(Yajl::EncodeError)
   end
+
+  it "should encode with unicode chars in the key" do
+    hash = {"浅草" => "<- those are unicode"}
+    Yajl::Encoder.encode(hash).should eql("{\"浅草\":\"<- those are unicode\"}")
+  end
 end

data/yajl-ruby.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.7.5"
+  s.version = "0.7.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Lopez", "Lloyd Hilaiel"]
-  s.date = %q{2010-03-23}
+  s.date = %q{2010-05-01}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 6
+  version: 0.7.6
 platform: ruby
 authors: 
 - Brian Lopez
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-23 00:00:00 -07:00
+date: 2010-05-01 00:00:00 -07:00
 default_executable: 
 dependencies: []