json 1.6.6-java → 1.6.7-java

data/lib/json/common.rb

@@ -1,4 +1,5 @@
 require 'json/version'
+require 'json/light_object'
 
 module JSON
   class << self

data/lib/json/light_object.rb

@@ -0,0 +1,45 @@
+require 'ostruct'
+
+module JSON
+  class LightObject < OpenStruct
+    class << self
+      alias [] new
+
+      def json_create(data)
+        data = data.dup
+        data.delete JSON.create_id
+        self[data]
+      end
+    end
+
+    def to_hash
+      table
+    end
+
+    def [](name)
+      to_hash[name.to_sym]
+    end
+
+    def []=(name, value)
+      modifiable[name.to_sym] = value
+    end
+
+    def |(other)
+      self.class[other.to_hash.merge(to_hash)]
+    end
+
+    def as_json(*)
+      to_hash | { JSON.create_id => self.class.name }
+    end
+
+    def to_json(*a)
+      as_json.to_json(*a)
+    end
+
+    def method_missing(*a, &b)
+      to_hash.__send__(*a, &b)
+    rescue NoMethodError
+      super
+    end
+  end
+end

data/lib/json/version.rb

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

@@ -21,7 +21,7 @@ unless Array.method_defined?(:permutation)
   end
 end
 
-class TC_JSON < Test::Unit::TestCase
+class TestJSON < Test::Unit::TestCase
   include JSON
 
   def setup
@@ -109,6 +109,8 @@ class TC_JSON < Test::Unit::TestCase
   def test_parse_json_primitive_values
     assert_raise(JSON::ParserError) { JSON.parse('') }
     assert_raise(JSON::ParserError) { JSON.parse('', :quirks_mode => true) }
+    assert_raise(TypeError) { JSON::Parser.new(nil).parse }
+    assert_raise(TypeError) { JSON::Parser.new(nil, :quirks_mode => true).parse }
     assert_raise(TypeError) { JSON.parse(nil) }
     assert_raise(TypeError) { JSON.parse(nil, :quirks_mode => true) }
     assert_raise(JSON::ParserError) { JSON.parse('  /* foo */ ') }
@@ -314,6 +316,16 @@ class TC_JSON < Test::Unit::TestCase
     assert res.item_set?
   end
 
+  def test_parse_light_object
+    res = parse('{"foo":"bar", "baz":{}}', :object_class => JSON::LightObject)
+    assert_equal(JSON::LightObject, res.class)
+    assert_equal "bar", res.foo
+    assert_equal "bar", res["foo"]
+    assert_equal "bar", res[:foo]
+    assert_equal "bar", res.to_hash[:foo]
+    assert_equal(JSON::LightObject, res.baz.class)
+  end
+
   def test_generate_core_subclasses_with_new_to_json
     obj = SubHash2["foo" => SubHash2["bar" => true]]
     obj_json = JSON(obj)

data/tests/test_json_addition.rb

@@ -10,7 +10,7 @@ require 'json/add/bigdecimal'
 require 'json/add/ostruct'
 require 'date'
 
-class TC_JSONAddition < Test::Unit::TestCase
+class TestJSONAddition < Test::Unit::TestCase
   include JSON
 
   class A
@@ -64,7 +64,7 @@ class TC_JSONAddition < Test::Unit::TestCase
 
     def to_json(*args)
       {
-        'json_class'  => 'TC_JSONAddition::Nix',
+        'json_class'  => 'TestJSONAddition::Nix',
       }.to_json(*args)
     end
   end
@@ -88,7 +88,7 @@ class TC_JSONAddition < Test::Unit::TestCase
     a_hash = JSON.parse(json, :create_additions => false)
     assert_kind_of Hash, a_hash
     assert_equal(
-      {"args"=>[666], "json_class"=>"TC_JSONAddition::A"}.sort_by { |k,| k },
+      {"args"=>[666], "json_class"=>"TestJSONAddition::A"}.sort_by { |k,| k },
       a_hash.sort_by { |k,| k }
     )
   end
@@ -97,7 +97,7 @@ class TC_JSONAddition < Test::Unit::TestCase
     b = B.new
     assert !B.json_creatable?
     json = generate(b)
-    assert_equal({ "json_class"=>"TC_JSONAddition::B" }, JSON.parse(json))
+    assert_equal({ "json_class"=>"TestJSONAddition::B" }, JSON.parse(json))
   end
 
   def test_extended_json_fail2

data/tests/test_json_encoding.rb

@@ -4,7 +4,7 @@
 require 'test/unit'
 require File.join(File.dirname(__FILE__), 'setup_variant')
 
