brianmario-yajl-ruby 0.5.0 → 0.5.1

data/CHANGELOG.rdoc

@@ -1,6 +1,12 @@
 = Changelog
 
-0.5.0 (?)
+0.5.1 (May 25th, 2009)
+ * added some more tests for the new API
+ * inlined a couple of hot functions used in parsing for a little speedup
+ * updates to readme, reflecting changes in API
+ * version bump to push another gem build
+
+0.5.0 (May 25th, 2009)
  * Refactored internal API so the caller can specify initialization options for the Parser and Encoder
    respectively. Two new classes were introduced as a result - Yajl::Parser and Yajl::Encoder.
    The newly refactored codebase is cleaner, thread-safe and removed all of the hack-code that was trickled

data/README.rdoc

@@ -25,16 +25,18 @@ Then maybe parse some JSON from:
 a File IO
 
  json = File.new('test.json', 'r')
- hash = Yajl::Stream.parse(json)
+ parser = Yajl::Parser.new
+ hash = parser.parse(json)
 
 or maybe a StringIO
 
- json = StringIO.new
- hash = Yajl::Stream.parse(json)
+ json = StringIO.new("...some JSON...")
+ parser = Yajl::Parser.new
+ hash = parser.parse(json)
 
 or maybe STDIN
 
- cat someJsonFile.json | ruby -ryajl -e "puts Yajl::Stream.parse(STDIN).inspect"
+ cat someJsonFile.json | ruby -ryajl -e "puts Yajl::Parser.new.parse(STDIN).inspect"
 
 
 Or lets say you didn't have access to the IO object that contained JSON data, but instead
@@ -42,6 +44,10 @@ 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
+ end
+ 
  def object_parsed(obj)
     puts "Sometimes one pays most for the things one gets for nothing. - Albert Einstein"
     puts obj.inspect
@@ -50,15 +56,12 @@ only had access to chunks of it at a time. No problem!
  def connection_completed
    # once a full JSON object has been parsed from the stream
    # object_parsed will be called, and passed the constructed object
-   Yajl::Chunked.on_parse_complete = method(:object_parsed)
+   @parser.on_parse_complete = method(:object_parsed)
  end
  
  def receive_data(data)
    # continue passing chunks
-   Yajl::Chunked.parse_some(data)
-   
-   # Or as an alias, you could have done:
-   # Yajl::Chunked << data
+   @parser << data
  end
 
 
@@ -110,7 +113,8 @@ 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", ... }
- Yajl::Stream.encode(hash, socket)
+ encoder = Yajl::Encoder.new
+ Yajl::encoder.encode(hash, socket)
 
 Or what if you wanted to compress the stream over the wire?
 
@@ -148,25 +152,25 @@ Here's what parsing a 2.43MB JSON file off the filesystem 20 times looks like:
 
 ==== Average
 
-* Yajl::Stream.parse: 32MB
+* Yajl::Parser#parse: 32MB
 * JSON.parse: 54MB
 * ActiveSupport::JSON.decode: 63MB
 
 ==== Peak
 
-* Yajl::Stream.parse: 32MB
+* Yajl::Parser#parse: 32MB
 * JSON.parse: 57MB
 * ActiveSupport::JSON.decode: 67MB
 
 === Parse Time
 
-* Yajl::Stream.parse: 4.54s
+* Yajl::Parser#parse: 4.54s
 * JSON.parse: 5.47s
 * ActiveSupport::JSON.decode: 64.42s
 
 === Encode Time
 
-* Yajl::Stream.encode: 3.59s
+* Yajl::Encoder#encode: 3.59s
 * JSON#to_json: 6.2s
 * ActiveSupport::JSON.encode: 45.58s
 
@@ -176,13 +180,13 @@ NOTE: I converted the 2.4MB JSON file to YAML for this test.
 
 ==== Parse Time (from their respective formats)
 
