json_pure 1.1.3 → 1.1.4

data/CHANGES

@@ -1,3 +1,12 @@
+2009-04-01 (1.1.4)
+  * Fixed a bug in the creation of serialized generic rails objects reported by
+    Friedrich Graeter <graeter@hydrixos.org>.
+  * Deleted tests/runner.rb, we're using testrb instead.
+  * Editor supports Infinity in numbers now.
+  * Made some changes in order to get the library to compile/run under Ruby
+    1.9.
+  * Improved speed of the code path for the fast_generate method in the pure
+    variant.
 2008-07-10 (1.1.3)
   * Wesley Beary <monki@geemus.com> reported a bug in json/add/core's DateTime
     handling: If the nominator and denominator of the offset were divisible by

data/Rakefile

@@ -19,12 +19,12 @@ PKG_FILES << EXT_PARSER_SRC
 EXT_GENERATOR_DIR = "#{EXT_ROOT_DIR}/generator"
 EXT_GENERATOR_DL  = "#{EXT_ROOT_DIR}/generator.#{CONFIG['DLEXT']}"
 EXT_GENERATOR_SRC = "#{EXT_GENERATOR_DIR}/generator.c"
-RAGEL_CODEGEN     = %w[rlcodegen rlgen-cd].find { |c| system(c, '-v') }
-RAGEL_DOTGEN      = %w[rlgen-dot rlgen-cd].find { |c| system(c, '-v') }
+RAGEL_CODEGEN     = %w[rlcodegen rlgen-cd ragel].find { |c| system(c, '-v') }
+RAGEL_DOTGEN      = %w[rlgen-dot rlgen-cd ragel].find { |c| system(c, '-v') }
 RAGEL_PATH        = "#{EXT_PARSER_DIR}/parser.rl"
 CLEAN.include 'doc', 'coverage', FileList['diagrams/*.*'],
   FileList["ext/**/*.{so,bundle,#{CONFIG['DLEXT']},o,obj,pdb,lib,manifest,exp,def}"],
-  FileList["ext/**/Makefile"]
+  FileList["ext/**/{Makefile,mkmf.log}"]
 
 
 desc "Installing library (pure)"
@@ -55,10 +55,10 @@ file EXT_PARSER_DL => EXT_PARSER_SRC do
   cd EXT_PARSER_DIR do
     ruby 'extconf.rb'
     if ON_WINDOWS
-      sh 'nmake'
-      sh "mt -manifest parser.#{CONFIG['DLEXT']}.manifest -outputresource:parser.#{CONFIG['DLEXT']};2"
+      system 'nmake'
+      system "mt -manifest parser.#{CONFIG['DLEXT']}.manifest -outputresource:parser.#{CONFIG['DLEXT']};2"
     else
-      sh 'make'
+      system 'make'
     end
   end
   cp "#{EXT_PARSER_DIR}/parser.#{CONFIG['DLEXT']}", EXT_ROOT_DIR
@@ -68,10 +68,10 @@ file EXT_GENERATOR_DL => EXT_GENERATOR_SRC do
   cd EXT_GENERATOR_DIR do
     ruby 'extconf.rb'
     if ON_WINDOWS
-      sh 'nmake'
-      sh "mt -manifest generator.#{CONFIG['DLEXT']}.manifest -outputresource:generator.#{CONFIG['DLEXT']};2"
+      system 'nmake'
+      system "mt -manifest generator.#{CONFIG['DLEXT']}.manifest -outputresource:generator.#{CONFIG['DLEXT']};2"
     else
-      sh 'make'
+      system 'make'
     end
   end
   cp "#{EXT_GENERATOR_DIR}/generator.#{CONFIG['DLEXT']}", EXT_ROOT_DIR
@@ -86,7 +86,11 @@ end
 
 file EXT_PARSER_SRC => RAGEL_PATH do
   cd EXT_PARSER_DIR do
-    sh "ragel -x parser.rl | #{RAGEL_CODEGEN} -G2"
+    if RAGEL_CODEGEN == 'ragel'
+      system "ragel parser.rl -G2 -o parser.c"
+    else
+      system "ragel -x parser.rl | #{RAGEL_CODEGEN} -G2"
+    end
   end
 end
 
@@ -96,7 +100,11 @@ task :ragel_dot_ps do
   specs = []
   File.new(RAGEL_PATH).grep(/^\s*machine\s*(\S+);\s*$/) { specs << $1 }
   for s in specs 
