scout 5.6.7 → 5.6.8.pre

data/CHANGELOG.markdown

@@ -1,3 +1,7 @@
+# 5.6.8
+
+* Updated JSON to 1.8.0
+
 # 5.6.7
 
 * changed fqdn override to hostname override. We no longer send fqdn.

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.6.7"
+  VERSION = "5.6.8.pre"
 end

data/vendor/json_pure/.gitignore

@@ -0,0 +1,12 @@
+.*.sw[pon]
+coverage
+tags
+pkg
+.nfs.*
+.idea
+java/Json.iml
+Gemfile.lock
+.rvmrc
+*.rbc
+.rbx
+.AppleDouble

data/vendor/json_pure/.travis.yml

@@ -0,0 +1,20 @@
+# Passes arguments to bundle install (http://gembundler.com/man/bundle-install.1.html)
+bundler_args: --binstubs
+
+# Specify which ruby versions you wish to run your tests on, each version will be used
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - 1.9.3
+  - 2.0.0
+  - ree
+  - rbx-18mode
+  - rbx-19mode
+  - jruby-18mode
+  - jruby-19mode
+  - ruby-head
+matrix:
+  allow_failures:
+    - rvm: rbx-18mode
+    - rvm: rbx-19mode
+script: "bundle exec rake"

data/vendor/json_pure/CHANGES

