fjson 0.0.2 → 0.0.3

data/CHANGES

@@ -1,3 +1,6 @@
+2006-10-17 (0.0.3)
+  * Enabled UTF8 support.
+
 2006-10-16 (0.0.2)
   * Gem now compiles the extension rather than just distribute the binary.
 

data/README

@@ -21,6 +21,11 @@ Author
 Brian Takita <brian.takita@gmail.com>
 Florian Frank <flori@ping.de>
 
+Special Thanks to
+=================
+Max Lapshin
+Marcus Rueckert
+
 License
 =======
 

data/Rakefile

@@ -54,7 +54,8 @@ end
 task :install do
   dir = File.dirname(__FILE__)
   fjson_extensions.each do |extension_path|
-    cp extension_binary_path(extension_path), "#{dir}/lib/#{extension_path}"
+    binary_path = extension_binary_path(extension_path)
+    cp binary_path, "#{dir}/lib/#{extension_path}.so"
   end
 end
 
@@ -77,7 +78,7 @@ def extension_directory_path(relative_extension_path)
 end
 
 PKG_NAME = "fjson"
-PKG_VERSION   = "0.0.2"
+PKG_VERSION   = "0.0.3"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',

data/ext/extensions/false_class_ext/false_class_ext.h

@@ -1,4 +1,4 @@
 #include "ruby.h"
 #include <string.h>
 
-static VALUE to_json(int, VALUE*, VALUE);
+static VALUE to_json(int, VALUE*, VALUE);

data/ext/extensions/float_ext/float_ext.h

@@ -1,4 +1,4 @@
 #include "ruby.h"
 #include <string.h>
 
-static VALUE to_json(int, VALUE*, VALUE);
+static VALUE to_json(int, VALUE*, VALUE);

data/ext/extensions/integer_ext/integer_ext.h

@@ -1,4 +1,4 @@
 #include "ruby.h"
 #include <string.h>
 
-static VALUE to_json(int, VALUE*, VALUE);
+static VALUE to_json(int, VALUE*, VALUE);

data/ext/extensions/nil_class_ext/nil_class_ext.h

@@ -1,4 +1,4 @@
 #include "ruby.h"
 #include <string.h>
 
-static VALUE to_json(int, VALUE*, VALUE);
+static VALUE to_json(int, VALUE*, VALUE);

data/ext/json_ext/json_ext.c

@@ -61,8 +61,17 @@ static VALUE utf8_to_json(self, input)
 
   int c_increment_length;
   size_t i = 0;
+
+  VALUE supports_utf8 = Qfalse;
+  if(
+    rb_funcall(mJSON, rb_intern("support_unicode?"), 0) == Qtrue &&
+    rb_equal(rb_gv_get("KCODE"), rb_str_new2("UTF8"))
+  ) {
+    supports_utf8 = Qtrue;
+  }
+
   while(i < c_length) {
-    c_increment_length = _convert_utf8_char(input, i, result);
+    c_increment_length = _convert_utf8_char(input, i, result, supports_utf8);
     i += c_increment_length;
   }
 
@@ -92,10 +101,11 @@ static void _begin_setup_iconv() {
   rb_funcall(mUTF16toUTF8, rb_intern("iconv"), 1, rb_str_new2("no bom"));
 }
 
-static long _convert_utf8_char(input, i, result)
+static long _convert_utf8_char(input, i, result, supports_utf8)
   VALUE input;
   long i;
   VALUE result;
