json 1.7.7 → 1.8.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 3f7699d7a235e5ee1831e5dd162893ca440a2dff
+  data.tar.gz: 8a7dfdd7b9a809f87b99b1f82be2cfb239445ed9
+SHA512:
+  metadata.gz: d8816837c8c09bb4a7337d8f9459cdb0f9d0b4e28698c7ccab16d4dfed21c96cdcc848f5a79390f4527a9393311f656bf1a02cc5ea5bd0362aa294fe5c35550c
+  data.tar.gz: 80394af8c38f184434a4c534ba5907e61d6fdf37960750a39f1cacc0b9120ee096d09c99f5ff1dbc6f64858f6af6b5ebbc6856ee5739f1c1e44ae012cc144663

data/.travis.yml

@@ -6,6 +6,7 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - ree
   - rbx-18mode
   - rbx-19mode

data/CHANGES

@@ -1,3 +1,13 @@
+2013-05-13 (1.8.0)
+  * Fix https://github.com/flori/json/issues/162 reported by Marc-Andre
+    Lafortune <github_rocks@marc-andre.ca>. Thanks!
+  * Applied patches by Yui NARUSE <naruse@airemix.jp> to suppress warning with
+    -Wchar-subscripts and better validate UTF-8 strings.
+  * Applied patch by ginriki@github to remove unnecessary if.
+  * Add load/dump interface to JSON::GenericObject to make
+        serialize :some_attribute, JSON::GenericObject
+    work in Rails active models for convenient SomeModel#some_attribute.foo.bar
+    access to serialised JSON data.
 2013-02-04 (1.7.7)
   * Security fix for JSON create_additions default value and
     JSON::GenericObject. It should not be possible to create additions unless
@@ -5,7 +15,7 @@
     using the JSON.load/dump interface. If JSON::GenericObject is supposed to
     be automatically deserialised, this has to be explicitely enabled by
     setting
-      JSON::GenericObject.json_createble = true
+      JSON::GenericObject.json_creatable = true
     as well.
   * Remove useless assert in fbuffer implementation.
   * Apply patch attached to https://github.com/flori/json/issues#issue/155

data/Gemfile

@@ -1,6 +1,6 @@
 # vim: set ft=ruby:
 
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec :name => 'json'
 gemspec :name => 'json_pure'

data/VERSION

@@ -1 +1 @@
-1.7.7
+1.8.0

data/ext/json/ext/generator/generator.c

@@ -273,7 +273,18 @@ static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string)
                     escape_len = 2;
                     break;
                 default:
-                    end++;
+                    {
+                        unsigned short clen = trailingBytesForUTF8[c] + 1;
+                        if (end + clen > len) {
+                            rb_raise(rb_path2class("JSON::GeneratorError"),
+                                    "partial character in source, but hit end");
+                        }
+                        if (!isLegalUTF8((UTF8 *) p, clen)) {
+                            rb_raise(rb_path2class("JSON::GeneratorError"),
+                                    "source sequence is illegal/malformed utf-8");
+                        }
+                        end += clen;
+                    }
                     continue;
                     break;
             }
@@ -511,11 +522,8 @@ static VALUE cState_configure(VALUE self, VALUE opts)
 {
     VALUE tmp;
     GET_STATE(self);
-    tmp = rb_convert_type(opts, T_HASH, "Hash", "to_hash");
+    tmp = rb_check_convert_type(opts, T_HASH, "Hash", "to_hash");
     if (NIL_P(tmp)) tmp = rb_convert_type(opts, T_HASH, "Hash", "to_h");
-    if (NIL_P(tmp)) {
-        rb_raise(rb_eArgError, "opts has to be hash like or convertable into a hash");
-    }
     opts = tmp;
     tmp = rb_hash_aref(opts, ID2SYM(i_indent));
     if (RTEST(tmp)) {
@@ -894,8 +902,8 @@ static int isArrayOrObject(VALUE string)
     long string_len = RSTRING_LEN(string);
     char *p = RSTRING_PTR(string), *q = p + string_len - 1;
     if (string_len < 2) return 0;
-    for (; p < q && isspace(*p); p++);
-    for (; q > p && isspace(*q); q--);
+    for (; p < q && isspace((unsigned char)*p); p++);
+    for (; q > p && isspace((unsigned char)*q); q--);
     return (*p == '[' && *q == ']') || (*p == '{' && *q == '}');
 }
 

data/java/src/json/ext/OptionsReader.java

@@ -24,13 +24,14 @@ final class OptionsReader {
     OptionsReader(ThreadContext context, IRubyObject vOpts) {
         this.context = context;
         this.runtime = context.getRuntime();
-
         if (vOpts == null || vOpts.isNil()) {
             opts = null;
         } else if (vOpts.respondsTo("to_hash")) {
             opts = vOpts.convertToHash();
-        } else {
+        } else if (vOpts.respondsTo("to_h")) {
             opts = vOpts.callMethod(context, "to_h").convertToHash();
+        } else {
+            opts = vOpts.convertToHash(); /* Should just raise the correct TypeError */
         }
     }
 

data/json.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "json"
-  s.version = "1.7.7"
+  s.version = "1.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2013-02-11"
+  s.date = "2013-05-13"
   s.description = "This is a JSON implementation as a Ruby extension in C."
   s.email = "flori@ping.de"
   s.extensions = ["ext/json/ext/generator/extconf.rb", "ext/json/ext/parser/extconf.rb"]
@@ -16,12 +16,12 @@ Gem::Specification.new do |s|
   s.licenses = ["Ruby"]
   s.rdoc_options = ["--title", "JSON implemention for Ruby", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.0.3"
   s.summary = "JSON Implementation for Ruby"
   s.test_files = ["./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb"]
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<permutation>, [">= 0"])

data/json_pure.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "json_pure"
-  s.version = "1.7.7"
+  s.version = "1.8.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2013-02-11"
+  s.date = "2013-05-13"
   s.description = "This is a JSON implementation in pure Ruby."
   s.email = "flori@ping.de"
   s.extra_rdoc_files = ["README.rdoc"]
@@ -15,12 +15,12 @@ Gem::Specification.new do |s|
   s.licenses = ["Ruby"]
   s.rdoc_options = ["--title", "JSON implemention for ruby", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "2.0.3"
   s.summary = "JSON Implementation for Ruby"
   s.test_files = ["./tests/test_json.rb", "./tests/test_json_addition.rb", "./tests/test_json_encoding.rb", "./tests/test_json_fixtures.rb", "./tests/test_json_generate.rb", "./tests/test_json_generic_object.rb", "./tests/test_json_string_matching.rb", "./tests/test_json_unicode.rb"]
 
   if s.respond_to? :specification_version then
-    s.specification_version = 3
+    s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<permutation>, [">= 0"])

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

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: json
 version: !ruby/object:Gem::Version
-  version: 1.7.7
-  prerelease: 
+  version: 1.8.0
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-11 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: permutation
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -170,6 +165,7 @@ files:
 homepage: http://flori.github.com/json
 licenses:
 - Ruby
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --title
@@ -179,25 +175,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3737191669219953404
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: JSON Implementation for Ruby
 test_files:
 - ./tests/test_json.rb