-    sh "ragel -x #{RAGEL_PATH} -S#{s} | #{RAGEL_DOTGEN} -p|dot -Tps -o#{root}/#{s}.ps"
+    if RAGEL_DOTGEN == 'ragel'
+      system "ragel #{RAGEL_PATH} -S#{s} -p -V | dot -Tps -o#{root}/#{s}.ps"
+    else
+      system "ragel -x #{RAGEL_PATH} -S#{s} | #{RAGEL_DOTGEN} -p|dot -Tps -o#{root}/#{s}.ps"
+    end
   end
 end
 
@@ -106,7 +114,11 @@ task :ragel_dot_png do
   specs = []
   File.new(RAGEL_PATH).grep(/^\s*machine\s*(\S+);\s*$/) { specs << $1 }
   for s in specs 
-    sh "ragel -x #{RAGEL_PATH} -S#{s} | #{RAGEL_DOTGEN} -p|dot -Tpng -o#{root}/#{s}.png"
+    if RAGEL_DOTGEN == 'ragel'
+      system "ragel #{RAGEL_PATH} -S#{s} -p -V | dot -Tpng -o#{root}/#{s}.png"
+    else
+      system "ragel -x #{RAGEL_PATH} -S#{s} | #{RAGEL_DOTGEN} -p|dot -Tpng -o#{root}/#{s}.png"
+    end
   end
 end
 
@@ -115,57 +127,39 @@ task :ragel_dot => [ :ragel_dot_png, :ragel_dot_ps ]
 
 desc "Testing library (pure ruby)"
 task :test_pure => :clean do
-  ruby '-v -I lib tests/runner.rb'
+  ENV['JSON'] = 'pure'
+  ENV['RUBYOPT'] = "-Iext:lib #{ENV['RUBYOPT']}"
+  system "testrb #{Dir['tests/*.rb'] * ' '}"
 end
 
 desc "Testing library (extension)"
 task :test_ext => :compile do
-  ruby '-v -I ext:lib tests/runner.rb'
+  ENV['JSON'] = 'ext'
+  ENV['RUBYOPT'] = "-Iext:lib #{ENV['RUBYOPT']}"
+  system "testrb #{Dir['tests/*.rb'] * ' '}"
 end
 
-desc "Benchmarking parser (pure)"
-task :benchmark_parser_pure do
-  ruby '-I lib benchmarks/benchmark_parser.rb pure'
+desc "Benchmarking parser"
+task :benchmark_parser do
+  ruby 'benchmarks/parser_benchmark.rb'
 end
 
-desc "Benchmarking generator (pure)"
-task :benchmark_generator_pure do
-  ruby '-I lib benchmarks/benchmark_generator.rb pure'
-  ruby 'benchmarks/benchmark_rails.rb'
+desc "Benchmarking generator"
+task :benchmark_generator do
+  ruby 'benchmarks/generator_benchmark.rb'
 end
 
-desc "Benchmarking library (pure)"
-task :benchmark_pure => [ :benchmark_parser_pure, :benchmark_generator_pure ]
-
-desc "Benchmarking parser (extension)"
-task :benchmark_parser_ext => :compile do
-  ruby '-I ext:lib benchmarks/benchmark_parser.rb ext'
-end
-
-desc "Benchmarking generator (extension)"
-task :benchmark_generator_ext => :compile do
-  ruby '-I ext:lib benchmarks/benchmark_generator.rb ext'
-  ruby 'benchmarks/benchmark_rails.rb'
-end
-
-desc "Benchmarking library (extension)"
-task :benchmark_ext => [ :benchmark_parser_ext, :benchmark_generator_ext ]
-
-task :benchmark do
-  puts "Benchmarking extension variant"
-  Rake::Task[:benchmark_ext].invoke
-  puts "Benchmarking pure variant"
-  Rake::Task[:benchmark_pure].invoke
-end
+desc "Benchmarking library"
+task :benchmark => [ :benchmark_parser, :benchmark_generator ]
 
-desc "Testing library with coverage" # XXX broken
-task :coverage do
-  system 'RUBYOPT="" rcov -x tests -Ilib tests/runner.rb'
+desc "Clean benchmark data"
+task :clean_benchmark_data do
+  rm_rf Dir['benchmarks/data/*.{dat,log}']
 end
 
 desc "Create RDOC documentation"
 task :doc => [ :version, EXT_PARSER_SRC ] do
-  sh "rdoc -m JSON -S -o doc lib/json.rb #{FileList['lib/json/**/*.rb']} #{EXT_PARSER_SRC} #{EXT_GENERATOR_SRC}"
+  system "rdoc -S -o doc -m main.txt doc-templates/main.txt lib/json.rb #{FileList['lib/json/**/*.rb']} #{EXT_PARSER_SRC} #{EXT_GENERATOR_SRC}"
 end
 
 if defined? Gem
