json_pure 1.4.6 → 1.5.0

data/tests/test_json_addition.rb

@@ -2,12 +2,8 @@
 # -*- 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 'json/add/core'
+require File.join(File.dirname(__FILE__), 'setup_variant')
+load 'json/add/core.rb'
 require 'date'
 
 class TC_JSONAddition < Test::Unit::TestCase
@@ -36,6 +32,15 @@ class TC_JSONAddition < Test::Unit::TestCase
     end
   end
 
+  class A2 < A
+    def to_json(*args)
+      {
+        'json_class'  => self.class.name,
+        'args'        => [ @a ],
+      }.to_json(*args)
+    end
+  end
+
   class B
     def self.json_creatable?
       false
@@ -110,9 +115,9 @@ class TC_JSONAddition < Test::Unit::TestCase
     json_raw_object = raw.to_json_raw_object
     hash = { 'json_class' => 'String', 'raw'=> raw_array }
     assert_equal hash, json_raw_object
-    assert_match /\A\{.*\}\Z/, json
-    assert_match /"json_class":"String"/, json
-    assert_match /"raw":\[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255\]/, json
+    assert_match(/\A\{.*\}\Z/, json)
+    assert_match(/"json_class":"String"/, json)
+    assert_match(/"raw":\[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255\]/, json)
     raw_again = JSON.parse(json)
     assert_equal raw, raw_again
   end

data/tests/test_json_encoding.rb

@@ -2,12 +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 'iconv'
+require File.join(File.dirname(__FILE__), 'setup_variant')
 
 class TC_JSONEncoding < Test::Unit::TestCase
   include JSON
@@ -15,19 +10,21 @@ class TC_JSONEncoding < Test::Unit::TestCase
   def setup
     @utf_8 = '["© ≠ €!"]'
     @parsed = [ "© ≠ €!" ]
-    @utf_16_data = Iconv.iconv('utf-16be', 'utf-8', @parsed.first)
     @generated = '["\u00a9 \u2260 \u20ac!"]'
-    if defined?(::Encoding)
+    if String.method_defined?(:encode)
+      @utf_16_data = [@parsed.first.encode('utf-16be', 'utf-8')]
       @utf_8_ascii_8bit = @utf_8.dup.force_encoding(Encoding::ASCII_8BIT)
-      @utf_16be, = Iconv.iconv('utf-16be', 'utf-8', @utf_8)
+      @utf_16be = @utf_8.encode('utf-16be', 'utf-8')
       @utf_16be_ascii_8bit = @utf_16be.dup.force_encoding(Encoding::ASCII_8BIT)
-      @utf_16le, = Iconv.iconv('utf-16le', 'utf-8', @utf_8)
+      @utf_16le = @utf_8.encode('utf-16le', 'utf-8')
       @utf_16le_ascii_8bit = @utf_16le.dup.force_encoding(Encoding::ASCII_8BIT)
-      @utf_32be, = Iconv.iconv('utf-32be', 'utf-8', @utf_8)
+      @utf_32be = @utf_8.encode('utf-32be', 'utf-8')
       @utf_32be_ascii_8bit = @utf_32be.dup.force_encoding(Encoding::ASCII_8BIT)
-      @utf_32le, = Iconv.iconv('utf-32le', 'utf-8', @utf_8)
+      @utf_32le = @utf_8.encode('utf-32le', 'utf-8')
       @utf_32le_ascii_8bit = @utf_32le.dup.force_encoding(Encoding::ASCII_8BIT)
     else
+      require 'iconv'
+      @utf_16_data = Iconv.iconv('utf-16be', 'utf-8', @parsed.first)
       @utf_8_ascii_8bit = @utf_8.dup
       @utf_16be, = Iconv.iconv('utf-16be', 'utf-8', @utf_8)
       @utf_16be_ascii_8bit = @utf_16be.dup

data/tests/test_json_fixtures.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')
 
 class TC_JSONFixtures < Test::Unit::TestCase
   def setup
@@ -18,15 +14,20 @@ class TC_JSONFixtures < Test::Unit::TestCase
 
   def test_passing
     for name, source in @passed
-      assert JSON.parse(source),
-        "Did not pass for fixture '#{name}'"
+      begin
+        assert JSON.parse(source),
+          "Did not pass for fixture '#{name}': #{source.inspect}"
+      rescue => e
+        warn "\nCaught #{e.class}(#{e}) for fixture '#{name}': #{source.inspect}\n#{e.backtrace * "\n"}"
+        raise e
+      end
     end
   end
 
   def test_failing
     for name, source in @failed
       assert_raises(JSON::ParserError, JSON::NestingError,
-        "Did not fail for fixture '#{name}'") do
+        "Did not fail for fixture '#{name}': #{source.inspect}") do
         JSON.parse(source)
       end
     end

data/tests/test_json_generate.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')
 
 class TC_JSONGenerate < Test::Unit::TestCase
   include JSON
@@ -84,6 +80,8 @@ EOT
     assert_raise(GeneratorError) { fast_generate(666) }
   end
 
+
+
   def test_states
     json = generate({1=>2}, nil)
     assert_equal('{"1":2}', json)

data/tests/test_json_string_matching.rb

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+
+require 'test/unit'
+require File.join(File.dirname(__FILE__), 'setup_variant')
+require 'stringio'
+require 'time'
+
+class TestJsonStringMatching < Test::Unit::TestCase
+  include JSON
+
+  class TestTime < ::Time
+    def self.json_create(string)
+      Time.parse(string)
+    end
+
+    def to_json(*)
+      %{"#{strftime('%FT%T%z')}"}
+    end
+
+    def ==(other)
+      to_i == other.to_i
+    end
+  end
+
+  def test_match_date
+    t = TestTime.new
+    t_json = [ t ].to_json
+    assert_equal [ t ],
+      JSON.parse(t_json,
+        :match_string => { /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\Z/ => TestTime })
+    assert_equal [ t.strftime('%FT%T%z') ],
+      JSON.parse(t_json,
+        :match_string => { /\A\d{3}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\Z/ => TestTime })
+    assert_equal [ t.strftime('%FT%T%z') ],
+      JSON.parse(t_json,
+        :match_string => { /\A\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}[+-]\d{4}\Z/ => TestTime },
+        :create_additions => false)
+  end
+end

data/tests/test_json_unicode.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')
 
 class TC_JSONUnicode < Test::Unit::TestCase
   include JSON

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: json_pure
 version: !ruby/object:Gem::Version 
-  version: 1.4.6
+  hash: 3
+  prerelease: false
+  segments: 
+  - 1
+  - 5
+  - 0
+  version: 1.5.0
 platform: ruby
 authors: 
 - Florian Frank
@@ -9,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 +02:00
+date: 2011-01-22 00:00:00 +01:00
 default_executable: edit_json.rb
 dependencies: []
 
@@ -75,8 +81,25 @@ files:
 - ext/json/ext/parser/parser.h
 - ext/json/ext/parser/parser.c
 - Rakefile
+- README-json-jruby.markdown
 - tools/fuzz.rb
 - tools/server.rb
+- java/src/json/ext/Parser.rl
+- java/src/json/ext/StringDecoder.java
+- java/src/json/ext/GeneratorMethods.java
+- java/src/json/ext/StringEncoder.java
+- java/src/json/ext/Generator.java
+- java/src/json/ext/GeneratorService.java
+- java/src/json/ext/Utils.java
+- java/src/json/ext/ByteListTranscoder.java
+- java/src/json/ext/RuntimeInfo.java
+- java/src/json/ext/ParserService.java
+- java/src/json/ext/OptionsReader.java
+- java/src/json/ext/GeneratorState.java
+- java/src/json/ext/Parser.java
+- java/lib/bytelist-1.0.6.jar
+- java/lib/jcodings.jar
+- COPYING-json-jruby
 - lib/json.rb
 - lib/json/json.xpm
 - lib/json/Key.xpm
@@ -132,13 +155,22 @@ files:
 - tests/fixtures/fail27.json
 - tests/fixtures/fail10.json
 - tests/fixtures/fail23.json
-- tests/test_json_rails.rb
 - tests/test_json.rb
+- tests/test_json_string_matching.rb
 - tests/test_json_generate.rb
 - tests/test_json_unicode.rb
+- tests/setup_variant.rb
 - tests/test_json_fixtures.rb
 - COPYING
+- json-java.gemspec
 - install.rb
+- ./tests/test_json_encoding.rb
+- ./tests/test_json_addition.rb
+- ./tests/test_json.rb
+- ./tests/test_json_string_matching.rb
+- ./tests/test_json_generate.rb
+- ./tests/test_json_unicode.rb
+- ./tests/test_json_fixtures.rb
 has_rdoc: true
 homepage: http://flori.github.com/json
 licenses: []
@@ -152,29 +184,35 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: json
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: JSON Implementation for Ruby
 test_files: 
-- tests/test_json_encoding.rb
-- tests/test_json_addition.rb
-- tests/test_json_rails.rb
-- tests/test_json.rb
-- tests/test_json_generate.rb
-- tests/test_json_unicode.rb
-- tests/test_json_fixtures.rb
+- ./tests/test_json_encoding.rb
+- ./tests/test_json_addition.rb
+- ./tests/test_json.rb
+- ./tests/test_json_string_matching.rb
+- ./tests/test_json_generate.rb
+- ./tests/test_json_unicode.rb
+- ./tests/test_json_fixtures.rb

data/tests/test_json_rails.rb

@@ -1,144 +0,0 @@
-#!/usr/bin/env ruby
-# -*- 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 'json/add/rails'
-require 'date'
-
-class TC_JSONRails < Test::Unit::TestCase
-  include JSON
-
-  class A
-    def initialize(a)
-      @a = a
-    end
-
-    attr_reader :a
-
-    def ==(other)
-      a == other.a
-    end
-    
-    def self.json_create(object)
-      new(*object['args'])
-    end
-
-    def to_json(*args)
-      {
-        'json_class'  => self.class.name,
-        'args'        => [ @a ],
-      }.to_json(*args)
-    end
-  end
-
-  class B
-    def self.json_creatable?
-      false
-    end
-
-    def to_json(*args)
-      {
-        'json_class'  => self.class.name,
-      }.to_json(*args)
-    end
-  end
-
-  class C
-    def to_json(*args)
-      {
-        'json_class'  => 'TC_JSONRails::Nix',
-      }.to_json(*args)
-    end
-  end
-
-  class D
-    def initialize
-      @foo = 666
-    end
-
-    attr_reader :foo
-
-    def ==(other)
-      foo == other.foo
-    end
-  end
-
-  def test_extended_json
-    a = A.new(666)
-    assert A.json_creatable?
-    assert_equal 666, a.a
-    json = generate(a)
-    a_again = JSON.parse(json)
-    assert_kind_of a.class, a_again
-    assert_equal a, a_again
-    assert_equal 666, a_again.a
-  end
-
-  def test_extended_json_generic_object
-    d = D.new
-    assert D.json_creatable?
-    assert_equal 666, d.foo
-    json = generate(d)
-    d_again = JSON.parse(json)
-    assert_kind_of d.class, d_again
-    assert_equal d, d_again
-    assert_equal 666, d_again.foo
-  end
-
-  def test_extended_json_disabled
-    a = A.new(666)
-    assert A.json_creatable?
-    json = generate(a)
-    a_again = JSON.parse(json, :create_additions => true)
-    assert_kind_of a.class, a_again
-    assert_equal a, a_again
-    a_hash = JSON.parse(json, :create_additions => false)
-    assert_kind_of Hash, a_hash
-    assert_equal(
-      {"args"=>[666], "json_class"=>"TC_JSONRails::A"}.sort_by { |k,| k },
-      a_hash.sort_by { |k,| k }
-    )
-  end
-
-  def test_extended_json_fail1
-    b = B.new
-    assert !B.json_creatable?
-    json = generate(b)
-    assert_equal({ 'json_class' => B.name }, JSON.parse(json))
-  end
-
-  def test_extended_json_fail2
-    c = C.new # with rails addition all objects are theoretically creatable
-    assert C.json_creatable?
-    json = generate(c)
-    assert_raises(ArgumentError, NameError) { JSON.parse(json) }
-  end
-
-  def test_raw_strings
-    raw = ''
-    raw.respond_to?(:encode!) and raw.encode!(Encoding::ASCII_8BIT)
-    raw_array = []
-    for i in 0..255
-      raw << i
-      raw_array << i
-    end
-    json = raw.to_json_raw
-    json_raw_object = raw.to_json_raw_object
-    hash = { 'json_class' => 'String', 'raw'=> raw_array }
-    assert_equal hash, json_raw_object
-    assert_match /\A\{.*\}\Z/, json
-    assert_match /"json_class":"String"/, json
-    assert_match /"raw":\[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,101,102,103,104,105,106,107,108,109,110,111,112,113,114,115,116,117,118,119,120,121,122,123,124,125,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255\]/, json
-    raw_again = JSON.parse(json)
-    assert_equal raw, raw_again
-  end
-
-  def test_symbol
-    assert_equal '"foo"', :foo.to_json #  we don't want an object here
-  end
-end