oj 1.2.0 → 1.2.1

data/ext/oj/oj.h

@@ -41,50 +41,38 @@ extern "C" {
 #define RSTRING_NOT_MODIFIED
 
 #include "ruby.h"
-#ifdef HAVE_RUBY_ENCODING_H
-// HAVE_RUBY_ENCODING_H defined for Ruby 1.9
-#define IVAR_HELPERS 1
+#if HAS_ENCODING_SUPPORT
 #include "ruby/encoding.h"
 #endif
 
 #include "cache.h"
 
-#ifdef JRUBY
-#define NO_RSTRUCT 1
-#endif
-
-#if (defined RBX_Qnil && !defined RUBINIUS)
-#define RUBINIUS
-#endif
-
-#ifdef RUBINIUS
+#ifdef RUBINIUS_RUBY
 #undef T_RATIONAL
 #undef T_COMPLEX
-#define NO_RSTRUCT 1
-#ifndef IVAR_HELPERS
-#define IVAR_HELPERS 0
-#endif
-#endif
-
-#if IVAR_HELPERS
-#include "ruby/st.h"
+enum st_retval {ST_CONTINUE = 0, ST_STOP = 1, ST_DELETE = 2, ST_CHECK};
 #else
+#if HAS_TOP_LEVEL_ST_H
+// Only on travis, local is where it is for all others. Seems to vary depending on the travis machine picked up.
 #include "st.h"
+#else
+#include "ruby/st.h"
+#endif
 #endif
 
 #define raise_error(msg, xml, current) _oj_raise_error(msg, xml, current, __FILE__, __LINE__)
 
 typedef enum {
-    Yes    = 'y',
-    No     = 'n',
+    Yes	   = 'y',
+    No	   = 'n',
     NotSet = 0
 } YesNo;
 
 typedef enum {
-    StrictMode  = 's',
-    ObjectMode  = 'o',
-    NullMode    = 'n',
-    CompatMode  = 'c'
+    StrictMode	= 's',
+    ObjectMode	= 'o',
+    NullMode	= 'n',
+    CompatMode	= 'c'
 } Mode;
 
 typedef struct _DumpOpts {
@@ -101,12 +89,12 @@ typedef struct _DumpOpts {
 } *DumpOpts;
 
 typedef struct _Options {
-    int         indent;		// indention for dump, default 2
-    char        circular;	// YesNo
-    char        auto_define;	// YesNo
-    char        sym_key;	// YesNo
-    char        ascii_only;	// YesNo
-    char        mode;		// Mode
+    int		indent;		// indention for dump, default 2
+    char	circular;	// YesNo
+    char	auto_define;	// YesNo
+    char	sym_key;	// YesNo
+    char	ascii_only;	// YesNo
+    char	mode;		// Mode
     DumpOpts	dump_opts;
 } *Options;
 
@@ -119,11 +107,11 @@ enum {
 typedef struct _Leaf {
     struct _Leaf	*next;
     union {
-	const char	*key;      // hash key
-	size_t		index;     // array index, 0 is not set
+	const char	*key;	   // hash key
+	size_t		index;	   // array index, 0 is not set
     };
     union {
-	char		*str;      // pointer to location in json string
+	char		*str;	   // pointer to location in json string
 	struct _Leaf	*elements; // array and hash elements
 	VALUE		value;
     };
@@ -142,9 +130,9 @@ extern void	_oj_raise_error(const char *msg, const char *xml, const char *curren
 
 extern void	oj_init_doc(void);
 
-extern VALUE    Oj;
+extern VALUE	Oj;
 extern struct _Options	oj_default_options;
-#ifdef HAVE_RUBY_ENCODING_H
+#if HAS_ENCODING_SUPPORT
 extern rb_encoding	*oj_utf8_encoding;
 #endif
 
@@ -166,9 +154,10 @@ extern ID	oj_to_json_id;
 extern ID	oj_to_sym_id;
 extern ID	oj_tv_nsec_id;
 extern ID	oj_tv_sec_id;
+extern ID	oj_tv_usec_id;
 
-extern Cache    oj_class_cache;
-extern Cache    oj_attr_cache;
+extern Cache	oj_class_cache;
+extern Cache	oj_attr_cache;
 
 #if defined(__cplusplus)
 #if 0

data/lib/oj/version.rb

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

data/test/tests.rb

@@ -8,6 +8,9 @@ require 'test/unit'
 require 'stringio'
 require 'oj'
 
+$ruby = RUBY_DESCRIPTION.split(' ')[0]
+$ruby = 'ree' if 'ruby' == $ruby && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
+
 def hash_eql(h1, h2)
   return false if h1.size != h2.size
   h1.keys.each do |k|
@@ -45,6 +48,37 @@ class Jeez < Jam
   end
 end # Jeez
 
+# contributed by sauliusg to fix as_json
+class Orange < Jam
+  def initialize(x, y)
+    super
+  end
+
+  def as_json()
+    { :json_class => self.class,
+      :x => @x,
+      :y => @y }
+  end
+
+  def self.json_create(h)
+    self.new(h['x'], h['y'])
+  end
+end
+
+class Melon < Jam
+  def initialize(x, y)
+    super
+  end
+
+  def as_json()
+    "#{x} #{y}"
+  end
+
+  def self.json_create(h)
+    self.new(h['x'], h['y'])
+  end
+end
+
 class Jazz < Jam
   def initialize(x, y)
     super
@@ -126,8 +160,8 @@ class Juice < ::Test::Unit::TestCase
     dump_and_load(12345.6789, false)
     dump_and_load(-54321.012, false)
     dump_and_load(2.48e16, false)
-    dump_and_load(2.48e1000, false)
-    dump_and_load(-2.48e1000, false)
+    dump_and_load(2.48e100 * 1.0e10, false)
+    dump_and_load(-2.48e100 * 1.0e10, false)
   end
 
   def test_string
@@ -283,7 +317,7 @@ class Juice < ::Test::Unit::TestCase
     assert_equal({ 1 => true, 'nil' => nil, :sim => 4 }, h)
   end
 
-# Object with to_json()
+  # Object with to_json()
   def test_json_object_strict
     obj = Jeez.new(true, 58)
     begin
@@ -301,16 +335,21 @@ class Juice < ::Test::Unit::TestCase
     Oj.default_options = { :mode => :compat }
     obj = Jeez.new(true, 58)
     json = Oj.dump(obj, :indent => 2)
-    assert_equal(%{{"json_class":"Jeez","x":true,"y":58}}, json)
+    assert(%{{"json_class":"Jeez","x":true,"y":58}} == json ||
+           %{{"json_class":"Jeez","y":58,"x":true}} == json)
     dump_and_load(obj, false)
   end
   def test_json_object_object
     obj = Jeez.new(true, 58)
     json = Oj.dump(obj, :mode => :object, :indent => 2)
-    assert_equal(%{{
+    assert(%{{
   "^o":"Jeez",
   "x":true,
-  "y":58}}, json)
+  "y":58}} == json ||
+%{{
+  "^o":"Jeez",
+  "y":58,
+  "x":true}} == json)
     obj2 = Oj.load(json, :mode => :object)
     assert_equal(obj, obj2)
   end
@@ -338,9 +377,58 @@ class Juice < ::Test::Unit::TestCase
   def test_to_hash_object_object
     obj = Jazz.new(true, 58)
     json = Oj.dump(obj, :mode => :object, :indent => 2)
-    assert_equal(%{{
+    assert(%{{
   "^o":"Jazz",
   "x":true,
+  "y":58}} == json ||
+%{{
+  "^o":"Jazz",
+  "y":58,
+  "x":true}} == json)
+    obj2 = Oj.load(json, :mode => :object)
+    assert_equal(obj, obj2)
+  end
+
+  # Object with as_json() # contributed by sauliusg
+  def test_as_json_object_strict
+    obj = Orange.new(true, 58)
+    begin
+      json = Oj.dump(obj, :mode => :strict)
+    rescue Exception => e
+      assert(true)
+    end
+  end
+
+  def test_as_json_object_null
+    obj = Orange.new(true, 58)
+    json = Oj.dump(obj, :mode => :null)
+    assert_equal('null', json)
+  end
+
+  def test_as_json_object_compat_hash
+    Oj.default_options = { :mode => :compat }
+    obj = Orange.new(true, 58)
+    json = Oj.dump(obj, :indent => 2)
+    assert_equal(%{{
+  "json_class":"Orange",
+  "x":true,
+  "y":58}}, json)
+    dump_and_load(obj, false)
+  end
+
+  def test_as_json_object_compat_non_hash
+    Oj.default_options = { :mode => :compat }
+    obj = Melon.new(true, 58)
+    json = Oj.dump(obj, :indent => 2)
+    assert_equal(%{"true 58"}, json)
+  end
+
+  def test_as_json_object_object
+    obj = Orange.new(true, 58)
+    json = Oj.dump(obj, :mode => :object, :indent => 2)
+    assert_equal(%{{
+  "^o":"Orange",
+  "x":true,
   "y":58}}, json)
     obj2 = Oj.load(json, :mode => :object)
     assert_equal(obj, obj2)
@@ -363,17 +451,24 @@ class Juice < ::Test::Unit::TestCase
   def test_object_compat
     obj = Jam.new(true, 58)
     json = Oj.dump(obj, :mode => :compat, :indent => 2)
-    assert_equal(%{{
+    assert(%{{
   "x":true,
-  "y":58}}, json)
+  "y":58}} == json ||
+%{{
+  "y":58,
+  "x":true}} == json)
   end
   def test_object_object
     obj = Jam.new(true, 58)
     json = Oj.dump(obj, :mode => :object, :indent => 2)
-    assert_equal(%{{
+    assert(%{{
   "^o":"Jam",
   "x":true,
-  "y":58}}, json)
+  "y":58}} == json ||
+%{{
+  "^o":"Jam",
+  "y":58,
+  "x":true}} == json)
     obj2 = Oj.load(json, :mode => :object)
     assert_equal(obj, obj2)
   end
@@ -390,7 +485,7 @@ class Juice < ::Test::Unit::TestCase
     #puts "*** #{json}"
     e2 = Oj.load(json, :mode => :strict)
     assert_equal(err.class.to_s, e2['^o'])
-    unless RUBY_VERSION.start_with?('1.8')
+    unless RUBY_VERSION.start_with?('1.8') || 'rubinius' == $ruby
       assert_equal(err.message, e2['~mesg'])
       assert_equal(err.backtrace, e2['~bt'])
       e2 = Oj.load(json, :mode => :object)
@@ -423,7 +518,11 @@ class Juice < ::Test::Unit::TestCase
     unless RUBY_VERSION.start_with?('1.8')
       Oj.default_options = { :mode => :object }
       json = Oj.dump(1..7, :mode => :object, :indent => 0)
-      assert_equal(%{{"^u":["Range",1,7,false]}}, json)
+      if 'rubinius' == $ruby
+        assert_equal(%{{"^o":"Range","excl":false,"begin":1,"end":7}}, json)
+      else
+        assert_equal(%{{"^u":["Range",1,7,false]}}, json)
+      end
       dump_and_load(1..7, false)
       dump_and_load(1..1, false)
       dump_and_load(1...7, false)
@@ -447,11 +546,16 @@ class Juice < ::Test::Unit::TestCase
     obj = Jam.new(nil, 58)
     obj.x = obj
     json = Oj.dump(obj, :mode => :object, :indent => 2, :circular => true)
-    assert_equal(%{{
+    assert(%{{
   "^o":"Jam",
   "^i":1,
   "x":"^r1",
-  "y":58}}, json)
+  "y":58}} == json ||
+%{{
+  "^o":"Jam",
+  "^i":1,
+  "y":58,
+  "x":"^r1"}} == json)
     obj2 = Oj.load(json, :mode => :object, :circular => true)
     assert_equal(obj2.x.__id__, obj2.__id__)
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000Z
+date: 2012-03-30 00:00:00.000000000 Z
 dependencies: []
 description: ! 'The fastest JSON parser and object serializer. '
 email: peter@ohler.com
@@ -88,3 +88,4 @@ signing_key:
 specification_version: 3
 summary: A fast JSON parser and serializer.
 test_files: []
+has_rdoc: true