json_pure 1.1.3 → 1.1.4

data/tests/test_json_generate.rb

@@ -1,11 +1,17 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
 require 'test/unit'
-require 'json'
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext'  then require 'json/ext'
+else             require 'json'
+end
 
 class TC_JSONGenerate < Test::Unit::TestCase
   include JSON
 
   def setup
-    $KCODE = 'UTF8'
     @hash = {
       'a' => 2,
       'b' => 3.141,

data/tests/test_json_rails.rb

@@ -1,6 +1,12 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 
 require 'test/unit'
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext'  then require 'json/ext'
+else             require 'json'
+end
 require 'json/add/rails'
 require 'date'
 
@@ -50,17 +56,38 @@ class TC_JSONRails < Test::Unit::TestCase
     end
   end
 
-  def setup
-    $KCODE = 'UTF8'
+  class D
+    def initialize
+      @foo = 666
+    end
+
+    attr_reader :foo
+
+    def ==(other)
+      foo == other.foo
+    end
   end
 
   def test_extended_json
     a = A.new(666)
     assert A.json_creatable?
+    assert_equal 666, a.a
     json = generate(a)
     a_again = JSON.parse(json)
     assert_kind_of a.class, a_again
     assert_equal a, a_again
+    assert_equal 666, a_again.a
+  end
+
+  def test_extended_json_generic_object
+    d = D.new
+    assert D.json_creatable?
+    assert_equal 666, d.foo
+    json = generate(d)
+    d_again = JSON.parse(json)
+    assert_kind_of d.class, d_again
+    assert_equal d, d_again
+    assert_equal 666, d_again.foo
   end
 
   def test_extended_json_disabled
@@ -94,6 +121,7 @@ class TC_JSONRails < Test::Unit::TestCase
 
   def test_raw_strings
     raw = ''
+    raw.respond_to?(:encode!) and raw.encode!(Encoding::ASCII_8BIT)
     raw_array = []
     for i in 0..255
       raw << i

data/tests/test_json_unicode.rb

@@ -1,15 +1,16 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 
 require 'test/unit'
-require 'json'
+case ENV['JSON']
+when 'pure' then require 'json/pure'
+when 'ext'  then require 'json/ext'
+else             require 'json'
+end
 
 class TC_JSONUnicode < Test::Unit::TestCase
   include JSON
 
-  def setup
-    $KCODE = 'UTF8'
-  end
-
   def test_unicode
     assert_equal '""', ''.to_json
     assert_equal '"\\b"', "\b".to_json
@@ -53,8 +54,8 @@ class TC_JSONUnicode < Test::Unit::TestCase
         assert_equal json, JSON.generate(["" << i])
       end
     end
-    assert_raises(JSON::GeneratorError) do
-      JSON.generate(["" << 0x80])
+    assert_raise(JSON::GeneratorError) do
+      JSON.generate(["\x80"])
     end
     assert_equal "\302\200", JSON.parse('["\u0080"]').first
   end

data/tools/fuzz.rb

@@ -1,4 +1,3 @@
-$KCODE='UTF8'
 require 'json'
 
 require 'iconv'

data/tools/server.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-$KCODE='UTF8'
 require 'webrick'
 include WEBrick
 $:.unshift 'ext'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: json_pure
 version: !ruby/object:Gem::Version 
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors: 
 - Florian Frank
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-11 00:00:00 +02:00
+date: 2009-04-02 00:00:00 +02:00
 default_executable: edit_json.rb
 dependencies: []
 
@@ -101,17 +101,49 @@ files:
 - tests/fixtures/fail23.json
 - tests/fixtures/fail14.json
 - tests/fixtures/fail8.json
-- 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
+- benchmarks/generator_benchmark.rb
+- benchmarks/data-p4-3GHz-ruby18
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML#parser.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt.log
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkExt#parser.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt.log
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails.log
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure.log
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkComparison.log
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_safe.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_pretty.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails#generator.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_safe.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkRails#parser.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkRails.log
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure.log
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_pretty.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkPure#parser.dat
+- benchmarks/data-p4-3GHz-ruby18/ParserBenchmarkYAML.log
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkPure#generator_fast-autocorrelation.dat
+- benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkExt#generator_fast-autocorrelation.dat
+- benchmarks/data
+- benchmarks/parser_benchmark.rb
 - Rakefile
+- doc-templates
+- doc-templates/main.txt
 - GPL
 - data
 - data/example.json
@@ -149,9 +181,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: json
-rubygems_version: 1.1.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A JSON implementation in Ruby
 test_files: 
-- tests/runner.rb
+- tests/test_json.rb
+- tests/test_json_addition.rb
+- tests/test_json_generate.rb
+- tests/test_json_rails.rb
+- tests/test_json_unicode.rb
+- tests/test_json_fixtures.rb

data/benchmarks/benchmark.txt

@@ -1,133 +0,0 @@
-(in /home/flori/json)
-Ragel Code Generator version 5.17 January 2007
-Copyright (c) 2001-2006 by Adrian Thurston
-Benchmarking extension variant
-First run for warmup.
-Running 'BC_Parser' for a duration of 10 secs per method:
-              real      total      utime      stime     cutime     cstime
-parser:   10.005944  10.010000   9.970000   0.040000   0.000000   0.000000
-              5091  508.591409    0.001966
-             calls   calls/sec   secs/call
---------------------------------------------------------------------------------
-Running 'BC_Parser' for a duration of 10 secs per method:
-              real      total      utime      stime     cutime     cstime
-parser:   10.006881  10.000000   9.950000   0.050000   0.000000   0.000000
-              5055  505.500000    0.001978
-             calls   calls/sec   secs/call
---------------------------------------------------------------------------------
-================================================================================
-
-
-[null,false,true,"f\u00d6\u00df\u00c4r",["n\u20acst\u20acd",true],{"quux":true,"foo\u00df":"b\u00e4r"}]
-First run for warmup.
-Running 'BC_Generator' for a duration of 10 secs per method:
-                        real      total      utime      stime     cutime     cstime
-generator_pretty:   10.001066  10.010000   9.990000   0.020000   0.000000   0.000000
-                        3492  348.851149    0.002867
-generator_fast  :   10.002910  10.000000   9.980000   0.020000   0.000000   0.000000
-                        5416  541.600000    0.001846
-generator_safe  :   10.003107  10.010000  10.000000   0.010000   0.000000   0.000000
-                        4926  492.107892    0.002032
-                       calls   calls/sec   secs/call
---------------------------------------------------------------------------------
-Running 'BC_Generator' for a duration of 10 secs per method:
-                        real      total      utime      stime     cutime     cstime
-generator_pretty:   10.009150  10.010000  10.010000   0.000000   0.000000   0.000000
-                        3511  350.749251    0.002851
-generator_fast  :   10.014407  10.020000  10.020000   0.000000   0.000000   0.000000
-                        5411  540.019960    0.001852
-generator_safe  :   10.010055  10.000000  10.000000   0.000000   0.000000   0.000000
-                        4933  493.300000    0.002027
-                       calls   calls/sec   secs/call
---------------------------------------------------------------------------------
-================================================================================
-
-Comparison in BC_Generator:
-                  secs/call     speed
-generator_fast  :    0.002 ->    1.540x
-generator_safe  :    0.002 ->    1.406x
-generator_pretty:    0.003 ->    1.000x
---------------------------------------------------------------------------------
-
-[null, false, true, "f\u00d6\u00df\u00c4r", ["n\u20acst\u20acd", true], {quux: true, "foo\u00df": "b\u00e4r"}]
-First run for warmup.
-Running 'BC_Rails' for a duration of 10 secs per method:
-                 real      total      utime      stime     cutime     cstime
-generator:   10.026043  10.020000  10.020000   0.000000   0.000000   0.000000
-                  239   23.852295    0.041925
-                calls   calls/sec   secs/call
---------------------------------------------------------------------------------
-Running 'BC_Rails' for a duration of 10 secs per method:
-                 real      total      utime      stime     cutime     cstime
-generator:   10.010931  10.020000  10.010000   0.010000   0.000000   0.000000
-                  238   23.752495    0.042101
-                calls   calls/sec   secs/call
---------------------------------------------------------------------------------
-================================================================================
-
-
-Benchmarking pure variant
-First run for warmup.
-Running 'BC_Parser' for a duration of 10 secs per method:
-              real      total      utime      stime     cutime     cstime
-parser:   10.022352  10.030000  10.020000   0.010000   0.000000   0.000000
-               288   28.713858    0.034826
-             calls   calls/sec   secs/call
---------------------------------------------------------------------------------
-Running 'BC_Parser' for a duration of 10 secs per method:
-              real      total      utime      stime     cutime     cstime
-parser:   10.006552  10.000000  10.000000   0.000000   0.000000   0.000000
-               289   28.900000    0.034602
-             calls   calls/sec   secs/call
---------------------------------------------------------------------------------
-================================================================================
-
-
-[null,false,true,"f\u00d6\u00df\u00c4r",["n\u20acst\u20acd",true],{"quux":true,"foo\u00df":"b\u00e4r"}]
-First run for warmup.
-Running 'BC_Generator' for a duration of 10 secs per method:
-                        real      total      utime      stime     cutime     cstime
-generator_fast  :   10.011644  10.010000  10.010000   0.000000   0.000000   0.000000
-                         411   41.058941    0.024355
-generator_safe  :   10.007100  10.010000  10.010000   0.000000   0.000000   0.000000
-                         352   35.164835    0.028438
-generator_pretty:   10.008156  10.010000  10.010000   0.000000   0.000000   0.000000
-                         341   34.065934    0.029355
-                       calls   calls/sec   secs/call
---------------------------------------------------------------------------------
-Running 'BC_Generator' for a duration of 10 secs per method:
-                        real      total      utime      stime     cutime     cstime
-generator_fast  :   10.005185  10.010000  10.010000   0.000000   0.000000   0.000000
-                         411   41.058941    0.024355
-generator_safe  :   10.006932  10.010000  10.010000   0.000000   0.000000   0.000000
-                         351   35.064935    0.028519
-generator_pretty:   10.007414  10.000000  10.000000   0.000000   0.000000   0.000000
-                         340   34.000000    0.029412
-                       calls   calls/sec   secs/call
---------------------------------------------------------------------------------
-================================================================================
-
-Comparison in BC_Generator:
-                  secs/call     speed
-generator_fast  :    0.024 ->    1.208x
-generator_safe  :    0.029 ->    1.031x
-generator_pretty:    0.029 ->    1.000x
---------------------------------------------------------------------------------
-
-[null, false, true, "f\u00d6\u00df\u00c4r", ["n\u20acst\u20acd", true], {quux: true, "foo\u00df": "b\u00e4r"}]
-First run for warmup.
-Running 'BC_Rails' for a duration of 10 secs per method:
-                 real      total      utime      stime     cutime     cstime
-generator:   10.005748  10.000000  10.000000   0.000000   0.000000   0.000000
-                  240   24.000000    0.041667
-                calls   calls/sec   secs/call
---------------------------------------------------------------------------------
-Running 'BC_Rails' for a duration of 10 secs per method:
-                 real      total      utime      stime     cutime     cstime
-generator:   10.006764  10.010000  10.010000   0.000000   0.000000   0.000000
-                  239   23.876124    0.041883
-                calls   calls/sec   secs/call
---------------------------------------------------------------------------------
-================================================================================
-
-

data/benchmarks/benchmark_generator.rb

@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bullshit'
-$KCODE='utf8'
-if ARGV.shift == 'pure'
-  require 'json/pure'
-else
-  require 'json/ext'
-end
-
-class BC_Generator < Bullshit::TimeCase
-  include JSON
-
-  warmup    true
-  duration  10
-
-  def setup
-    a = [ nil, false, true, "fÖßÄr", [ "n€st€d", true ], { "fooß" => "bär", "quux" => true } ]
-    puts JSON[a]
-    @big = a * 100
-  end
-
-  def benchmark_generator_fast
-    @result = JSON.fast_generate(@big)
-  end
-
-  def reset_benchmark_generator_fast
-    @result and @result.size > 2 + 6 * @big.size or raise @result.to_s
-  end
-
-  def benchmark_generator_safe
-    @result = JSON.generate(@big)
-  end
-
-  def reset_benchmark_generator_safe
-    @result and @result.size > 2 + 6 * @big.size or raise @result.to_s
-  end
-
-  def benchmark_generator_pretty
-    @result = JSON.pretty_generate(@big)
-  end
-
-  def reset_benchmark_generator_pretty
-    @result and @result.size > 2 + 6 * @big.size or raise @result.to_s
-  end
-
-  compare :generator_fast, :generator_safe, :generator_pretty
-end

data/benchmarks/benchmark_parser.rb

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bullshit'
-if ARGV.shift == 'pure'
-  require 'json/pure'
-else
-  require 'json/ext'
-end
-
-class BC_Parser < Bullshit::TimeCase
-  include JSON
-
-  warmup    true
-  duration  10
-
-  def setup
-    a = [ nil, false, true, "fÖß\nÄr", [ "n€st€d", true ], { "fooß" => "bär", "qu\r\nux" => true } ]
-    @big = a * 100
-    @json = JSON.generate(@big)
-  end
-
-  def benchmark_parser
-    a = JSON.parse(@json)
-    a == @big or raise "not equal"
-  end
-end

data/benchmarks/benchmark_rails.rb

@@ -1,26 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'bullshit'
-require 'active_support'
-
-class BC_Rails < Bullshit::TimeCase
-  warmup    true
-  duration  10
-
-  def setup
-    a = [ nil, false, true, "fÖßÄr", [ "n€st€d", true ], { "fooß" => "bär", "quux" => true } ]
-    puts a.to_json
-    @big = a * 100
-  end
-
-  def benchmark_generator
-    @result = @big.to_json
-  end
-
-  def reset_benchmark_generator
-    @result and @result.size > 2 + 6 * @big.size or raise @result.to_s
-    if stack = Thread.current[:json_reference_stack]
-      stack.clear
-    end
-  end
-end

data/tests/runner.rb

@@ -1,25 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'test/unit/ui/console/testrunner'
-require 'test/unit/testsuite'
-$:.unshift File.expand_path(File.dirname($0))
-$:.unshift 'tests'
-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
-  def self.suite
-    suite = Test::Unit::TestSuite.new name
-    suite << TC_JSONGenerate.suite
-    suite << TC_JSON.suite
-    suite << TC_JSONUnicode.suite
-    suite << TC_JSONAddition.suite
-    suite << TC_JSONRails.suite
-    suite << TC_JSONFixtures.suite
-  end
-end
-Test::Unit::UI::Console::TestRunner.run(TS_AllTests)