json 1.0.2 → 1.0.3

data/CHANGES

@@ -1,3 +1,6 @@
+2007-03-24 (1.0.3)
+  * Improved performance of pure variant a bit.
+  * The ext variant of this release supports the mswin32 platform. Ugh!
 2007-03-24 (1.0.2)
   * Ext Parser didn't parse 0e0 correctly into 0.0: Fixed!
 2007-03-24 (1.0.1)

data/Rakefile

@@ -1,10 +1,12 @@
 # vim: set et sw=2 ts=2:
+
 require 'rake/gempackagetask'
 require 'rake/clean'
 
 require 'rbconfig'
 include Config
 
+ON_WINDOWS        = RUBY_PLATFORM =~ /mswin32/i 
 PKG_NAME          = 'json'
 PKG_VERSION       = File.read('VERSION').chomp
 PKG_FILES         = FileList["**/*"].exclude(/CVS|pkg|coverage|Makefile/).exclude(/\.(so|bundle|o|#{CONFIG['DLEXT']})$/)
@@ -19,7 +21,7 @@ EXT_GENERATOR_SRC = "#{EXT_GENERATOR_DIR}/generator.c"
 RAGEL_CODEGEN     = %w[rlcodegen rlgen-cd].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}"],
+  FileList["ext/**/*.{so,bundle,#{CONFIG['DLEXT']},o,obj,pdb,lib,manifest,exp,def}"],
   FileList["ext/**/Makefile"]
 
 
@@ -28,8 +30,7 @@ task :install_pure => :version do
   ruby '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']}"]
@@ -40,6 +41,9 @@ task :install_ext => [ :compile, :install_pure ]  do
   end
 end
 
+desc "Installing library (extension)"
+task :install_ext => [ :compile, :install_pure, :install_ext_really ]
+
 task :install => :install_ext
 
 desc "Compiling extension"
@@ -48,7 +52,12 @@ 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'
+    if ON_WINDOWS
+      sh 'nmake'
+      sh "mt -manifest parser.#{CONFIG['DLEXT']}.manifest -outputresource:parser.#{CONFIG['DLEXT']};2"
+    else
+      sh 'make'
+    end
   end
   cp "#{EXT_PARSER_DIR}/parser.#{CONFIG['DLEXT']}", EXT_ROOT_DIR
 end
@@ -56,7 +65,12 @@ end
 file EXT_GENERATOR_DL => EXT_GENERATOR_SRC do
   cd EXT_GENERATOR_DIR do
     ruby 'extconf.rb'
-    sh 'make'
+    if ON_WINDOWS
+      sh 'nmake'
+      sh "mt -manifest generator.#{CONFIG['DLEXT']}.manifest -outputresource:generator.#{CONFIG['DLEXT']};2"
+    else
+      sh 'make'
+    end
   end
   cp "#{EXT_GENERATOR_DIR}/generator.#{CONFIG['DLEXT']}", EXT_ROOT_DIR
 end
@@ -220,6 +234,44 @@ Rake::GemPackageTask.new(spec_ext) do |pkg|
   pkg.package_files += PKG_FILES
 end
 
+task :package_win => :compile do
+  mkdir_p 'pkg'
+  spec_win_ext = Gem::Specification.new do |s|
+    s.name = 'json'
+    s.platform = Gem::Platform::WIN32
+    s.version = PKG_VERSION
+    s.summary = "A JSON implementation as a Ruby extension"
+    s.description = ""
+
+    s.files = PKG_FILES.to_a <<
+      "#{EXT_ROOT_DIR}/parser.#{CONFIG['DLEXT']}" <<
+      "#{EXT_ROOT_DIR}/generator.#{CONFIG['DLEXT']}"
+
+    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.has_rdoc = true
+    s.rdoc_options <<
+      '--title' <<  'JSON -- A JSON implemention' <<
+      '--main' << 'JSON' << '--line-numbers'
+    s.test_files << 'tests/runner.rb'
+
+    s.author = "Florian Frank"
+    s.email = "flori@ping.de"
+    s.homepage = "http://json.rubyforge.org"
+    s.rubyforge_project = "json"
+  end
+
+  gem_file = "json-#{spec_win_ext.version}-#{spec_win_ext.platform}.gem"
+  Gem::Builder.new(spec_win_ext).build
+  mv gem_file, 'pkg'
+end
+
 task :mrproper => [ :ragel_clean, :clean ] do
   for dir in [ EXT_PARSER_DIR, EXT_GENERATOR_DIR ]
     cd(dir) {  rm_f 'Makefile' }
@@ -243,6 +295,10 @@ EOT
   end
 end
 
-task :release => [ :version, :clean, :ragel_clean, :ragel, :package ]
+if ON_WINDOWS
+  task :release => [ :version, :clean, :compile, :package_win ]
+else
+  task :release => [ :version, :mrproper, :package ]
+end
 
 task :default => [ :version, :compile ]

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

