Merge branch 'master' of github.com:flori/json

CHANGES.md

@@ -28,7 +28,7 @@
     `JSON.dump_default_options`.
   * More tests by Michael Mac-Vicar <[email protected]> and fixing
     `space_before` accessor in generator.
-  * Performance on Jruby improvemed by Ben Browning <[email protected]>.
+  * Performance on Jruby improved by Ben Browning <[email protected]>.
   * Some fixes to be compatible with the new Ruby 2.2 by Zachary Scott <[email protected]>
     and SHIBATA Hiroshi <[email protected]>.
 

README.md

@@ -3,8 +3,8 @@
 
 ## Description
 
-This is a implementation of the JSON specification according to RFC 4627
-http://www.ietf.org/rfc/rfc4627.txt . Starting from version 1.0.0 on there
+This is a implementation of the JSON specification according to RFC 7159
+http://www.ietf.org/rfc/rfc7159.txt . Starting from version 1.0.0 on there
 will be two variants available:
 
 * A pure ruby variant, that relies on the iconv and the stringscan

ext/json/ext/generator/generator.c

@@ -951,6 +951,7 @@ static VALUE cState_generate(VALUE self, VALUE obj)
 {
     VALUE result = cState_partial_generate(self, obj);
     GET_STATE(self);
+    (void)state;
     return result;
 }
 

tests/json_common_interface_test.rb

@@ -47,7 +47,7 @@ def test_create_id
   end
 
   def test_deep_const_get
-    assert_raises(ArgumentError) { JSON.deep_const_get('Nix::Da') }
+    assert_raise(ArgumentError) { JSON.deep_const_get('Nix::Da') }
     assert_equal File::SEPARATOR, JSON.deep_const_get('File::SEPARATOR')
   end
 
@@ -93,8 +93,8 @@ def test_load_with_options
 
   def test_load_null
     assert_equal nil, JSON.load(nil, nil, :allow_blank => true)
-    assert_raises(TypeError) { JSON.load(nil, nil, :allow_blank => false) }
-    assert_raises(JSON::ParserError) { JSON.load('', nil, :allow_blank => false) }
+    assert_raise(TypeError) { JSON.load(nil, nil, :allow_blank => false) }
+    assert_raise(JSON::ParserError) { JSON.load('', nil, :allow_blank => false) }
   end
 
   def test_dump