json 1.6.5-java → 1.6.6-java

data/lib/json/pure/generator.rb

@@ -255,8 +255,12 @@ module JSON
         # GeneratorError exception.
         def generate(obj)
           result = obj.to_json(self)
-          if !@quirks_mode && result !~ /\A\s*(?:\[.*\]|\{.*\})\s*\Z/m
-            raise GeneratorError, "only generation of JSON objects or arrays allowed"
+          unless @quirks_mode
+            unless result =~ /\A\s*\[/ && result =~ /\]\s*\Z/ ||
+              result =~ /\A\s*\{/ && result =~ /\}\s*\Z/
+            then
+              raise GeneratorError, "only generation of JSON objects or arrays allowed"
+            end
           end
           result
         end

data/lib/json/version.rb

@@ -1,6 +1,6 @@
 module JSON
   # JSON version
-  VERSION         = '1.6.5'
+  VERSION         = '1.6.6'
   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.rb

@@ -314,7 +314,7 @@ class TC_JSON < Test::Unit::TestCase
     assert res.item_set?
   end
 
-  def test_generation_of_core_subclasses_with_new_to_json
+  def test_generate_core_subclasses_with_new_to_json
     obj = SubHash2["foo" => SubHash2["bar" => true]]
     obj_json = JSON(obj)
     obj_again = JSON(obj_json)
@@ -325,12 +325,12 @@ class TC_JSON < Test::Unit::TestCase
     assert_equal ["foo"], JSON(JSON(SubArray2["foo"]))
   end
 
-  def test_generation_of_core_subclasses_with_default_to_json
+  def test_generate_core_subclasses_with_default_to_json
     assert_equal '{"foo":"bar"}', JSON(SubHash["foo" => "bar"])
     assert_equal '["foo"]', JSON(SubArray["foo"])
   end
 
-  def test_generation_of_core_subclasses
+  def test_generate_of_core_subclasses
     obj = SubHash["foo" => SubHash["bar" => true]]
     obj_json = JSON(obj)
     obj_again = JSON(obj_json)

data/tests/test_json_generate.rb

@@ -227,23 +227,25 @@ EOT
     GC.stress = stress
   end if GC.respond_to?(:stress=)
 
-  def test_broken_bignum # [ruby-core:38867]
-    pid = fork do
-      Bignum.class_eval do
-        def to_s
+  if defined?(JSON::Ext::Generator)
+    def test_broken_bignum # [ruby-core:38867]
+      pid = fork do
+        Bignum.class_eval do
+          def to_s
+          end
+        end
+        begin
+          JSON::Ext::Generator::State.new.generate(1<<64)
+          exit 1
+        rescue TypeError
+          exit 0
         end
       end
-      begin
-        JSON::Ext::Generator::State.new.generate(1<<64)
-        exit 1
-      rescue TypeError
-        exit 0
-      end
+      _, status = Process.waitpid2(pid)
+      assert status.success?
+    rescue NotImplementedError
+      # forking to avoid modifying core class of a parent process and
+      # introducing race conditions of tests are run in parallel
     end
-    _, status = Process.waitpid2(pid)
-    assert status.success?
-  rescue NotImplementedError
-    # forking to avoid modifying core class of a parent process and
-    # introducing race conditions of tests are run in parallel
-  end if defined?(JSON::Ext)
+  end
 end

metadata

@@ -2,7 +2,7 @@
 name: json
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.6.5
+  version: 1.6.6
 platform: java
 authors: 
   - Daniel Luz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-15 00:00:00 Z
+date: 2012-03-26 00:00:00 Z
 dependencies: []
 
 description: A JSON implementation as a JRuby extension.
@@ -23,66 +23,66 @@ extra_rdoc_files: []
 
 files: 
   - lib/json.rb
-  - lib/json/version.rb
   - lib/json/common.rb
   - lib/json/ext.rb
   - lib/json/pure.rb