data/benchmarks/benchmark_parser.rb

@@ -10,7 +10,7 @@ class BC_Parser < Bullshit::TimeCase
   duration  10
 
   def setup
-    a = [ nil, false, true, "fÖßÄr", [ "n€st€d", true ], { "fooß" => "bär", "quux" => true } ]
+    a = [ nil, false, true, "fÖß\nÄr", [ "n€st€d", true ], { "fooß" => "bär", "qu\r\nux" => true } ]
     @big = a * 100
     @json = JSON.generate(@big)
   end

data/ext/json/ext/generator/unicode.c

@@ -100,7 +100,7 @@ inline static unsigned char isLegalUTF8(const UTF8 *source, int length)
     return 1;
 }
 
-inline void JSON_convert_UTF8_to_JSON(VALUE buffer, VALUE string, ConversionFlags flags)
+void JSON_convert_UTF8_to_JSON(VALUE buffer, VALUE string, ConversionFlags flags)
 {
     char buf[7];
     const UTF8* source = (UTF8 *) RSTRING(string)->ptr;

data/ext/json/ext/parser/parser.c

@@ -1349,10 +1349,10 @@ static VALUE cParser_initialize(VALUE self, VALUE source)
  */
 static VALUE cParser_parse(VALUE self)
 {
-    GET_STRUCT;
     char *p, *pe;
     int cs = EVIL;
     VALUE result = Qnil;
+    GET_STRUCT;
 
     
 #line 1359 "parser.c"

data/ext/json/ext/parser/parser.rl

@@ -444,10 +444,10 @@ static VALUE cParser_initialize(VALUE self, VALUE source)
  */
 static VALUE cParser_parse(VALUE self)
 {
-    GET_STRUCT;
     char *p, *pe;
     int cs = EVIL;
     VALUE result = Qnil;
+    GET_STRUCT;
 
     %% write init;
     p = json->source;

data/ext/json/ext/parser/unicode.c

@@ -59,7 +59,7 @@ static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080
  */
 static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
 
-inline char *JSON_convert_UTF16_to_UTF8 (
+char *JSON_convert_UTF16_to_UTF8 (
         VALUE buffer,
         char *source,
         char *sourceEnd,

data/lib/json/pure/parser.rb

@@ -77,22 +77,26 @@ module JSON
 
       private
 
+      # Unescape characters in strings.
+      UNESCAPE_MAP = {
+        ?"  => '"',
+        ?\\ => '\\',
+        ?/  => '/',
+        ?b  => "\b",
+        ?f  => "\f",
+        ?n  => "\n",
+        ?r  => "\r",
+        ?t  => "\t",
+      }
+
       def parse_string
         if scan(STRING)
           return '' if self[1].empty?
-          self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+))) do
-            case $~[0]
-            when '\\"'  then '"'
-            when '\\\\' then '\\'
-            when '\\/'  then '/'
-            when '\\b'  then "\b"
-            when '\\f'  then "\f"
-            when '\\n'  then "\n"
-            when '\\r'  then "\r"
-            when '\\t'  then "\t"
-            else
+          self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+))) do |c|
+            if u = UNESCAPE_MAP[c[1]]
+              u
+            else # \uXXXX
               bytes = ''
-              c = $~[0]
               i = 0
               while c[6 * i] == ?\\ && c[6 * i + 1] == ?u 
                 bytes << c[6 * i + 2, 2].to_i(16) << c[6 * i + 4, 2].to_i(16)

data/lib/json/version.rb

@@ -1,6 +1,6 @@
 module JSON
   # JSON version
-  VERSION         = '1.0.2'
+  VERSION         = '1.0.3'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/tests/test_json_unicode.rb

@@ -41,7 +41,10 @@ class TC_JSONUnicode < Test::Unit::TestCase
     (0..0x7f).each do |i|
       json = '["\u%04x"]' % i
       assert_equal i, JSON.parse(json).first[0]
-      if [?\b, ?\n, ?\r, ?\t, ?\f].include?(i)
+      if i == ?\b
+        generated = JSON.generate(["" << i])
+        assert '["\b"]' == generated || '["\10"]' == generated
+      elsif [?\n, ?\r, ?\t, ?\f].include?(i)
         assert_equal '[' << ('' << i).dump << ']', JSON.generate(["" << i])
       elsif i < 0x20
         assert_equal json, JSON.generate(["" << i])

data/tools/fuzz.rb

@@ -1,7 +1,5 @@
 $KCODE='UTF8'
 require 'json'
-require 'irb'
-require 'pp'
 
 class Fuzzer
   def initialize(n, freqs = {})

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: json
 version: !ruby/object:Gem::Version 
-  version: 1.0.2
-date: 2007-04-02 00:00:00 +02:00
+  version: 1.0.3
+date: 2007-04-26 00:00:00 +02:00
 summary: A JSON implementation as a Ruby extension
 require_paths: 
 - ext/json/ext