json 2.1.0-java → 2.2.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 634b7c9d77f51f54770f912bce42e4a6765ad87f
-  data.tar.gz: 67189aeb4ed037c326096522f03d5455d875c5e0
+SHA256:
+  metadata.gz: 5cbe28120a7a65d91699b5ad5e8f0c3b1c2c0895cc1bfd1d27de93513da6276c
+  data.tar.gz: a79ed2632e93ef7dc2df67f197d56d4be671c61e94ebe59c298cc5d6bde668a3
 SHA512:
-  metadata.gz: 7f4402403159951b48a71ae16f990e5a273f89bd249d27d8fc1b965c2017de88480941e3d3f73bb068e5f4e7a91f05dcd46f077f3149c26acada386752e7d796
-  data.tar.gz: '082bde17c11b76f51ae1fd60df8dd72bdee08c31aae7495d436f1a12d0c2f5b29c028ac2e151921ae8cbe0a027f135a21dd703fea39243dfd5cdfb2667ba2fbd'
+  metadata.gz: 711bab89dfc319519f4f5818e87de1d1f12a4e4542b193e5dfdff50a0db12c31fe453a4353666257689b8d3ba2a3456bc818e65065f97e8ca2574add40b7b300
+  data.tar.gz: 64b77395e18b73007922ea755f58048dc68262eaf040c12c944ed89fd422db468ed8ccce3c9904a65c6b58fd4848b5462e920cac9039140dfa1cf28db54decfe

data/lib/json/add/ostruct.rb

@@ -23,7 +23,7 @@ class OpenStruct
     }
   end
 
-  # Stores class name (OpenStruct) with this struct's values <tt>v</tt> as a
+  # Stores class name (OpenStruct) with this struct's values <tt>t</tt> as a
   # JSON string.
   def to_json(*args)
     as_json.to_json(*args)

data/lib/json/add/set.rb

@@ -0,0 +1,29 @@
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
+  require 'json'
+end
+defined?(::Set) or require 'set'
+
+class Set
+  # Import a JSON Marshalled object.
+  #
+  # method used for JSON marshalling support.
+  def self.json_create(object)
+    new object['a']
+  end
+
+  # Marshal the object to JSON.
+  #
+  # method used for JSON marshalling support.
+  def as_json(*)
+    {
+      JSON.create_id => self.class.name,
+      'a'            => to_a,
+    }
+  end
+
+  # return the JSON value
+  def to_json(*args)
+    as_json.to_json(*args)
+  end
+end
+

data/lib/json/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: false
 module JSON
   # JSON version
-  VERSION         = '2.1.0'
+  VERSION         = '2.2.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/json_addition_test.rb

@@ -5,6 +5,7 @@ require 'json/add/complex'
 require 'json/add/rational'
 require 'json/add/bigdecimal'
 require 'json/add/ostruct'
+require 'json/add/set'
 require 'date'
 
 class JSONAdditionTest < Test::Unit::TestCase
@@ -190,4 +191,13 @@ class JSONAdditionTest < Test::Unit::TestCase
     o.foo = { 'bar' => true }
     assert_equal o, parse(JSON(o), :create_additions => true)
   end
+
+  def test_set
+    s = Set.new([:a, :b, :c, :a])
+    assert_equal s, JSON.parse(JSON(s), :create_additions => true)
+    ss = SortedSet.new([:d, :b, :a, :c])
+    ss_again = JSON.parse(JSON(ss), :create_additions => true)
+    assert_kind_of ss.class, ss_again
+    assert_equal ss, ss_again
+  end
 end

data/tests/json_parser_test.rb

@@ -4,6 +4,7 @@ require 'test_helper'
 require 'stringio'
 require 'tempfile'
 require 'ostruct'
+require 'bigdecimal'
 
 class JSONParserTest < Test::Unit::TestCase
   include JSON

data/tests/test_helper.rb

@@ -15,7 +15,3 @@ begin
   require 'byebug'
 rescue LoadError
 end
-if ENV['START_SIMPLECOV'].to_i == 1
-  require 'simplecov'
-  SimpleCov.start
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: java
 authors:
 - Daniel Luz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -55,6 +55,7 @@ files:
 - lib/json/add/range.rb
 - lib/json/add/rational.rb
 - lib/json/add/regexp.rb
+- lib/json/add/set.rb
 - lib/json/add/struct.rb
 - lib/json/add/symbol.rb
 - lib/json/add/time.rb
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: json-jruby
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key:
 specification_version: 4
 summary: JSON implementation for JRuby