json 1.2.4 → 1.4.0

data/README

@@ -1,6 +1,4 @@
-== json - JSON Implementation for Ruby
-
-=== Description
+== Description
 
 This is a implementation of the JSON specification according to RFC 4627
 http://www.ietf.org/rfc/rfc4627.txt . Starting from version 1.0.0 on there
@@ -34,7 +32,7 @@ String#encoding set. If a document string has ASCII-8BIT as an encoding the
 parser attempts to figure out which of the UTF encodings from above it is and
 trys to parse it.
 
-=== Installation
+== Installation
 
 It's recommended to use the extension variant of JSON, because it's faster than
 the pure ruby variant. If you cannot build it on your system, you can settle
@@ -65,7 +63,7 @@ with:
 
   # gem install json_pure
 
-=== Compiling the extensions yourself
+== Compiling the extensions yourself
 
 If you want to build the extensions yourself you need rake:
 
@@ -82,7 +80,7 @@ If you want to create the parser.c file from its parser.rl file or draw nice
 graphviz images of the state machines, you need ragel from: http://www.cs.queensu.ca/~thurston/ragel
 
 
-=== Usage
+== Usage
 
 To use JSON you can
   require 'json'
@@ -136,7 +134,7 @@ To get the best compatibility to rails' JSON implementation, you can
 Both of the additions attempt to require 'json' (like above) first, if it has
 not been required yet.
 
-=== More Examples
+== More Examples
 
 To create a JSON document from a ruby data structure, you can call
 JSON.generate like that:
@@ -226,7 +224,7 @@ The script tools/server.rb contains a small example if you want to test, how
 receiving a JSON object from a webrick server in your browser with the
 javasript prototype library http://www.prototypejs.org works.
 
-=== Speed Comparisons
+== Speed Comparisons
 
 I have created some benchmark results (see the benchmarks/data-p4-3Ghz
 subdir of the package) for the JSON-parser to estimate the speed up in the C
@@ -339,17 +337,17 @@ Here are the median comparisons for completeness' sake:
             calls/sec (  time) ->    speed  covers
             secs/call
 
-=== Author
+== Author
 
 Florian Frank <mailto:flori@ping.de>
 
-=== License
+== License
 
 Ruby License, see the COPYING file included in the source distribution. The
 Ruby License includes the GNU General Public License (GPL), Version 2, so see
 the file GPL as well.
 
-=== Download
+== Download
 
 The latest version of this library can be downloaded at
 

data/Rakefile

@@ -9,30 +9,29 @@ 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 'rake/clean'
-CLOBBER.include Dir['benchmarks/data/*.{dat,log}']
-
 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|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_SRC    = "#{EXT_PARSER_DIR}/parser.c"
+EXT_PARSER_SRC    = "#{EXT_ROOT_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_SRC = "#{EXT_GENERATOR_DIR}/generator.c"
+EXT_GENERATOR_SRC = "#{EXT_ROOT_DIR}/generator.c"
 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 FileList['diagrams/*.*'], 'doc', 'coverage', 'tmp',
-  FileList["ext/**/{Makefile,mkmf.log}"],
-  FileList["{ext,lib}/**/*.{so,bundle,#{CONFIG['DLEXT']},o,obj,pdb,lib,manifest,exp,def}"]
+RAGEL_PATH        = "#{EXT_ROOT_DIR}/parser.rl"
 
 def myruby(*args, &block)
   @myruby ||= File.join(CONFIG['bindir'], CONFIG['ruby_install_name'])
@@ -74,19 +73,17 @@ desc "Compiling extension"
 task :compile_ext => [ EXT_PARSER_DL, EXT_GENERATOR_DL ]
 
 file EXT_PARSER_DL => EXT_PARSER_SRC do
-  cd EXT_PARSER_DIR do
-    myruby 'extconf.rb'
+  cd EXT_ROOT_DIR do
+    myruby 'extconf_parser.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
-    myruby 'extconf.rb'
+  cd EXT_ROOT_DIR do
+    myruby 'extconf_generator.rb'
     sh MAKE
   end
-  cp "#{EXT_GENERATOR_DIR}/generator.#{CONFIG['DLEXT']}", EXT_ROOT_DIR
 end
 
 desc "Generate parser with ragel"
@@ -97,7 +94,7 @@ task :ragel_clean do
 end
 
 file EXT_PARSER_SRC => RAGEL_PATH do
-  cd EXT_PARSER_DIR do
+  cd EXT_ROOT_DIR do
     if RAGEL_CODEGEN == 'ragel'
       sh "ragel parser.rl -G2 -o parser.c"
     else
@@ -158,12 +155,14 @@ 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 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"
@@ -171,14 +170,14 @@ task :benchmark => [ :benchmark_parser, :benchmark_generator ]
 
 desc "Create RDOC documentation"
 task :doc => [ :version, EXT_PARSER_SRC ] do
