brianmario-yajl-ruby 0.5.3 → 0.5.4

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-## 0.5.3 (Jun 7th, 2009)
+## 0.5.4 (June 16th, 2009)
+* Yajl::Parser's :symbolize_keys option now defaults to false
+* remove use of sprintf for a little speed improvement while parsing
+
+## 0.5.3 (June 7th, 2009)
 * The IO parameter for Yajl::Encode#encode is now optional, and accepts a block
 ** it will return the resulting JSON string if no IO is passed to stream to
 ** if a block is passed, it will call and pass it the resulting JSON string

data/VERSION.yml

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

data/ext/yajl_ext.c

@@ -166,9 +166,7 @@ static int yajl_found_number(void * ctx, const char * numberVal, unsigned int nu
     VALUE subString = rb_str_new(numberVal, numberLen);
     char * cSubString = RSTRING_PTR(subString);
     
-    if (strstr(cSubString, ".") != NULL ||
-        strstr(cSubString, "e") != NULL ||
-        strstr(cSubString, "E") != NULL) {
+    if (strstr(cSubString, ".") != NULL || strstr(cSubString, "e") != NULL || strstr(cSubString, "E") != NULL) {
             yajl_set_static_value(ctx, rb_Float(subString));
     } else {
         yajl_set_static_value(ctx, rb_Integer(subString));
@@ -186,15 +184,13 @@ static int yajl_found_string(void * ctx, const unsigned char * stringVal, unsign
 static int yajl_found_hash_key(void * ctx, const unsigned char * stringVal, unsigned int stringLen) {
     struct yajl_parser_wrapper * wrapper;
     GetParser((VALUE)ctx, wrapper);
+    VALUE keyStr = rb_str_new((const char *)stringVal, stringLen);
     
     if (wrapper->symbolizeKeys) {
-        char keyStr[stringLen];
-        ID key;
-        sprintf(keyStr, "%.*s", stringLen, stringVal);
-        key = rb_intern(keyStr);
+        ID key = rb_intern(RSTRING_PTR(keyStr));
         yajl_set_static_value(ctx, ID2SYM(key));
     } else {
-        yajl_set_static_value(ctx, rb_str_new((const char *)stringVal, stringLen));
+        yajl_set_static_value(ctx, keyStr);
     }
     yajl_check_and_fire_callback(ctx);
     return 1;
@@ -252,17 +248,19 @@ static int yajl_found_end_array(void * ctx) {
 /*
  * Document-method: new
  *
- * call-seq: new([:allow_comments => false, :check_utf8 => false])
+ * call-seq: new([:symbolize_keys => true, [:allow_comments => false[, :check_utf8 => false]]])
  *
- * :allow_comments will turn on/off the check for comments inside the JSON stream.
+ * :symbolize_keys will turn hash keys into Ruby symbols, defaults to false.
  *
- * :check_utf8 will validate UTF8 characters found in the JSON stream.
+ * :allow_comments will turn on/off the check for comments inside the JSON stream, defaults to true.
+ *
+ * :check_utf8 will validate UTF8 characters found in the JSON stream, defaults to true.
  */
 static VALUE rb_yajl_parser_new(int argc, VALUE * argv, VALUE klass) {
     struct yajl_parser_wrapper * wrapper;
     yajl_parser_config cfg;
     VALUE opts, obj;
-    int allowComments = 1, checkUTF8 = 1, symbolizeKeys = 1;
+    int allowComments = 1, checkUTF8 = 1, symbolizeKeys = 0;
     
     // Scan off config vars
     if (rb_scan_args(argc, argv, "01", &opts) == 1) {
@@ -274,8 +272,8 @@ static VALUE rb_yajl_parser_new(int argc, VALUE * argv, VALUE klass) {
         if (rb_hash_aref(opts, ID2SYM(sym_check_utf8)) == Qfalse) {
             checkUTF8 = 0;
         }
-        if (rb_hash_aref(opts, ID2SYM(sym_symbolize_keys)) == Qfalse) {
-            symbolizeKeys = 0;
+        if (rb_hash_aref(opts, ID2SYM(sym_symbolize_keys)) == Qtrue) {
+            symbolizeKeys = 1;
         }
     }
     cfg = (yajl_parser_config){allowComments, checkUTF8};
@@ -295,12 +293,14 @@ static VALUE rb_yajl_parser_new(int argc, VALUE * argv, VALUE klass) {
 /*
  * Document-method: initialize
  *
- * call-seq: initialize([:allow_comments => false, :check_utf8 => false])
+ * call-seq: new([:symbolize_keys => true, [:allow_comments => false[, :check_utf8 => false]]])
  *
- * :allow_comments will turn on/off the check for comments inside the JSON stream.
+ * :symbolize_keys will turn hash keys into Ruby symbols, defaults to false.
  *
- * :check_utf8 will validate UTF8 characters found in the JSON stream.
-*/
+ * :allow_comments will turn on/off the check for comments inside the JSON stream, defaults to true.
+ *
+ * :check_utf8 will validate UTF8 characters found in the JSON stream, defaults to true.
+ */
 static VALUE rb_yajl_parser_init(int argc, VALUE * argv, VALUE self) {
     return self;
 }

data/spec/parsing/chunked_spec.rb

@@ -4,7 +4,7 @@ require 'stringio'
 
 describe "Chunked parser" do
   before(:all) do
-    @final = [{:abc => 123}, {:def => 456}]
+    @final = [{"abc" => 123}, {"def" => 456}]
   end
   
   before(:each) do

data/spec/parsing/one_off_spec.rb

@@ -6,7 +6,7 @@ describe "One-off JSON examples" do
     infinity = (1.0/0)
     silence_warnings do
       parser = Yajl::Parser.new
-      parser.parse(StringIO.new('{"key": 23456789012E666}')).should == {:key => infinity}
+      parser.parse(StringIO.new('{"key": 23456789012E666}')).should == {"key" => infinity}
     end
   end
   
@@ -36,16 +36,16 @@ describe "One-off JSON examples" do
   
   it "should parse using it's class method, from an IO" do
     io = StringIO.new('{"key": 1234}')
-    Yajl::Parser.parse(io).should == {:key => 1234}
+    Yajl::Parser.parse(io).should == {"key" => 1234}
   end
   
-  it "should parse using it's class method, from an IO with string keys" do
+  it "should parse using it's class method, from an IO with symbolized keys" do
     parser = Yajl::Parser.new(:symbolize_keys => true)
     parser.parse('{"key": 1234}').should == {:key => 1234}
   end
   
   it "should parse using it's class method, from a string" do
-    Yajl::Parser.parse('{"key": 1234}').should == {:key => 1234}
+    Yajl::Parser.parse('{"key": 1234}').should == {"key" => 1234}
   end
   
   it "should parse using it's class method, from a string with a block" do
@@ -53,6 +53,6 @@ describe "One-off JSON examples" do
     Yajl::Parser.parse('{"key": 1234}') do |obj|
       output = obj
     end
-    output.should == {:key => 1234}
+    output.should == {"key" => 1234}
   end
 end

data/yajl-ruby.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yajl-ruby}
-  s.version = "0.5.3"
+  s.version = "0.5.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-06-07}
+  s.date = %q{2009-06-16}
   s.email = %q{seniorlopez@gmail.com}
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brianmario-yajl-ruby
 version: !ruby/object:Gem::Version 
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors: 
 - Brian Lopez
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-07 00:00:00 -07:00
+date: 2009-06-16 00:00:00 -07:00
 default_executable: 
 dependencies: []