Rails encoder fix (#984)

* Handle empty args to new encoder
* Remove deprecated json tests
* More test removal for 4.0

Author: ohler55

ext/oj/rails.c

@@ -661,13 +661,15 @@ static VALUE encoder_new(int argc, VALUE *argv, VALUE self) {
     Encoder e = OJ_R_ALLOC(struct _encoder);
 
     e->opts = oj_default_options;
-    e->arg  = Qnil;
     copy_opts(&ropts, &e->ropts);
 
     if (1 <= argc && Qnil != *argv) {
-        oj_parse_options(*argv, &e->opts);
         e->arg = *argv;
+    } else {
+        e->arg = rb_hash_new();
     }
+    oj_parse_options(*argv, &e->opts);
+
     return TypedData_Wrap_Struct(encoder_class, &oj_encoder_type, e);
 }
 

test/json_gem/json_common_interface_test.rb

@@ -55,12 +55,13 @@ def test_state
   end
 
   # This doesn't have anything to do with JSON parsing or generation. It seems
-  # to be more of an internal tool that is exposed to users.
-  def test_deep_const_get
-    omit("mimic_JSON") unless REAL_JSON_GEM
-    assert_raise(ArgumentError) { JSON.deep_const_get('Nix::Da') }
-    assert_equal File::SEPARATOR, JSON.deep_const_get('File::SEPARATOR')
-  end
+  # to be more of an internal tool that is exposed to users. It also breaks in
+  # ruby 4.0.0.
+  # def test_deep_const_get
+  #   omit("mimic_JSON") unless REAL_JSON_GEM
+  #   assert_raise(ArgumentError) { JSON.deep_const_get('Nix::Da') }
+  #   assert_equal File::SEPARATOR, JSON.deep_const_get('File::SEPARATOR')
+  # end
   ##############################################################################
 
   def test_create_id
@@ -142,11 +143,12 @@ def test_dump
     assert_equal too_deep, output.string
   end
 
-  def test_dump_should_modify_defaults
-    max_nesting = JSON.dump_default_options[:max_nesting]
-    JSON.dump([], StringIO.new, 10)
-    assert_equal max_nesting, JSON.dump_default_options[:max_nesting]
-  end
+  # Removed after 3.0
+  # def test_dump_should_modify_defaults
+  #   max_nesting = JSON.dump_default_options[:max_nesting]
+  #   JSON.dump([], StringIO.new, 10)
+  #   assert_equal max_nesting, JSON.dump_default_options[:max_nesting]
+  # end
 
   def test_JSON
     assert_equal @json, JSON(@hash)

test/json_gem/json_generic_object_test.rb

@@ -33,7 +33,7 @@ def test_parse_json
         :create_additions => true
     )
     ch = Hash
-    # JSON after 2.10 no longer allows GenericObject creatable to be turned off or so it appears
+    # JSON after 2.10 no longer allows GenericObject creatable to be turned off or so it appears.
     ch = JSON::GenericObject if REAL_JSON_GEM && ([2, 11, 0] <=> JSON::VERSION.split('.').map { |v| v.to_i }) <= 0
     assert_kind_of ch,
                    JSON(

test/json_gem/json_parser_test.rb

@@ -294,10 +294,10 @@ def test_backslash
     json = '["\""]'
     data = ['"']
     assert_equal data, JSON.parse(json)
-    #
-    json = '["\\\'"]'
-    data = ["'"]
-    assert_equal data, JSON.parse(json)
+    # no longer a valid escape sequence in ruby 4.0
+    # json = '["\\\'"]'
+    # data = ["'"]
+    # assert_equal data, JSON.parse(json)
   end
 
   class SubArray < Array