json 1.1.1 → 1.1.2

data/lib/json/pure/parser.rb

@@ -58,6 +58,9 @@ module JSON
       # * *allow_nan*: If set to true, allow NaN, Infinity and -Infinity in
       #   defiance of RFC 4627 to be parsed by the Parser. This option defaults
       #   to false.
+      # * *create_additions*: If set to false, the Parser doesn't create
+      #   additions even if a matchin class and create_id was found. This option
+      #   defaults to true.
       def initialize(source, opts = {})
         super
         if !opts.key?(:max_nesting) # defaults to 19
@@ -68,7 +71,9 @@ module JSON
           @max_nesting = 0
         end
         @allow_nan = !!opts[:allow_nan]
-        @create_id = JSON.create_id
+        ca = true
+        ca = opts[:create_additions] if opts.key?(:create_additions)
+        @create_id = ca ? JSON.create_id : nil
       end
 
       alias source string
@@ -235,11 +240,10 @@ module JSON
             if delim
               raise ParserError, "expected next name, value pair in object at '#{peek(20)}'!"
             end
-            if klassname = result[@create_id]
+            if @create_id and klassname = result[@create_id]
               klass = JSON.deep_const_get klassname
               break unless klass and klass.json_creatable?
               result = klass.json_create(result)
-              result
             end
             break
           when skip(IGNORE)

data/lib/json/version.rb

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

data/tests/runner.rb

@@ -8,6 +8,7 @@ require 'test_json'
 require 'test_json_generate'
 require 'test_json_unicode'
 require 'test_json_addition'
+require 'test_json_rails'
 require 'test_json_fixtures'
 
 class TS_AllTests
@@ -17,6 +18,7 @@ class TS_AllTests
     suite << TC_JSON.suite
     suite << TC_JSONUnicode.suite
     suite << TC_JSONAddition.suite
+    suite << TC_JSONRails.suite
     suite << TC_JSONFixtures.suite
   end
 end

data/tests/test_json_addition.rb

@@ -39,6 +39,10 @@ class TC_JSONAddition < Test::Unit::TestCase
   end
 
   class C
+    def self.json_creatable?
+      false
+    end
+
     def to_json(*args)
       {
         'json_class'  => 'TC_JSONAddition::Nix',
@@ -59,6 +63,21 @@ class TC_JSONAddition < Test::Unit::TestCase
     assert_equal a, a_again
   end
 
+  def test_extended_json_disabled
+    a = A.new(666)
+    assert A.json_creatable?
+    json = generate(a)
+    a_again = JSON.parse(json, :create_additions => true)
+    assert_kind_of a.class, a_again
+    assert_equal a, a_again
+    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 },
+      a_hash.sort_by { |k,| k }
+    )
+  end
+
   def test_extended_json_fail
     b = B.new
     assert !B.json_creatable?

data/tests/test_json_rails.rb