-  sh "rdoc -o doc -m README README lib/json.rb #{FileList['lib/json/**/*.rb']} #{EXT_PARSER_SRC} #{EXT_GENERATOR_SRC}"
+  sh "rdoc -o doc -t '#{PKG_TITLE}' -m README README lib/json.rb #{FileList['lib/json/**/*.rb']} #{EXT_PARSER_SRC} #{EXT_GENERATOR_SRC}"
 end
 
 if defined?(Gem) and defined?(Rake::GemPackageTask) and defined?(Rake::ExtensionTask)
   spec_pure = Gem::Specification.new do |s|
     s.name = 'json_pure'
     s.version = PKG_VERSION
-    s.summary = "A JSON implementation in Ruby"
+    s.summary = PKG_TITLE
     s.description = "This is a JSON implementation in pure Ruby."
 
     s.files = PKG_FILES
@@ -192,7 +191,7 @@ if defined?(Gem) and defined?(Rake::GemPackageTask) and defined?(Rake::Extension
     s.has_rdoc = true
     s.extra_rdoc_files << 'README'
     s.rdoc_options <<
-      '--title' <<  'JSON -- A JSON implemention' << '--main' << 'README'
+      '--title' <<  'JSON implemention for ruby' << '--main' << 'README'
     s.test_files.concat Dir['tests/*.rb']
 
     s.author = "Florian Frank"
@@ -209,12 +208,12 @@ if defined?(Gem) and defined?(Rake::GemPackageTask) and defined?(Rake::Extension
   spec_ext = Gem::Specification.new do |s|
     s.name = 'json'
     s.version = PKG_VERSION
-    s.summary = "A JSON implementation as a Ruby extension"
+    s.summary = PKG_TITLE
     s.description = "This is a JSON implementation as a Ruby extension in C."
 
     s.files = PKG_FILES
 
-    s.extensions = FileList['ext/**/extconf.rb']
+    s.extensions = FileList['ext/**/extconf_*.rb']
 
     s.require_path = EXT_ROOT_DIR
     s.require_paths << 'ext'
@@ -227,7 +226,7 @@ if defined?(Gem) and defined?(Rake::GemPackageTask) and defined?(Rake::Extension
     s.has_rdoc = true
     s.extra_rdoc_files << 'README'
     s.rdoc_options <<
-      '--title' <<  'JSON -- A JSON implemention' << '--main' << 'README'
+      '--title' <<  'JSON implemention for Ruby' << '--main' << 'README'
     s.test_files.concat Dir['tests/*.rb']
 
     s.author = "Florian Frank"
@@ -243,19 +242,21 @@ if defined?(Gem) and defined?(Rake::GemPackageTask) and defined?(Rake::Extension
 
   Rake::ExtensionTask.new do |ext|
     ext.name            = 'parser'
+    ext.config_script   = 'extconf_parser.rb'
     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.ext_dir         = 'ext/json/ext'
     ext.lib_dir         = 'lib/json/ext'
   end
 
   Rake::ExtensionTask.new do |ext|
     ext.name            = 'generator'
+    ext.config_script   = 'extconf_generator.rb'
     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.ext_dir         = 'ext/json/ext'
     ext.lib_dir         = 'lib/json/ext'
   end
 end

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.4.0

data/benchmarks/generator2_benchmark.rb

@@ -0,0 +1,222 @@
+#!/usr/bin/env ruby
+# CODING: UTF-8
+
+require 'rbconfig'
+RUBY_PATH=File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])
+RAKE_PATH=File.join(Config::CONFIG['bindir'], 'rake')
+require 'bullshit'
+case ARGV.first
+when 'ext'
+  require 'json/ext'
+when 'pure'
+  require 'json/pure'
+when 'rails'
+  require 'active_support'
+when 'yajl'
+  require 'yajl'
+  require 'yajl/json_gem'
+  require 'stringio'
+end
+
+module JSON
+  def self.[](*) end
+end
+
+module Generator2BenchmarkCommon
+  include JSON
+
+  def setup
+    @big = eval File.read(File.join(File.dirname(__FILE__), 'ohai.ruby'))
+  end
+
+  def generic_reset_method
+    @result and @result.size >= 16 or raise @result.to_s
+  end
+end
+
+module JSONGeneratorCommon
+  include Generator2BenchmarkCommon
+
+  def benchmark_generator_fast
+    @result = JSON.fast_generate(@big)
+  end
+
+  alias reset_benchmark_generator_fast generic_reset_method
+
+  def benchmark_generator_safe
+    @result = JSON.generate(@big)
+  end
+
+  alias reset_benchmark_generator_safe generic_reset_method
+
+  def benchmark_generator_pretty
+    @result = JSON.pretty_generate(@big)
+  end
+
+  alias reset_benchmark_generator_pretty generic_reset_method
+
+  def benchmark_generator_ascii
+    @result = JSON.generate(@big, :ascii_only => true)
+  end
+
+  alias reset_benchmark_generator_ascii generic_reset_method
+end
+
+class Generator2BenchmarkExt < Bullshit::RepeatCase
+  include JSONGeneratorCommon
+
+  warmup      yes
+  iterations  2000
+
+  truncate_data do
+    enabled false
+    alpha_level 0.05
+    window_size 50
+    slope_angle 0.1
+  end
+
+  autocorrelation do
+    alpha_level 0.05
+    max_lags    50
+    file        yes
+  end
+
+
+  output_dir File.join(File.dirname(__FILE__), 'data')
+  output_filename benchmark_name + '.log'
+  data_file yes
+  histogram yes
+end
+
+class Generator2BenchmarkPure < Bullshit::RepeatCase
+  include JSONGeneratorCommon
+
+  warmup      yes
+  iterations  400
+
+  truncate_data do
+    enabled false
+    alpha_level 0.05
+    window_size 50
+    slope_angle 0.1
+  end
+
+  autocorrelation do
+    alpha_level 0.05
+    max_lags    50
+    file        yes
+  end
+
+  output_dir File.join(File.dirname(__FILE__), 'data')
+  output_filename benchmark_name + '.log'
+  data_file yes
+  histogram yes
+end
+
+class Generator2BenchmarkRails < Bullshit::RepeatCase
+  include Generator2BenchmarkCommon
+
+  warmup      yes
+  iterations  400
+
+  truncate_data do
+    enabled false
+    alpha_level 0.05
+    window_size 50
+    slope_angle 0.1
+  end
+
+  autocorrelation do
+    alpha_level 0.05
+    max_lags    50
+    file        yes
+  end
+
+  output_dir File.join(File.dirname(__FILE__), 'data')
+  output_filename benchmark_name + '.log'
+  data_file yes
+  histogram yes
+
+  def benchmark_generator
+    @result = @big.to_json
+  end
+
+  alias reset_benchmark_generator generic_reset_method
+end
+
+class Generator2BenchmarkYajl < Bullshit::RepeatCase
+  include Generator2BenchmarkCommon
+
+  warmup      yes
+  iterations  2000
+
+  truncate_data do
+    enabled false
+    alpha_level 0.05
+    window_size 50
+    slope_angle 0.1
+  end
+
+  autocorrelation do
+    alpha_level 0.05
+    max_lags    50
+    file        yes
+  end
+
+  output_dir File.join(File.dirname(__FILE__), 'data')
+  output_filename benchmark_name + '.log'
+  data_file yes
+  histogram yes
+
+  def benchmark_generator
+    output = StringIO.new
+    Yajl::Encoder.new.encode(@big, output)
+    @result = output.string
+  end
+
+  def benchmark_generator_gem_api
+    @result = @big.to_json
+  end
+
+  def reset_benchmark_generator
+    generic_reset_method
+  end
+end
+
+if $0 == __FILE__
+  Bullshit::Case.autorun false
+
+  case ARGV.first
+  when 'ext'
+    Generator2BenchmarkExt.run
+  when 'pure'
+    Generator2BenchmarkPure.run
+  when 'rails'
+    Generator2BenchmarkRails.run
+  when 'yajl'
+    Generator2BenchmarkYajl.run
+  else
+    system "#{RAKE_PATH} clean"
+    system "#{RUBY_PATH} #$0 rails"
+    system "#{RUBY_PATH} #$0 pure"
+    system "#{RAKE_PATH} compile_ext"
+    system "#{RUBY_PATH} #$0 ext"
+    system "#{RUBY_PATH} #$0 yajl"
+    Bullshit.compare do
+      output_filename File.join(File.dirname(__FILE__), 'data', 'Generator2BenchmarkComparison.log')
+
+      benchmark Generator2BenchmarkExt,    :generator_fast,    :load => yes
+      benchmark Generator2BenchmarkExt,    :generator_safe,    :load => yes
+      benchmark Generator2BenchmarkExt,    :generator_pretty,  :load => yes
+      benchmark Generator2BenchmarkExt,    :generator_ascii,   :load => yes
+      benchmark Generator2BenchmarkPure,   :generator_fast,    :load => yes
+      benchmark Generator2BenchmarkPure,   :generator_safe,    :load => yes
+      benchmark Generator2BenchmarkPure,   :generator_pretty,  :load => yes
+      benchmark Generator2BenchmarkPure,   :generator_ascii,   :load => yes
+      benchmark Generator2BenchmarkRails,  :generator,         :load => yes
+      benchmark Generator2BenchmarkYajl,   :generator,         :load => yes
+      benchmark Generator2BenchmarkYajl,   :generator_gem_api, :load => yes
+    end
+  end
+end
+