@@ -1,3 +1,123 @@
+2013-05-13 (1.8.0)
+  * Fix https://github.com/flori/json/issues/162 reported by Marc-Andre
+    Lafortune <github_rocks@marc-andre.ca>. Thanks!
+  * Applied patches by Yui NARUSE <naruse@airemix.jp> to suppress warning with
+    -Wchar-subscripts and better validate UTF-8 strings.
+  * Applied patch by ginriki@github to remove unnecessary if.
+  * Add load/dump interface to JSON::GenericObject to make
+        serialize :some_attribute, JSON::GenericObject
+    work in Rails active models for convenient SomeModel#some_attribute.foo.bar
+    access to serialised JSON data.
+2013-02-04 (1.7.7)
+  * Security fix for JSON create_additions default value and
+    JSON::GenericObject. It should not be possible to create additions unless
+    explicitely requested by setting the create_additions argument to true or
+    using the JSON.load/dump interface. If JSON::GenericObject is supposed to
+    be automatically deserialised, this has to be explicitely enabled by
+    setting
+      JSON::GenericObject.json_creatable = true
+    as well.
+  * Remove useless assert in fbuffer implementation.
+  * Apply patch attached to https://github.com/flori/json/issues#issue/155
+    provided by John Shahid <jvshahid@gmail.com>, Thx!
+  * Add license information to rubygems spec data, reported by Jordi Massaguer Pla <jmassaguerpla@suse.de>.
+  * Improve documentation, thx to Zachary Scott <zachary@zacharyscott.net>.
+2012-11-29 (1.7.6)
+  * Add GeneratorState#merge alias for JRuby, fix state accessor methods. Thx to
+   jvshahid@github.
+  * Increase hash likeness of state objects.
+2012-08-17 (1.7.5)
+  * Fix compilation of extension on older rubies.
+2012-07-26 (1.7.4)
+  * Fix compilation problem on AIX, see https://github.com/flori/json/issues/142
+2012-05-12 (1.7.3)
+  * Work around Rubinius encoding issues using iconv for conversion instead.
+2012-05-11 (1.7.2)
+  * Fix some encoding issues, that cause problems for  the pure and the
+    extension variant in jruby 1.9 mode.
+2012-04-28 (1.7.1)
+  * Some small fixes for building
+2012-04-28 (1.7.0)
+  * Add JSON::GenericObject for method access to objects transmitted via JSON.
+2012-04-27 (1.6.7)
+  * Fix possible crash when trying to parse nil value.
+2012-02-11 (1.6.6)
+  * Propagate src encoding to values made from it (fixes 1.9 mode converting
+    everything to ascii-8bit; harmless for 1.8 mode too) (Thomas E. Enebo
+    <tom.enebo@gmail.com>), should fix
+    https://github.com/flori/json/issues#issue/119.
+  * Fix https://github.com/flori/json/issues#issue/124 Thx to Jason Hutchens.
+  * Fix https://github.com/flori/json/issues#issue/117
+2012-01-15 (1.6.5)
+  * Vit Ondruch <v.ondruch@tiscali.cz> reported a bug that shows up when using
+    optimisation under GCC 4.7. Thx to him, Bohuslav Kabrda
+    <bkabrda@redhat.com> and Yui NARUSE <naruse@airemix.jp> for debugging and
+    developing a patch fix.
+2011-12-24 (1.6.4)
+  * Patches that improve speed on JRuby contributed by Charles Oliver Nutter
+    <headius@headius.com>.
+  * Support object_class/array_class with duck typed hash/array.
+2011-12-01 (1.6.3)
+  * Let JSON.load('') return nil as well to make mysql text columns (default to
+    '') work better for serialization.
+2011-11-21 (1.6.2)
+  * Add support for OpenStruct and BigDecimal.
+  * Fix bug when parsing nil in quirks_mode.
+  * Make JSON.dump and JSON.load methods better cooperate with Rails' serialize
+    method. Just use: serialize :value, JSON
+  * Fix bug with time serialization concerning nanoseconds. Thanks for the
+    patch go to Josh Partlow (jpartlow@github).
+  * Improve parsing speed for JSON numbers (integers and floats) in a similar way to
+    what Evan Phoenix <evan@phx.io> suggested in:
+    https://github.com/flori/json/pull/103
+2011-09-18 (1.6.1)
+  * Using -target 1.5 to force Java bits to compile with 1.5.
+2011-09-12 (1.6.0)
+  * Extract utilities (prettifier and GUI-editor) in its own gem json-utils.
+  * Split json/add/core into different files for classes to be serialised.
+2011-08-31 (1.5.4)
+  * Fix memory leak when used from multiple JRuby. (Patch by
+    jfirebaugh@github).
+  * Apply patch by Eric Wong <nocode@yhbt.net> that fixes garbage collection problem
+    reported in https://github.com/flori/json/issues/46.
+  * Add :quirks_mode option to parser and generator.
+  * Add support for Rational and Complex number additions via json/add/complex
+    and json/add/rational requires.
+2011-06-20 (1.5.3)
+  * Alias State#configure method as State#merge to increase duck type synonymy with Hash.
+	* Add as_json methods in json/add/core, so rails can create its json objects
+	  the new way.
+2011-05-11 (1.5.2)
+  * Apply documentation patch by Cory Monty <cory.monty@gmail.com>.
+  * Add gemspecs for json and json_pure.
+  * Fix bug in jruby pretty printing.
+  * Fix bug in object_class and array_class when inheriting from Hash or Array.
+2011-01-24 (1.5.1)
+  * Made rake-compiler build a fat binary gem. This should fix issue
+    https://github.com/flori/json/issues#issue/54.
+2011-01-22 (1.5.0)
+  * Included Java source codes for the Jruby extension made by Daniel Luz
+    <dev@mernen.com>.
+  * Output full exception message of deep_const_get to aid debugging.
+  * Fixed an issue with ruby 1.9 Module#const_defined? method, that was
+    reported by Riley Goodside.
+2010-08-09 (1.4.6)
+  * Fixed oversight reported in http://github.com/flori/json/issues/closed#issue/23,
+    always create a new object from the state prototype.
+  * Made pure and ext api more similar again.
+2010-08-07 (1.4.5)
+  * Manage data structure nesting depth in state object during generation. This
+    should reduce problems with to_json method definіtions that only have one
+    argument.
+  * Some fixes in the state objects and additional tests.
+2010-08-06 (1.4.4)
+  * Fixes build problem for rubinius under OS X, http://github.com/flori/json/issues/closed#issue/25
+  * Fixes crashes described in http://github.com/flori/json/issues/closed#issue/21 and
+    http://github.com/flori/json/issues/closed#issue/23
+2010-05-05 (1.4.3)
+  * Fixed some test assertions, from Ruby r27587 and r27590, patch by nobu.
+  * Fixed issue http://github.com/flori/json/issues/#issue/20 reported by
+    electronicwhisper@github. Thx!
 2010-04-26 (1.4.2)
   * Applied patch from naruse Yui NARUSE <naruse@airemix.com> to make building with
     Microsoft Visual C possible again.

data/vendor/json_pure/COPYING-json-jruby

