json-maglev- 1.6.5 → 1.6.7

data/.gitignore

@@ -6,3 +6,6 @@ pkg
 java/Json.iml
 Gemfile.lock
 .rvmrc
+*.rbc
+.rbx
+.AppleDouble

data/.travis.yml

@@ -6,10 +6,11 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
-  - rbx
-  - rbx-2.0
+  - rbx-18mode
+  - rbx-19mode
   - ree
-  - jruby
+  - jruby-18mode
+  - jruby-19mode
   - ruby-head
 
 script: "bundle exec rake"

data/CHANGES

@@ -1,3 +1,12 @@
+2012-04-27 (1.6.7)
+  * Fix possible crash when trying to parse nil value.
+2012-02-11 (1.6.6)
+  * Propagate src encoding to values made from it (fixes 1.9 mode converting
+    everything to ascii-8bit; harmless for 1.8 mode too) (Thomas E. Enebo
+    <tom.enebo@gmail.com>), should fix
+    https://github.com/flori/json/issues#issue/119.
+  * Fix https://github.com/flori/json/issues#issue/124 Thx to Jason Hutchens.
+  * Fix https://github.com/flori/json/issues#issue/117
 2012-01-15 (1.6.5)
   * Vit Ondruch <v.ondruch@tiscali.cz> reported a bug that shows up when using
     optimisation under GCC 4.7. Thx to him, Bohuslav Kabrda

data/Gemfile

@@ -6,10 +6,10 @@ gemspec :name => 'json'
 gemspec :name => 'json_pure'
 gemspec :name => 'json-java'
 
-group :development do
+group :development, :test do
   gem 'simplecov', :platform => :mri_19
 end
 
 group :test do
-  gem 'test-unit', :platform => :mri_19
+  gem 'test-unit', '2.4.7', :platform => :mri_19
 end

data/README.rdoc

