json 2.0.2 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 320c2302d7fb456edd4ef4a745cc5ed7ad4e1846
-  data.tar.gz: 71abe50769b7736fbcec5051546c3a1df959c18e
+  metadata.gz: 7f771ff2dbe2582a3e23652725e44a2c04f9ef38
+  data.tar.gz: 1ee70a27e6878091c34a96f65be2dc4e9cb7b509
 SHA512:
-  metadata.gz: 58774480805deb214c3f28fbd11c306d98de072de879726457077e23884ca49573f64f83ee41882518b958dbc621732c6f463324ad891e0875f2a8847c52e188
-  data.tar.gz: de4ab46ed538410857c7f4118147d6ee92348eb4dc6dbb85447c1142692a5dfefc6f01333565f909869ab249ea5043cf8c0debb851d7ff870602ab1900589d59
+  metadata.gz: e38803d57bcb19d115083216ff027bbf749879c8fc09b676937072f5e1f95d975965c263252a8aeba6581405e09fd423a5bbc7d5ecaa4d6033d9a12bc9da262d
+  data.tar.gz: 80a69daa2ffa65cf6b9824dc77ce5e286a5e021c111d70ec0eb3fdf213a38b83feb48f004b7a2165586405a2f898b1358d5c74b9f6ffee33b627111f9af86208

data/.gitignore

@@ -14,3 +14,4 @@ Gemfile.lock
 .DS_Store
 */**/Makefile
 */**/*.o
+.byebug_history

data/.travis.yml

@@ -4,17 +4,16 @@ language: ruby
 
 # Specify which ruby versions you wish to run your tests on, each version will be used
 rvm:
+  - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2
-  - 2.3.1
+  - 2.3.3
+  - 2.4.0
+  - jruby
   - ruby-head
 matrix:
-  include:
-    - rvm: jruby
-      env: JRUBY_OPTS="--2.0"
   allow_failures:
-    - rvm: rbx-2
     - rvm: ruby-head
 script: "bundle exec rake"
 sudo: false

data/CHANGES.md

@@ -1,11 +1,16 @@
 # Changes
 
+
+## 2017-01-12 (2.0.3)
+ * Set `required_ruby_version` to 1.9
+ * Some small fixes
+
 ## 2016-07-26 (2.0.2)
   * Specify `required_ruby_version` for json\_pure.
   * Fix issue #295 failure when parsing frozen strings.
 
 ## 2016-07-01 (2.0.1)
-  * Fix problem when requiring json\_pure and Parser constant was defiend top
+  * Fix problem when requiring json\_pure and Parser constant was defined top
     level.
   * Add `RB_GC_GUARD` to avoid possible GC problem via Pete Johns.
   * Store `current_nesting` on stack by Aaron Patterson.

data/Gemfile

@@ -2,8 +2,15 @@
 
 source 'https://rubygems.org'
 
-gemspec :name => 'json'
-gemspec :name => 'json_pure'
-gemspec :name => 'json-java'
+case ENV['JSON']
+when 'ext', nil
+  if ENV['RUBY_ENGINE'] == 'jruby'
+    gemspec :name => 'json', :path => 'java'
+  else
+    gemspec :name => 'json'
+  end
+when 'pure'
+  gemspec :name => 'json_pure'
+end
 
 gem 'simplecov'

data/README.md

@@ -115,7 +115,7 @@ generate a JSON document from an array or hash:
 
 ```ruby
 document = JSON 'test'  => 23 # => "{\"test\":23}"
-document = JSON['test'] => 23 # => "{\"test\":23}"
+document = JSON['test' => 23] # => "{\"test\":23}"
 ```
 
 and

data/Rakefile

@@ -95,7 +95,7 @@ if defined?(Gem) and defined?(Gem::PackageTask)
     s.email = "flori@ping.de"
     s.homepage = "http://flori.github.com/#{PKG_NAME}"
     s.license = 'Ruby'
-    s.required_ruby_version = '~> 2.0'
+    s.required_ruby_version = '>= 1.9'
   end
 
   desc 'Creates a json_pure.gemspec file'
@@ -133,7 +133,7 @@ if defined?(Gem) and defined?(Gem::PackageTask)
     s.email = "flori@ping.de"
     s.homepage = "http://flori.github.com/#{PKG_NAME}"
     s.license = 'Ruby'
-    s.required_ruby_version = '~> 2.0'
+    s.required_ruby_version = '>= 1.9'
   end
 
   desc 'Creates a json.gemspec file'
