json 0.4.1 → 0.4.2

data/CHANGES

@@ -1,3 +1,6 @@
+2006-08-25 (0.4.2)
+  * Fixed a bug in handling solidi (/-characters), that was reported by
+    Kevin Gilpin <kevin.gilpin@alum.mit.edu>.
 2006-02-06 (0.4.1)
   * Fixed a bug concerning escaping with backslashes. Thanks for the report go
     to Florian Munz <surf@theflow.de>.

data/Rakefile

@@ -5,7 +5,7 @@ include Config
 
 PKG_NAME = 'json'
 PKG_VERSION = File.read('VERSION').chomp
-PKG_FILES = FileList["**/*"].exclude("CVS").exclude("pkg")
+PKG_FILES = FileList["**/*"].exclude("CVS").exclude("pkg").exclude('coverage')
 
 desc "Installing library"
 task :install  do

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/json.rb

@@ -140,12 +140,15 @@ module JSON
     end
 
     # Returns _true_ if JSON supports unicode, otherwise _false_ is returned.
+    #
+    # If loading of the iconv library fails, or it doesn't support utf8/utf16
+    # encoding, this will be set to false, as a fallback.
     def support_unicode?
       !!@support_unicode
     end
   end
-  JSON.support_unicode = true # default, hower it's possible to switch off full
-                              # unicode support, if non-ascii bytes should be
+  JSON.support_unicode = true # default, however it's possible to switch off
+                              # full unicode support, if non-ascii bytes should be
                               # just passed through.
 
   begin
@@ -154,8 +157,59 @@ module JSON
     UTF16toUTF8 = Iconv.new('utf-8', 'utf-16be')
     # An iconv instance to convert from UTF16 Big Endian to UTF8.
     UTF8toUTF16 = Iconv.new('utf-16be', 'utf-8'); UTF8toUTF16.iconv('no bom')
+  rescue Errno::EINVAL
+    begin
+      old_verbose = $VERBOSE
+      $VERBOSE = nil
+      # An iconv instance to convert from UTF8 to UTF16 Big Endian.
+      UTF16toUTF8 = Iconv.new('utf-8', 'utf-16')
+      # An iconv instance to convert from UTF16 Big Endian to UTF8.
+      UTF8toUTF16 = Iconv.new('utf-16', 'utf-8'); UTF8toUTF16.iconv('no bom')
+      if UTF8toUTF16.iconv("\xe2\x82\xac") == "\xac\x20"
+        swapper = Class.new do
+          def initialize(iconv)
+            @iconv = iconv
+          end
+
+          def iconv(string)
+            result = @iconv.iconv(string)
+            JSON.swap!(result)
+          end
+        end
+        UTF8toUTF16 = swapper.new(UTF8toUTF16)
+      end
+      if UTF16toUTF8.iconv("\xac\x20") == "\xe2\x82\xac"
+        swapper = Class.new do
+          def initialize(iconv)
+            @iconv = iconv
+          end
+
+          def iconv(string)
+            string = JSON.swap!(string.dup)
+            @iconv.iconv(string)
+          end
+        end
+        UTF16toUTF8 = swapper.new(UTF16toUTF8)
+      end
+    rescue Errno::EINVAL
+      # Enforce disabling of unicode support, if iconv doesn't support
+      # UTF8/UTF16 at all.
+      JSON.support_unicode = false
+    ensure
+      $VERBOSE = old_verbose
+    end
   rescue LoadError
-    JSON.support_unicode = false # enforce disabling of unicode support
+    # Enforce disabling of unicode support, if iconv doesn't exist.
+    JSON.support_unicode = false
+  end
+
+  # Swap consecutive bytes in string in place.
+  def self.swap!(string)
+    0.upto(string.size / 2) do |i|
+      break unless string[2 * i + 1]
+      string[2 * i], string[2 * i + 1] = string[2 * i + 1], string[2 * i]
+    end
+    string
   end
 
   # This class implements the JSON parser that is used to parse a JSON string
@@ -215,7 +269,7 @@ 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 '\\b'  then "\b"
@@ -224,6 +278,7 @@ module JSON
           when '\\r'  then "\r"
           when '\\t'  then "\t"
           when '\\"'  then '"'
+          when '\\/'  then '/'
           else
             if JSON.support_unicode? and $KCODE == 'UTF8'
               JSON.utf16_to_utf8($~[1])
@@ -408,6 +463,7 @@ module JSON
       when char == ?\r then result << '\r'
       when char == ?"  then result << '\"'
       when char == ?\\ then result << '\\\\'
+      when char == ?/ then result << '\/'
       when char.between?(0x0, 0x1f) then result << "\\u%04x" % char
       when char.between?(0x20, 0x7f) then result << char
       when !(JSON.support_unicode? && $KCODE == 'UTF8')

data/tests/runner.rb

@@ -5,7 +5,7 @@ require 'test/unit/testsuite'
 $:.unshift File.expand_path(File.dirname($0))
 $:.unshift 'lib'
 $:.unshift '../lib'