+  VALUE supports_utf8;
 {
   long c_increment_length = 1;
   if (i < 0 || RSTRING(input)->len <= i) {
@@ -124,6 +134,9 @@ static long _convert_utf8_char(input, i, result)
   else if(c_current == '\\') {
     rb_str_cat2(result, "\\\\");
   }
+  else if(c_current == '\/') {
+    rb_str_cat2(result, "\\\/");
+  }
   else if(0x00 <= c_current && c_current <= 0x1f) {
     VALUE format_string =  rb_str_new2("\\u%04x");
     rb_str_append(result, rb_funcall(format_string, rb_intern("%"), 1, LONG2NUM(c_current)));
@@ -131,38 +144,35 @@ static long _convert_utf8_char(input, i, result)
   else if(0x20 <= c_current && c_current <= 0x7f) {
     rb_str_concat(result, LONG2NUM(c_current));
   }
-  else if(
-    !(
-      rb_funcall(mJSON, rb_intern("support_unicode?"), 0) == Qtrue &&
-      rb_equal(rb_gv_get("KCODE"), rb_str_new2("UTF8"))
-    )) {
+  else if(supports_utf8 == Qfalse) {
     VALUE current = rb_funcall(input, rb_intern("[]"), 1, LONG2NUM(i));
     rb_str_concat(result, current);
   }
-//  else if((c_current & 0xe0) == 0xc0) {
-//    c_increment_length = 2;
-//    _convert_utf_8_string_part(result, input, i, c_increment_length);
-//  }
-//  else if((c_current & 0xf0) == 0xe0) {
-//    c_increment_length = 3;
-//    _convert_utf_8_string_part(result, input, i, c_increment_length);
-//  }
-//  else if((c_current & 0xf8) == 0xf0) {
-//    c_increment_length = 4;
-//    _convert_utf_8_string_part(result, input, i, c_increment_length);
-//  }
-//  // TODO: See if these next two steps are valid unicode.
-//  else if((c_current & 0xf8) == 0xf8) {
-//    c_increment_length = 5;
-//    _convert_utf_8_string_part(result, input, i, c_increment_length);
-//  }
-//  else if((c_current & 0xf8) == 0xfc) {
-//    c_increment_length = 6;
-//    _convert_utf_8_string_part(result, input, i, c_increment_length);
-//  }
+  else if((c_current & 0xe0) == 0xc0) {
+    c_increment_length = 2;
+    _convert_utf_8_string_part(result, input, i, c_increment_length);
+  }
+  else if((c_current & 0xf0) == 0xe0) {
+    c_increment_length = 3;
+    _convert_utf_8_string_part(result, input, i, c_increment_length);
+  }
+  else if((c_current & 0xf8) == 0xf0) {
+    c_increment_length = 4;
+    _convert_utf_8_string_part(result, input, i, c_increment_length);
+  }
+  else if((c_current & 0xfc) == 0xf8) {
+    c_increment_length = 5;
+    _convert_utf_8_string_part(result, input, i, c_increment_length);
+  }
+  else if((c_current & 0xfe) == 0xfc) {
+    c_increment_length = 6;
+    _convert_utf_8_string_part(result, input, i, c_increment_length);
+  }
   else {
-    VALUE current = rb_funcall(input, rb_intern("[]"), 1, LONG2NUM(i));
-    rb_str_concat(result, current);
+    char* error_message = "Encountered unknown UTF-8 byte: ";
+    error_message += c_current;
+    strcat(error_message, "!");
+    rb_raise(rb_eRuntimeError, error_message);
   }
 
   return c_increment_length;

data/ext/json_ext/json_ext.h

@@ -3,7 +3,7 @@
 
 static VALUE utf8_to_utf16(VALUE, VALUE);
 static VALUE _convert_utf_8_string_part(VALUE, VALUE, long, long);
-static long _convert_utf8_char(VALUE, long, VALUE);
+static long _convert_utf8_char(VALUE, long, VALUE, VALUE);
 static VALUE utf8_to_json(VALUE, VALUE);
 static void _begin_setup_iconv();
 void Init_json_ext();

data/lib/parser.rb

@@ -56,8 +56,9 @@ module JSON
     def parse_string
       if scan(STRING)
         return '' if self[1].empty?
-        self[1].gsub(/\\(?:[\\bfnrt"]|u([A-Fa-f\d]{4}))/) do
+        self[1].gsub(%r(\\(?:[\\bfnrt"/]|u([A-Fa-f\d]{4})))) do
           case $~[0]
+          when '\/' then '/'
           when '\\\\' then '\\'
           when '\\b'  then "\b"
           when '\\f'  then "\f"

data/spec/string_with_latin1_character_set_json_spec.rb

@@ -51,4 +51,17 @@ context "String with latin1 character set Json" do
     JSON.utf8_to_json("test").should_equal "test"
     JSON.utf8_to_json('1').should_equal '1'
   end
+
+  specify "should support backslashes" do
+    json = '"\\\\.(?i:gif|jpe?g|png)$"'
+    data = JSON.parse(json)
+    JSON.unparse(data).should_equal json
+    json = '"\\""'
+    data = JSON.parse(json)
+    JSON.unparse(data).should_equal json
+    json = '"\/"'
+    data = JSON.parse(json)
+    data.should_equal '/'
+    JSON.unparse(data).should_equal json
+  end
 end

data/spec/string_with_utf8_values_when_supporting_unicode_json_spec.rb

@@ -4,33 +4,50 @@ dir = File.dirname(__FILE__)
 require File.expand_path("#{dir}/spec_helper")
 require File.expand_path("#{dir}/../lib/fjson")
 
-#context "String with UTF8 values when supporting unicode Json" do
-#  setup do
-#    JSON.support_unicode = true
-#    $KCODE = "UTF8"
-#  end
-#
-#  specify "should format values between 0x00000080 and 0x000007ff" do
-#    val = [0x0080].pack("U")
-#    JSON.utf8_to_json(val).should_equal "\\u0080"
-#
-#    val = [0x07ff].pack("U")
-#    JSON.utf8_to_json(val).should_equal "\\u07ff"
-#  end
-#
-#  specify "should format values between 0x00001000 and 0x0000ffff" do
-#    val = [0x1000].pack("U")
-#    JSON.utf8_to_json(val).should_equal "\\u1000"
-#
-#    val = [0xffff].pack("U")
-#    JSON.utf8_to_json(val).should_equal "\\uffff"
-#  end
-#
-#  specify "should format values between 0x00010000 and 0x0010ffff" do
-#    val = [0x010000].pack("U")
-#    JSON.utf8_to_json(val).should_equal "\\ud800dc00"
-#
-#    val = [0x10ffff].pack("U")
-#    JSON.utf8_to_json(val).should_equal "\\udbffdfff"
-#  end
-#end
+context "String with UTF8 values when supporting unicode Json" do
+  setup do
+    JSON.support_unicode = true
+    $KCODE = "UTF8"
+  end
+
+  specify "should format values between 0x00000080 and 0x000007ff" do
+    val = [0x0080].pack("U")
+    JSON.utf8_to_json(val).should_equal "\\u0080"
+
+    val = [0x07ff].pack("U")
+    JSON.utf8_to_json(val).should_equal "\\u07ff"
+  end
+
+  specify "should format values between 0x00001000 and 0x0000ffff" do
+    val = [0x1000].pack("U")
+    JSON.utf8_to_json(val).should_equal "\\u1000"
+
+    val = [0xffff].pack("U")
+    JSON.utf8_to_json(val).should_equal "\\uffff"
+  end
+
+  specify "should format values between 0x00010000 and 0x0010ffff" do
+    val = [0x010000].pack("U")
+    JSON.utf8_to_json(val).should_equal "\\ud800dc00"
+
+    val = [0x10ffff].pack("U")
+    JSON.utf8_to_json(val).should_equal "\\udbffdfff"
+  end
+
+  specify "should parse unicode values" do
+    utf8 = '© ≠ €!'
+    json = '"\u00a9 \u2260 \u20ac!"'
+    utf8.to_json.should_equal json
+    JSON.parse(json).should_equal utf8
+    
+    utf8 = "\343\201\202\343\201\204\343\201\206\343\201\210\343\201\212"
+    json = '"\u3042\u3044\u3046\u3048\u304a"'
+    utf8.to_json.should_equal json
+    JSON.parse(json).should_equal utf8
+
+    utf8 = 'საქართველო'
+    json = '"\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd"'
+    utf8.to_json.should_equal json
+    JSON.parse(json).should_equal utf8
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: fjson
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2006-10-16 00:00:00 -07:00
+  version: 0.0.3
+date: 2006-10-17 00:00:00 -07:00
 summary: This library is for parsing JSON strings and unparsing ruby data structures. This library is a fork of Florian Frank's JSON library with key parts implemented in C for performance improvements.
 require_paths: 
 - lib