@@ -187,7 +181,7 @@ if defined? Gem
     s.rdoc_options <<
       '--title' <<  'JSON -- A JSON implemention' <<
       '--main' << 'JSON' << '--line-numbers'
-    s.test_files << 'tests/runner.rb'
+    s.test_files.concat Dir['tests/*.rb']
 
     s.author = "Florian Frank"
     s.email = "flori@ping.de"
@@ -224,7 +218,7 @@ if defined? Gem
     s.rdoc_options <<
       '--title' <<  'JSON -- A JSON implemention' <<
       '--main' << 'JSON' << '--line-numbers'
-    s.test_files << 'tests/runner.rb'
+    s.test_files.concat Dir['tests/*.rb']
 
     s.author = "Florian Frank"
     s.email = "flori@ping.de"
@@ -262,7 +256,7 @@ if defined? Gem
       s.rdoc_options <<
         '--title' <<  'JSON -- A JSON implemention' <<
         '--main' << 'JSON' << '--line-numbers'
-      s.test_files << 'tests/runner.rb'
+      s.test_files.concat Dir['tests/*.rb']
 
       s.author = "Florian Frank"
       s.email = "flori@ping.de"
@@ -276,9 +270,9 @@ if defined? Gem
   end
 end
 
-task :mrproper => [ :ragel_clean, :clean ] do
+task :mrproper => [ :ragel_clean, :clean, :clean_benchmark_data ] do
   for dir in [ EXT_PARSER_DIR, EXT_GENERATOR_DIR ]
-    cd(dir) {  rm_f 'Makefile' }
+    cd(dir) {  rm_f %w[Makefile mkmf.log] }
   end
 end
 

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.1.4

data/benchmarks/data-p4-3GHz-ruby18/GeneratorBenchmarkComparison.log

@@ -0,0 +1,52 @@
+========================== 2009-04-01T16:54:14 CEST ===========================
+
+Comparing times (call_time_mean):
+ 1 GeneratorBenchmarkExt#generator_fast    1000 repeats:
+       547.354332608 (  real) ->   15.090x 
+         0.001826970
+ 2 GeneratorBenchmarkExt#generator_safe    1000 repeats:
+       443.968212317 (  real) ->   12.240x 
+         0.002252414
+ 3 GeneratorBenchmarkExt#generator_pretty  900 repeats:
+       375.104545883 (  real) ->   10.341x 
+         0.002665923
+ 4 GeneratorBenchmarkPure#generator_fast   1000 repeats:
+        49.978706968 (  real) ->    1.378x 
+         0.020008521
+ 5 GeneratorBenchmarkRails#generator       1000 repeats:
+        38.531868759 (  real) ->    1.062x 
+         0.025952543
+ 6 GeneratorBenchmarkPure#generator_safe   1000 repeats:
+        36.927649925 (  real) ->    1.018x 7 (>=3859)
+         0.027079979
+ 7 GeneratorBenchmarkPure#generator_pretty 1000 repeats:
+        36.272134441 (  real) ->    1.000x 6 (>=3859)
+         0.027569373
+           calls/sec (  time) ->    speed  covers
+           secs/call
+
+Comparing times (call_time_median):
+ 1 GeneratorBenchmarkExt#generator_fast    1000 repeats:
+       708.258020939 (  real) ->   16.547x 
+         0.001411915
+ 2 GeneratorBenchmarkExt#generator_safe    1000 repeats:
+       569.105020353 (  real) ->   13.296x 
+         0.001757145
+ 3 GeneratorBenchmarkExt#generator_pretty  900 repeats:
+       482.825371244 (  real) ->   11.280x 
+         0.002071142
+ 4 GeneratorBenchmarkPure#generator_fast   1000 repeats:
+        62.717626652 (  real) ->    1.465x 
+         0.015944481
+ 5 GeneratorBenchmarkRails#generator       1000 repeats:
+        43.965681162 (  real) ->    1.027x 
+         0.022745013
+ 6 GeneratorBenchmarkPure#generator_safe   1000 repeats:
+        43.929073409 (  real) ->    1.026x 7 (>=3859)
+         0.022763968
+ 7 GeneratorBenchmarkPure#generator_pretty 1000 repeats:
+        42.802514491 (  real) ->    1.000x 6 (>=3859)
+         0.023363113
+           calls/sec (  time) ->    speed  covers
+           secs/call
+===============================================================================