json 1.0.3-mswin32 → 1.0.4-mswin32

data/CHANGES

@@ -1,3 +1,9 @@
+2007-05-09 (1.0.4)
+  * Applied a patch from Yui NARUSE <naruse@airemix.com> to make JSON compile
+    under Ruby 1.9. Thank you very much for mailing it to me!
+  * Made binary variants of JSON fail early, instead of falling back to the
+    pure version. This should avoid overshadowing of eventual problems while
+    loading of the binary.
 2007-03-24 (1.0.3)
   * Improved performance of pure variant a bit.
   * The ext variant of this release supports the mswin32 platform. Ugh!

data/Rakefile

@@ -290,6 +290,7 @@ module JSON
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
   VERSION_BUILD   = VERSION_ARRAY[2] # :nodoc:
+  VARIANT_BINARY  = #{!!ON_WINDOWS}
 end
 EOT
   end

data/VERSION

@@ -1 +1 @@
-1.0.3
+1.0.4

data/bin/prettify_json.rb

@@ -22,7 +22,7 @@ def go(s, args = ARGV)
     until p == ''
       o = p.slice!(0, 1)
       if v.key?(o)
-        v[o] = if p == '': args.shift or break 1 else p end
+        v[o] = if p == '' then args.shift or break 1 else p end
         break
       elsif b.key?(o)
         b[o] = true

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

