resolved

2 files changed, 19 insertions, 0 deletions

diff --git a/lib/json/generic_object.rb b/lib/json/generic_object.rb
index 8b1074c..8b8fd53 100644
--- a/lib/json/generic_object.rb
+++ b/lib/json/generic_object.rb
@@ -31,6 +31,15 @@ module JSON
           object
         end
       end
+
+      def load(source, proc = nil, opts = {})
+        result = ::JSON.load(source, proc, opts.merge(:object_class => self))
+        result.nil? ? new : result
+      end
+
+      def dump(obj, *args)
+        ::JSON.dump(obj, *args)
+      end
     end
     self.json_creatable = false
 
diff --git a/tests/test_json_generic_object.rb b/tests/test_json_generic_object.rb
index 77ef22e..b96b735 100644
--- a/tests/test_json_generic_object.rb
+++ b/tests/test_json_generic_object.rb
@@ -49,6 +49,16 @@ class TestJSONGenericObject < Test::Unit::TestCase
     assert_equal   true, GenericObject.from_hash(true)
   end
 
+  def test_json_generic_object_load
+    empty = JSON::GenericObject.load(nil)
+    assert_kind_of JSON::GenericObject, empty
+    simple = JSON::GenericObject.load('{ "hello": "world" }')
+    assert_kind_of JSON::GenericObject, simple
+    assert_equal "world", simple.hello
+    json = JSON::GenericObject.dump(JSON::GenericObject[:hello => 'world'])
+    assert_equal json, '{ "hello": "world" }'
+  end
+
   private
 
   def switch_json_creatable