@@ -1,4 +1,4 @@
-= JSON implementation for Ruby http://travis-ci.org/flori/json.png?branch=master
+= JSON implementation for Ruby {<img src="https://secure.travis-ci.org/flori/json.png" />}[http://travis-ci.org/flori/json]
 
 == Description
 

data/Rakefile

@@ -4,21 +4,27 @@ rescue LoadError
 end
 
 require 'rbconfig'
-begin
-  include RbConfig
-rescue NameError
-  include Config
-end
-
+include\
+  begin
+    RbConfig
+  rescue NameError
+    Config
+  end
 
 require 'rake/clean'
-CLOBBER.include Dir['benchmarks/data/*.{dat,log}'], 'doc', 'Gemfile.lock'
+CLOBBER.include 'doc', 'Gemfile.lock'
 CLEAN.include FileList['diagrams/*.*'], 'doc', 'coverage', 'tmp',
   FileList["ext/**/{Makefile,mkmf.log}"], 'build', 'dist', FileList['**/*.rbc'],
   FileList["{ext,lib}/**/*.{so,bundle,#{CONFIG['DLEXT']},o,obj,pdb,lib,manifest,exp,def,jar,class,dSYM}"],
   FileList['java/src/**/*.class']
 
-MAKE = ENV['MAKE'] || %w[gmake make].find { |c| system(c, '-v') }
+require 'rake/testtask'
+class UndocumentedTestTask < Rake::TestTask
+  def desc(*) end
+end
+
+MAKE   = ENV['MAKE']   || %w[gmake make].find { |c| system(c, '-v') }
+BUNDLE = ENV['BUNDLE'] || %w[bundle].find { |c| system(c, '-v') }
 PKG_NAME          = 'json'
 PKG_TITLE         = 'JSON Implementation for Ruby'
 PKG_VERSION       = File.read('VERSION').chomp
@@ -44,19 +50,9 @@ JRUBY_GENERATOR_JAR = File.expand_path("lib/json/ext/generator.jar")
 RAGEL_CODEGEN     = %w[rlcodegen rlgen-cd ragel].find { |c| system(c, '-v') }
 RAGEL_DOTGEN      = %w[rlgen-dot rlgen-cd ragel].find { |c| system(c, '-v') }
 
-def myruby(*args, &block)
-  @myruby ||= File.join(CONFIG['bindir'], CONFIG['ruby_install_name'])
-  options = (Hash === args.last) ? args.pop : {}
-  if args.length > 1 then
-    sh(*([@myruby] + args + [options]), &block)
-  else
-    sh("#{@myruby} #{args.first}", options, &block)
-  end
-end
-
 desc "Installing library (pure)"
 task :install_pure => :version do
-  myruby 'install.rb'
+  ruby 'install.rb'
 end
 
 task :install_ext_really do
@@ -75,11 +71,7 @@ desc "Installing library (extension)"
 task :install_ext => [ :compile, :install_pure, :install_ext_really ]
 
 desc "Installing library (extension)"
-if RUBY_PLATFORM =~ /java/
-  task :install => :install_pure
-else
-  task :install => :install_ext
-end
+task :install => :install_ext
 
 if defined?(Gem) and defined?(Gem::PackageTask)
   spec_pure = Gem::Specification.new do |s|
@@ -92,7 +84,6 @@ if defined?(Gem) and defined?(Gem::PackageTask)
 
     s.require_path = 'lib'
     s.add_development_dependency 'permutation'
-    s.add_development_dependency 'bullshit'
     s.add_development_dependency 'sdoc'
     s.add_development_dependency 'rake', '~>0.9.2'
 
@@ -133,7 +124,6 @@ if defined?(Gem) and defined?(Gem::PackageTask)
     s.require_paths << 'ext'
     s.require_paths << 'lib'
     s.add_development_dependency 'permutation'
-    s.add_development_dependency 'bullshit'
     s.add_development_dependency 'sdoc'
 
     s.extra_rdoc_files << 'README.rdoc'
@@ -182,18 +172,26 @@ EOT
 end
 
 desc "Testing library (pure ruby)"
-task :test_pure => :clean do
-  ENV['JSON'] = 'pure'
-  ENV['RUBYOPT'] = "-Ilib #{ENV['RUBYOPT']}"
-  myruby '-S', 'testrb', *Dir['./tests/test_*.rb']
+task :test_pure => [ :clean, :do_test_pure ]
+
+UndocumentedTestTask.new do |t|
+  t.name = 'do_test_pure'
+  t.libs << 'lib'
+  t.test_files = FileList['tests/test_*.rb']
+  t.verbose = true
+  t.options = '-v'
 end
 
 desc "Testing library (pure ruby and extension)"
-task :test => [ :test_pure, :test_ext ]
+task :test do
+  sh "env JSON=pure #{BUNDLE} exec rake test_pure" or exit 1
+  sh "env JSON=ext #{BUNDLE} exec rake test_ext"  or exit 1
+end
 
 namespace :gems do
+  desc 'Install all development gems'
   task :install do
-    sh 'bundle'
+    sh "#{BUNDLE}"
   end
 end
 
@@ -250,9 +248,14 @@ if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
   end
 
   desc "Testing library (jruby)"
-  task :test_ext => :create_jar do
-    ENV['JSON'] = 'ext'
-    myruby '-S', 'testrb', '-Ilib', *Dir['./tests/test_*.rb']
+  task :test_ext => [ :create_jar, :do_test_ext ]
+
+  UndocumentedTestTask.new do |t|
+    t.name = 'do_test_ext'
+    t.libs << 'lib'
+    t.test_files = FileList['tests/test_*.rb']
+    t.verbose = true
+    t.options = '-v'
   end
 
   file JRUBY_PARSER_JAR => :compile do
@@ -304,7 +307,7 @@ else
 
   file EXT_PARSER_DL => EXT_PARSER_SRC do
     cd EXT_PARSER_DIR do
-      myruby 'extconf.rb'
+      ruby 'extconf.rb'
       sh MAKE
     end
     cp "#{EXT_PARSER_DIR}/parser.#{CONFIG['DLEXT']}", EXT_ROOT_DIR
@@ -312,36 +315,23 @@ else
 
   file EXT_GENERATOR_DL => EXT_GENERATOR_SRC do
     cd EXT_GENERATOR_DIR do
-      myruby 'extconf.rb'
+      ruby 'extconf.rb'
       sh MAKE
     end
     cp "#{EXT_GENERATOR_DIR}/generator.#{CONFIG['DLEXT']}", EXT_ROOT_DIR
   end
 
   desc "Testing library (extension)"
-  task :test_ext => :compile do
-    ENV['JSON'] = 'ext'
-    ENV['RUBYOPT'] = "-Iext:lib #{ENV['RUBYOPT']}"
-    myruby '-S', 'testrb', *Dir['./tests/test_*.rb']
+  task :test_ext => [ :compile, :do_test_ext ]
+
+  UndocumentedTestTask.new do |t|
+    t.name = 'do_test_ext'
+    t.libs << 'ext' << 'lib'
+    t.test_files = FileList['tests/test_*.rb']
+    t.verbose = true
+    t.options = '-v'
   end
 
-  desc "Benchmarking parser"
-  task :benchmark_parser do
-    ENV['RUBYOPT'] = "-Ilib:ext #{ENV['RUBYOPT']}"
-    myruby 'benchmarks/parser_benchmark.rb'
-    myruby 'benchmarks/parser2_benchmark.rb'
-  end
-
-  desc "Benchmarking generator"
-  task :benchmark_generator do
-    ENV['RUBYOPT'] = "-Ilib:ext #{ENV['RUBYOPT']}"
-    myruby 'benchmarks/generator_benchmark.rb'
-    myruby 'benchmarks/generator2_benchmark.rb'
-  end
-
-  desc "Benchmarking library"
-  task :benchmark => [ :benchmark_parser, :benchmark_generator ]
-
   desc "Create RDOC documentation"
   task :doc => [ :version, EXT_PARSER_SRC ] do
     sh "sdoc -o doc -t '#{PKG_TITLE}' -m README.rdoc README.rdoc lib/json.rb #{FileList['lib/json/**/*.rb']} #{EXT_PARSER_SRC} #{EXT_GENERATOR_SRC}"

data/VERSION

@@ -1 +1 @@
-1.6.5
+1.6.7

data/ext/json/ext/generator/generator.c

@@ -852,6 +852,21 @@ static VALUE cState_partial_generate(VALUE self, VALUE obj)
     return fbuffer_to_s(buffer);
 }
 
