oj 3.7.11 → 3.9.1

data/ext/oj/val_stack.c

@@ -1,21 +1,21 @@
 /* val_stack.c
  * Copyright (c) 2011, Peter Ohler
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  *  - Redistributions of source code must retain the above copyright notice, this
  *    list of conditions and the following disclaimer.
- * 
+ *
  *  - Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  *  - Neither the name of Peter Ohler nor the names of its contributors may be
  *    used to endorse or promote products derived from this software without
  *    specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -42,7 +42,7 @@ mark(void *ptr) {
     if (0 == ptr) {
 	return;
     }
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_lock(&stack->mutex);
 #else
     rb_mutex_lock(stack->mutex);
@@ -66,7 +66,7 @@ mark(void *ptr) {
 	    }
 	}
     }
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_unlock(&stack->mutex);
 #else
     rb_mutex_unlock(stack->mutex);
@@ -75,9 +75,9 @@ mark(void *ptr) {
 
 VALUE
 oj_stack_init(ValStack stack) {
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     int	err;
-    
+
     if (0 != (err = pthread_mutex_init(&stack->mutex, 0))) {
 	rb_raise(rb_eException, "failed to initialize a mutex. %s", strerror(err));
     }

data/ext/oj/val_stack.h

@@ -1,21 +1,21 @@
 /* val_stack.h
  * Copyright (c) 2011, Peter Ohler
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  *  - Redistributions of source code must retain the above copyright notice, this
  *    list of conditions and the following disclaimer.
- * 
+ *
  *  - Redistributions in binary form must reproduce the above copyright notice,
  *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 
+ *
  *  - Neither the name of Peter Ohler nor the names of its contributors may be
  *    used to endorse or promote products derived from this software without
  *    specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -34,7 +34,7 @@
 #include "ruby.h"
 #include "odd.h"
 #include <stdint.h>
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 #include <pthread.h>
 #endif
 
@@ -72,7 +72,7 @@ typedef struct _valStack {
     Val			head;	// current stack
     Val			end;	// stack end
     Val			tail;	// pointer to one past last element name on stack
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
     pthread_mutex_t	mutex;
 #else
     VALUE		mutex;
@@ -110,7 +110,7 @@ stack_push(ValStack stack, VALUE val, ValNext next) {
 	} else {
 	    REALLOC_N(head, struct _val, len + STACK_INC);
 	}
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 	pthread_mutex_lock(&stack->mutex);
 #else
 	rb_mutex_lock(stack->mutex);
@@ -118,7 +118,7 @@ stack_push(ValStack stack, VALUE val, ValNext next) {
 	stack->head = head;
 	stack->tail = stack->head + toff;
 	stack->end = stack->head + len + STACK_INC;
-#if HAVE_LIBPTHREAD
+#ifdef HAVE_PTHREAD_MUTEX_INIT
 	pthread_mutex_unlock(&stack->mutex);
 #else
 	rb_mutex_unlock(stack->mutex);

data/lib/oj/json.rb

@@ -95,7 +95,7 @@ module JSON
   State = ::JSON::Ext::Generator::State unless defined?(::JSON::State)
 
   begin
-    Object.send(:remove_const, :Parser)
+    send(:remove_const, :Parser)
   rescue
   end
   Parser = ::JSON::Ext::Parser unless defined?(::JSON::Parser)

data/lib/oj/mimic.rb

@@ -31,7 +31,7 @@ module Oj
   end
 
   # Loads mimic-ed JSON paths. Used by Oj.mimic_JSON().
-  # @param mimic_path [Array] additional paths to add to the Ruby loaded features.
+  # @param mimic_paths [Array] additional paths to add to the Ruby loaded features.
   def self.mimic_loaded(mimic_paths=[])
     $LOAD_PATH.each do |d|
       next unless File.exist?(d)

data/lib/oj/version.rb

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

data/pages/Modes.md

@@ -14,7 +14,7 @@ modes are:
  - `:object`
  - `:custom`
 
-Since modes detemine what the JSON output will look like and alternatively
+Since modes determine what the JSON output will look like and alternatively
 what Oj expects when the `Oj.load()` method is called, mixing the output and
 input mode formats will most likely not behave as intended. If the object mode
 is used for producing JSON then use object mode for reading. The same is true
@@ -117,6 +117,7 @@ information.
 | :object_nl             | String  |         |         |       x |       x |         |       x |         |
 | :omit_nil              | Boolean |       x |       x |       x |       x |       x |       x |         |
 | :quirks_mode           | Boolean |         |         |       6 |         |         |       x |         |
+| :safe                  | String  |         |         |       x |         |         |         |         |
 | :second_precision      | Fixnum  |         |         |         |         |       x |       x |         |
 | :space                 | String  |         |         |       x |       x |         |       x |         |
 | :space_before          | String  |         |         |       x |       x |         |       x |         |
@@ -124,6 +125,7 @@ information.
 | :trace                 | Boolean |       x |       x |       x |       x |       x |       x |       x |
 | :time_format           | Symbol  |         |         |         |         |       x |       x |         |
 | :use_as_json           | Boolean |         |         |         |         |         |       x |         |
+| :use_raw_json          | Boolean |         |         |       x |       x |       x |       x |         |
 | :use_to_hash           | Boolean |         |         |         |         |         |       x |         |
 | :use_to_json           | Boolean |         |         |         |         |         |       x |         |
  --------------------------------------------------------------------------------------------------------
@@ -151,4 +153,3 @@ information.
  6. The quirks mode option is no longer supported in the most recent json
     gem. It is supported by Oj for backward compatibility with older json gem
     versions.
-

data/pages/Options.md

@@ -89,6 +89,10 @@ with the key.
 The :create_id option specifies that key is used for dumping and loading when
 specifying the class for an encoded object. The default is `json_create`.
 
+In the `:custom` mode setting the `:create_id` to nil will cause Complex,
+Rational, Range, and Regexp to be output as strings instead of as JSON
+objects.
+
 ### :empty_string [Boolean]
 
 If true an empty or all whitespace input will not raise an Exception. The
@@ -149,7 +153,7 @@ integer gives better performance.
 
 ### :integer_range [Range]
 
-Dump integers outside range as strings. 
+Dump integers outside range as strings.
 Note: range bounds must be Fixnum.
 
 ### :match_string
@@ -211,6 +215,12 @@ Allow single JSON values instead of documents, default is true (allow). This
 can also be used in :compat mode to be backward compatible with older versions
 of the json gem.
 
+### :safe
+
+The JSON gem includes the complete JSON in parse errors with no limit
+on size. To break from the JSON gem behavior for this case set `:safe`
+to true.
+
 ### :second_precision [Fixnum]
 
 The number of digits after the decimal when dumping the seconds of time.
@@ -254,6 +264,18 @@ The :time_format when dumping.
 Call `as_json()` methods on dump, default is false. The option is ignored in
 the :compat and :rails mode.
 
+
+### :use_raw_json [Boolean]
+
+Call `raw_json()` methods on dump, default is false. The option is
+accepted in the :compat and :rails mode even though it is not
+supported by other JSON gems. It provides a means to optimize dump or
+generate performance. The `raw_json(depth, indent)` method should be
+called only by Oj. It is not intended for any other use. This is mean
+to replace the abused `to_json` methods. Calling `Oj.dump` inside the
+`raw_json` with the object itself when `:use_raw_json` is true will
+result in an infinite loop.
+
 ### :use_to_hash [Boolean]
 
 Call `to_hash()` methods on dump, default is false. The option is ignored in
@@ -263,4 +285,3 @@ the :compat and :rails mode.
 
 Call `to_json()` methods on dump, default is false. The option is ignored in
 the :compat and :rails mode.
-

data/pages/Security.md

@@ -7,7 +7,7 @@ Symbols. The same is true for auto defining classes in all versions of ruby;
 memory will also be exhausted if too many classes are automatically
 defined. Auto defining is a useful feature during development and from trusted
 sources but it allows too many classes to be created in the object load mode and
-auto defined is used with an untrusted source. The `Oj.strict_load()` method
+auto defined is used with an untrusted source. The `Oj.safe_load()` method
 sets and uses the most strict and safest options. It should be used by
 developers who find it difficult to understand the options available in Oj.
 

data/test/test_custom.rb

@@ -32,6 +32,9 @@ class CustomJuice < Minitest::Test
     def to_json(*args)
       %|{"xx":#{@x},"yy":#{y}}|
     end
+    def raw_json(depth, indent)
+      %|{"xxx":#{@x},"yyy":#{y}}|
+    end
     def as_json(*args)
       {'a' => @x, :b => @y }
     end
@@ -40,6 +43,40 @@ class CustomJuice < Minitest::Test
     end
   end
 
+  class AsJson
+    attr_accessor :x, :y
+
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
+    def ==(o)
+      self.class == o.class && @x == o.x && @y = o.y
+    end
+    def as_json(*args)
+      {'a' => @x, :b => @y }
+    end
+  end
+
+  class AsRails
+    attr_accessor :x, :y
+
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
+    def ==(o)
+      self.class == o.class && @x == o.x && @y = o.y
+    end
+    def as_json(*args)
+      a = @x
+      a = a.as_json if a.respond_to?('as_json')
+      b = @y
+      b = b.as_json if b.respond_to?('as_json')
+      {'a' => a, :b => b }
+    end
+  end
+
   def setup
     @default_options = Oj.default_options
     Oj.default_options = { :mode => :custom }
@@ -92,7 +129,7 @@ class CustomJuice < Minitest::Test
     end
     assert(false, "*** expected an exception")
   end
-  
+
   def test_infinity_dump
     assert_equal('null', Oj.dump(1/0.0, :nan => :null))
     assert_equal('3.0e14159265358979323846', Oj.dump(1/0.0, :nan => :huge))
@@ -187,7 +224,7 @@ class CustomJuice < Minitest::Test
                                                         '19' => {
                                                           '20' => {}}}}}}}}}}}}}}}}}}}}}, false)
   end
-  
+
   def test_hash_escaped_key
     json = %{{"a\nb":true,"c\td":false}}
     obj = Oj.load(json)
@@ -232,6 +269,66 @@ class CustomJuice < Minitest::Test
     assert_equal(%|{"b":true,"n":58}|, json)
   end
 
+  def test_object_raw_json
+    obj = Jeez.new(true, 58)
+    json = Oj.dump(obj, :use_to_json => true, :use_as_json => false, :use_raw_json => true, :use_to_hash => false)
+    assert_equal(%|{"xxx":true,"yyy":58}|, json)
+  end
+
+  def test_raw_json_stringwriter
+    obj = Oj::StringWriter.new(:indent => 0)
+    obj.push_array()
+    obj.pop()
+    json = Oj.dump(obj, :use_raw_json => true)
+    assert_equal(%|[]|, json)
+  end
+
+  def test_as_raw_json_stringwriter
+    obj = Oj::StringWriter.new(:indent => 0)
+    obj.push_array()
+    obj.push_value(3)
+    obj.pop()
+    j = AsJson.new(1, obj)
+
+    json = Oj.dump(j, use_raw_json: true, use_as_json: true, indent: 2)
+    assert_equal(%|{
+  "a":1,
+  "b":[3]
+}
+|, json)
+
+    json = Oj.dump(j, use_raw_json: false, use_as_json: true, indent: 2)
+    assert_equal(%|{
+  "a":1,
+  "b":{}
+}
+|, json)
+  end
+
+  def test_rails_as_raw_json_stringwriter
+    obj = Oj::StringWriter.new(:indent => 0)
+    obj.push_array()
+    obj.push_value(3)
+    obj.pop()
+    j = AsRails.new(1, obj)
+    json = Oj.dump(j, mode: :rails, use_raw_json: true, indent: 2)
+    assert_equal(%|{
+  "a":1,
+  "b":{}
+}
+|, json)
+
+    Oj::Rails.optimize
+    json = Oj.dump(j, mode: :rails, use_raw_json: true, indent: 2)
+    Oj::Rails.deoptimize
+    assert_equal(%|{
+  "a":1,
+  "b":[3]
+}
+|, json)
+
+  end
+
   def test_symbol
     json = Oj.dump(:abc)
     assert_equal('"abc"', json)

data/test/test_various.rb

@@ -134,6 +134,7 @@ class Juice < Minitest::Test
       :use_to_json=>false,
       :use_to_hash=>false,
       :use_as_json=>false,
+      :use_raw_json=>false,
       :nilnil=>true,
       :empty_string=>true,
       :allow_gc=>false,
@@ -158,6 +159,7 @@ class Juice < Minitest::Test
       :array_class=>Array,
       :ignore=>nil,
       :trace=>true,
+      :safe=>true,
     }
     Oj.default_options = alt
     #keys = alt.keys

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 3.7.11
+  version: 3.9.1
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -266,14 +266,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A fast JSON parser and serializer.