-  - lib/json/add/symbol.rb
-  - lib/json/add/struct.rb
-  - lib/json/add/complex.rb
-  - lib/json/add/rational.rb
-  - lib/json/add/exception.rb
-  - lib/json/add/time.rb
+  - lib/json/version.rb
   - lib/json/add/bigdecimal.rb
-  - lib/json/add/date_time.rb
+  - lib/json/add/complex.rb
   - lib/json/add/core.rb
-  - lib/json/add/range.rb
   - lib/json/add/date.rb
-  - lib/json/add/regexp.rb
+  - lib/json/add/date_time.rb
+  - lib/json/add/exception.rb
   - lib/json/add/ostruct.rb
-  - lib/json/pure/generator.rb
-  - lib/json/pure/parser.rb
+  - lib/json/add/range.rb
+  - lib/json/add/rational.rb
+  - lib/json/add/regexp.rb
+  - lib/json/add/struct.rb
+  - lib/json/add/symbol.rb
+  - lib/json/add/time.rb
   - lib/json/ext/generator.jar
   - lib/json/ext/parser.jar
-  - tests/test_json_string_matching.rb
-  - tests/test_json_fixtures.rb
+  - lib/json/pure/generator.rb
+  - lib/json/pure/parser.rb
   - tests/setup_variant.rb
-  - tests/test_json_unicode.rb
+  - tests/test_json.rb
   - tests/test_json_addition.rb
-  - tests/test_json_generate.rb
   - tests/test_json_encoding.rb
-  - tests/test_json.rb
-  - tests/fixtures/fail6.json
-  - tests/fixtures/fail9.json
+  - tests/test_json_fixtures.rb
+  - tests/test_json_generate.rb
+  - tests/test_json_string_matching.rb
+  - tests/test_json_unicode.rb
+  - tests/fixtures/fail1.json
   - tests/fixtures/fail10.json
-  - tests/fixtures/fail24.json
-  - tests/fixtures/fail28.json
-  - tests/fixtures/fail13.json
-  - tests/fixtures/fail4.json
-  - tests/fixtures/pass3.json
   - tests/fixtures/fail11.json
-  - tests/fixtures/fail14.json
-  - tests/fixtures/fail3.json
   - tests/fixtures/fail12.json
-  - tests/fixtures/pass16.json
-  - tests/fixtures/pass15.json
-  - tests/fixtures/fail20.json
-  - tests/fixtures/fail8.json
-  - tests/fixtures/pass2.json
-  - tests/fixtures/fail5.json
-  - tests/fixtures/fail1.json
-  - tests/fixtures/fail25.json
-  - tests/fixtures/pass17.json
-  - tests/fixtures/fail7.json
-  - tests/fixtures/pass26.json
-  - tests/fixtures/fail21.json
-  - tests/fixtures/pass1.json
-  - tests/fixtures/fail23.json
+  - tests/fixtures/fail13.json
+  - tests/fixtures/fail14.json
   - tests/fixtures/fail18.json
+  - tests/fixtures/fail19.json
   - tests/fixtures/fail2.json
+  - tests/fixtures/fail20.json
+  - tests/fixtures/fail21.json
   - tests/fixtures/fail22.json
+  - tests/fixtures/fail23.json
+  - tests/fixtures/fail24.json
+  - tests/fixtures/fail25.json
   - tests/fixtures/fail27.json
-  - tests/fixtures/fail19.json
+  - tests/fixtures/fail28.json
+  - tests/fixtures/fail3.json
+  - tests/fixtures/fail4.json
+  - tests/fixtures/fail5.json
+  - tests/fixtures/fail6.json
+  - tests/fixtures/fail7.json
+  - tests/fixtures/fail8.json
+  - tests/fixtures/fail9.json
+  - tests/fixtures/pass1.json
+  - tests/fixtures/pass15.json
+  - tests/fixtures/pass16.json
+  - tests/fixtures/pass17.json
+  - tests/fixtures/pass2.json
+  - tests/fixtures/pass26.json
+  - tests/fixtures/pass3.json
 homepage: http://json-jruby.rubyforge.org/
 licenses: []
 
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: json-jruby
-rubygems_version: 1.8.9
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: JSON implementation for JRuby