-#require 'coverage'
+$:.unshift 'tests'
 require 'test_json'
 
 class TS_AllTests

data/tests/test_json.rb

@@ -104,18 +104,22 @@ class TC_JSON < Test::Unit::TestCase
     assert_equal '"\u001f"', 0x1f.chr.to_json
     assert_equal '" "', ' '.to_json
     assert_equal "\"#{0x7f.chr}\"", 0x7f.chr.to_json
-    utf8 = '© ≠ €!'
-    json = '"\u00a9 \u2260 \u20ac!"'
-    assert_equal json, utf8.to_json
-    assert_equal utf8, parse(json)
-    utf8 = "\343\201\202\343\201\204\343\201\206\343\201\210\343\201\212"
-    json = '"\u3042\u3044\u3046\u3048\u304a"'
-    assert_equal json, utf8.to_json
-    assert_equal utf8, parse(json)
-    utf8 = 'საქართველო'
-    json = '"\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd"'
-    assert_equal json, utf8.to_json
-    assert_equal utf8, parse(json)
+    if JSON.support_unicode?
+      utf8 = '© ≠ €!'
+      json = '"\u00a9 \u2260 \u20ac!"'
+      assert_equal json, utf8.to_json
+      assert_equal utf8, parse(json)
+      utf8 = "\343\201\202\343\201\204\343\201\206\343\201\210\343\201\212"
+      json = '"\u3042\u3044\u3046\u3048\u304a"'
+      assert_equal json, utf8.to_json
+      assert_equal utf8, parse(json)
+      utf8 = 'საქართველო'
+      json = '"\u10e1\u10d0\u10e5\u10d0\u10e0\u10d7\u10d5\u10d4\u10da\u10dd"'
+      assert_equal json, utf8.to_json
+      assert_equal utf8, parse(json)
+    else
+      warn "No unicode support found - skipping test"
+    end
   end
 
   def test_comments
@@ -187,6 +191,10 @@ EOT
   end
 
   def test_utf8_mode
+    unless JSON.support_unicode?
+      warn "No unicode support found - skipping test"
+      return
+    end
     $KCODE = 'NONE'
     utf8 = "© ≠ €! - \001"
     json = "\"© ≠ €! - \\u0001\""
@@ -213,6 +221,10 @@ EOT
     json = '"\\""'
     data = JSON.parse(json)
     assert_equal json, JSON.unparse(data)
+    json = '"\/"'
+    data = JSON.parse(json)
+    assert_equal '/', data
+    assert_equal json, JSON.unparse(data)
   end
 end
   # vim: set et sw=2 ts=2:

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: json
 version: !ruby/object:Gem::Version 
-  version: 0.4.1
-date: 2006-02-06 00:00:00 +01:00
+  version: 0.4.2
+date: 2006-08-25 00:00:00 +02:00
 summary: A JSON implementation in Ruby
 require_paths: 
 - lib
@@ -29,33 +29,30 @@ authors:
 - Florian Frank
 files: 
 - bin
-- install.rb
-- GPL
-- linecover_config.rb
-- TODO
-- Rakefile
-- linecover.db
 - VERSION
+- TODO
 - tests
+- GPL
+- install.rb
+- Rakefile
+- lib
 - README
 - CHANGES
-- lib
 - bin/edit_json.rb
-- tests/load_linecover.rb
-- tests/test_json.rb
 - tests/runner.rb
-- lib/json.rb
+- tests/test_json.rb
 - lib/json
-- lib/json/json.xpm
-- lib/json/NilClass.xpm
-- lib/json/Key.xpm
+- lib/json.rb
 - lib/json/FalseClass.xpm
-- lib/json/editor.rb
-- lib/json/Array.xpm
 - lib/json/TrueClass.xpm
+- lib/json/Hash.xpm
+- lib/json/Key.xpm
 - lib/json/Numeric.xpm
+- lib/json/Array.xpm
+- lib/json/editor.rb
 - lib/json/String.xpm
-- lib/json/Hash.xpm
+- lib/json/NilClass.xpm
+- lib/json/json.xpm
 test_files: 
 - tests/runner.rb
 rdoc_options: []

data/linecover_config.rb

@@ -1,14 +0,0 @@
-module LineCover::Config
-  VERSION               = 1
-  COVERAGE_DATABASE     = 'linecover.db'
-  HTML_OUTPUT_DIRECTORY = 'linecover'
-  CONSOLE_LAST_COLUMN   = 80
-  FILE_FILTER_ORDER     = :EXCLUDE_INCLUDE
-  FILE_FILTER_INCLUDE   = [
-    #%r(^(\./)?lib/.*\.rb$/),
-  ]
-  FILE_FILTER_EXCLUDE   = [
-    %r(^/.*),
-    %r(^(\./)?test(s)?/.*\.rb$),
-  ]
-end

data/tests/load_linecover.rb

@@ -1,6 +0,0 @@
-begin
-  require 'linecover'
-rescue LoadError
-  require 'rubygems'
-  require 'linecover'
-end