oj 2.11.0 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4acaa9204b28018f0acc3ba755aa319759807b0
-  data.tar.gz: 50e58cf7d4ac2265a74f234a6d8d9bff6b45b00d
+  metadata.gz: 6d3e4872cc8b3155f8547f4ab99ad2f0767ba878
+  data.tar.gz: 5ca0ea5af332edfdda45af2deca6323543395bfb
 SHA512:
-  metadata.gz: b81caf19b41d35592c690f9e1c8411681a9ff0236eed9db198fdcc93e6a3b5463f5ef437849944b99808742f3ce91339d748a38bb687083e22f71bc1a658f788
-  data.tar.gz: ba0df930d57755e5bbe0524ed88ff43542ef4a0177454fd139aa38cfcdf1801e63f73358e8f94d4e69ef6a55f972b3f162714c97212da734557afcec2080e914
+  metadata.gz: 951e8ce648c1afb634ef3b4b21387043dd918cc513b3f26c7966c5ef08c6ee03b41cb531ecc7065ac667612e334870a4ff3eac063606a626f799ea6a84ef3b24
+  data.tar.gz: 8c3fa952247342e7f58ce3c6a0966beba3dc89701a15fd72affa1cdcd1c2c5542df07db734753499cb363d51fba4a63e569ff31765cab006615d592c369ce60a

data/README.md

@@ -26,30 +26,10 @@ 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.11.0
+### Current Release 2.11.1
 
- - Restricted strict dump to not dump NaN nor Infinity but instead raise an exception.
+ - Changed the use_to_json option to still allow as_json even when set to false.
 
