json_pure 1.0.0 → 1.4.6

data/Rakefile

@@ -1,33 +1,56 @@
-# vim: set et sw=2 ts=2:
-require 'rake/gempackagetask'
-require 'rake/clean'
+begin
+  require 'rake/gempackagetask'
+rescue LoadError
+end
+
+begin
+  require 'rake/extensiontask'
+rescue LoadError
+  puts "WARNING: rake-compiler is not installed. You will not be able to build the json gem until you install it."
+end
 
 require 'rbconfig'
 include Config
 
+require 'rake/clean'
+CLOBBER.include Dir['benchmarks/data/*.{dat,log}'], FileList['**/*.rbc']
+CLEAN.include FileList['diagrams/*.*'], 'doc', 'coverage', 'tmp',
+  FileList["ext/**/{Makefile,mkmf.log}"],
+  FileList["{ext,lib}/**/*.{so,bundle,#{CONFIG['DLEXT']},o,obj,pdb,lib,manifest,exp,def}"]
+
+MAKE = ENV['MAKE'] || %w[gmake make].find { |c| system(c, '-v') }
 PKG_NAME          = 'json'
+PKG_TITLE         = 'JSON Implementation for Ruby'
 PKG_VERSION       = File.read('VERSION').chomp
-PKG_FILES         = FileList["**/*"].exclude(/CVS|pkg|coverage/)
+PKG_FILES         = FileList["**/*"].exclude(/CVS|pkg|tmp|coverage|Makefile|\.nfs\./).exclude(/\.(so|bundle|o|#{CONFIG['DLEXT']})$/)
 EXT_ROOT_DIR      = 'ext/json/ext'
 EXT_PARSER_DIR    = "#{EXT_ROOT_DIR}/parser"
-EXT_PARSER_DL     = "#{EXT_ROOT_DIR}/parser.#{CONFIG['DLEXT']}"
+EXT_PARSER_DL     = "#{EXT_PARSER_DIR}/parser.#{CONFIG['DLEXT']}"
 EXT_PARSER_SRC    = "#{EXT_PARSER_DIR}/parser.c"
 PKG_FILES << EXT_PARSER_SRC
 EXT_GENERATOR_DIR = "#{EXT_ROOT_DIR}/generator"
-EXT_GENERATOR_DL  = "#{EXT_ROOT_DIR}/generator.#{CONFIG['DLEXT']}"
+EXT_GENERATOR_DL  = "#{EXT_GENERATOR_DIR}/generator.#{CONFIG['DLEXT']}"
 EXT_GENERATOR_SRC = "#{EXT_GENERATOR_DIR}/generator.c"
-RAGEL_CODEGEN     = %w[rlcodegen 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}"]
+
+def myruby(*args, &block)
+  @myruby ||= File.join(CONFIG['bindir'], CONFIG['ruby_install_name'])
+  options = (Hash === args.last) ? args.pop : {}
+  if args.length > 1 then
+    sh(*([@myruby] + args + [options]), &block)
+  else
+    sh("#{@myruby} #{args.first}", options, &block)
+  end
+end
 
 desc "Installing library (pure)"
 task :install_pure => :version do
-  ruby 'install.rb'
+  myruby 'install.rb'
 end
 
-desc "Installing library (extension)"
-task :install_ext => [ :compile, :install_pure ]  do
+task :install_ext_really do
   sitearchdir = CONFIG["sitearchdir"]
   cd 'ext' do
     for file in Dir["json/ext/*.#{CONFIG['DLEXT']}"]
@@ -38,23 +61,31 @@ task :install_ext => [ :compile, :install_pure ]  do
   end
 end
 
-task :install => :install_ext
+desc "Installing library (extension)"
+task :install_ext => [ :compile_ext, :install_pure, :install_ext_really ]
+
+desc "Installing library (extension)"
+if RUBY_PLATFORM =~ /java/
+  task :install => :install_pure
+else
+  task :install => :install_ext
+end
 
 desc "Compiling extension"
-task :compile => [ EXT_PARSER_DL, EXT_GENERATOR_DL ]
+task :compile_ext => [ EXT_PARSER_DL, EXT_GENERATOR_DL ]
 
 file EXT_PARSER_DL => EXT_PARSER_SRC do
   cd EXT_PARSER_DIR do
-    ruby 'extconf.rb'
-    sh 'make'
+    myruby 'extconf.rb'
+    sh MAKE
   end
   cp "#{EXT_PARSER_DIR}/parser.#{CONFIG['DLEXT']}", EXT_ROOT_DIR
 end
 
 file EXT_GENERATOR_DL => EXT_GENERATOR_SRC do
   cd EXT_GENERATOR_DIR do
-    ruby 'extconf.rb'
-    sh 'make'
+    myruby 'extconf.rb'
+    sh MAKE
   end
   cp "#{EXT_GENERATOR_DIR}/generator.#{CONFIG['DLEXT']}", EXT_ROOT_DIR
 end
@@ -68,18 +99,24 @@ end
 
 file EXT_PARSER_SRC => RAGEL_PATH do
   cd EXT_PARSER_DIR do
-    sh "ragel parser.rl | #{RAGEL_CODEGEN} -G2"
+    if RAGEL_CODEGEN == 'ragel'
+      sh "ragel parser.rl -G2 -o parser.c"
+    else
+      sh "ragel -x parser.rl | #{RAGEL_CODEGEN} -G2"
+    end
   end
 end
 
 desc "Generate diagrams of ragel parser (ps)"
 task :ragel_dot_ps do
   root = 'diagrams'
-  cd EXT_PARSER_DIR do
-    specs = []
-    File.new('parser.rl').grep(/^\s*machine\s*(\S+);\s*$/) { specs << $1 }
-    for s in specs 
-      sh "ragel parser.rl -S#{s} | #{RAGEL_CODEGEN} -p -V|dot -Tps -o#{root}/#{s}.ps"
+  specs = []
+  File.new(RAGEL_PATH).grep(/^\s*machine\s*(\S+);\s*$/) { specs << $1 }
+  for s in specs
+    if RAGEL_DOTGEN == 'ragel'
+      sh "ragel #{RAGEL_PATH} -S#{s} -p -V | dot -Tps -o#{root}/#{s}.ps"
+    else
+      sh "ragel -x #{RAGEL_PATH} -S#{s} | #{RAGEL_DOTGEN} -p|dot -Tps -o#{root}/#{s}.ps"
     end
   end
 end
@@ -87,11 +124,13 @@ end
 desc "Generate diagrams of ragel parser (png)"
 task :ragel_dot_png do
   root = 'diagrams'
-  cd EXT_PARSER_DIR do
-    specs = []
-    File.new('parser.rl').grep(/^\s*machine\s*(\S+);\s*$/) { specs << $1 }
-    for s in specs 
-      sh "ragel parser.rl -S#{s} | #{RAGEL_CODEGEN} -p -V|dot -Tpng -o#{root}/#{s}.png"
+  specs = []
+  File.new(RAGEL_PATH).grep(/^\s*machine\s*(\S+);\s*$/) { specs << $1 }
+  for s in specs
+    if RAGEL_DOTGEN == 'ragel'
+      sh "ragel #{RAGEL_PATH} -S#{s} -p -V | dot -Tpng -o#{root}/#{s}.png"
+    else
+      sh "ragel -x #{RAGEL_PATH} -S#{s} | #{RAGEL_DOTGEN} -p|dot -Tpng -o#{root}/#{s}.png"
     end
   end
 end
@@ -101,130 +140,128 @@ task :ragel_dot => [ :ragel_dot_png, :ragel_dot_ps ]
 
 desc "Testing library (pure ruby)"
 task :test_pure => :clean do
-  ruby '-I lib tests/runner.rb'
+  ENV['JSON'] = 'pure'
+  ENV['RUBYOPT'] = "-Iext:lib #{ENV['RUBYOPT']}"
+  myruby "-S testrb #{Dir['./tests/*.rb'] * ' '}"
 end
 
 desc "Testing library (extension)"
-task :test_ext => :compile do
-  ruby '-I ext:lib tests/runner.rb'
+task :test_ext => :compile_ext do
+  ENV['JSON'] = 'ext'
+  ENV['RUBYOPT'] = "-Iext:lib #{ENV['RUBYOPT']}"
+  myruby "-S testrb #{Dir['./tests/*.rb'] * ' '}"
 end
 
-desc "Benchmarking parser (pure)"
-task :benchmark_parser_pure do
-  ruby '-I lib benchmarks/benchmark_parser.rb'
-end
+desc "Testing library (pure ruby and extension)"
+task :test => [ :test_pure, :test_ext ]
 
-desc "Benchmarking generator (pure)"
-task :benchmark_generator_pure do
-  ruby '-I lib benchmarks/benchmark_generator.rb'
-  ruby 'benchmarks/benchmark_rails.rb'
+desc "Benchmarking parser"
+task :benchmark_parser do
+  ENV['RUBYOPT'] = "-Ilib:ext #{ENV['RUBYOPT']}"
+  myruby 'benchmarks/parser_benchmark.rb'
+  myruby 'benchmarks/parser2_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'
-end
-
-desc "Benchmarking generator (extension)"
-task :benchmark_generator_ext => :compile do
-  ruby '-I ext:lib benchmarks/benchmark_generator.rb'
-  ruby 'benchmarks/benchmark_rails.rb'
+desc "Benchmarking generator"
+task :benchmark_generator do
+  ENV['RUBYOPT'] = "-Ilib:ext #{ENV['RUBYOPT']}"
+  myruby 'benchmarks/generator_benchmark.rb'
+  myruby 'benchmarks/generator2_benchmark.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 "Testing library with coverage" # XXX broken
-task :coverage do
-  system 'RUBYOPT="" rcov -x tests -Ilib tests/runner.rb'
-end
+desc "Benchmarking library"
+task :benchmark => [ :benchmark_parser, :benchmark_generator ]
 
 desc "Create RDOC documentation"
 task :doc => [ :version, EXT_PARSER_SRC ] do
-  sh "rdoc -m JSON -d -S -o doc #{FileList['lib/**/*.rb']} #{EXT_PARSER_SRC} #{EXT_GENERATOR_SRC}"
+  sh "sdoc -o doc -t '#{PKG_TITLE}' -m README README lib/json.rb #{FileList['lib/json/**/*.rb']} #{EXT_PARSER_SRC} #{EXT_GENERATOR_SRC}"
 end
 
-spec_pure = Gem::Specification.new do |s|
-  s.name = 'json_pure'
-  s.version = PKG_VERSION
-  s.summary = "A JSON implementation in Ruby"
-  s.description = ""
+if defined?(Gem) and defined?(Rake::GemPackageTask)
+  spec_pure = Gem::Specification.new do |s|
+    s.name = 'json_pure'
+    s.version = PKG_VERSION
+    s.summary = PKG_TITLE
+    s.description = "This is a JSON implementation in pure Ruby."
 
-  s.files = PKG_FILES
+    s.files = PKG_FILES
 
-  s.require_path = 'lib'
+    s.require_path = 'lib'
 
-  s.bindir = "bin"
-  s.executables = ["edit_json.rb"]
-  s.default_executable = "edit_json.rb"
+    s.bindir = "bin"
+    s.executables = [ "edit_json.rb", "prettify_json.rb" ]
+    s.default_executable = "edit_json.rb"
 
-  s.has_rdoc = true
-  s.rdoc_options <<
-    '--title' <<  'JSON -- A JSON implemention' <<
-    '--main' << 'JSON' << '--line-numbers'
-  s.test_files << 'tests/runner.rb'
+    s.has_rdoc = true
+    s.extra_rdoc_files << 'README'
+    s.rdoc_options <<
+      '--title' <<  'JSON implemention for ruby' << '--main' << 'README'
+    s.test_files.concat Dir['tests/*.rb']
 
-  s.author = "Florian Frank"
-  s.email = "flori@ping.de"
-  s.homepage = "http://json.rubyforge.org"
-  s.rubyforge_project = "json"
-end
+    s.author = "Florian Frank"
+    s.email = "flori@ping.de"
+    s.homepage = "http://flori.github.com/#{PKG_NAME}"
+    s.rubyforge_project = "json"
+  end
 
-Rake::GemPackageTask.new(spec_pure) do |pkg|
-    pkg.need_tar = true
-    pkg.package_files += PKG_FILES
+  Rake::GemPackageTask.new(spec_pure) do |pkg|
+      pkg.need_tar = true
+      pkg.package_files = PKG_FILES
+  end
 end
 
-spec_ext = Gem::Specification.new do |s|
-  s.name = 'json'
-  s.version = PKG_VERSION
-  s.summary = "A JSON implementation as a Ruby extension"
-  s.description = ""
+if defined?(Gem) and defined?(Rake::GemPackageTask) and defined?(Rake::ExtensionTask)
+  spec_ext = Gem::Specification.new do |s|
+    s.name = 'json'
+    s.version = PKG_VERSION
+    s.summary = PKG_TITLE
+    s.description = "This is a JSON implementation as a Ruby extension in C."
 
-  s.files = PKG_FILES
+    s.files = PKG_FILES
 
-  s.extensions <<
-    "#{EXT_PARSER_DIR}/extconf.rb" <<
-    "#{EXT_GENERATOR_DIR}/extconf.rb"
+    s.extensions = FileList['ext/**/extconf.rb']
 
-  s.require_path = EXT_ROOT_DIR
-  s.require_paths << 'ext'
-  s.require_paths << 'lib'
+    s.require_path = EXT_ROOT_DIR
+    s.require_paths << 'ext'
+    s.require_paths << 'lib'
 
-  s.bindir = "bin"
-  s.executables = ["edit_json.rb"]
-  s.default_executable = "edit_json.rb"
+    s.bindir = "bin"
+    s.executables = [ "edit_json.rb", "prettify_json.rb" ]
+    s.default_executable = "edit_json.rb"
 
-  s.has_rdoc = true
-  s.rdoc_options <<
-    '--title' <<  'JSON -- A JSON implemention' <<
-    '--main' << 'JSON' << '--line-numbers'
-  s.test_files << 'tests/runner.rb'
+    s.has_rdoc = true
+    s.extra_rdoc_files << 'README'
+    s.rdoc_options <<
+      '--title' <<  'JSON implemention for Ruby' << '--main' << 'README'
+    s.test_files.concat Dir['tests/*.rb']
 
-  s.author = "Florian Frank"
-  s.email = "flori@ping.de"
-  s.homepage = "http://json.rubyforge.org"
-  s.rubyforge_project = "json"
-end
+    s.author = "Florian Frank"
+    s.email = "flori@ping.de"
+    s.homepage = "http://flori.github.com/#{PKG_NAME}"
+    s.rubyforge_project = "json"
+  end
 
-Rake::GemPackageTask.new(spec_ext) do |pkg|
-  pkg.need_tar = true
-  pkg.package_files += PKG_FILES
-end
+  Rake::GemPackageTask.new(spec_ext) do |pkg|
+    pkg.need_tar      = true
+    pkg.package_files = PKG_FILES
+  end
+
+  Rake::ExtensionTask.new do |ext|
+    ext.name            = 'parser'
+    ext.gem_spec        = spec_ext
+    ext.cross_compile   = true
+    ext.cross_platform  = %w[i386-mswin32 i386-mingw32]
+    ext.ext_dir         = 'ext/json/ext/parser'
+    ext.lib_dir         = 'lib/json/ext'
+  end
 
-task :mrproper => [ :ragel_clean, :clean ] do
-  for dir in [ EXT_PARSER_DIR, EXT_GENERATOR_DIR ]
-    cd(dir) {  rm_f 'Makefile' }
+  Rake::ExtensionTask.new do |ext|
+    ext.name            = 'generator'
+    ext.gem_spec        = spec_ext
+    ext.cross_compile   = true
+    ext.cross_platform  = %w[i386-mswin32 i386-mingw32]
+    ext.ext_dir         = 'ext/json/ext/generator'
+    ext.lib_dir         = 'lib/json/ext'
   end
 end
 
@@ -245,6 +282,11 @@ EOT
   end
 end
 
-task :release => [ :version, :clean, :ragel_clean, :ragel, :package ]
+desc "Build all gems and archives for a new release."
+task :release => [ :clean, :version, :cross, :native, :gem ] do
+  sh "#$0 clean native gem"
+  sh "#$0 clean package"
+end
 
-task :default => [ :version, :compile ]
+desc "Compile in the the source directory"
+task :default => [ :version, :compile_ext ]

data/TODO

@@ -1 +1 @@
-* Get the extension to compile on Windows, eventually?
+

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.4.6

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
+===============================================================================