-* Yajl::Stream.parse: 4.33s
+* Yajl::Parser#parse: 4.33s
 * JSON.parse: 5.37s
 * YAML.load_stream: 19.47s
 
 ==== Encode Time (to their respective formats)
 
-* Yajl::Stream.encode: 3.47s
+* Yajl::Encoder#encode: 3.47s
 * JSON#to_json: 6.6s
 * YAML.dump(obj, io): 1309.93s
 

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :minor: 5
-:patch: 0
+:patch: 1
 :major: 0

data/ext/yajl_ext.c

@@ -1,7 +1,7 @@
 #include "yajl_ext.h"
 
 // Helpers for building objects
-void yajl_check_and_fire_callback(void * ctx) {
+inline void yajl_check_and_fire_callback(void * ctx) {
     struct yajl_parser_wrapper * wrapper;
     GetParser((VALUE)ctx, wrapper);
     
@@ -14,7 +14,7 @@ void yajl_check_and_fire_callback(void * ctx) {
     }
 }
 
-void yajl_set_static_value(void * ctx, VALUE val) {
+inline void yajl_set_static_value(void * ctx, VALUE val) {
     struct yajl_parser_wrapper * wrapper;
     VALUE lastEntry, hash;
     int len;

data/ext/yajl_ext.h

@@ -11,8 +11,8 @@ static ID intern_io_read, intern_eof, intern_call, intern_keys, intern_to_s,
 #define GetParser(obj, sval) (sval = (struct yajl_parser_wrapper*)DATA_PTR(obj));
 #define GetEncoder(obj, sval) (sval = (yajl_gen*)DATA_PTR(obj));
 
-void yajl_check_and_fire_callback(void * ctx);
-void yajl_set_static_value(void * ctx, VALUE val);
+inline void yajl_check_and_fire_callback(void * ctx);
+inline void yajl_set_static_value(void * ctx, VALUE val);
 void yajl_encode_part(yajl_gen hand, VALUE obj, VALUE io);
 
 static int yajl_found_null(void * ctx);

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.5.0"
+  VERSION = "0.5.1"
   
   # == Yajl::Parser
   #

data/spec/encoding/encoding_spec.rb

@@ -25,4 +25,24 @@ describe "Yajl JSON encoder" do
       end
     end
   end
+  
+  it "should encode with :pretty turned on and a single space indent" do
+    output = "{\n \"foo\": {\n  \"name\": \"bar\",\n  \"id\": 1234\n }\n}\n"
+    obj = {:foo => {:id => 1234, :name => "bar"}}
+    io = StringIO.new
+    encoder = Yajl::Encoder.new(:pretty => true, :indent => ' ')
+    encoder.encode(obj, io)
+    io.rewind
+    io.read.should == output
+  end
+  
+  it "should encode with :pretty turned on and a tab character indent" do
+    output = "{\n\t\"foo\": {\n\t\t\"name\": \"bar\",\n\t\t\"id\": 1234\n\t}\n}\n"
+    obj = {:foo => {:id => 1234, :name => "bar"}}
+    io = StringIO.new
+    encoder = Yajl::Encoder.new(:pretty => true, :indent => "\t")
+    encoder.encode(obj, io)
+    io.rewind
+    io.read.should == output
+  end
 end

data/spec/parsing/one_off_spec.rb

@@ -9,4 +9,30 @@ describe "One-off JSON examples" do
       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)
+    }.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)
+    }.should_not raise_error(Yajl::ParseError)
+  end
+  
+  it "should not parse invalid UTF8 with :check_utf8 set to true" do
+    pending
+    # not sure how to write this test yet
+  end
+  
+  it "should parse invalid UTF8 with :check_utf8 set to false" do
+    pending
+    # not sure how to write this test yet
+  end
 end

data/yajl-ruby.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brian Lopez", "Lloyd Hilaiel"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brianmario-yajl-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Brian Lopez