oj 2.9.4 → 2.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 472794bb4413026604920270cbf2d91e9486184d
-  data.tar.gz: da2a776a8dd4e69c8b34bfbc478dbbcd11c60db3
+  metadata.gz: e14bd3bc917698abb03e0a65db6ad92ebc89cb38
+  data.tar.gz: 1290ce177f66c2dffb8dd852b03faab17bab15ec
 SHA512:
-  metadata.gz: b4619f73d69dde844139216836a04570e2abb5103a0235e7199d3a98449c8b6f8c96385f86e627f6592d0095229d329f3f9d0b608b1eb09a9381e7b0d626f398
-  data.tar.gz: 2dcd720bd6e964c23f33e83227163388bc72b8294c583501bc51ef79d24b7395771f0657b5ba575ea638e2814b1fa3bdc707db8cec6d565638399befac751d03
+  metadata.gz: 92b820c57e3c81d2fb716d9726476fb28dd13384436910caec2d930f2464249066d4a9326e519c76dc8aeba7194bfa12e5d00acd69a8aadf81d85ada921b949c
+  data.tar.gz: 126a7c2f3ebc4c660894df4d75f723e9180e7fd38c1e25ec56b79d29f10299eab2b40a81ee8899fe496eaee91754d09d96b41c6f81eae422729c3c5b6f579f2c

data/README.md