- - Changed compat mode so that the :bigdecimal_as_decimal option over-rides the
-   to_json method if the option is true. The default for mimic_JSON is to leave
-   the option off.
-
- - Added support for Module encoding in compat mode.
-
- - Added ActiveSupportHelper so that require 'active_support_helper' will added
-   a helper for serializing ActiveSupport::TimeWithZone.
-
- - Added float_precision option to control the number of digits used for floats
-   when dumping.
- 
-### Release 2.10.4
-
- - Fixed Range encoding in compat mode to not use the object mode encoding.
-
- - Fixed serialization problem with timestamps.
-
- - Fixed compat parser to accept NaN and Infinity.
- 
 [Older release notes](http://www.ohler.com/dev/oj_misc/release_notes.html).
 
 ## Description

data/ext/oj/dump.c

@@ -480,7 +480,7 @@ dump_float(VALUE obj, Out out) {
 	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
 	cnt = RSTRING_LEN(rstr);
-	if (sizeof(buf) <= cnt) {
+	if ((int)sizeof(buf) <= cnt) {
 	    cnt = sizeof(buf) - 1;
 	}
 	strncpy(buf, rb_string_value_ptr((VALUE*)&rstr), cnt);
@@ -1201,7 +1201,7 @@ dump_data_comp(VALUE obj, int depth, Out out) {
 	volatile VALUE	rstr = rb_funcall(obj, oj_to_s_id, 0);
 
 	dump_raw(rb_string_value_ptr((VALUE*)&rstr), RSTRING_LEN(rstr), out);
-    } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_as_json_id)) {
+    } else if (rb_respond_to(obj, oj_as_json_id)) {
 	volatile VALUE	aj = rb_funcall(obj, oj_as_json_id, 0);
 
 	// Catch the obvious brain damaged recursive dumping.
@@ -1298,7 +1298,7 @@ dump_obj_comp(VALUE obj, int depth, Out out) {
 	    rb_raise(rb_eTypeError, "%s.to_hash() did not return a Hash.\n", rb_class2name(rb_obj_class(obj)));
 	}
 	dump_hash(h, Qundef, depth, out->opts->mode, out);
-    } else if (Yes == out->opts->to_json && rb_respond_to(obj, oj_as_json_id)) {
+    } else if (rb_respond_to(obj, oj_as_json_id)) {
 	volatile VALUE	aj = rb_funcall(obj, oj_as_json_id, 0);
 
 	// Catch the obvious brain damaged recursive dumping.
@@ -1759,6 +1759,8 @@ dump_odd(VALUE obj, Odd odd, VALUE clas, int depth, Out out) {
 	    
 	    if (sizeof(nbuf) <= nlen) {
 		n2 = strdup(name);
+	    } else {
+		strcpy(n2, name);
 	    }
 	    n = n2;
 	    v = obj;

data/ext/oj/oj.c

@@ -380,7 +380,7 @@ set_def_opts(VALUE self, VALUE opts) {
     } else if (ascii_sym == v) {
 	oj_default_options.escape_mode = ASCIIEsc;
     } else {
-	rb_raise(rb_eArgError, ":encoding must be :json, :xss_safe, or :ascii.");
+	rb_raise(rb_eArgError, ":escape_mode must be :newline, :json, :xss_safe, or :ascii.");
     }
 
     v = rb_hash_lookup(opts, bigdecimal_load_sym);

data/lib/oj/version.rb

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

data/test/_test_active.rb

@@ -0,0 +1,76 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'minitest'
+require 'minitest/autorun'
+
+require 'sqlite3'
+require 'active_record'
+require 'oj'
+
+#Oj.mimic_JSON()
+Oj.default_options = {mode: :compat, indent: 2}
+
+#ActiveRecord::Base.logger = Logger.new(STDERR)
+
+ActiveRecord::Base.establish_connection(
+  :adapter => "sqlite3",
+  :database => ":memory:"
+)
+
+ActiveRecord::Schema.define do
+  create_table :users do |table|
+    table.column :first_name, :string
+    table.column :last_name, :string
+    table.column :email, :string
+  end
+end
+
+class User < ActiveRecord::Base
+end
+
+class ActiveTest < Minitest::Test
+
+  def test_active
+    User.find_or_create_by(first_name: "John", last_name: "Smith", email: "john@example.com")
+    User.find_or_create_by(first_name: "Joan", last_name: "Smith", email: "joan@example.com")
+
+    # Single instance.
+    assert_equal(%|{
+  "id":1,
+  "first_name":"John",
+  "last_name":"Smith",
+  "email":"john@example.com"
+}
+|, Oj.dump(User.first))
+
+    # Array of instances.
+    assert_equal(%|[
+  {
+    "id":1,
+    "first_name":"John",
+    "last_name":"Smith",
+    "email":"john@example.com"
+  },
+  {
+    "id":2,
+    "first_name":"Joan",
+    "last_name":"Smith",
+    "email":"joan@example.com"
+  }
+]
+|, Oj.dump(User.all))
+
+    # Single instance as json. (not Oj)
+    assert_equal(%|{"id":1,"first_name":"John","last_name":"Smith","email":"john@example.com"}|, User.first.to_json)
+
+    # Array of instances as json. (not Oj)
+    assert_equal(%|[{"id":1,"first_name":"John","last_name":"Smith","email":"john@example.com"},{"id":2,"first_name":"Joan","last_name":"Smith","email":"joan@example.com"}]|, User.all.to_json)
+
+  end
+end

data/test/_test_active_mimic.rb

@@ -0,0 +1,96 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+%w(lib ext test).each do |dir|
+  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
+end
+
+require 'minitest'
+require 'minitest/autorun'
+
+require 'sqlite3'
+require 'active_record'
+require 'oj'
+
+Oj.mimic_JSON()
+Oj.default_options = {mode: :compat, indent: 2}
+
+#ActiveRecord::Base.logger = Logger.new(STDERR)
+
+ActiveRecord::Base.establish_connection(
+  :adapter => "sqlite3",
+  :database => ":memory:"
+)
+
+ActiveRecord::Schema.define do
+  create_table :users do |table|
+    table.column :first_name, :string
+    table.column :last_name, :string
+    table.column :email, :string
+  end
+end
+
+class User < ActiveRecord::Base
+end
+
+class ActiveTest < Minitest::Test
+
+  def test_active
+    User.find_or_create_by(first_name: "John", last_name: "Smith", email: "john@example.com")
+    User.find_or_create_by(first_name: "Joan", last_name: "Smith", email: "joan@example.com")
+
+    # Single instance.
+    assert_equal(%|{
+  "id":1,
+  "first_name":"John",
+  "last_name":"Smith",
+  "email":"john@example.com"
+}
+|, Oj.dump(User.first))
+
+    # Array of instances.
+    assert_equal(%|[
+  {
+    "id":1,
+    "first_name":"John",
+    "last_name":"Smith",
+    "email":"john@example.com"
+  },
+  {
+    "id":2,
+    "first_name":"Joan",
+    "last_name":"Smith",
+    "email":"joan@example.com"
+  }
+]
+|, Oj.dump(User.all))
+
+    # Single instance as json. (not Oj)
+    assert_equal(%|{
+  "id":1,
+  "first_name":"John",
+  "last_name":"Smith",
+  "email":"john@example.com"
+}
+|, User.first.to_json)
+
+    # Array of instances as json. (not Oj)
+    assert_equal(%|[
+  {
+    "id":1,
+    "first_name":"John",
+    "last_name":"Smith",
+    "email":"john@example.com"
+  },
+  {
+    "id":2,
+    "first_name":"Joan",
+    "last_name":"Smith",
+    "email":"joan@example.com"
+  }
+]
+|, User.all.to_json)
+
+  end
+end

data/test/_test_mimic_rails.rb

@@ -11,6 +11,7 @@ require 'active_model'
 require 'active_model_serializers'
 require 'active_support/json'
 require 'active_support/time'
+require 'active_support/all'
 
 require 'oj/active_support_helper'
 
@@ -89,6 +90,26 @@ class MimicRails < Minitest::Test
     puts "*** serializer.as_json() #{serializer.as_json()}"
     json = JSON.dump(serializer)
     puts "*** JSON.dump(serializer) #{JSON.dump(serializer)}"
+
+    puts "*** category.to_json() #{category.to_json()}"
+    puts "*** category.as_json() #{category.as_json()}"
+    puts "*** JSON.dump(serializer) #{JSON.dump(category)}"
+    puts "*** Oj.dump(serializer) #{Oj.dump(category)}"
+
+  end
+
+  def test_dump_object_array
+    Oj.default_options= {:indent => 2}
+    cat1 = Category.new(1, 'test')
+    cat2 = Category.new(2, 'test')
+    a = Array.wrap([cat1, cat2])
+
+    #serializer = CategorySerializer.new(a)
+
+    puts "*** a.to_json() #{a.to_json()}"
+    puts "*** a.as_json() #{a.as_json()}"
+    puts "*** JSON.dump(a) #{JSON.dump(a)}"
+    puts "*** Oj.dump(a) #{Oj.dump(a)}"
   end
 
   def test_dump_time

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-02 00:00:00.000000000 Z
+date: 2014-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -101,6 +101,8 @@ files:
 - lib/oj/saj.rb
 - lib/oj/schandler.rb
 - lib/oj/version.rb
+- test/_test_active.rb
+- test/_test_active_mimic.rb
 - test/_test_mimic_rails.rb
 - test/bug.rb
 - test/bug2.rb