@@ -30,7 +30,6 @@ typedef struct JSON_Generator_StateStruct {
 #define GET_STATE(self)                       \
     JSON_Generator_State *state;              \
     Data_Get_Struct(self, JSON_Generator_State, state);
-#define FUL(string) RSTRING(string)->len
 
 /* 
  * Document-module: JSON::Ext::Generator
@@ -55,19 +54,19 @@ static int hash_to_json_state_i(VALUE key, VALUE value, VALUE Vstate)
     if (state->flag) {
         state->flag = 0;
         rb_str_buf_cat2(buf, ",");
-        if (FUL(state->object_nl)) rb_str_buf_append(buf, state->object_nl);
+        if (RSTRING_LEN(state->object_nl)) rb_str_buf_append(buf, state->object_nl);
     }
-    if (FUL(state->object_nl)) {
+    if (RSTRING_LEN(state->object_nl)) {
         rb_str_buf_append(buf, rb_str_times(state->indent, Vdepth));
     }
     json = rb_funcall(rb_funcall(key, i_to_s, 0), i_to_json, 2, Vstate, Vdepth);
     rb_str_buf_append(buf, json);
     OBJ_INFECT(buf, json);
-    if (FUL(state->space_before)) {
+    if (RSTRING_LEN(state->space_before)) {
         rb_str_buf_append(buf, state->space_before);
     }
     rb_str_buf_cat2(buf, ":");
-    if (FUL(state->space)) rb_str_buf_append(buf, state->space);
+    if (RSTRING_LEN(state->space)) rb_str_buf_append(buf, state->space);
     json = rb_funcall(value, i_to_json, 2, Vstate, Vdepth);
     state->flag = 1;
     rb_str_buf_append(buf, json);
@@ -88,10 +87,10 @@ inline static VALUE mHash_json_transfrom(VALUE self, VALUE Vstate, VALUE Vdepth)
     state->depth = LONG2FIX(depth);
     state->flag = 0;
     rb_str_buf_cat2(result, "{");
-    if (FUL(state->object_nl)) rb_str_buf_append(result, state->object_nl);
+    if (RSTRING_LEN(state->object_nl)) rb_str_buf_append(result, state->object_nl);
     rb_hash_foreach(self, hash_to_json_state_i, Vstate);
-    if (FUL(state->object_nl)) rb_str_buf_append(result, state->object_nl);
-    if (FUL(state->object_nl)) {
+    if (RSTRING_LEN(state->object_nl)) rb_str_buf_append(result, state->object_nl);
+    if (RSTRING_LEN(state->object_nl)) {
         rb_str_buf_append(result, rb_str_times(state->indent, Vdepth));
     }
     rb_str_buf_cat2(result, "}");
@@ -103,7 +102,7 @@ static int hash_to_json_i(VALUE key, VALUE value, VALUE buf)
     VALUE tmp;
 
     if (key == Qundef) return ST_CONTINUE;
-    if (RSTRING(buf)->len > 1) rb_str_buf_cat2(buf, ",");
+    if (RSTRING_LEN(buf) > 1) rb_str_buf_cat2(buf, ",");
     tmp = rb_funcall(rb_funcall(key, i_to_s, 0), i_to_json, 0);
     rb_str_buf_append(buf, tmp);
     OBJ_INFECT(buf, tmp);
@@ -157,7 +156,7 @@ static VALUE mHash_to_json(int argc, VALUE *argv, VALUE self)
 }
 
 inline static VALUE mArray_json_transfrom(VALUE self, VALUE Vstate, VALUE Vdepth) {
-    long i, len = RARRAY(self)->len;
+    long i, len = RARRAY_LEN(self);
     VALUE shift, result;
     long depth = NIL_P(Vdepth) ? 0 : FIX2LONG(Vdepth);
     VALUE delim = rb_str_new2(",");
@@ -167,13 +166,13 @@ inline static VALUE mArray_json_transfrom(VALUE self, VALUE Vstate, VALUE Vdepth
         VALUE self_id = rb_obj_id(self);
         rb_hash_aset(state->seen, self_id, Qtrue);
         result = rb_str_buf_new(len);
-        if (FUL(state->array_nl)) rb_str_append(delim, state->array_nl);
+        if (RSTRING_LEN(state->array_nl)) rb_str_append(delim, state->array_nl);
         shift = rb_str_times(state->indent, LONG2FIX(depth + 1));
 
         rb_str_buf_cat2(result, "[");
         rb_str_buf_append(result, state->array_nl);
         for (i = 0;  i < len; i++) {
-            VALUE element = RARRAY(self)->ptr[i];
+            VALUE element = RARRAY_PTR(self)[i];
             if (RTEST(rb_hash_aref(state->seen, rb_obj_id(element)))) {
                 rb_raise(eCircularDatastructure,
                         "circular data structures not supported!");
@@ -183,7 +182,7 @@ inline static VALUE mArray_json_transfrom(VALUE self, VALUE Vstate, VALUE Vdepth
             rb_str_buf_append(result, shift);
             rb_str_buf_append(result, rb_funcall(element, i_to_json, 2, Vstate, LONG2FIX(depth + 1)));
         }
-        if (FUL(state->array_nl)) {
+        if (RSTRING_LEN(state->array_nl)) {
             rb_str_buf_append(result, state->array_nl);
             rb_str_buf_append(result, rb_str_times(state->indent, LONG2FIX(depth)));
         }
@@ -191,20 +190,20 @@ inline static VALUE mArray_json_transfrom(VALUE self, VALUE Vstate, VALUE Vdepth
         rb_hash_delete(state->seen, self_id);
     } else {
         result = rb_str_buf_new(len);
-        if (FUL(state->array_nl)) rb_str_append(delim, state->array_nl);
+        if (RSTRING_LEN(state->array_nl)) rb_str_append(delim, state->array_nl);
         shift = rb_str_times(state->indent, LONG2FIX(depth + 1));
 
         rb_str_buf_cat2(result, "[");
         rb_str_buf_append(result, state->array_nl);
         for (i = 0;  i < len; i++) {
-            VALUE element = RARRAY(self)->ptr[i];
+            VALUE element = RARRAY_PTR(self)[i];
             OBJ_INFECT(result, element);
             if (i > 0) rb_str_buf_append(result, delim);
             rb_str_buf_append(result, shift);
             rb_str_buf_append(result, rb_funcall(element, i_to_json, 2, Vstate, LONG2FIX(depth + 1)));
         }
         rb_str_buf_append(result, state->array_nl);
-        if (FUL(state->array_nl)) {
+        if (RSTRING_LEN(state->array_nl)) {
             rb_str_buf_append(result, rb_str_times(state->indent, LONG2FIX(depth)));
         }
         rb_str_buf_cat2(result, "]");
@@ -226,11 +225,11 @@ static VALUE mArray_to_json(int argc, VALUE *argv, VALUE self) {
 
     rb_scan_args(argc, argv, "02", &Vstate, &Vdepth);
     if (NIL_P(Vstate)) {
-        long i, len = RARRAY(self)->len;
+        long i, len = RARRAY_LEN(self);
         result = rb_str_buf_new(2 + 2 * len);
         rb_str_buf_cat2(result, "[");
         for (i = 0;  i < len; i++) {
-            VALUE element = RARRAY(self)->ptr[i];
+            VALUE element = RARRAY_PTR(self)[i];
             OBJ_INFECT(result, element);
             if (i > 0) rb_str_buf_cat2(result, ",");
             rb_str_buf_append(result, rb_funcall(element, i_to_json, 0));
@@ -281,7 +280,7 @@ static VALUE mString_included_s(VALUE self, VALUE modul) {
  */
 static VALUE mString_to_json(int argc, VALUE *argv, VALUE self)
 {
-    VALUE result = rb_str_buf_new(RSTRING(self)->len);
+    VALUE result = rb_str_buf_new(RSTRING_LEN(self));
     rb_str_buf_cat2(result, "\"");
     JSON_convert_UTF8_to_JSON(result, self, strictConversion);
     rb_str_buf_cat2(result, "\"");

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

@@ -103,8 +103,8 @@ inline static unsigned char isLegalUTF8(const UTF8 *source, int length)
 void JSON_convert_UTF8_to_JSON(VALUE buffer, VALUE string, ConversionFlags flags)
 {
     char buf[7];
-    const UTF8* source = (UTF8 *) RSTRING(string)->ptr;
-    const UTF8* sourceEnd = source + RSTRING(string)->len;
+    const UTF8* source = (UTF8 *) RSTRING_PTR(string);
+    const UTF8* sourceEnd = source + RSTRING_LEN(string);
 
     while (source < sourceEnd) {
         UTF32 ch = 0;

data/ext/json/ext/generator/unicode.h

@@ -37,4 +37,17 @@ static const UTF32 halfMask = 0x3FFUL;
 
 void JSON_convert_UTF8_to_JSON(VALUE buffer, VALUE string, ConversionFlags flags);
 
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(ARRAY) RARRAY(ARRAY)->ptr
+#endif
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len
+#endif
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(string) RSTRING(string)->ptr
+#endif
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(string) RSTRING(string)->len
+#endif
+
 #endif

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

@@ -1317,8 +1317,8 @@ static VALUE cParser_initialize(VALUE self, VALUE source)
     long len;
     GET_STRUCT;
     source = StringValue(source);
-    ptr = RSTRING(source)->ptr;
-    len = RSTRING(source)->len;
+    ptr = RSTRING_PTR(source);
+    len = RSTRING_LEN(source);
     if (len < 2) {
         rb_raise(eParserError, "A JSON text must at least contain two octets!");
     }

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

@@ -412,8 +412,8 @@ static VALUE cParser_initialize(VALUE self, VALUE source)
     long len;
     GET_STRUCT;
     source = StringValue(source);
-    ptr = RSTRING(source)->ptr;
-    len = RSTRING(source)->len;
+    ptr = RSTRING_PTR(source);
+    len = RSTRING_LEN(source);
     if (len < 2) {
         rb_raise(eParserError, "A JSON text must at least contain two octets!");
     }

data/ext/json/ext/parser/unicode.h

@@ -41,4 +41,18 @@ char *JSON_convert_UTF16_to_UTF8 (
     char *source,
     char *sourceEnd,
 		ConversionFlags flags);
+
+#ifndef RARRAY_PTR
+#define RARRAY_PTR(ARRAY) RARRAY(ARRAY)->ptr
+#endif
+#ifndef RARRAY_LEN
+#define RARRAY_LEN(ARRAY) RARRAY(ARRAY)->len
+#endif
+#ifndef RSTRING_PTR
+#define RSTRING_PTR(string) RSTRING(string)->ptr
+#endif
+#ifndef RSTRING_LEN
+#define RSTRING_LEN(string) RSTRING(string)->len
+#endif
+
 #endif

data/lib/json.rb

@@ -197,9 +197,15 @@ require 'json/common'
 # javasript prototype library (http://www.prototypejs.org) works.
 #
 module JSON
-  begin
+  require 'json/version'
+
+  if VARIANT_BINARY
     require 'json/ext'
-  rescue LoadError
-    require 'json/pure'
+  else
+    begin
+      require 'json/ext'
+    rescue LoadError
+      require 'json/pure'
+    end
   end
 end

data/lib/json/common.rb

@@ -29,11 +29,12 @@ module JSON
     # level (absolute namespace path?). If there doesn't exist a constant at
     # the given path, an ArgumentError is raised.
     def deep_const_get(path) # :nodoc:
+      path = path.to_s
       path.split(/::/).inject(Object) do |p, c|
         case
         when c.empty?             then p
         when p.const_defined?(c)  then p.const_get(c)
-        else                      raise ArgumentError, "can't find #{path}"
+        else                      raise ArgumentError, "can't find const #{path}"
         end
       end
     end

data/lib/json/version.rb

@@ -1,8 +1,9 @@
 module JSON
   # JSON version
-  VERSION         = '1.0.3'
+  VERSION         = '1.0.4'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:
   VERSION_BUILD   = VERSION_ARRAY[2] # :nodoc:
+  VARIANT_BINARY  = true
 end

metadata

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