+/*
+ * This function returns true if string is either a JSON array or JSON object.
+ * It might suffer from false positives, e. g. syntactically incorrect JSON in
+ * the string or certain UTF-8 characters on the right hand side.
+ */
+static int isArrayOrObject(VALUE string)
+{
+    long string_len = RSTRING_LEN(string);
+    char *p = RSTRING_PTR(string), *q = p + string_len - 1;
+    if (string_len < 2) return 0;
+    for (; p < q && isspace(*p); p++);
+    for (; q > p && isspace(*q); q--);
+    return *p == '[' && *q == ']' || *p == '{' && *q == '}';
+}
+
 /*
  * call-seq: generate(obj)
  *
@@ -862,15 +877,9 @@ static VALUE cState_partial_generate(VALUE self, VALUE obj)
 static VALUE cState_generate(VALUE self, VALUE obj)
 {
     VALUE result = cState_partial_generate(self, obj);
-    VALUE re, args[2];
     GET_STATE(self);
-    if (!state->quirks_mode) {
-        args[0] = rb_str_new2("\\A\\s*(?:\\[.*\\]|\\{.*\\})\\s*\\Z");
-        args[1] = CRegexp_MULTILINE;
-        re = rb_class_new_instance(2, args, rb_cRegexp);
-        if (NIL_P(rb_funcall(re, i_match, 1, result))) {
-            rb_raise(eGeneratorError, "only generation of JSON objects or arrays allowed");
-        }
+    if (!state->quirks_mode && !isArrayOrObject(result)) {
+        rb_raise(eGeneratorError, "only generation of JSON objects or arrays allowed");
     }
     return result;
 }

data/ext/json/ext/generator/generator.h

@@ -4,6 +4,7 @@
 #include <string.h>
 #include <assert.h>
 #include <math.h>
+#include <ctype.h>
 
 #include "ruby.h"
 

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

@@ -1731,6 +1731,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
       source = convert_encoding(StringValue(source));
     }
     json->current_nesting = 0;
+    StringValue(source);
     json->len = RSTRING_LEN(source);
     json->source = RSTRING_PTR(source);;
     PARSER_SET_REFERENCE(json, Vsource, source);
@@ -1738,7 +1739,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
 }
 
 
-#line 1742 "parser.c"
+#line 1743 "parser.c"
 static const int JSON_start = 1;
 static const int JSON_first_final = 10;
 static const int JSON_error = 0;
@@ -1746,7 +1747,7 @@ static const int JSON_error = 0;
 static const int JSON_en_main = 1;
 
 
-#line 749 "parser.rl"
+#line 750 "parser.rl"
 
 
 static VALUE cParser_parse_strict(VALUE self)
@@ -1757,16 +1758,16 @@ static VALUE cParser_parse_strict(VALUE self)
     GET_PARSER;
 
 
-#line 1761 "parser.c"
+#line 1762 "parser.c"
 	{
 	cs = JSON_start;
 	}
 
-#line 759 "parser.rl"
+#line 760 "parser.rl"
     p = json->source;
     pe = p + json->len;
 
-#line 1770 "parser.c"
+#line 1771 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1822,7 +1823,7 @@ case 5:
 		goto st1;
 	goto st5;
 tr3:
-#line 738 "parser.rl"
+#line 739 "parser.rl"
 	{
         char *np;
         json->current_nesting = 1;
@@ -1831,7 +1832,7 @@ tr3:
     }
 	goto st10;
 tr4:
-#line 731 "parser.rl"
+#line 732 "parser.rl"
 	{
         char *np;
         json->current_nesting = 1;
@@ -1843,7 +1844,7 @@ st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 1847 "parser.c"
+#line 1848 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
@@ -1900,7 +1901,7 @@ case 9:
 	_out: {}
 	}
 
-#line 762 "parser.rl"
+#line 763 "parser.rl"
 
     if (cs >= JSON_first_final && p == pe) {
         return result;
@@ -1912,7 +1913,7 @@ case 9:
 
 
 
-#line 1916 "parser.c"
+#line 1917 "parser.c"
 static const int JSON_quirks_mode_start = 1;
 static const int JSON_quirks_mode_first_final = 10;
 static const int JSON_quirks_mode_error = 0;
@@ -1920,7 +1921,7 @@ static const int JSON_quirks_mode_error = 0;
 static const int JSON_quirks_mode_en_main = 1;
 
 
-#line 787 "parser.rl"
+#line 788 "parser.rl"
 
 
 static VALUE cParser_parse_quirks_mode(VALUE self)
@@ -1931,16 +1932,16 @@ static VALUE cParser_parse_quirks_mode(VALUE self)
     GET_PARSER;
 
 
-#line 1935 "parser.c"
+#line 1936 "parser.c"
 	{
 	cs = JSON_quirks_mode_start;
 	}
 
-#line 797 "parser.rl"
+#line 798 "parser.rl"
     p = json->source;
     pe = p + json->len;
 
-#line 1944 "parser.c"
+#line 1945 "parser.c"
 	{
 	if ( p == pe )
 		goto _test_eof;
@@ -1974,7 +1975,7 @@ st0:
 cs = 0;
 	goto _out;
 tr2:
-#line 779 "parser.rl"
+#line 780 "parser.rl"
 	{
         char *np = JSON_parse_value(json, p, pe, &result);
         if (np == NULL) { p--; {p++; cs = 10; goto _out;} } else {p = (( np))-1;}
@@ -1984,7 +1985,7 @@ st10:
 	if ( ++p == pe )
 		goto _test_eof10;
 case 10:
-#line 1988 "parser.c"
+#line 1989 "parser.c"
 	switch( (*p) ) {
 		case 13: goto st10;
 		case 32: goto st10;
@@ -2073,7 +2074,7 @@ case 9:
 	_out: {}
 	}
 
-#line 800 "parser.rl"
+#line 801 "parser.rl"
 
     if (cs >= JSON_quirks_mode_first_final && p == pe) {
         return result;

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

@@ -715,6 +715,7 @@ static VALUE cParser_initialize(int argc, VALUE *argv, VALUE self)
       source = convert_encoding(StringValue(source));
     }
     json->current_nesting = 0;
+    StringValue(source);
     json->len = RSTRING_LEN(source);
     json->source = RSTRING_PTR(source);;
     PARSER_SET_REFERENCE(json, Vsource, source);