@@ -0,0 +1,114 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'json/add/rails'
+require 'date'
+
+class TC_JSONRails < Test::Unit::TestCase
+  include JSON
+
+  class A
+    def initialize(a)
+      @a = a
+    end
+
+    attr_reader :a
+
+    def ==(other)
+      a == other.a
+    end
+    
+    def self.json_create(object)
+      new(*object['args'])
+    end
+
+    def to_json(*args)
+      {
+        'json_class'  => self.class.name,
+        'args'        => [ @a ],
+      }.to_json(*args)
+    end
+  end
+
+  class B
+    def to_json(*args)
+      {
+        'json_class'  => self.class.name,
+      }.to_json(*args)
+    end
+  end
+
+  class C
+    def to_json(*args)
+      {
+        'json_class'  => 'TC_JSONRails::Nix',
+      }.to_json(*args)
+    end
+  end
+
+  def setup
+    $KCODE = 'UTF8'
+  end
+
+  def test_extended_json
+    a = A.new(666)
+    assert A.json_creatable?
+    json = generate(a)
+    a_again = JSON.parse(json)
+    assert_kind_of a.class, a_again
+    assert_equal a, a_again
+  end
+
+  def test_extended_json_disabled
+    a = A.new(666)
+    assert A.json_creatable?
+    json = generate(a)
+    a_again = JSON.parse(json, :create_additions => true)
+    assert_kind_of a.class, a_again
+    assert_equal a, a_again
+    a_hash = JSON.parse(json, :create_additions => false)
+    assert_kind_of Hash, a_hash
+    assert_equal(
+      {"args"=>[666], "json_class"=>"TC_JSONRails::A"}.sort_by { |k,| k },
+      a_hash.sort_by { |k,| k }
+    )
+  end
+
+  def test_extended_json_fail
+    b = B.new
+    assert !B.json_creatable?
+    json = generate(b)
+    assert_equal({ 'json_class' => B.name }, JSON.parse(json))
+  end
+
+  def test_extended_json_fail
+    c = C.new # with rails addition all objects are theoretically creatable
+    assert C.json_creatable?
+    json = generate(c)
+    assert_raises(ArgumentError) { JSON.parse(json) }
+  end
+
+  def test_raw_strings
+    raw = ''
+    raw_array = []
+    for i in 0..255
+      raw << i
+      raw_array << i
+    end
+    json = raw.to_json_raw
+    json_raw_object = raw.to_json_raw_object
+    hash = { 'json_class' => 'String', 'raw'=> raw_array }
+    assert_equal hash, json_raw_object
+    json_raw = <<EOT.chomp
+{\"json_class\":\"String\",\"raw\":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255]}
+EOT
+# "
+    assert_equal json_raw, json
+    raw_again = JSON.parse(json)
+    assert_equal raw, raw_again
+  end
+
+  def test_symbol
+    assert_equal '"foo"', JSON(:foo) #  we don't want an object here
+  end
+end

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.4
 specification_version: 1
 name: json
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2007-07-06 00:00:00 +02:00
+  version: 1.1.2
+date: 2007-11-27 00:00:00 +01:00
 summary: A JSON implementation as a Ruby extension
 require_paths: 
 - ext/json/ext
@@ -27,109 +27,111 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Florian Frank
 files: 
-- bin
-- VERSION
-- TODO
-- tests
-- RUBY
-- GPL
 - install.rb
-- ext
-- diagrams
-- benchmarks
-- Rakefile
-- data
 - lib
+- lib/json.rb
+- lib/json
+- lib/json/Array.xpm
+- lib/json/FalseClass.xpm
+- lib/json/json.xpm
+- lib/json/editor.rb
+- lib/json/Hash.xpm
+- lib/json/Key.xpm
+- lib/json/common.rb
+- lib/json/String.xpm
+- lib/json/pure
+- lib/json/pure/generator.rb
+- lib/json/pure/parser.rb
+- lib/json/Numeric.xpm
+- lib/json/ext.rb
+- lib/json/pure.rb
+- lib/json/NilClass.xpm
+- lib/json/add
+- lib/json/add/rails.rb
+- lib/json/add/core.rb
+- lib/json/TrueClass.xpm
+- lib/json/version.rb
+- ext
+- ext/json
+- ext/json/ext
+- ext/json/ext/parser
+- ext/json/ext/parser/unicode.h
+- ext/json/ext/parser/parser.c
+- ext/json/ext/parser/extconf.rb
+- ext/json/ext/parser/unicode.c
+- ext/json/ext/parser/parser.rl
+- ext/json/ext/generator
+- ext/json/ext/generator/unicode.h
+- ext/json/ext/generator/extconf.rb
+- ext/json/ext/generator/generator.c
+- ext/json/ext/generator/unicode.c
 - README
-- tools
+- diagrams
 - CHANGES
-- bin/edit_json.rb
-- bin/prettify_json.rb
-- tests/test_json_fixtures.rb
-- tests/runner.rb
+- RUBY
+- TODO
+- VERSION
+- tests
 - tests/test_json.rb
-- tests/fixtures
-- tests/test_json_unicode.rb
-- tests/test_json_generate.rb
 - tests/test_json_addition.rb
-- tests/fixtures/fail27.json
-- tests/fixtures/pass26.json
-- tests/fixtures/fail22.json
-- tests/fixtures/pass17.json
-- tests/fixtures/fail28.json
-- tests/fixtures/fail25.json
-- tests/fixtures/fail9.json
-- tests/fixtures/fail20.json
-- tests/fixtures/fail24.json
-- tests/fixtures/fail14.json
-- tests/fixtures/fail4.json
-- tests/fixtures/fail7.json
+- tests/fixtures
+- tests/fixtures/fail11.json
+- tests/fixtures/fail5.json
 - tests/fixtures/fail10.json
+- tests/fixtures/fail3.json
 - tests/fixtures/pass15.json
-- tests/fixtures/fail18.json
-- tests/fixtures/fail13.json
+- tests/fixtures/fail9.json
+- tests/fixtures/fail22.json
 - tests/fixtures/fail6.json
-- tests/fixtures/fail21.json
-- tests/fixtures/fail23.json
-- tests/fixtures/fail3.json
+- tests/fixtures/pass2.json
+- tests/fixtures/fail20.json
+- tests/fixtures/fail19.json
+- tests/fixtures/fail12.json
+- tests/fixtures/fail7.json
+- tests/fixtures/fail4.json
 - tests/fixtures/fail1.json
-- tests/fixtures/fail11.json
-- tests/fixtures/fail5.json
+- tests/fixtures/fail24.json
+- tests/fixtures/fail21.json
 - tests/fixtures/pass1.json
-- tests/fixtures/fail12.json
+- tests/fixtures/fail2.json
+- tests/fixtures/fail25.json
+- tests/fixtures/pass16.json
 - tests/fixtures/pass3.json
+- tests/fixtures/fail18.json
+- tests/fixtures/fail28.json
+- tests/fixtures/fail13.json
+- tests/fixtures/fail27.json
+- tests/fixtures/pass17.json
+- tests/fixtures/pass26.json
+- tests/fixtures/fail23.json
+- tests/fixtures/fail14.json
 - tests/fixtures/fail8.json
-- tests/fixtures/fail19.json
-- tests/fixtures/pass16.json
-- tests/fixtures/pass2.json
-- tests/fixtures/fail2.json
-- ext/json
-- ext/json/ext
-- ext/json/ext/generator
-- ext/json/ext/parser
-- ext/json/ext/generator/unicode.c
-- ext/json/ext/generator/unicode.h
-- ext/json/ext/generator/extconf.rb
-- ext/json/ext/generator/generator.c
-- ext/json/ext/parser/unicode.c
-- ext/json/ext/parser/parser.rl
-- ext/json/ext/parser/unicode.h
-- ext/json/ext/parser/extconf.rb
-- benchmarks/benchmark_generator.rb
-- benchmarks/benchmark.txt
+- tests/runner.rb
+- tests/test_json_generate.rb
+- tests/test_json_rails.rb
+- tests/test_json_unicode.rb
+- tests/test_json_fixtures.rb
+- benchmarks
 - benchmarks/benchmark_parser.rb
+- benchmarks/benchmark_generator.rb
 - benchmarks/benchmark_rails.rb
+- benchmarks/benchmark.txt
+- Rakefile
+- GPL
+- data
 - data/example.json
-- data/prototype.js
 - data/index.html
-- lib/json
-- lib/json.rb
-- lib/json/FalseClass.xpm
-- lib/json/TrueClass.xpm
-- lib/json/add
-- lib/json/ext.rb
-- lib/json/common.rb
-- lib/json/Hash.xpm
-- lib/json/pure
-- lib/json/Key.xpm
-- lib/json/Numeric.xpm
-- lib/json/Array.xpm
-- lib/json/editor.rb
-- lib/json/String.xpm
-- lib/json/pure.rb
-- lib/json/NilClass.xpm
-- lib/json/version.rb
-- lib/json/json.xpm
-- lib/json/add/core.rb
-- lib/json/add/rails.rb
-- lib/json/pure/parser.rb
-- lib/json/pure/generator.rb
-- tools/server.rb
+- data/prototype.js
+- bin
+- bin/edit_json.rb
+- bin/prettify_json.rb
+- tools
 - tools/fuzz.rb
-- ext/json/ext/parser/parser.c
+- tools/server.rb
 test_files: 
 - tests/runner.rb
 rdoc_options: