json 1.4.6 → 1.5.0

data/json-java.gemspec

@@ -0,0 +1,20 @@
+#! /usr/bin/env jruby
+require "rubygems"
+
+spec = Gem::Specification.new do |s|
+  s.name = "json"
+  s.version = File.read("VERSION").chomp
+  s.summary = "JSON implementation for JRuby"
+  s.description = "A JSON implementation as a JRuby extension."
+  s.author = "Daniel Luz"
+  s.email = "dev+ruby@mernen.com"
+  s.homepage = "http://json-jruby.rubyforge.org/"
+  s.platform = 'java'
+  s.rubyforge_project = "json-jruby"
+
+  s.files = Dir["{docs,lib,tests}/**/*"]
+end
+
+if $0 == __FILE__
+  Gem::Builder.new(spec).build
+end

data/lib/json/add/core.rb

@@ -1,8 +1,7 @@
 # This file contains implementations of ruby core's custom objects for
 # serialisation/deserialisation.
 
-unless Object.const_defined?(:JSON) and ::JSON.const_defined?(:JSON_LOADED) and
-  ::JSON::JSON_LOADED
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 require 'date'

data/lib/json/add/rails.rb

@@ -1,58 +1,8 @@
-# This file contains implementations of rails custom objects for
-# serialisation/deserialisation.
+# This file used to implementations of rails custom objects for
+# serialisation/deserialisation and is obsoleted now.
 
-unless Object.const_defined?(:JSON) and ::JSON.const_defined?(:JSON_LOADED) and
-  ::JSON::JSON_LOADED
+unless defined?(::JSON::JSON_LOADED) and ::JSON::JSON_LOADED
   require 'json'
 end
 
-class Object
-  def self.json_create(object)
-    obj = new
-    for key, value in object
-      next if key == JSON.create_id
-      instance_variable_set "@#{key}", value
-    end
-    obj
-  end
-
-  def to_json(*a)
-    result = {
-      JSON.create_id => self.class.name
-    }
-    instance_variables.inject(result) do |r, name|
-      r[name[1..-1]] = instance_variable_get name
-      r
-    end
-    result.to_json(*a)
-  end
-end
-
-class Symbol
-  def to_json(*a)
-    to_s.to_json(*a)
-  end
-end
-
-module Enumerable
-  def to_json(*a)
-    to_a.to_json(*a)
-  end
-end
-
-# class Regexp
-#   def to_json(*)
-#     inspect
-#   end
-# end
-#
-# The above rails definition has some problems:
-#
-# 1. { 'foo' => /bar/ }.to_json # => "{foo: /bar/}"
-#    This isn't valid JSON, because the regular expression syntax is not
-#    defined in RFC 4627. (And unquoted strings are disallowed there, too.)
-#    Though it is valid Javascript.
-#
-# 2. { 'foo' => /bar/mix }.to_json # => "{foo: /bar/mix}"
-#    This isn't even valid Javascript.
-
+$DEBUG and warn "required json/add/rails which is obsolete now!"

data/lib/json/common.rb

@@ -1,5 +1,4 @@
 require 'json/version'
-require 'iconv'
 
 module JSON
   class << self
@@ -24,7 +23,7 @@ module JSON
     # Set the JSON parser class _parser_ to be used by JSON.
     def parser=(parser) # :nodoc:
       @parser = parser
-      remove_const :Parser if const_defined? :Parser
+      remove_const :Parser if JSON.const_defined_in?(self, :Parser)
       const_set :Parser, parser
     end
 
@@ -35,13 +34,13 @@ module JSON
     def deep_const_get(path) # :nodoc:
       path.to_s.split(/::/).inject(Object) do |p, c|
         case
-        when c.empty?             then p
-        when p.const_defined?(c)  then p.const_get(c)
+        when c.empty?                     then p
+        when JSON.const_defined_in?(p, c) then p.const_get(c)
         else
           begin
             p.const_missing(c)
-          rescue NameError
-            raise ArgumentError, "can't find const #{path}"
+          rescue NameError => e
+            raise ArgumentError, "can't get const #{path}: #{e}"
           end
         end
       end
@@ -49,6 +48,7 @@ module JSON
 
     # Set the module _generator_ to be used by JSON.
     def generator=(generator) # :nodoc:
+      old, $VERBOSE = $VERBOSE, nil
       @generator = generator
       generator_methods = generator::GeneratorMethods
       for const in generator_methods.constants
@@ -77,6 +77,8 @@ module JSON
         :object_nl      => "\n",
         :array_nl       => "\n"
       )
+    ensure
+      $VERBOSE = old
     end
 
     # Returns the JSON generator modul, that is used by JSON. This might be
@@ -338,9 +340,35 @@ module JSON
     raise ArgumentError, "exceed depth limit"
   end
 
+  # Swap consecutive bytes of _string_ in place.
+  def self.swap!(string) # :nodoc:
+    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
+
   # Shortuct for iconv.
-  def self.iconv(to, from, string)
-    Iconv.iconv(to, from, string).first
+  if ::String.method_defined?(:encode)
+    def self.iconv(to, from, string)
+      string.encode(to, from)
+    end
+  else
+    require 'iconv'
+    def self.iconv(to, from, string)
+      Iconv.iconv(to, from, string).first
+    end
+  end
+
+  if ::Object.method(:const_defined?).arity == 1
+    def self.const_defined_in?(modul, constant)
+      modul.const_defined?(constant)
+    end
+  else
+    def self.const_defined_in?(modul, constant)
+      modul.const_defined?(constant, false)
+    end
   end
 end
 

data/lib/json/editor.rb

@@ -2,7 +2,6 @@
 # requires ruby-gtk to be installed.
 
 require 'gtk2'
-require 'iconv'
 require 'json'
 require 'rbconfig'
 require 'open-uri'
@@ -1272,8 +1271,7 @@ module JSON
       def parse_json(json)
         check_pretty_printed(json)
         if @encoding && !/^utf8$/i.match(@encoding)
-          iconverter = Iconv.new('utf8', @encoding)
-          json = iconverter.iconv(json)
+          json = JSON.iconv 'utf-8', @encoding, json
         end
         JSON::parse(json, :max_nesting => false, :create_additions => false)
       end

data/lib/json/ext.rb

@@ -6,10 +6,10 @@ module JSON
   module Ext
     require 'json/ext/parser'
     require 'json/ext/generator'
-    $DEBUG and warn "Using c extension for JSON."
+    $DEBUG and warn "Using Ext extension for JSON."
     JSON.parser = Parser
     JSON.generator = Generator
   end
 
-  JSON_LOADED = true
+  JSON_LOADED = true unless defined?(::JSON::JSON_LOADED)
 end

data/lib/json/pure.rb

@@ -3,75 +3,13 @@ require 'json/pure/parser'
 require 'json/pure/generator'
 
 module JSON
-  begin
-    require 'iconv'
-    # An iconv instance to convert from UTF8 to UTF16 Big Endian.
-    UTF16toUTF8 = Iconv.new('utf-8', 'utf-16be') # :nodoc:
-    # An iconv instance to convert from UTF16 Big Endian to UTF8.
-    UTF8toUTF16 = Iconv.new('utf-16be', 'utf-8') # :nodoc:
-    UTF8toUTF16.iconv('no bom')
-  rescue LoadError
-    raise MissingUnicodeSupport,
-      "iconv couldn't be loaded, which is required for UTF-8/UTF-16 conversions"
-  rescue Errno::EINVAL, Iconv::InvalidEncoding
-    # Iconv doesn't support big endian utf-16. Let's try to hack this manually
-    # into the converters.
-    begin
-      old_verbose, $VERBSOSE = $VERBOSE, nil
-      # An iconv instance to convert from UTF8 to UTF16 Big Endian.
-      UTF16toUTF8 = Iconv.new('utf-8', 'utf-16') # :nodoc:
-      # An iconv instance to convert from UTF16 Big Endian to UTF8.
-      UTF8toUTF16 = Iconv.new('utf-16', 'utf-8') # :nodoc:
-      UTF8toUTF16.iconv('no bom')
-      if UTF8toUTF16.iconv("\xe2\x82\xac") == "\xac\x20"
-        swapper = Class.new do
-          def initialize(iconv) # :nodoc:
-            @iconv = iconv
-          end
-
-          def iconv(string) # :nodoc:
-            result = @iconv.iconv(string)
-            JSON.swap!(result)
-          end
-        end
-        UTF8toUTF16 = swapper.new(UTF8toUTF16) # :nodoc:
-      end
-      if UTF16toUTF8.iconv("\xac\x20") == "\xe2\x82\xac"
-        swapper = Class.new do
-          def initialize(iconv) # :nodoc:
-            @iconv = iconv
-          end
-
-          def iconv(string) # :nodoc:
-            string = JSON.swap!(string.dup)
-            @iconv.iconv(string)
-          end
-        end
-        UTF16toUTF8 = swapper.new(UTF16toUTF8) # :nodoc:
-      end
-    rescue Errno::EINVAL, Iconv::InvalidEncoding
-      raise MissingUnicodeSupport, "iconv doesn't seem to support UTF-8/UTF-16 conversions"
-    ensure
-      $VERBOSE = old_verbose
-    end
-  end
-
-  # Swap consecutive bytes of _string_ in place.
-  def self.swap!(string) # :nodoc:
-    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 module holds all the modules/classes that implement JSON's
   # functionality in pure ruby.
   module Pure
-    $DEBUG and warn "Using pure library for JSON."
+    $DEBUG and warn "Using Pure library for JSON."
     JSON.parser = Parser
     JSON.generator = Generator
   end
 
-  JSON_LOADED = true
+  JSON_LOADED = true unless defined?(::JSON::JSON_LOADED)
 end

data/lib/json/pure/generator.rb

@@ -62,12 +62,12 @@ module JSON
                       [\x80-\xc1\xf5-\xff]       # invalid
                     )/nx) { |c|
                       c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
-                      s = JSON::UTF8toUTF16.iconv(c).unpack('H*')[0]
+                      s = JSON.iconv('utf-16be', 'utf-8', c).unpack('H*')[0]
                       s.gsub!(/.{4}/n, '\\\\u\&')
                     }
       string.force_encoding(::Encoding::UTF_8)
       string
-    rescue Iconv::Failure => e
+    rescue => e
       raise GeneratorError, "Caught #{e.class}: #{e}"
     end
   else
@@ -86,11 +86,11 @@ module JSON
                       [\x80-\xc1\xf5-\xff]       # invalid
                     )/nx) { |c|
         c.size == 1 and raise GeneratorError, "invalid utf8 byte: '#{c}'"
-        s = JSON::UTF8toUTF16.iconv(c).unpack('H*')[0]
+        s = JSON.iconv('utf-16be', 'utf-8', c).unpack('H*')[0]
         s.gsub!(/.{4}/n, '\\\\u\&')
       }
       string
-    rescue Iconv::Failure => e
+    rescue => e
       raise GeneratorError, "Caught #{e.class}: #{e}"
     end
   end
@@ -106,11 +106,13 @@ module JSON
         # an unconfigured instance. If _opts_ is a State object, it is just
         # returned.
         def self.from_state(opts)
-          case opts
-          when self
+          case
+          when self === opts
             opts
-          when Hash
-            new(opts)
+          when opts.respond_to?(:to_hash)
+            new(opts.to_hash)
+          when opts.respond_to?(:to_h)
+            new(opts.to_h)
           else
             SAFE_STATE_PROTOTYPE.dup
           end

data/lib/json/pure/parser.rb

@@ -113,13 +113,13 @@ module JSON
         else
           @max_nesting = 0
         end
-        @allow_nan = !!opts[:allow_nan]
-        @symbolize_names = !!opts[:symbolize_names]
-        ca = true
-        ca = opts[:create_additions] if opts.key?(:create_additions)
-        @create_id = ca ? JSON.create_id : nil
-        @object_class = opts[:object_class] || Hash
-        @array_class = opts[:array_class] || Array
+        @allow_nan        = !!opts[:allow_nan]
+        @symbolize_names  = !!opts[:symbolize_names]
+        @create_additions = opts.key?(:create_additions) ? !!opts[:create_additions] : true
+        @create_id        = opts[:create_id] || JSON.create_id
+        @object_class     = opts[:object_class] || Hash
+        @array_class      = opts[:array_class] || Array
+        @match_string     = opts[:match_string]
       end
 
       alias source string
@@ -165,6 +165,11 @@ module JSON
         ?u  => nil, 
       })
 
+      EMPTY_8BIT_STRING = ''
+      if ::String.method_defined?(:encode)
+        EMPTY_8BIT_STRING.force_encoding Encoding::ASCII_8BIT 
+      end
+
       def parse_string
         if scan(STRING)
           return '' if self[1].empty?
@@ -172,24 +177,30 @@ module JSON
             if u = UNESCAPE_MAP[$&[1]]
               u
             else # \uXXXX
-              bytes = ''
+              bytes = EMPTY_8BIT_STRING.dup
               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)
                 i += 1
               end
-              JSON::UTF16toUTF8.iconv(bytes)
+              JSON.iconv('utf-8', 'utf-16be', bytes)
             end
           end
           if string.respond_to?(:force_encoding)
             string.force_encoding(::Encoding::UTF_8)
           end
+          if @create_additions and @match_string
+            for (regexp, klass) in @match_string
+              klass.json_creatable? or next
+              string =~ regexp and return klass.json_create(string)
+            end
+          end
           string
         else
           UNPARSED
         end
-      rescue Iconv::Failure => e
-        raise GeneratorError, "Caught #{e.class}: #{e}"
+      rescue => e
+        raise ParserError, "Caught #{e.class} at '#{peek(20)}': #{e}"
       end
 
       def parse_value
@@ -290,7 +301,7 @@ module JSON
             if delim
               raise ParserError, "expected next name, value pair in object at '#{peek(20)}'!"
             end
-            if @create_id and klassname = result[@create_id]
+            if @create_additions and klassname = result[@create_id]
               klass = JSON.deep_const_get klassname
               break unless klass and klass.json_creatable?
               result = klass.json_create(result)

data/lib/json/version.rb

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

data/tests/setup_variant.rb

@@ -0,0 +1,11 @@
+case ENV['JSON']
+when 'pure'
+  $:.unshift 'lib'
+  require 'json/pure'
+when 'ext'
+  $:.unshift 'ext', 'lib'
+  require 'json/ext'
+else
+  $:.unshift 'ext', 'lib'
+  require 'json'
+end

data/tests/test_json.rb

@@ -2,11 +2,7 @@
 # -*- coding: utf-8 -*-
 
 require 'test/unit'
-case ENV['JSON']
-when 'pure' then require 'json/pure'
-when 'ext'  then require 'json/ext'
-else             require 'json'
-end
+require File.join(File.dirname(__FILE__), 'setup_variant')
 require 'stringio'
 
 unless Array.method_defined?(:permutation)