json_pure 1.4.0 → 1.4.6

data/CHANGES

@@ -1,3 +1,35 @@
+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.
+  * Applied patch from devrandom <c1.github@niftybox.net> in order to allow building of
+    json_pure if extensiontask is not present.
+  * Thanks to Dustin Schneider <dustin@stocktwits.com>, who reported a memory
+    leak, which is fixed in this release.
+  * Applied 993f261ccb8f911d2ae57e9db48ec7acd0187283 patch from josh@github.
+2010-04-25 (1.4.1)
+  * Fix for a bug reported by Dan DeLeo <dan@kallistec.com>, caused by T_FIXNUM
+    being different on 32bit/64bit architectures.
+2010-04-23 (1.4.0)
+  * Major speed improvements and building with simplified
+    directory/file-structure.
+  * Extension should at least be comapatible with MRI, YARV and Rubinius.
 2010-04-07 (1.2.4)
   * Triger const_missing callback to make Rails' dynamic class loading work.
 2010-03-11 (1.2.3)

data/README

@@ -11,13 +11,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/Rakefile

@@ -24,14 +24,16 @@ 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_DL     = "#{EXT_ROOT_DIR}/parser.#{CONFIG['DLEXT']}"
-EXT_PARSER_SRC    = "#{EXT_ROOT_DIR}/parser.c"
+EXT_PARSER_DIR    = "#{EXT_ROOT_DIR}/parser"
+EXT_PARSER_DL     = "#{EXT_PARSER_DIR}/parser.#{CONFIG['DLEXT']}"
+EXT_PARSER_SRC    = "#{EXT_PARSER_DIR}/parser.c"
 PKG_FILES << EXT_PARSER_SRC
-EXT_GENERATOR_DL  = "#{EXT_ROOT_DIR}/generator.#{CONFIG['DLEXT']}"
-EXT_GENERATOR_SRC = "#{EXT_ROOT_DIR}/generator.c"
+EXT_GENERATOR_DIR = "#{EXT_ROOT_DIR}/generator"
+EXT_GENERATOR_DL  = "#{EXT_GENERATOR_DIR}/generator.#{CONFIG['DLEXT']}"
+EXT_GENERATOR_SRC = "#{EXT_GENERATOR_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_ROOT_DIR}/parser.rl"
+RAGEL_PATH        = "#{EXT_PARSER_DIR}/parser.rl"
 
 def myruby(*args, &block)
   @myruby ||= File.join(CONFIG['bindir'], CONFIG['ruby_install_name'])
@@ -73,17 +75,19 @@ desc "Compiling extension"
 task :compile_ext => [ EXT_PARSER_DL, EXT_GENERATOR_DL ]
 
 file EXT_PARSER_DL => EXT_PARSER_SRC do
-  cd EXT_ROOT_DIR do
-    myruby 'extconf_parser.rb'
+  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_ROOT_DIR do
-    myruby 'extconf_generator.rb'
+  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"
@@ -94,7 +98,7 @@ task :ragel_clean do
 end
 
 file EXT_PARSER_SRC => RAGEL_PATH do
-  cd EXT_ROOT_DIR do
+  cd EXT_PARSER_DIR do
     if RAGEL_CODEGEN == 'ragel'
       sh "ragel parser.rl -G2 -o parser.c"
     else
@@ -170,10 +174,10 @@ 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}"
+  sh "sdoc -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)
+if defined?(Gem) and defined?(Rake::GemPackageTask)
   spec_pure = Gem::Specification.new do |s|
     s.name = 'json_pure'
     s.version = PKG_VERSION
@@ -204,7 +208,9 @@ if defined?(Gem) and defined?(Rake::GemPackageTask) and defined?(Rake::Extension
       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
@@ -213,7 +219,7 @@ if defined?(Gem) and defined?(Rake::GemPackageTask) and defined?(Rake::Extension
 
     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'
@@ -242,21 +248,19 @@ 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'
+    ext.ext_dir         = 'ext/json/ext/parser'
     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'
+    ext.ext_dir         = 'ext/json/ext/generator'
     ext.lib_dir         = 'lib/json/ext'
   end
 end

data/VERSION

@@ -1 +1 @@
-1.4.0
+1.4.6

data/benchmarks/parser2_benchmark.rb

@@ -39,7 +39,7 @@ class Parser2BenchmarkExt < Bullshit::RepeatCase
   include Parser2BenchmarkCommon
 
   warmup      yes
-  iterations  500
+  iterations  2000
 
   truncate_data do
     enabled false
@@ -76,7 +76,7 @@ class Parser2BenchmarkPure < Bullshit::RepeatCase
   include Parser2BenchmarkCommon
 
   warmup      yes
-  iterations  100
+  iterations  400
 
   truncate_data do
     enabled false
@@ -111,7 +111,7 @@ end
 
 class Parser2BenchmarkYAML < Bullshit::RepeatCase
   warmup      yes
-  iterations  100
+  iterations  400
 
   truncate_data do
     enabled false
@@ -146,7 +146,7 @@ end
 
 class Parser2BenchmarkRails < Bullshit::RepeatCase
   warmup      yes
-  iterations  100
+  iterations  400
 
   truncate_data do
     alpha_level 0.05
@@ -182,7 +182,7 @@ end
 
 class Parser2BenchmarkYajl < Bullshit::RepeatCase
   warmup      yes
-  iterations  500
+  iterations  2000
 
   truncate_data do
     alpha_level 0.05

data/ext/json/ext/{extconf_generator.rb → generator/extconf.rb}

@@ -11,6 +11,10 @@ if CONFIG['CC'] =~ /gcc/
   #end
 end
 
-have_header("ruby/re.h") || have_header("re.h")
-have_header("ruby/encoding.h")
-create_makefile 'generator'
+if RUBY_VERSION < "1.9"
+  have_header("re.h")
+else
+  have_header("ruby/re.h")
+  have_header("ruby/encoding.h")
+end
+create_makefile 'json/ext/generator'