@@ -26,9 +26,21 @@ Follow [@peterohler on Twitter](http://twitter.com/#!/peterohler) for announceme
 
 [![Build Status](https://secure.travis-ci.org/ohler55/oj.png?branch=master)](http://travis-ci.org/ohler55/oj)
 
+### Current Release 2.9.5
+
+ - Mimic mode now monkey patches Object like JSON.
+
+ - A big thanks to krasnoukhov for reorganizing test and helping get Oj more
+   rails compatible.
+
+ - Another thanks goes out to lautis for a pull request that provided some
+   optimization and fixed the return exception for an embedded null in a string.
+
+ - Fixed a bug with zip reader streams where EOF was not handled nicely.
+
 ### Current Release 2.9.4
 
- - In mimic mode parse errors not match the JSON::ParserError.
+ - In mimic mode parse errors now match the JSON::ParserError.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 
@@ -60,6 +72,10 @@ is the `:object` mode.
   preferred over the `to_json` method. If neither the `to_json` or `to_hash`
   methods exists, then the Oj internal `Object` variable encoding is used.
 
+To change default serialization mode:
+```ruby
+Oj.default_options[:mode] = :compat
+```
 
 ## Compatibility
 

data/ext/oj/dump.c

@@ -113,7 +113,7 @@ static const char	hex_chars[17] = "0123456789abcdef";
 
 static char	hibit_friendly_chars[256] = "\
 66666666222622666666666666666666\
-11211111111111111111111111111111\
+11211111111111121111111111111111\
 11111111111111111111111111112111\
 11111111111111111111111111111111\
 11111111111111111111111111111111\
@@ -512,6 +512,7 @@ dump_cstr(const char *str, size_t cnt, int is_sym, int escape1, Out out) {
 	    case '2':
 		*out->cur++ = '\\';
 		switch (*str) {
+		case '\\':	*out->cur++ = '\\';	break;
 		case '\b':	*out->cur++ = 'b';	break;
 		case '\t':	*out->cur++ = 't';	break;
 		case '\n':	*out->cur++ = 'n';	break;

data/ext/oj/oj.c

@@ -177,7 +177,7 @@ static VALUE	define_mimic_json(int argc, VALUE *argv, VALUE self);
  * - circular: [true|false|nil] support circular references while dumping
  * - auto_define: [true|false|nil] automatically define classes if they do not exist
  * - symbol_keys: [true|false|nil] use symbols instead of strings for hash keys
- * - escape_mode: [:json|:xss_safe|:ascii|nil] use symbols instead of strings for hash keys
+ * - escape_mode: [:json|:xss_safe|:ascii|nil] determines the characters to escape
  * - class_cache: [true|false|nil] cache classes for faster parsing (if dynamically modifying classes or reloading classes then don't use this)
  * - mode: [:object|:strict|:compat|:null] load and dump modes to use for JSON
  * - time_format: [:unix|:xmlschema|:ruby] time format when dumping in :compat mode
@@ -1680,6 +1680,48 @@ mimic_create_id(VALUE self, VALUE id) {
     return id;
 }
 
+static struct _Options	mimic_object_to_json_options = {
+    0,			// indent
+    No,			// circular
+    No,			// auto_define
+    No,			// sym_key
+    JSONEsc,		// escape_mode
+    CompatMode,		// mode
+    No,			// class_cache
+    UnixTime,		// time_format
+    Yes,		// bigdec_as_num
+    AutoDec,		// bigdec_load
+    No,			// to_json
+    Yes,		// nilnil
+    json_class,		// create_id
+    10,			// create_id_len
+    9,			// sec_prec
+    Yes,		// allow_gc
+    0,			// dump_opts
+};
+
+static VALUE
+mimic_object_to_json(int argc, VALUE *argv, VALUE self) {
+    char		buf[4096];
+    struct _Out		out;
+    VALUE		rstr;
+    
+    out.buf = buf;
+    out.end = buf + sizeof(buf) - 10;
+    out.allocated = 0;
+    oj_dump_obj_to_json(self, &mimic_object_to_json_options, &out);
+    if (0 == out.buf) {
+	rb_raise(rb_eNoMemError, "Not enough memory.");
+    }
+    rstr = rb_str_new2(out.buf);
+    rstr = oj_encode(rstr);
+    if (out.allocated) {
+	xfree(out.buf);
+    }
+    return rstr;
+}
+
+
 /* Document-method: mimic_JSON
  *    call-seq: mimic_JSON() => Module
  *
@@ -1752,6 +1794,9 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
 
     rb_define_module_function(mimic, "parse", mimic_parse, -1);
     rb_define_module_function(mimic, "parse!", mimic_parse, -1);
+
+    rb_define_method(rb_cObject, "to_json", mimic_object_to_json, -1);
+
     rb_gv_set("$VERBOSE", dummy);
 
     array_nl_sym = ID2SYM(rb_intern("array_nl"));			rb_gc_register_address(&array_nl_sym);
@@ -1761,9 +1806,15 @@ define_mimic_json(int argc, VALUE *argv, VALUE self) {
     space_sym = ID2SYM(rb_intern("space"));				rb_gc_register_address(&space_sym);
     symbolize_names_sym = ID2SYM(rb_intern("symbolize_names"));		rb_gc_register_address(&symbolize_names_sym);
 
-    if (!rb_const_defined_at(mimic, rb_intern("ParserError"))) {
-	rb_define_const(mimic, "ParserError", oj_parse_error_class);
+    if (rb_const_defined_at(mimic, rb_intern("ParserError"))) {
+	rb_funcall(mimic, rb_intern("remove_const"), 1, ID2SYM(rb_intern("ParserError")));
     }
+    rb_define_const(mimic, "ParserError", oj_parse_error_class);
+
+    if (!rb_const_defined_at(mimic, rb_intern("State"))) {
+        rb_define_class_under(mimic, "State", rb_cObject);
+    }
+
     oj_default_options.mode = CompatMode;
     oj_default_options.escape_mode = ASCIIEsc;
     oj_default_options.nilnil = Yes;

data/ext/oj/parse.c

@@ -70,11 +70,11 @@ static void
 skip_comment(ParseInfo pi) {
     if ('*' == *pi->cur) {
 	pi->cur++;
-	for (; '\0' != *pi->cur; pi->cur++) {
+	for (; pi->cur < pi->end; pi->cur++) {
 	    if ('*' == *pi->cur && '/' == *(pi->cur + 1)) {
 		pi->cur += 2;
 		return;
-	    } else if ('\0' == *pi->cur) {
+	    } else if (pi->end <= pi->cur) {
 		oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "comment not terminated");
 		return;
 	    }
@@ -226,7 +226,7 @@ read_escaped_str(ParseInfo pi, const char *start) {
 	buf_append_string(&buf, start, cnt);
     }
     for (s = pi->cur; '"' != *s; s++) {
-	if ('\0' == *s) {
+	if (s >= pi->end) {
 	    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "quoted string not terminated");
 	    buf_cleanup(&buf);
 	    return;
@@ -328,9 +328,12 @@ read_str(ParseInfo pi) {
     Val		parent = stack_peek(&pi->stack);
 
     for (; '"' != *pi->cur; pi->cur++) {
-	if ('\0' == *pi->cur) {
+	if (pi->end <= pi->cur) {
 	    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "quoted string not terminated");
 	    return;
+	} else if ('\0' == *pi->cur) {
+	    oj_set_error_at(pi, oj_parse_error_class, __FILE__, __LINE__, "NULL byte in string");
+	    return;
 	} else if ('\\' == *pi->cur) {
 	    read_escaped_str(pi, str);
 	    return;
@@ -736,6 +739,12 @@ protect_parse(VALUE pip) {
     return Qnil;
 }
 
+void
+oj_pi_set_input_str(ParseInfo pi, volatile VALUE input) {
+    pi->json = rb_string_value_ptr((VALUE*)&input);
+    pi->end = pi->json + RSTRING_LEN(input);
+}
+
 VALUE
 oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yieldOk) {
     char		*buf = 0;
@@ -763,8 +772,7 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
 	pi->end = json + len;
 	free_json = 1;
     } else if (T_STRING == rb_type(input)) {
-	pi->json = rb_string_value_cstr((VALUE*)&input);
-	pi->end = pi->json + RSTRING_LEN(input);
+	oj_pi_set_input_str(pi, input);
     } else if (Qnil == input && Yes == pi->options.nilnil) {
 	return Qnil;
     } else {
@@ -776,8 +784,7 @@ oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yie
 
 	if (oj_stringio_class == clas) {
 	    s = rb_funcall2(input, oj_string_id, 0, 0);
-	    pi->json = rb_string_value_cstr((VALUE*)&s);
-	    pi->end = pi->json + RSTRING_LEN(s);
+	    oj_pi_set_input_str(pi, s);
 #if !IS_WINDOWS
 	} else if (rb_respond_to(input, oj_fileno_id) &&
 		   Qnil != (s = rb_funcall(input, oj_fileno_id, 0)) &&

data/ext/oj/parse.h

@@ -89,6 +89,7 @@ typedef struct _ParseInfo {
 
 extern void	oj_parse2(ParseInfo pi);
 extern void	oj_set_error_at(ParseInfo pi, VALUE err_clas, const char* file, int line, const char *format, ...);
+extern void	oj_pi_set_input_str(ParseInfo pi, volatile VALUE input);
 extern VALUE	oj_pi_parse(int argc, VALUE *argv, ParseInfo pi, char *json, size_t len, int yieldOk);
 extern VALUE	oj_num_as_value(NumInfo ni);
 

data/ext/oj/reader.c

@@ -163,7 +163,9 @@ oj_reader_read(Reader reader) {
 
 static VALUE
 rescue_cb(VALUE rbuf, VALUE err) {
-    if (rb_eTypeError != rb_obj_class(err)) {
+    VALUE	clas = rb_obj_class(err);
+
+    if (rb_eTypeError != clas && rb_eEOFError != clas) {
 	Reader	reader = (Reader)rbuf;
 
 	rb_raise(err, "at line %d, column %d\n", reader->line, reader->col);
@@ -186,7 +188,6 @@ partial_io_cb(VALUE rbuf) {
     }
     str = StringValuePtr(rstr);
     cnt = RSTRING_LEN(rstr);
-    //printf("*** read %lu bytes, str: '%s'\n", cnt, str);
     strcpy(reader->tail, str);
     reader->read_end = reader->tail + cnt;
 

data/ext/oj/scp.c

@@ -256,7 +256,7 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
 	pi.expect_value = 0;
     }
     if (rb_type(input) == T_STRING) {
-	pi.json = StringValuePtr(input);
+	oj_pi_set_input_str(&pi, input);
     } else {
 	VALUE		clas = rb_obj_class(input);
 	volatile VALUE	s;
@@ -265,7 +265,7 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
 #endif
 	if (oj_stringio_class == clas) {
 	    s = rb_funcall2(input, oj_string_id, 0, 0);
-	    pi.json = StringValuePtr(input);
+	    oj_pi_set_input_str(&pi, input);
 #if !IS_WINDOWS
 	    // JRuby gets confused with what is the real fileno.
 	} else if (rb_respond_to(input, oj_fileno_id) &&
@@ -275,20 +275,19 @@ oj_sc_parse(int argc, VALUE *argv, VALUE self) {
 	    size_t	len = lseek(fd, 0, SEEK_END);
 
 	    lseek(fd, 0, SEEK_SET);
-	    buf = ALLOC_N(char, len + 1);
+	    buf = ALLOC_N(char, len);
 	    pi.json = buf;
+	    pi.end = buf + len;
 	    if (0 >= (cnt = read(fd, (char*)pi.json, len)) || cnt != (ssize_t)len) {
 		if (0 != buf) {
 		    xfree(buf);
 		}
 		rb_raise(rb_eIOError, "failed to read from IO Object.");
 	    }
-	    ((char*)pi.json)[len] = '\0';
 #endif
 	} else if (rb_respond_to(input, oj_read_id)) {
 	    s = rb_funcall2(input, oj_read_id, 0, 0);
-	    pi.json = rb_string_value_cstr((VALUE*)&s);
-
+	    oj_pi_set_input_str(&pi, s);
 	} else {
 	    rb_raise(rb_eArgError, "saj_parse() expected a String or IO Object.");
 	}

data/lib/oj/mimic.rb

@@ -1,12 +1,12 @@
 
 module Oj
-  
+
   def self.mimic_loaded(mimic_paths=[])
     $LOAD_PATH.each do |d|
       next unless File.exist?(d)
       offset = d.size() + 1
       Dir.glob(File.join(d, '**', '*.rb')).each do |file|
-        next unless file[offset..-1].start_with?('json')
+        next if file[offset..-1] !~ /^json[\/\\\.]{1}/
         $LOADED_FEATURES << file unless $LOADED_FEATURES.include?(file)
       end
     end

data/lib/oj/version.rb

@@ -1,5 +1,5 @@
 
 module Oj
   # Current version of the module. 
-  VERSION = '2.9.4'
+  VERSION = '2.9.5'
 end

data/test/_test_mimic_rails.rb

@@ -0,0 +1,31 @@
+# encoding: UTF-8
+
+require 'helper'
+Oj.mimic_JSON
+require 'rails/all'
+
+class MimicRails < Minitest::Test
+
+  def test_mimic_exception
+    begin
+      ActiveSupport::JSON.decode("{")
+      puts "Failed"
+    rescue ActiveSupport::JSON.parse_error
+      assert(true)
+    rescue Exception
+      assert(false, 'Expected a JSON::ParserError')
+    end
+  end
+
+  def test_dump_string
+    Oj.default_options= {:indent => 2} # JSON this will not change anything
+    json = ActiveSupport::JSON.encode([1, true, nil])
+    assert_equal(%{[
+  1,
+  true,
+  null
+]
+}, json)
+  end
+
+end # MimicRails

data/test/helper.rb

@@ -0,0 +1,27 @@
+# Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
+# required. That can be set in the RUBYOPT environment variable.
+# export RUBYOPT=-w
+
+$VERBOSE = true
+
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'rubygems' if RUBY_VERSION.start_with?('1.8.')
+require 'minitest'
+require 'minitest/autorun'
+require 'stringio'
+require 'date'
+require 'bigdecimal'
+require 'pp'
+require 'oj'
+
+$ruby = RUBY_DESCRIPTION.split(' ')[0]
+$ruby = 'ree' if 'ruby' == $ruby && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
+
+class Range
+  def to_hash()
+    { 'begin' => self.begin, 'end' => self.end, 'exclude_end' => self.exclude_end? }
+  end
+end

data/test/{test_mimic.rb → isolated/shared.rb}

@@ -1,52 +1,47 @@
-#!/usr/bin/env ruby
 # encoding: UTF-8
 
-# Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
-# required. That can be set in the RUBYOPT environment variable.
-# export RUBYOPT=-w
+class SharedMimicTest < Minitest::Test
+  class Jam
+    attr_accessor :x, :y
 
-$VERBOSE = true
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-require 'test/unit'
-require 'stringio'
-require 'bigdecimal'
-require 'oj'
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
 
-$ruby = RUBY_DESCRIPTION.split(' ')[0]
-$ruby = 'ree' if 'ruby' == $ruby && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
+    def eql?(o)
+      self.class == o.class && @x == o.x && @y == o.y
+    end
+    alias == eql?
 
-class Jam
-  attr_accessor :x, :y
+    def as_json()
+      {"json_class" => self.class.to_s,"x" => @x,"y" => @y}
+    end
 
-  def initialize(x, y)
-    @x = x
-    @y = y
-  end
+    def self.json_create(h)
+      self.new(h['x'], h['y'])
+    end
 
-  def eql?(o)
-    self.class == o.class && @x == o.x && @y == o.y
-  end
-  alias == eql?
+  end # Jam
 
-  def as_json()
-    {"json_class" => self.class.to_s,"x" => @x,"y" => @y}
+  def setup
+    @default_options = Oj.default_options
   end
 
-  def self.json_create(h)
-    self.new(h['x'], h['y'])
+  def teardown
+    Oj.default_options = @default_options
   end
 
-end # Jam
-
-class Mimic < ::Test::Unit::TestCase
-
-  def test0_mimic_json
-    assert(defined?(JSON).nil?)
-    Oj.mimic_JSON
-    assert(!defined?(JSON).nil?)
+# exception
+  def test_exception
+    begin
+      JSON.parse("{")
+      puts "Failed"
+    rescue JSON::ParserError
+      assert(true)
+    rescue Exception
+      assert(false, 'Expected a JSON::ParserError')
+    end
   end
 
 # dump
@@ -55,6 +50,17 @@ class Mimic < ::Test::Unit::TestCase
     assert_equal(%{[1,true,null]}, json)
   end
 
+  def test_dump_with_options
+    Oj.default_options= {:indent => 2} # JSON this will not change anything
+    json = JSON.dump([1, true, nil])
+    assert_equal(%{[
+  1,
+  true,
+  null
+]
+}, json)
+  end
+
   def test_dump_io
     s = StringIO.new()
     json = JSON.dump([1, true, nil], s)
@@ -179,7 +185,7 @@ class Mimic < ::Test::Unit::TestCase
     obj = JSON.parse(json, :create_additions => true)
     assert_equal(jam, obj)
     obj = JSON.parse(json, :create_additions => false)
-    assert_equal({'json_class' => 'Jam', 'x' => true, 'y' => 58}, obj)
+    assert_equal({'json_class' => 'SharedMimicTest::Jam', 'x' => true, 'y' => 58}, obj)
     json.gsub!('json_class', 'kson_class')
     JSON.create_id = 'kson_class'
     obj = JSON.parse(json, :create_additions => true)
@@ -203,17 +209,30 @@ class Mimic < ::Test::Unit::TestCase
     end
   end
 
-  # exception check
-  def test_exception
-    json = %{["a":1]}
-    begin
-      obj = JSON.parse(json)
-      
-    rescue JSON::ParserError => je
-      assert(true)
-      return
+# make sure to_json is defined for object.
+  def test_mimic_to_json
+    {'a' => 1}.to_json()
+    Object.new().to_json()
+  end
+end # SharedMimicTest
+
+if defined?(ActiveSupport)
+  class SharedMimicRailsTest < SharedMimicTest
+    def test_activesupport_exception
+      begin
+        ActiveSupport::JSON.decode("{")
+        puts "Failed"
+      rescue ActiveSupport::JSON.parse_error
+        assert(true)
+      rescue Exception
+        assert(false, 'Expected a JSON::ParserError')
+      end
     end
-    assert(false, "*** expected an JSON::ParserError")
-  end
 
-end # Mimic
+    def test_activesupport_encode
+      Oj.default_options= {:indent => 0}
+      json = ActiveSupport::JSON.encode([1, true, nil])
+      assert_equal(%{[1,true,null]}, json)
+    end
+  end # SharedMimicRailsTest
+end