@@ -0,0 +1,57 @@
+JSON-JRuby is copyrighted free software by Daniel Luz <mernen at gmail dot com>,
+and is a derivative work of Florian Frank's json library <flori at ping dot de>.
+You can redistribute it and/or modify it under either the terms of the GPL
+version 2 (see the file GPL), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.

data/vendor/json_pure/Gemfile

@@ -0,0 +1,11 @@
+# vim: set ft=ruby:
+
+source 'https://rubygems.org'
+
+gemspec :name => 'json'
+gemspec :name => 'json_pure'
+gemspec :name => 'json-java'
+
+gem 'utils'
+gem 'test-unit'
+gem 'debugger', :platform => :mri_19

data/vendor/json_pure/README-json-jruby.markdown

@@ -0,0 +1,33 @@
+JSON-JRuby
+==========
+
+JSON-JRuby is a port of Florian Frank's native
+[`json` library](http://json.rubyforge.org/) to JRuby.
+It aims to be a perfect drop-in replacement for `json_pure`.
+
+
+Development version
+===================
+
+The latest version is available from the
+[Git repository](http://github.com/mernen/json-jruby/tree):
+
+    git clone git://github.com/mernen/json-jruby.git
+
+
+Compiling
+=========
+
+You'll need JRuby version 1.2 or greater to build JSON-JRuby.
+Its path must be set on the `jruby.dir` property of
+`nbproject/project.properties` (defaults to `../jruby`).
+
+Additionally, you'll need [Ant](http://ant.apache.org/), and
+[Ragel](http://www.cs.queensu.ca/~thurston/ragel/) 6.4 or greater.
+
+Then, from the folder where the sources are located, type:
+
+    ant clean jar
+
+to clean any leftovers from previous builds and generate the `.jar` files.
+To generate a RubyGem, specify the `gem` action rather than `jar`.

data/vendor/json_pure/{README → README.rdoc}

@@ -1,3 +1,5 @@
+= JSON implementation for Ruby {<img src="https://secure.travis-ci.org/flori/json.png" />}[http://travis-ci.org/flori/json]
+
 == Description
 
 This is a implementation of the JSON specification according to RFC 4627
@@ -11,13 +13,11 @@ will be two variants available:
   generated by the ragel state machine compiler
   http://www.cs.queensu.ca/~thurston/ragel .
 
-Both variants of the JSON generator escape all non-ASCII and control characters
-with \uXXXX escape sequences, and support UTF-16 surrogate pairs in order to be
-able to generate the whole range of unicode code points. This means that
-generated JSON document is encoded as UTF-8 (because ASCII is a subset of
-UTF-8) and at the same time avoids decoding problems for receiving endpoints,
-that don't expect UTF-8 encoded texts. On the negative side this may lead to a
-bit longer strings than necessarry.
+Both variants of the JSON generator generate UTF-8 character sequences by
+default. If an :ascii_only option with a true value is given, they escape all
+non-ASCII and control characters with \uXXXX escape sequences, and support
+UTF-16 surrogate pairs in order to be able to generate the whole range of
+unicode code points.
 
 All strings, that are to be encoded as JSON strings, should be UTF-8 byte
 sequences on the Ruby side. To encode raw binary strings, that aren't UTF-8

data/vendor/json_pure/Rakefile

@@ -1,53 +1,62 @@
 begin
-  require 'rake/gempackagetask'
+  require 'rubygems/package_task'
 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
+include\
+  begin
+    RbConfig
+  rescue NameError
+    Config
+  end
 
 require 'rake/clean'
-CLOBBER.include Dir['benchmarks/data/*.{dat,log}'], FileList['**/*.rbc']
+CLOBBER.include 'doc', 'Gemfile.lock'
 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}"]
+  FileList["ext/**/{Makefile,mkmf.log}"], 'build', 'dist', FileList['**/*.rbc'],
+  FileList["{ext,lib}/**/*.{so,bundle,#{CONFIG['DLEXT']},o,obj,pdb,lib,manifest,exp,def,jar,class,dSYM}"],
+  FileList['java/src/**/*.class']
+
+require 'rake/testtask'
+class UndocumentedTestTask < Rake::TestTask
+  def desc(*) end
+end
+
+def skip_sdoc(src)
+  src.gsub(/^.*sdoc.*/) { |s| s + ' if RUBY_VERSION > "1.8.6"' }
+end
 
-MAKE = ENV['MAKE'] || %w[gmake make].find { |c| system(c, '-v') }
+MAKE   = ENV['MAKE']   || %w[gmake make].find { |c| system(c, '-v') }
+BUNDLE = ENV['BUNDLE'] || %w[bundle].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']})$/)
+PKG_FILES         = FileList[`git ls-files`.split(/\n/)]
+
 EXT_ROOT_DIR      = 'ext/json/ext'
 EXT_PARSER_DIR    = "#{EXT_ROOT_DIR}/parser"
 EXT_PARSER_DL     = "#{EXT_PARSER_DIR}/parser.#{CONFIG['DLEXT']}"
+RAGEL_PATH        = "#{EXT_PARSER_DIR}/parser.rl"
 EXT_PARSER_SRC    = "#{EXT_PARSER_DIR}/parser.c"
-PKG_FILES << EXT_PARSER_SRC
 EXT_GENERATOR_DIR = "#{EXT_ROOT_DIR}/generator"
 EXT_GENERATOR_DL  = "#{EXT_GENERATOR_DIR}/generator.#{CONFIG['DLEXT']}"
 EXT_GENERATOR_SRC = "#{EXT_GENERATOR_DIR}/generator.c"
+
+JAVA_DIR            = "java/src/json/ext"
+JAVA_RAGEL_PATH     = "#{JAVA_DIR}/Parser.rl"
+JAVA_PARSER_SRC     = "#{JAVA_DIR}/Parser.java"
+JAVA_SOURCES        = FileList["#{JAVA_DIR}/*.java"]
+JAVA_CLASSES        = []
+JRUBY_PARSER_JAR    = File.expand_path("lib/json/ext/parser.jar")
+JRUBY_GENERATOR_JAR = File.expand_path("lib/json/ext/generator.jar")
+
 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"
-
-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
-  myruby 'install.rb'
+  ruby 'install.rb'
 end
 
 task :install_ext_really do
@@ -58,126 +67,17 @@ task :install_ext_really do
       mkdir_p File.dirname(d)
       install(file, d)
     end
+    warn " *** Installed EXT ruby library."
   end
 end
 
 desc "Installing library (extension)"
-task :install_ext => [ :compile_ext, :install_pure, :install_ext_really ]
+task :install_ext => [ :compile, :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 => [ EXT_PARSER_DL, EXT_GENERATOR_DL ]
-
-file EXT_PARSER_DL => EXT_PARSER_SRC do
-  cd EXT_PARSER_DIR do
-    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
-    myruby 'extconf.rb'
-    sh MAKE
-  end
-  cp "#{EXT_GENERATOR_DIR}/generator.#{CONFIG['DLEXT']}", EXT_ROOT_DIR
-end
-
-desc "Generate parser with ragel"
-task :ragel => EXT_PARSER_SRC
-
-task :ragel_clean do
-  rm_rf EXT_PARSER_SRC
-end
-
-file EXT_PARSER_SRC => RAGEL_PATH do
-  cd EXT_PARSER_DIR do
-    if RAGEL_CODEGEN == 'ragel'
-      sh "ragel parser.rl -G2 -o parser.c"
-    else
-      sh "ragel -x parser.rl | #{RAGEL_CODEGEN} -G2"
-    end
-  end
-end
+task :install => :install_ext
 
-desc "Generate diagrams of ragel parser (ps)"
-task :ragel_dot_ps do
-  root = 'diagrams'
-  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
-
-desc "Generate diagrams of ragel parser (png)"
-task :ragel_dot_png do
-  root = 'diagrams'
-  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
-
-desc "Generate diagrams of ragel parser"
-task :ragel_dot => [ :ragel_dot_png, :ragel_dot_ps ]
-
-desc "Testing library (pure ruby)"
-task :test_pure => :clean do
-  ENV['JSON'] = 'pure'
-  ENV['RUBYOPT'] = "-Iext:lib #{ENV['RUBYOPT']}"
-  myruby "-S testrb #{Dir['./tests/*.rb'] * ' '}"
-end
-
-desc "Testing library (extension)"
-task :test_ext => :compile_ext do
-  ENV['JSON'] = 'ext'
-  ENV['RUBYOPT'] = "-Iext:lib #{ENV['RUBYOPT']}"
-  myruby "-S testrb #{Dir['./tests/*.rb'] * ' '}"
-end
-
-desc "Testing library (pure ruby and extension)"
-task :test => [ :test_pure, :test_ext ]
-
-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"
-task :benchmark => [ :benchmark_parser, :benchmark_generator ]
-
-desc "Create RDOC documentation"
-task :doc => [ :version, EXT_PARSER_SRC ] do
-  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)
+if defined?(Gem) and defined?(Gem::PackageTask)
   spec_pure = Gem::Specification.new do |s|
     s.name = 'json_pure'
     s.version = PKG_VERSION
@@ -187,30 +87,33 @@ if defined?(Gem) and defined?(Rake::GemPackageTask)
     s.files = PKG_FILES
 
     s.require_path = 'lib'
+    s.add_development_dependency 'permutation'
+    s.add_development_dependency 'sdoc', '~>0.3.16'
+    s.add_development_dependency 'rake', '~>0.9.2'
 
-    s.bindir = "bin"
-    s.executables = [ "edit_json.rb", "prettify_json.rb" ]
-    s.default_executable = "edit_json.rb"
-
-    s.has_rdoc = true
-    s.extra_rdoc_files << 'README'
+    s.extra_rdoc_files << 'README.rdoc'
     s.rdoc_options <<
-      '--title' <<  'JSON implemention for ruby' << '--main' << 'README'
-    s.test_files.concat Dir['tests/*.rb']
+      '--title' <<  'JSON implemention for ruby' << '--main' << 'README.rdoc'
+    s.test_files.concat Dir['./tests/test_*.rb']
 
     s.author = "Florian Frank"
     s.email = "flori@ping.de"
     s.homepage = "http://flori.github.com/#{PKG_NAME}"
-    s.rubyforge_project = "json"
+    s.license = 'Ruby'
   end
 
-  Rake::GemPackageTask.new(spec_pure) do |pkg|
+  desc 'Creates a json_pure.gemspec file'
+  task :gemspec_pure => :version do
+    File.open('json_pure.gemspec', 'w') do |gemspec|
+      gemspec.write skip_sdoc(spec_pure.to_ruby)
+    end
+  end
+
+  Gem::PackageTask.new(spec_pure) do |pkg|
       pkg.need_tar = true
       pkg.package_files = PKG_FILES
   end
-end
 
-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
@@ -221,48 +124,36 @@ if defined?(Gem) and defined?(Rake::GemPackageTask) and defined?(Rake::Extension
 
     s.extensions = FileList['ext/**/extconf.rb']
 
-    s.require_path = EXT_ROOT_DIR
-    s.require_paths << 'ext'
-    s.require_paths << 'lib'
-
-    s.bindir = "bin"
-    s.executables = [ "edit_json.rb", "prettify_json.rb" ]
-    s.default_executable = "edit_json.rb"
+    s.require_path = 'lib'
+    s.add_development_dependency 'permutation'
+    s.add_development_dependency 'sdoc', '~>0.3.16'
 
-    s.has_rdoc = true
-    s.extra_rdoc_files << 'README'
+    s.extra_rdoc_files << 'README.rdoc'
     s.rdoc_options <<
-      '--title' <<  'JSON implemention for Ruby' << '--main' << 'README'
-    s.test_files.concat Dir['tests/*.rb']
+      '--title' <<  'JSON implemention for Ruby' << '--main' << 'README.rdoc'
+    s.test_files.concat Dir['./tests/test_*.rb']
 
     s.author = "Florian Frank"
     s.email = "flori@ping.de"
     s.homepage = "http://flori.github.com/#{PKG_NAME}"
-    s.rubyforge_project = "json"
+    s.license = 'Ruby'
   end
 
-  Rake::GemPackageTask.new(spec_ext) do |pkg|
+  desc 'Creates a json.gemspec file'
+  task :gemspec_ext => :version do
+    File.open('json.gemspec', 'w') do |gemspec|
+      gemspec.write skip_sdoc(spec_ext.to_ruby)
+    end
+  end
+
+  Gem::PackageTask.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
 
-  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
+  desc 'Create all gemspec files'
+  task :gemspec => [ :gemspec_pure, :gemspec_ext ]
 end
 
 desc m = "Writing version information for #{PKG_VERSION}"
@@ -282,11 +173,240 @@ EOT
   end
 end
 
-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"
+desc "Testing library (pure ruby)"
+task :test_pure => [ :clean, :do_test_pure ]
+
+UndocumentedTestTask.new do |t|
+  t.name = 'do_test_pure'
+  t.libs << 'lib'
+  t.test_files = FileList['tests/test_*.rb']
+  t.verbose = true
+  t.options = '-v'
+end
+
+desc "Testing library (pure ruby and extension)"
+task :test do
+  sh "env JSON=pure #{BUNDLE} exec rake test_pure" or exit 1
+  sh "env JSON=ext #{BUNDLE} exec rake test_ext"  or exit 1
+end
+
+namespace :gems do
+  desc 'Install all development gems'
+  task :install do
+    sh "#{BUNDLE}"
+  end
+end
+
+if defined?(RUBY_ENGINE) and RUBY_ENGINE == 'jruby'
+  if ENV.key?('JAVA_HOME')
+    warn " *** JAVA_HOME was set to #{ENV['JAVA_HOME'].inspect}"
+  elsif File.directory?(local_java = '/usr/local/java/jdk') ||
+    File.directory?(local_java = '/usr/lib/jvm/java-6-openjdk')
+  then
+    ENV['JAVA_HOME'] = local_java
+  end
+  if ENV['JAVA_HOME']
+    warn " *** JAVA_HOME is set to #{ENV['JAVA_HOME'].inspect}"
+    ENV['PATH'] = ENV['PATH'].split(/:/).unshift(java_path = "#{ENV['JAVA_HOME']}/bin") * ':'
+    warn " *** java binaries are assumed to be in #{java_path.inspect}"
+  else
+    warn " *** JAVA_HOME was not set or could not be guessed!"
+    exit 1
+  end
+
+  file JAVA_PARSER_SRC => JAVA_RAGEL_PATH do
+    cd JAVA_DIR do
+      if RAGEL_CODEGEN == 'ragel'
+        sh "ragel Parser.rl -J -o Parser.java"
+      else
+        sh "ragel -x Parser.rl | #{RAGEL_CODEGEN} -J"
+      end
+    end
+  end
+
+  desc "Generate parser for java with ragel"
+  task :ragel => JAVA_PARSER_SRC
+
+  desc "Delete the ragel generated Java source"
+  task :ragel_clean do
+    rm_rf JAVA_PARSER_SRC
+  end
+
+  JRUBY_JAR = File.join(CONFIG["libdir"], "jruby.jar")
+  if File.exist?(JRUBY_JAR)
+    JAVA_SOURCES.each do |src|
+      classpath = (Dir['java/lib/*.jar'] << 'java/src' << JRUBY_JAR) * ':'
+      obj = src.sub(/\.java\Z/, '.class')
+      file obj => src do
+        sh 'javac', '-classpath', classpath, '-source', '1.5', '-target', '1.5', src
+      end
+      JAVA_CLASSES << obj
+    end
+  else
+    warn "WARNING: Cannot find jruby in path => Cannot build jruby extension!"
+  end
+
+  desc "Compiling jruby extension"
+  task :compile => JAVA_CLASSES
+
+  desc "Package the jruby gem"
+  task :jruby_gem => :create_jar do
+    sh 'gem build json-java.gemspec'
+    mkdir_p 'pkg'
+    mv "json-#{PKG_VERSION}-java.gem", 'pkg'
+  end
+
+  desc "Testing library (jruby)"
+  task :test_ext => [ :create_jar, :do_test_ext ]
+
+  UndocumentedTestTask.new do |t|
+    t.name = 'do_test_ext'
+    t.libs << 'lib'
+    t.test_files = FileList['tests/test_*.rb']
+    t.verbose = true
+    t.options = '-v'
+  end
+
+  file JRUBY_PARSER_JAR => :compile do
+    cd 'java/src' do
+      parser_classes = FileList[
+        "json/ext/ByteListTranscoder*.class",
+        "json/ext/OptionsReader*.class",
+        "json/ext/Parser*.class",
+        "json/ext/RuntimeInfo*.class",
+        "json/ext/StringDecoder*.class",
+        "json/ext/Utils*.class"
+      ]
+      sh 'jar', 'cf', File.basename(JRUBY_PARSER_JAR), *parser_classes
+      mv File.basename(JRUBY_PARSER_JAR), File.dirname(JRUBY_PARSER_JAR)
+    end
+  end
+
+  desc "Create parser jar"
+  task :create_parser_jar => JRUBY_PARSER_JAR
+
+  file JRUBY_GENERATOR_JAR => :compile do
+    cd 'java/src' do
+      generator_classes = FileList[
+        "json/ext/ByteListTranscoder*.class",
+        "json/ext/OptionsReader*.class",
+        "json/ext/Generator*.class",
+        "json/ext/RuntimeInfo*.class",
+        "json/ext/StringEncoder*.class",
+        "json/ext/Utils*.class"
+      ]
+      sh 'jar', 'cf', File.basename(JRUBY_GENERATOR_JAR), *generator_classes
+      mv File.basename(JRUBY_GENERATOR_JAR), File.dirname(JRUBY_GENERATOR_JAR)
+    end
+  end
+
+  desc "Create generator jar"
+  task :create_generator_jar => JRUBY_GENERATOR_JAR
+
+  desc "Create parser and generator jars"
+  task :create_jar => [ :create_parser_jar, :create_generator_jar ]
+
+  desc "Build all gems and archives for a new release of the jruby extension."
+  task :build => [ :clean, :version, :jruby_gem ]
+
+  task :release => :build
+else
+  desc "Compiling extension"
+  task :compile => [ EXT_PARSER_DL, EXT_GENERATOR_DL ]
+
+  file EXT_PARSER_DL => EXT_PARSER_SRC do
+    cd EXT_PARSER_DIR do
+      ruby '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
+    end
+    cp "#{EXT_GENERATOR_DIR}/generator.#{CONFIG['DLEXT']}", EXT_ROOT_DIR
+  end
+
+  desc "Testing library (extension)"
+  task :test_ext => [ :compile, :do_test_ext ]
+
+  UndocumentedTestTask.new do |t|
+    t.name = 'do_test_ext'
+    t.libs << 'ext' << 'lib'
+    t.test_files = FileList['tests/test_*.rb']
+    t.verbose = true
+    t.options = '-v'
+  end
+
+  desc "Create RDOC documentation"
+  task :doc => [ :version, EXT_PARSER_SRC ] do
+    sh "sdoc -o doc -t '#{PKG_TITLE}' -m README.rdoc README.rdoc lib/json.rb #{FileList['lib/json/**/*.rb']} #{EXT_PARSER_SRC} #{EXT_GENERATOR_SRC}"
+  end
+
+  desc "Generate parser with ragel"
+  task :ragel => EXT_PARSER_SRC
+
+  desc "Delete the ragel generated C source"
+  task :ragel_clean do
+    rm_rf EXT_PARSER_SRC
+  end
+
+  desc "Update the tags file"
+  task :tags do
+    system 'ctags', *Dir['**/*.{rb,c,h,java}']
+  end
+
+  file EXT_PARSER_SRC => RAGEL_PATH do
+    cd EXT_PARSER_DIR do
+      if RAGEL_CODEGEN == 'ragel'
+        sh "ragel parser.rl -G2 -o parser.c"
+      else
+        sh "ragel -x parser.rl | #{RAGEL_CODEGEN} -G2"
+      end
+      src = File.read("parser.c").gsub(/[ \t]+$/, '')
+      File.open("parser.c", "w") {|f| f.print src}
+    end
+  end
+
+  desc "Generate diagrams of ragel parser (ps)"
+  task :ragel_dot_ps do
+    root = 'diagrams'
+    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
+
+  desc "Generate diagrams of ragel parser (png)"
+  task :ragel_dot_png do
+    root = 'diagrams'
+    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
+
+  desc "Generate diagrams of ragel parser"
+  task :ragel_dot => [ :ragel_dot_png, :ragel_dot_ps ]
+
+  desc "Build all gems and archives for a new release of json and json_pure."
+  task :build => [ :clean, :gemspec, :package ]
+
+  task :release => :build
 end
 
 desc "Compile in the the source directory"
-task :default => [ :version, :compile_ext ]
+task :default => [ :clean, :gemspec, :test ]