oj 2.9.5 → 2.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e14bd3bc917698abb03e0a65db6ad92ebc89cb38
-  data.tar.gz: 1290ce177f66c2dffb8dd852b03faab17bab15ec
+  metadata.gz: aa935c82f850cb8bacad4b1dfdbeebdfd0af777f
+  data.tar.gz: 1bf95c9767bb1ee814871a859fd2312fbe00dd28
 SHA512:
-  metadata.gz: 92b820c57e3c81d2fb716d9726476fb28dd13384436910caec2d930f2464249066d4a9326e519c76dc8aeba7194bfa12e5d00acd69a8aadf81d85ada921b949c
-  data.tar.gz: 126a7c2f3ebc4c660894df4d75f723e9180e7fd38c1e25ec56b79d29f10299eab2b40a81ee8899fe496eaee91754d09d96b41c6f81eae422729c3c5b6f579f2c
+  metadata.gz: 10e76efb7219459edcc77fec2518dc1c9e036cfa7a2f7c3d49942b3b26085d3b45a25fae451c934eadc087656abc7d2678813de3be7496e5665bb9f7c6278d05
+  data.tar.gz: 4643da9813d1664bbbf06bd6ca7a29e3a9c5fac54d0750ac0fc05e25ea6c72cbab825eaf5901cd029eccff9f00eeb7e3d6fcc3c761a37793452f85b81685540e

data/README.md

@@ -26,21 +26,12 @@ 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
+### Current Release 2.9.6
 
- - Mimic mode now monkey patches Object like JSON.
+ - Fixed bug using StringIO with SCParser.
 
- - 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 now match the JSON::ParserError.
+ - Tightened up JSON mimic to raise an exception if JSON.parse is called on
+   a JSON documents that returns a primitive type.
 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 

data/ext/oj/oj.c

@@ -1614,6 +1614,7 @@ static VALUE
 mimic_parse(int argc, VALUE *argv, VALUE self) {
     struct _ParseInfo	pi;
     VALUE		args[1];
+    VALUE		result;
 
     if (argc < 1) {
 	rb_raise(rb_eArgError, "Wrong number of arguments to parse.");
@@ -1643,7 +1644,22 @@ mimic_parse(int argc, VALUE *argv, VALUE self) {
     }
     *args = *argv;
 
-    return oj_pi_parse(1, args, &pi, 0, 0, 0);
+    result = oj_pi_parse(1, args, &pi, 0, 0, 0);
+    switch (rb_type(result)) {
+    case T_NIL:
+    case T_TRUE:
+    case T_FALSE:
+    case T_FIXNUM:
+    case T_FLOAT:
+    case T_CLASS:
+    case T_SYMBOL:
+	rb_raise(oj_parse_error_class, "parse is only allowed to return data structure.");
+	break;
+    default:
+	// okay
+	break;
+    }
+    return result;
 }
 
 static VALUE

data/ext/oj/scp.c

@@ -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);
-	    oj_pi_set_input_str(&pi, input);
+	    oj_pi_set_input_str(&pi, s);
 #if !IS_WINDOWS
 	    // JRuby gets confused with what is the real fileno.
 	} else if (rb_respond_to(input, oj_fileno_id) &&

data/lib/oj/schandler.rb

@@ -30,10 +30,56 @@ module Oj
   #
   #    def hash_start(); end
   #    def hash_end(); end
+  #    def hash_set(h, key, value); end
   #    def array_start(); end
   #    def array_end(); end
+  #    def array_append(a, value); end
   #    def add_value(value); end
-  #    def error(message, line, column); end
+  #
+  # As certain elements of a JSON document are reached during parsing the
+  # callbacks are called. The parser helps by keeping track of objects created
+  # by the callbacks but does not create those objects itself.
+  #
+  #    hash_start
+  #
+  # When a JSON object element starts the hash_start() callback is called if
+  # public. It should return what ever Ruby Object is to be used as the element
+  # that will later be included in the hash_set() callback.
+  # 
+  #    hash_end
+  # 
+  # At the end of a JSON object element the hash_end() callback is called if public.
+  # 
+  #    hash_set
+  # 
+  # When a key value pair is encountered during parsing the hash_set() callback
+  # is called if public. The first element will be the object returned from the
+  # enclosing hash_start() callback. The second argument is the key and the last
+  # is the value.
+  # 
+  #    array_start
+  # 
+  # When a JSON array element is started the array_start() callback is called if
+  # public. It should return what ever Ruby Object is to be used as the element
+  # that will later be included in the array_append() callback.
+  # 
+  #    array_end
+  # 
+  # At the end of a JSON array element the array_end() callback is called if public.
+  # 
+  #    array_append
+  # 
+  # When a element is encountered that is an element of an array the
+  # array_append() callback is called if public. The first argument to the
+  # callback is the Ruby object returned from the enclosing array_start()
+  # callback.
+  # 
+  #    add_value
+  # 
+  # The handler is expected to handle multiple JSON elements in one stream,
+  # file, or string. When a top level JSON has been read completely the
+  # add_value() callback is called. Even if only one element was ready this
+  # callback returns the Ruby object that was constructed during the parsing.
   #
   class ScHandler
     # Create a new instance of the ScHandler class.
@@ -51,6 +97,9 @@ module Oj
     def hash_end()
     end
 
+    def hash_set(h, key, value)
+    end
+    
     def array_start()
     end
 
@@ -60,11 +109,8 @@ module Oj
     def add_value(value)
     end
     
-    def hash_set(h, key, value)
-    end
-    
     def array_append(a, value)
     end
-    
+
   end # ScHandler
 end # Oj

data/lib/oj/version.rb

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

data/test/bug.rb

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+
+require 'helper'
+
+File.open('tst', 'r') do |file|
+  puts file.gets
+  puts file.read(1)
+  Oj.load(file) do |val|
+    puts "*** inside: #{val}"
+  end
+end

data/test/io.rb

@@ -0,0 +1,48 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+
+require 'helper'
+
+class Handler
+  def initialize
+    @state = []
+  end
+
+  def hash_start
+    @state << {}
+    @state.last
+  end
+
+  def hash_end
+    @state.pop
+  end
+
+  def hash_set(h,k,v)
+    h.store(k,v)
+  end
+
+  def array_start
+    @state << []
+    @state.last
+  end
+
+
+  def array_end
+    @state.pop
+  end
+
+  def array_append(a,v)
+    a << v
+  end
+
+  def error(message, line, column); p "ERROR: #{message}" end
+end
+
+handler = Handler.new
+def handler.add_value(v)
+  p v
+end
+
+Oj.sc_parse(handler, StringIO.new('{"a":"b","c":[1,2,{"d":"e"}]}[4,5,6]'))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.9.5
+  version: 2.9.6
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -102,8 +102,10 @@ files:
 - lib/oj/schandler.rb
 - lib/oj/version.rb
 - test/_test_mimic_rails.rb
+- test/bug.rb
 - test/files.rb
 - test/helper.rb
+- test/io.rb
 - test/isolated/shared.rb
 - test/isolated/test_mimic_after.rb
 - test/isolated/test_mimic_alone.rb
@@ -176,3 +178,4 @@ signing_key:
 specification_version: 4
 summary: A fast JSON parser and serializer.
 test_files: []
+has_rdoc: true