merge

Author: ohler55

oj.gemspec

@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--title', 'Oj', '--main', 'README.md']
 
   s.add_runtime_dependency 'bigdecimal', '>= 3.0'
-  s.add_runtime_dependency 'ostruct', '>= 0.2'
   s.add_development_dependency 'minitest', '~> 5'
   s.add_development_dependency 'rake-compiler', '>= 0.9', '< 2.0'
   s.add_development_dependency 'test-unit', '~> 3.0'

test/json_gem/json_generic_object_test.rb

@@ -420,19 +420,6 @@ def test_parse_object_custom_non_hash_derived_class
     assert res.item_set?
   end
 
-  def test_parse_generic_object
-    res = JSON.parse(
-      '{"foo":"bar", "baz":{}}',
-      :object_class => JSON::GenericObject
-    )
-    assert_equal(JSON::GenericObject, res.class)
-    assert_equal "bar", res.foo
-    assert_equal "bar", res["foo"]
-    assert_equal "bar", res[:foo]
-    assert_equal "bar", res.to_hash[:foo]
-    assert_equal(JSON::GenericObject, res.baz.class)
-  end if defined?(JSON::GenericObject)
-
   def test_generate_core_subclasses_with_new_to_json
     obj = SubHash2["foo" => SubHash2["bar" => true]]
     obj_json = JSON(obj)

test/json_gem/json_parser_test.rb

@@ -9,7 +9,6 @@
 require 'json_ext_parser_test'
 require 'json_fixtures_test'
 require 'json_generator_test'
-require 'json_generic_object_test'
 require 'json_parser_test'
 require 'json_string_matching_test'