json 1.1.4 → 1.1.5

data/ext/json/ext/parser/parser.rl

@@ -27,7 +27,7 @@ static VALUE mJSON, mExt, cParser, eParserError, eNestingError;
 static VALUE CNaN, CInfinity, CMinusInfinity;
 
 static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
-          i_chr, i_max_nesting, i_allow_nan; 
+          i_chr, i_max_nesting, i_allow_nan, i_object_class, i_array_class; 
 
 #define MinusInfinity "-Infinity"
 
@@ -40,6 +40,8 @@ typedef struct JSON_ParserStruct {
     int max_nesting;
     int current_nesting;
     int allow_nan;
+    VALUE object_class;
+    VALUE array_class;
 } JSON_Parser;
 
 static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *result);
@@ -118,12 +120,13 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
 {
     int cs = EVIL;
     VALUE last_name = Qnil;
+    VALUE object_class = json->object_class;
 
     if (json->max_nesting && json->current_nesting > json->max_nesting) {
         rb_raise(eNestingError, "nesting of %d is to deep", json->current_nesting);
     }
 
-    *result = rb_hash_new();
+    *result = NIL_P(object_class) ? rb_hash_new() : rb_class_new_instance(0, 0, object_class);
 
     %% write init;
     %% write exec;
@@ -330,11 +333,12 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
 static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *result)
 {
     int cs = EVIL;
+    VALUE array_class = json->array_class;
 
     if (json->max_nesting && json->current_nesting > json->max_nesting) {
         rb_raise(eNestingError, "nesting of %d is to deep", json->current_nesting);
     }
-    *result = rb_ary_new();
+    *result = NIL_P(array_class) ? rb_ary_new() : rb_class_new_instance(0, 0, array_class);
 
     %% write init;
     %% write exec;
@@ -500,6 +504,8 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
  * * *create_additions*: If set to false, the Parser doesn't create
  *   additions even if a matchin class and create_id was found. This option
  *   defaults to true.
+ * * *object_class*: Defaults to Hash
+ * * *array_class*: Defaults to Array
  */
 static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 {
@@ -549,11 +555,25 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
             } else {
                 json->create_id = rb_funcall(mJSON, i_create_id, 0);
             }
+            tmp = ID2SYM(i_object_class);
+            if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
+                json->object_class = rb_hash_aref(opts, tmp);
+            } else {
+                json->object_class = Qnil;
+            }
+            tmp = ID2SYM(i_array_class);
+            if (st_lookup(RHASH_TBL(opts), tmp, 0)) {
+                json->array_class = rb_hash_aref(opts, tmp);
+            } else {
+                json->array_class = Qnil;
+            }
         }
     } else {
         json->max_nesting = 19;
         json->allow_nan = 0;
         json->create_id = rb_funcall(mJSON, i_create_id, 0);
+        json->object_class = Qnil;
+        json->array_class = Qnil;
     }
     json->current_nesting = 0;
     /*
@@ -610,6 +630,8 @@ static void JSON_mark(JSON_Parser *json)
 {
     rb_gc_mark_maybe(json->Vsource);
     rb_gc_mark_maybe(json->create_id);
+    rb_gc_mark_maybe(json->object_class);
+    rb_gc_mark_maybe(json->array_class);
 }
 
 static void JSON_free(JSON_Parser *json)
@@ -659,4 +681,6 @@ void Init_parser()
     i_chr = rb_intern("chr");
     i_max_nesting = rb_intern("max_nesting");
     i_allow_nan = rb_intern("allow_nan");
+    i_object_class = rb_intern("object_class");
+    i_array_class = rb_intern("array_class");
 }

data/ext/json/ext/parser/unicode.c

@@ -81,7 +81,7 @@ char *JSON_convert_UTF16_to_UTF8 (
         buf[1] = *p++;
         buf[2] = *p++;
         buf[3] = *p++;
-        tmpPtr[i] = strtol(buf, NULL, 16);
+        tmpPtr[i] = (UTF16)strtol(buf, NULL, 16);
         p += 2;
     }
 

data/lib/json.rb

@@ -2,13 +2,9 @@ require 'json/common'
 module JSON
   require 'json/version'
 
-  if VARIANT_BINARY
+  begin
     require 'json/ext'
-  else
-    begin
-      require 'json/ext'
-    rescue LoadError
-      require 'json/pure'
-    end
+  rescue LoadError
+    require 'json/pure'
   end
 end

data/lib/json/pure/parser.rb

@@ -61,6 +61,8 @@ module JSON
       # * *create_additions*: If set to false, the Parser doesn't create
       #   additions even if a matchin class and create_id was found. This option
       #   defaults to true.
+      # * *object_class*: Defaults to Hash
+      # * *array_class*: Defaults to Array
       def initialize(source, opts = {})
         super
         if !opts.key?(:max_nesting) # defaults to 19
@@ -74,6 +76,8 @@ module JSON
         ca = true
         ca = opts[:create_additions] if opts.key?(:create_additions)
         @create_id = ca ? JSON.create_id : nil
+        @object_class = opts[:object_class] || Hash
+        @array_class = opts[:array_class] || Array
       end
 
       alias source string
@@ -184,7 +188,7 @@ module JSON
       def parse_array
         raise NestingError, "nesting of #@current_nesting is to deep" if
           @max_nesting.nonzero? && @current_nesting > @max_nesting
-        result = []
+        result = @array_class.new
         delim = false
         until eos?
           case
@@ -216,7 +220,7 @@ module JSON
       def parse_object
         raise NestingError, "nesting of #@current_nesting is to deep" if
           @max_nesting.nonzero? && @current_nesting > @max_nesting
-        result = {}
+        result = @object_class.new
         delim = false
         until eos?
           case

data/lib/json/version.rb

@@ -1,9 +1,8 @@
 module JSON
   # JSON version
-  VERSION         = '1.1.4'
+  VERSION         = '1.1.5'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
   VERSION_BUILD   = VERSION_ARRAY[2] # :nodoc:
-  VARIANT_BINARY  = false
 end

data/tests/test_json.rb

@@ -150,6 +150,14 @@ class TC_JSON < Test::Unit::TestCase
       , [2718.0E-3 ],\r[ null] , [[1, -2, 3 ]], [false ],[ true]\n ]  }))
   end
 
+  class SubArray < Array; end
+
+  def test_parse_array_custom_class
+    res = parse('[]', :array_class => SubArray)
+    assert_equal([], res)
+    assert_equal(SubArray, res.class)
+  end
+
   def test_parse_object
     assert_equal({}, parse('{}'))
     assert_equal({}, parse('  {  }  '))
@@ -157,6 +165,14 @@ class TC_JSON < Test::Unit::TestCase
     assert_equal({'foo'=>'bar'}, parse('    { "foo"  :   "bar"   }   '))
   end
 
+  class SubHash < Hash; end
+
+  def test_parse_object_custom_class
+    res = parse('{}', :object_class => SubHash)
+    assert_equal({}, res)
+    assert_equal(SubHash, res.class)
+  end
+
   def test_parser_reset
     parser = Parser.new(@json)
     assert_equal(@hash, parser.parse)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: json
 version: !ruby/object:Gem::Version 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors: 
 - Florian Frank
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-02 00:00:00 +02:00
+date: 2009-05-10 00:00:00 +02:00
 default_executable: edit_json.rb
 dependencies: []
 
@@ -17,145 +17,147 @@ description: ""
 email: flori@ping.de
 executables: 
 - edit_json.rb
+- prettify_json.rb
 extensions: 
-- ext/json/ext/parser/extconf.rb
 - ext/json/ext/generator/extconf.rb
+- ext/json/ext/parser/extconf.rb
 extra_rdoc_files: []
 
 files: 
-- install.rb
-- lib
-- lib/json.rb
-- lib/json
-- lib/json/Array.xpm
-- lib/json/FalseClass.xpm
-- lib/json/json.xpm
-- lib/json/editor.rb
-- lib/json/Hash.xpm
-- lib/json/Key.xpm
-- lib/json/common.rb
-- lib/json/String.xpm
-- lib/json/pure
-- lib/json/pure/generator.rb
-- lib/json/pure/parser.rb
-- lib/json/Numeric.xpm
-- lib/json/ext.rb
-- lib/json/pure.rb
-- lib/json/NilClass.xpm
-- lib/json/add
-- lib/json/add/rails.rb
-- lib/json/add/core.rb
-- lib/json/TrueClass.xpm
-- lib/json/version.rb
-- ext
-- ext/json
-- ext/json/ext
-- ext/json/ext/parser
-- ext/json/ext/parser/unicode.h
-- ext/json/ext/parser/parser.c
-- ext/json/ext/parser/extconf.rb
-- ext/json/ext/parser/unicode.c
-- ext/json/ext/parser/parser.rl
-- ext/json/ext/generator
-- ext/json/ext/generator/unicode.h
-- ext/json/ext/generator/extconf.rb
-- ext/json/ext/generator/generator.c
-- ext/json/ext/generator/unicode.c
-- README
-- diagrams
-- CHANGES
-- RUBY
-- TODO
-- VERSION
+- GPL
 - tests
+- tests/test_json_unicode.rb
 - tests/test_json.rb
 - tests/test_json_addition.rb
 - tests/fixtures
-- tests/fixtures/fail11.json
-- tests/fixtures/fail5.json
-- tests/fixtures/fail10.json
+- tests/fixtures/fail1.json
+- tests/fixtures/fail18.json
+- tests/fixtures/fail13.json
 - tests/fixtures/fail3.json
-- tests/fixtures/pass15.json
-- tests/fixtures/fail9.json
-- tests/fixtures/fail22.json
+- tests/fixtures/fail10.json
 - tests/fixtures/fail6.json
-- tests/fixtures/pass2.json
 - tests/fixtures/fail20.json
-- tests/fixtures/fail19.json
-- tests/fixtures/fail12.json
-- tests/fixtures/fail7.json
-- tests/fixtures/fail4.json
-- tests/fixtures/fail1.json
-- tests/fixtures/fail24.json
-- tests/fixtures/fail21.json
 - tests/fixtures/pass1.json
+- tests/fixtures/fail28.json
+- tests/fixtures/fail21.json
+- tests/fixtures/pass26.json
+- tests/fixtures/fail22.json
+- tests/fixtures/pass15.json
+- tests/fixtures/fail11.json
+- tests/fixtures/fail19.json
 - tests/fixtures/fail2.json
-- tests/fixtures/fail25.json
+- tests/fixtures/fail8.json
 - tests/fixtures/pass16.json
+- tests/fixtures/fail24.json
+- tests/fixtures/fail23.json
 - tests/fixtures/pass3.json
-- tests/fixtures/fail18.json
-- tests/fixtures/fail28.json
-- tests/fixtures/fail13.json
-- tests/fixtures/fail27.json
+- tests/fixtures/fail7.json
+- tests/fixtures/pass2.json
 - tests/fixtures/pass17.json
-- tests/fixtures/pass26.json
-- tests/fixtures/fail23.json
 - tests/fixtures/fail14.json
-- tests/fixtures/fail8.json
+- tests/fixtures/fail9.json
+- tests/fixtures/fail12.json
+- tests/fixtures/fail27.json
+- tests/fixtures/fail4.json
+- tests/fixtures/fail5.json
+- tests/fixtures/fail25.json
 - tests/test_json_generate.rb
 - tests/test_json_rails.rb
-- tests/test_json_unicode.rb
 - tests/test_json_fixtures.rb
+- install.rb
+- ext
+- ext/json
+- ext/json/ext
+- ext/json/ext/generator
+- ext/json/ext/generator/unicode.h
+- ext/json/ext/generator/extconf.rb
+- ext/json/ext/generator/generator.c
+- ext/json/ext/generator/unicode.c
+- ext/json/ext/parser
+- ext/json/ext/parser/unicode.h
+- ext/json/ext/parser/parser.rl
+- ext/json/ext/parser/extconf.rb
+- ext/json/ext/parser/parser.c
+- ext/json/ext/parser/unicode.c
+- VERSION
+- README
+- tools
+- tools/server.rb
+- tools/fuzz.rb
+- lib
+- lib/json.rb
+- lib/json
+- lib/json/add
+- lib/json/add/core.rb
+- lib/json/add/rails.rb
+- lib/json/ext.rb
+- lib/json/Key.xpm
+- lib/json/Array.xpm
+- lib/json/common.rb
+- lib/json/ext
+- lib/json/Hash.xpm
+- lib/json/String.xpm
+- lib/json/FalseClass.xpm
+- lib/json/Numeric.xpm
+- lib/json/version.rb
+- lib/json/pure
+- lib/json/pure/generator.rb
+- lib/json/pure/parser.rb
+- lib/json/pure.rb
+- lib/json/NilClass.xpm
+- lib/json/json.xpm
+- lib/json/editor.rb
+- lib/json/TrueClass.xpm
+- TODO
+- data
+- data/prototype.js
+- data/index.html
+- data/example.json
+- bin
+- bin/prettify_json.rb
+- bin/edit_json.rb
+- diagrams
+- doc-templates
+- doc-templates/main.txt
+- RUBY
 - benchmarks
-- benchmarks/generator_benchmark.rb
 - benchmarks/data-p4-3GHz-ruby18
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat
 - benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat
 - benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat
 - benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat
 - benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat
-- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat
 - benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log
 - benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log
 - benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log
 - benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat
-- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat
 - benchmarks/data
 - benchmarks/parser_benchmark.rb
+- benchmarks/generator_benchmark.rb
 - Rakefile
-- doc-templates
-- doc-templates/main.txt
-- GPL
-- data
-- data/example.json
-- data/index.html
-- data/prototype.js
-- bin
-- bin/edit_json.rb
-- bin/prettify_json.rb
-- tools
-- tools/fuzz.rb
-- tools/server.rb
+- CHANGES
 has_rdoc: true
 homepage: http://json.rubyforge.org
 post_install_message: 
@@ -189,9 +191,9 @@ signing_key:
 specification_version: 2
 summary: A JSON implementation as a Ruby extension
 test_files: 
+- tests/test_json_unicode.rb
 - tests/test_json.rb
 - tests/test_json_addition.rb
 - tests/test_json_generate.rb
 - tests/test_json_rails.rb
-- tests/test_json_unicode.rb
 - tests/test_json_fixtures.rb