json 1.7.7-java → 1.8.0-java

data/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
 

data/lib/json/pure/generator.rb

@@ -70,6 +70,13 @@ module JSON
     rescue => e
       raise GeneratorError.wrap(e)
     end
+
+    def valid_utf8?(string)
+      encoding = string.encoding
+      (encoding == Encoding::UTF_8 || encoding == Encoding::ASCII) &&
+        string.valid_encoding?
+    end
+    module_function :valid_utf8?
   else
     def utf8_to_json(string) # :nodoc:
       string.gsub(/["\\\x0-\x1f]/n) { MAP[$&] }
@@ -93,8 +100,22 @@ module JSON
     rescue => e
       raise GeneratorError.wrap(e)
     end
+
+    def valid_utf8?(string)
+      string =~
+         /\A( [\x09\x0a\x0d\x20-\x7e]         # ASCII
+         | [\xc2-\xdf][\x80-\xbf]             # non-overlong 2-byte
+         |  \xe0[\xa0-\xbf][\x80-\xbf]        # excluding overlongs
+         | [\xe1-\xec\xee\xef][\x80-\xbf]{2}  # straight 3-byte
+         |  \xed[\x80-\x9f][\x80-\xbf]        # excluding surrogates
+         |  \xf0[\x90-\xbf][\x80-\xbf]{2}     # planes 1-3
+         | [\xf1-\xf3][\x80-\xbf]{3}          # planes 4-15
+         |  \xf4[\x80-\x8f][\x80-\xbf]{2}     # plane 16
+        )*\z/nx
+    end
   end
-  module_function :utf8_to_json, :utf8_to_json_ascii
+  module_function :utf8_to_json, :utf8_to_json_ascii, :valid_utf8?
+
 
   module Pure
     module Generator
@@ -220,6 +241,13 @@ module JSON
         # Configure this State instance with the Hash _opts_, and return
         # itself.
         def configure(opts)
+          if opts.respond_to?(:to_hash)
+            opts = opts.to_hash
+          elsif opts.respond_to?(:to_h)
+            opts = opts.to_h
+          else
+            raise TypeError, "can't convert #{opts.class} into Hash"
+          end
           for key, value in opts
             instance_variable_set "@#{key}", value
           end
@@ -263,6 +291,8 @@ module JSON
         # GeneratorError exception.
         def generate(obj)
           result = obj.to_json(self)
+          JSON.valid_utf8?(result) or raise GeneratorError,
+            "source sequence #{result.inspect} is illegal/malformed utf-8"
           unless @quirks_mode
             unless result =~ /\A\s*\[/ && result =~ /\]\s*\Z/ ||
               result =~ /\A\s*\{/ && result =~ /\}\s*\Z/
@@ -338,7 +368,7 @@ module JSON
             }
             depth = state.depth -= 1
             result << state.object_nl
-            result << state.indent * depth if indent if indent
+            result << state.indent * depth if indent
             result << '}'
             result
           end

data/lib/json/version.rb

@@ -1,6 +1,6 @@
 module JSON
   # JSON version
-  VERSION         = '1.7.7'
+  VERSION         = '1.8.0'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/tests/test_json_generate.rb

@@ -251,6 +251,22 @@ EOT
     assert_equal '5', state2.array_nl
   end
 
+  def test_configure_hash_conversion
+    state = JSON.state.new
+    state.configure(:indent => '1')
+    assert_equal '1', state.indent
+    state = JSON.state.new
+    foo = 'foo'
+    assert_raise(TypeError) do
+      state.configure(foo)
+    end
+    def foo.to_h
+      { :indent => '2' }
+    end
+    state.configure(foo)
+    assert_equal '2', state.indent
+  end
+
   if defined?(JSON::Ext::Generator)
     def test_broken_bignum # [ruby-core:38867]
       pid = fork do
@@ -297,4 +313,10 @@ EOT
     assert_kind_of Hash, state_hash
     assert_equal :bar, state_hash[:foo]
   end
+
+  def test_json_generate
+    assert_raise JSON::GeneratorError do
+      assert_equal true, JSON.generate(["\xea"])
+    end
+  end
 end

data/tests/test_json_generic_object.rb

@@ -49,6 +49,21 @@ 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 = '{"json_class":"JSON::GenericObject","hello":"world"}'
+    simple = JSON::GenericObject.load(simple_json)
+    assert_kind_of JSON::GenericObject, simple
+    assert_equal "world", simple.hello
+    converting = JSON::GenericObject.load('{ "hello": "world" }')
+    assert_kind_of JSON::GenericObject, converting
+    assert_equal "world", converting.hello
+
+    json = JSON::GenericObject.dump(JSON::GenericObject[:hello => 'world'])
+    assert_equal JSON(json), JSON('{"json_class":"JSON::GenericObject","hello":"world"}')
+  end
+
   private
 
   def switch_json_creatable

metadata

@@ -2,14 +2,14 @@
 name: json
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 1.7.7
+  version: 1.8.0
 platform: java
 authors:
 - Daniel Luz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies: []
 description: A JSON implementation as a JRuby extension.
 email: dev+ruby@mernen.com