@@ -200,13 +200,11 @@ namespace :gems do
 end
 
 if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
-  if ENV.key?('JAVA_HOME')
-    warn " *** JAVA_HOME was set to #{ENV['JAVA_HOME'].inspect}"
-  elsif File.directory?(local_java = '/usr/local/java/jdk') ||
-    File.directory?(local_java = '/usr/lib/jvm/java-6-openjdk')
-  then
-    ENV['JAVA_HOME'] = local_java
-  end
+  ENV['JAVA_HOME'] ||= [
+    '/usr/local/java/jdk',
+    '/usr/lib/jvm/java-6-openjdk',
+    '/Library/Java/Home',
+  ].find { |c| File.directory?(c) }
   if ENV['JAVA_HOME']
     warn " *** JAVA_HOME is set to #{ENV['JAVA_HOME'].inspect}"
     ENV['PATH'] = ENV['PATH'].split(/:/).unshift(java_path = "#{ENV['JAVA_HOME']}/bin") * ':'

data/VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

data/ext/json/ext/parser/parser.c

@@ -1675,7 +1675,7 @@ static VALUE convert_encoding(VALUE source)
     }
     FORCE_UTF8(source);
   } else {
-    source = rb_str_conv_enc(source, NULL, rb_utf8_encoding());
+    source = rb_str_conv_enc(source, rb_enc_get(source), rb_utf8_encoding());
   }
 #endif
     return source;

data/ext/json/ext/parser/parser.rl

@@ -570,7 +570,7 @@ static VALUE convert_encoding(VALUE source)
     }
     FORCE_UTF8(source);
   } else {
-    source = rb_str_conv_enc(source, NULL, rb_utf8_encoding());
+    source = rb_str_conv_enc(source, rb_enc_get(source), rb_utf8_encoding());
   }
 #endif
     return source;

data/json_pure.gemspec

@@ -1,14 +1,14 @@
 # -*- encoding: utf-8 -*-
-# stub: json_pure 2.0.2 ruby lib
+# stub: json_pure 2.0.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "json_pure".freeze
-  s.version = "2.0.2"
+  s.version = "2.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["Florian Frank".freeze]
-  s.date = "2016-07-26"
+  s.date = "2017-01-12"
   s.description = "This is a JSON implementation in pure Ruby.".freeze
   s.email = "flori@ping.de".freeze
   s.extra_rdoc_files = ["README.md".freeze]
@@ -16,8 +16,8 @@ Gem::Specification.new do |s|
   s.homepage = "http://flori.github.com/json".freeze
   s.licenses = ["Ruby".freeze]
   s.rdoc_options = ["--title".freeze, "JSON implemention for ruby".freeze, "--main".freeze, "README.md".freeze]
-  s.required_ruby_version = Gem::Requirement.new("~> 2.0".freeze)
-  s.rubygems_version = "2.6.4".freeze
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9".freeze)
+  s.rubygems_version = "2.6.8".freeze
   s.summary = "JSON Implementation for Ruby".freeze
   s.test_files = ["./tests/test_helper.rb".freeze]
 

data/lib/json/add/ostruct.rb

@@ -7,7 +7,7 @@ require 'ostruct'
 class OpenStruct
 
   # Deserializes JSON string by constructing new Struct object with values
-  # <tt>v</tt> serialized by <tt>to_json</tt>.
+  # <tt>t</tt> serialized by <tt>to_json</tt>.
   def self.json_create(object)
     new(object['t'] || object[:t])
   end

data/lib/json/version.rb

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

data/tests/json_generator_test.rb

@@ -277,12 +277,13 @@ EOT
   if defined?(JSON::Ext::Generator)
     def test_broken_bignum # [ruby-core:38867]
       pid = fork do
-        Bignum.class_eval do
+        x = 1 << 64
+        x.class.class_eval do
           def to_s
           end
         end
         begin
-          JSON::Ext::Generator::State.new.generate(1<<64)
+          JSON::Ext::Generator::State.new.generate(x)
           exit 1
         rescue TypeError
           exit 0

data/tests/test_helper.rb

@@ -1,5 +1,3 @@
-gem 'json', File.read('VERSION').chomp
-
 case ENV['JSON']
 when 'pure'
   $:.unshift 'lib'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
 platform: ruby
 authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-26 00:00:00.000000000 Z
+date: 2017-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -170,9 +170,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -180,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: JSON Implementation for Ruby