-class TC_JSONEncoding < Test::Unit::TestCase
+class TestJSONEncoding < Test::Unit::TestCase
   include JSON
 
   def setup

data/tests/test_json_fixtures.rb

@@ -4,7 +4,7 @@
 require 'test/unit'
 require File.join(File.dirname(__FILE__), 'setup_variant')
 
-class TC_JSONFixtures < Test::Unit::TestCase
+class TestJSONFixtures < Test::Unit::TestCase
   def setup
     fixtures = File.join(File.dirname(__FILE__), 'fixtures/*.json')
     passed, failed = Dir[fixtures].partition { |f| f['pass'] }

data/tests/test_json_generate.rb

@@ -4,7 +4,7 @@
 require 'test/unit'
 require File.join(File.dirname(__FILE__), 'setup_variant')
 
-class TC_JSONGenerate < Test::Unit::TestCase
+class TestJSONGenerate < Test::Unit::TestCase
   include JSON
 
   def setup

data/tests/test_json_string_matching.rb

@@ -6,7 +6,7 @@ require File.join(File.dirname(__FILE__), 'setup_variant')
 require 'stringio'
 require 'time'
 
-class TestJsonStringMatching < Test::Unit::TestCase
+class TestJSONStringMatching < Test::Unit::TestCase
   include JSON
 
   class TestTime < ::Time

data/tests/test_json_unicode.rb

@@ -4,7 +4,7 @@
 require 'test/unit'
 require File.join(File.dirname(__FILE__), 'setup_variant')
 
-class TC_JSONUnicode < Test::Unit::TestCase
+class TestJSONUnicode < Test::Unit::TestCase
   include JSON
 
   def test_unicode

metadata

@@ -2,7 +2,7 @@
 name: json
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.6.6
+  version: 1.6.7
 platform: java
 authors: 
   - Daniel Luz
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-03-26 00:00:00 Z
+date: 2012-04-28 00:00:00 Z
 dependencies: []
 
 description: A JSON implementation as a JRuby extension.
@@ -23,66 +23,67 @@ 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/version.rb
-  - lib/json/add/bigdecimal.rb
+  - lib/json/light_object.rb
+  - lib/json/add/symbol.rb
+  - lib/json/add/struct.rb
   - lib/json/add/complex.rb
-  - lib/json/add/core.rb
-  - lib/json/add/date.rb
-  - lib/json/add/date_time.rb
+  - lib/json/add/rational.rb
   - lib/json/add/exception.rb
-  - lib/json/add/ostruct.rb
+  - lib/json/add/time.rb
+  - lib/json/add/bigdecimal.rb
+  - lib/json/add/date_time.rb
+  - lib/json/add/core.rb
   - lib/json/add/range.rb
-  - lib/json/add/rational.rb
+  - lib/json/add/date.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
+  - lib/json/add/ostruct.rb
   - lib/json/pure/generator.rb
   - lib/json/pure/parser.rb
+  - lib/json/ext/generator.jar
+  - lib/json/ext/parser.jar
+  - tests/test_json_string_matching.rb
+  - tests/test_json_fixtures.rb
   - tests/setup_variant.rb
-  - tests/test_json.rb
+  - tests/test_json_unicode.rb
   - tests/test_json_addition.rb
-  - tests/test_json_encoding.rb
-  - 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/test_json_encoding.rb
+  - tests/test_json.rb
+  - tests/fixtures/fail6.json
+  - tests/fixtures/fail9.json
   - tests/fixtures/fail10.json
-  - tests/fixtures/fail11.json
-  - tests/fixtures/fail12.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/fail28.json
-  - tests/fixtures/fail3.json
+  - tests/fixtures/fail13.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/pass3.json
+  - tests/fixtures/fail11.json
+  - tests/fixtures/fail14.json
+  - tests/fixtures/fail3.json
+  - tests/fixtures/fail12.json
   - tests/fixtures/pass16.json
-  - tests/fixtures/pass17.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/pass3.json
+  - tests/fixtures/fail21.json
+  - tests/fixtures/pass1.json
+  - tests/fixtures/fail23.json
+  - tests/fixtures/fail18.json
+  - tests/fixtures/fail2.json
+  - tests/fixtures/fail22.json
+  - tests/fixtures/fail27.json
+  - tests/fixtures/fail19.json
 homepage: http://json-jruby.rubyforge.org/
 licenses: []
 
@@ -112,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: json-jruby
-rubygems_version: 1.8.21
+rubygems_version: 1.8.22
 signing_key: 
 specification_version: 3
 summary: JSON implementation for JRuby