json 1.4.1 → 1.4.2

data/CHANGES

@@ -1,3 +1,11 @@
+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.

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
@@ -173,7 +177,7 @@ 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) 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.1
+1.4.2

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

@@ -13,4 +13,4 @@ end
 
 have_header("ruby/re.h") || have_header("re.h")
 have_header("ruby/encoding.h")
-create_makefile 'generator'
+create_makefile 'json/ext/generator'

data/ext/json/ext/{generator.c → generator/generator.c}

@@ -172,7 +172,7 @@ static void convert_UTF8_to_JSON_ASCII(FBuffer *buffer, VALUE string)
                             fbuffer_append(buffer, "\\\"", 2);
                             break;
                         default:
-                            fbuffer_append_char(buffer, ch);
+                            fbuffer_append_char(buffer, (char)ch);
                             break;
                     }
                 } else {
@@ -284,8 +284,9 @@ static void convert_UTF8_to_JSON(FBuffer *buffer, VALUE string)
 }
 
 static char *fstrndup(const char *ptr, int len) {
+  char *result;
   if (len <= 0) return NULL;
-  char *result = ALLOC_N(char, len);
+  result = ALLOC_N(char, len);
   memccpy(result, ptr, 0, len);
   return result;
 }
@@ -302,8 +303,9 @@ static FBuffer *fbuffer_alloc()
 
 static FBuffer *fbuffer_alloc_with_length(unsigned int initial_length)
 {
+    FBuffer *fb;
     assert(initial_length > 0);
-    FBuffer *fb = ALLOC(FBuffer);
+    fb = ALLOC(FBuffer);
     memset((void *) fb, 0, sizeof(FBuffer));
     fb->initial_length = initial_length;
     return fb;
@@ -641,36 +643,41 @@ static VALUE cState_configure(VALUE self, VALUE opts)
     opts = tmp;
     tmp = rb_hash_aref(opts, ID2SYM(i_indent));
     if (RTEST(tmp)) {
+        int len;
         Check_Type(tmp, T_STRING);
-        int len = RSTRING_LEN(tmp);
+        len = RSTRING_LEN(tmp);
         state->indent = fstrndup(RSTRING_PTR(tmp), len);
         state->indent_len = len;
     }
     tmp = rb_hash_aref(opts, ID2SYM(i_space));
     if (RTEST(tmp)) {
+        int len;
         Check_Type(tmp, T_STRING);
-        int len = RSTRING_LEN(tmp);
+        len = RSTRING_LEN(tmp);
         state->space = fstrndup(RSTRING_PTR(tmp), len);
         state->space_len = len;
     }
     tmp = rb_hash_aref(opts, ID2SYM(i_space_before));
     if (RTEST(tmp)) {
+        int len;
         Check_Type(tmp, T_STRING);
-        int len = RSTRING_LEN(tmp);
+        len = RSTRING_LEN(tmp);
         state->space_before = fstrndup(RSTRING_PTR(tmp), len);
         state->space_before_len = len;
     }
     tmp = rb_hash_aref(opts, ID2SYM(i_array_nl));
     if (RTEST(tmp)) {
+        int len;
         Check_Type(tmp, T_STRING);
-        int len = RSTRING_LEN(tmp);
+        len = RSTRING_LEN(tmp);
         state->array_nl = fstrndup(RSTRING_PTR(tmp), len);
         state->array_nl_len = len;
     }
     tmp = rb_hash_aref(opts, ID2SYM(i_object_nl));
     if (RTEST(tmp)) {
+        int len;
         Check_Type(tmp, T_STRING);
-        int len = RSTRING_LEN(tmp);
+        len = RSTRING_LEN(tmp);
         state->object_nl = fstrndup(RSTRING_PTR(tmp), len);
         state->object_nl_len = len;
     }
@@ -744,14 +751,14 @@ static void generate_json(FBuffer *buffer, VALUE Vstate, JSON_Generator_State *s
                 char *delim2 = FBUFFER_PTR(state->object_delim2);
                 long delim2_len = FBUFFER_LEN(state->object_delim2);
                 int i, j;
+                VALUE key, key_to_s, keys;
                 depth++;
                 if (max_nesting != 0 && depth > max_nesting) {
                     fbuffer_free(buffer);
                     rb_raise(eNestingError, "nesting of %ld is too deep", depth);
                 }
                 fbuffer_append_char(buffer, '{');
-                VALUE keys = rb_funcall(obj, rb_intern("keys"), 0);
-                VALUE key, key_to_s;
+                keys = rb_funcall(obj, rb_intern("keys"), 0);
                 for(i = 0; i < RARRAY_LEN(keys); i++) {
                     if (i > 0) fbuffer_append(buffer, delim, delim_len);
                     if (object_nl) {
@@ -914,7 +921,7 @@ static VALUE cState_partial_generate(VALUE self, VALUE obj, VALUE depth)
 
     generate_json(buffer, self, state, obj, NIL_P(depth) ? 0 : FIX2INT(depth));
     result = rb_str_new(FBUFFER_PAIR(buffer));
-    fbuffer_free_only_buffer(buffer);
+    fbuffer_free(buffer);
     FORCE_UTF8(result);
     return result;
 }

data/ext/json/ext/{extconf_parser.rb → parser/extconf.rb}

@@ -12,4 +12,4 @@ if CONFIG['CC'] =~ /gcc/
 end
 
 have_header("re.h")
-create_makefile 'parser'
+create_makefile 'json/ext/parser'

data/ext/json/ext/{parser.c → parser/parser.c}

@@ -147,8 +147,9 @@ case 2:
 tr2:
 #line 127 "parser.rl"
 	{
+        char *np;
         json->parsing_name = 1;
-        char *np = JSON_parse_string(json, p, pe, &last_name);
+        np = JSON_parse_string(json, p, pe, &last_name);
         json->parsing_name = 0;
         if (np == NULL) { p--; {p++; cs = 3; goto _out;} } else {p = (( np))-1;}
     }

data/ext/json/ext/{parser.rl → parser/parser.rl}

@@ -125,8 +125,9 @@ static ID i_json_creatable_p, i_json_create, i_create_id, i_create_additions,
     }
 
     action parse_name {
+        char *np;
         json->parsing_name = 1;
-        char *np = JSON_parse_string(json, fpc, pe, &last_name);
+        np = JSON_parse_string(json, fpc, pe, &last_name);
         json->parsing_name = 0;
         if (np == NULL) { fhold; fbreak; } else fexec np;
     }

data/lib/json/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: json
 version: !ruby/object:Gem::Version 
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors: 
 - Florian Frank
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-25 00:00:00 +02:00
+date: 2010-04-28 00:00:00 +02:00
 default_executable: edit_json.rb
 dependencies: []
 
@@ -19,8 +19,8 @@ executables:
 - edit_json.rb
 - prettify_json.rb
 extensions: 
-- ext/json/ext/extconf_generator.rb
-- ext/json/ext/extconf_parser.rb
+- ext/json/ext/generator/extconf.rb
+- ext/json/ext/parser/extconf.rb
 extra_rdoc_files: 
 - README
 files: 
@@ -68,13 +68,13 @@ files:
 - benchmarks/generator_benchmark.rb
 - benchmarks/parser2_benchmark.rb
 - benchmarks/ohai.ruby
-- ext/json/ext/extconf_generator.rb
-- ext/json/ext/parser.rl
-- ext/json/ext/extconf_parser.rb
-- ext/json/ext/parser.h
-- ext/json/ext/parser.c
-- ext/json/ext/generator.c
-- ext/json/ext/generator.h
+- ext/json/ext/generator/extconf.rb
+- ext/json/ext/generator/generator.c
+- ext/json/ext/generator/generator.h
+- ext/json/ext/parser/extconf.rb
+- ext/json/ext/parser/parser.rl
+- ext/json/ext/parser/parser.h
+- ext/json/ext/parser/parser.c
 - Rakefile
 - tools/fuzz.rb
 - tools/server.rb