json_pure 1.1.2 → 1.1.3

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

@@ -1,5 +1,3 @@
-/* vim: set cin et sw=4 ts=4: */
-
 #include "ruby.h"
 #include "re.h"
 #include "st.h"
@@ -75,7 +73,7 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
         VALUE v = Qnil;
         char *np = JSON_parse_value(json, fpc, pe, &v); 
         if (np == NULL) {
-            fbreak;
+            fhold; fbreak;
         } else {
             rb_hash_aset(*result, last_name, v);
             fexec np;
@@ -84,10 +82,10 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
 
     action parse_name {
         char *np = JSON_parse_string(json, fpc, pe, &last_name);
-        if (np == NULL) fbreak; else fexec np;
+        if (np == NULL) { fhold; fbreak; } else fexec np;
     }
 
-    action exit { fbreak; }
+    action exit { fhold; fbreak; }
 
     a_pair  = ignore* begin_name >parse_name
         ignore* name_separator ignore*
@@ -147,19 +145,19 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
         if (json->allow_nan) {
             *result = CNaN;
         } else {
-            rb_raise(eParserError, "unexpected token at '%s'", p - 2);
+            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 2);
         }
     }
     action parse_infinity {
         if (json->allow_nan) {
             *result = CInfinity;
         } else {
-            rb_raise(eParserError, "unexpected token at '%s'", p - 8);
+            rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p - 8);
         }
     }
     action parse_string {
         char *np = JSON_parse_string(json, fpc, pe, result);
-        if (np == NULL) fbreak; else fexec np;
+        if (np == NULL) { fhold; fbreak; } else fexec np;
     }
 
     action parse_number {
@@ -168,35 +166,35 @@ static char *JSON_parse_object(JSON_Parser *json, char *p, char *pe, VALUE *resu
             if (json->allow_nan) {
                 *result = CMinusInfinity;
                 fexec p + 10;
-                fbreak;
+                fhold; fbreak;
             } else {
-                rb_raise(eParserError, "unexpected token at '%s'", p);
+                rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
             }
         }
         np = JSON_parse_float(json, fpc, pe, result);
         if (np != NULL) fexec np;
         np = JSON_parse_integer(json, fpc, pe, result);
         if (np != NULL) fexec np;
-        fbreak;
+        fhold; fbreak;
     }
 
     action parse_array { 
         char *np;
-        json->current_nesting += 1;
+        json->current_nesting++;
         np = JSON_parse_array(json, fpc, pe, result);
-        json->current_nesting -= 1;
-        if (np == NULL) fbreak; else fexec np;
+        json->current_nesting--;
+        if (np == NULL) { fhold; fbreak; } else fexec np;
     }
 
     action parse_object { 
         char *np;
-        json->current_nesting += 1;
+        json->current_nesting++;
         np =  JSON_parse_object(json, fpc, pe, result);
-        json->current_nesting -= 1;
-        if (np == NULL) fbreak; else fexec np;
+        json->current_nesting--;
+        if (np == NULL) { fhold; fbreak; } else fexec np;
     }
 
-    action exit { fbreak; }
+    action exit { fhold; fbreak; }
 
 main := (
               Vnull @parse_null |
@@ -230,7 +228,7 @@ static char *JSON_parse_value(JSON_Parser *json, char *p, char *pe, VALUE *resul
 
     write data;
 
-    action exit { fbreak; }
+    action exit { fhold; fbreak; }
 
     main := '-'? ('0' | [1-9][0-9]*) (^[0-9] @exit);
 }%%
@@ -258,7 +256,7 @@ static char *JSON_parse_integer(JSON_Parser *json, char *p, char *pe, VALUE *res
 
     write data;
 
-    action exit { fbreak; }
+    action exit { fhold; fbreak; }
 
     main := '-'? (
               (('0' | [1-9][0-9]*) '.' [0-9]+ ([Ee] [+\-]?[0-9]+)?)
@@ -294,14 +292,14 @@ static char *JSON_parse_float(JSON_Parser *json, char *p, char *pe, VALUE *resul
         VALUE v = Qnil;
         char *np = JSON_parse_value(json, fpc, pe, &v); 
         if (np == NULL) {
-            fbreak;
+            fhold; fbreak;
         } else {
             rb_ary_push(*result, v);
             fexec np;
         }
     }
 
-    action exit { fbreak; }
+    action exit { fhold; fbreak; }
 
     next_element  = value_separator ignore* begin_value >parse_value;
 
@@ -326,7 +324,7 @@ static char *JSON_parse_array(JSON_Parser *json, char *p, char *pe, VALUE *resul
     if(cs >= JSON_array_first_final) {
         return p + 1;
     } else {
-        rb_raise(eParserError, "unexpected token at '%s'", p);
+        rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
     }
 }
 
@@ -394,10 +392,10 @@ static VALUE json_string_unescape(char *p, char *pe)
 
     action parse_string {
         *result = json_string_unescape(json->memo + 1, p);
-        if (NIL_P(*result)) fbreak; else fexec p + 1;
+        if (NIL_P(*result)) { fhold; fbreak; } else fexec p + 1;
     }
 
-    action exit { fbreak; }
+    action exit { fhold; fbreak; }
 
     main := '"' ((^(["\\] | 0..0x1f) | '\\'["\\/bfnrt] | '\\u'[0-9a-fA-F]{4} | '\\'^(["\\/bfnrtu]|0..0x1f))* %parse_string) '"' @exit;
 }%%
@@ -430,14 +428,14 @@ static char *JSON_parse_string(JSON_Parser *json, char *p, char *pe, VALUE *resu
         char *np;
         json->current_nesting = 1;
         np = JSON_parse_object(json, fpc, pe, &result);
-        if (np == NULL) fbreak; else fexec np;
+        if (np == NULL) { fhold; fbreak; } else fexec np;
     }
 
     action parse_array {
         char *np;
         json->current_nesting = 1;
         np = JSON_parse_array(json, fpc, pe, &result);
-        if (np == NULL) fbreak; else fexec np;
+        if (np == NULL) { fhold; fbreak; } else fexec np;
     }
 
     main := ignore* (
@@ -573,7 +571,7 @@ static VALUE cParser_parse(VALUE self)
     if (cs >= JSON_first_final && p == pe) {
         return result;
     } else {
-        rb_raise(eParserError, "unexpected token at '%s'", p);
+        rb_raise(eParserError, "%u: unexpected token at '%s'", __LINE__, p);
     }
 }
 
@@ -615,6 +613,7 @@ static VALUE cParser_source(VALUE self)
 
 void Init_parser()
 {
+    rb_require("json/common");
     mJSON = rb_define_module("JSON");
     mExt = rb_define_module_under(mJSON, "Ext");
     cParser = rb_define_class_under(mExt, "Parser", rb_cObject);

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

@@ -1,5 +1,3 @@
-/* vim: set cin et sw=4 ts=4: */
-
 #include "unicode.h"
 
 /*

data/lib/json/add/core.rb

@@ -9,14 +9,21 @@ require 'date'
 
 class Time
   def self.json_create(object)
-    at(*object.values_at('s', 'u'))
+    if usec = object.delete('u') # used to be tv_usec -> tv_nsec
+      object['n'] = usec * 1000
+    end
+    if respond_to?(:tv_nsec)
+      at(*object.values_at('s', 'n'))
+    else
+      at(object['s'], object['n'] / 1000)
+    end
   end
 
   def to_json(*args)
     {
       'json_class' => self.class.name,
       's' => tv_sec,
-      'u' => tv_usec,
+      'n' => respond_to?(:tv_nsec) ? tv_nsec : tv_usec * 1000
     }.to_json(*args)
   end
 end
@@ -26,13 +33,15 @@ class Date
     civil(*object.values_at('y', 'm', 'd', 'sg'))
   end
 
+  alias start sg unless method_defined?(:start)
+
   def to_json(*args)
     {
       'json_class' => self.class.name,
       'y' => year,
       'm' => month,
       'd' => day,
-      'sg' => sg,
+      'sg' => start,
     }.to_json(*args)
   end
 end
@@ -41,11 +50,17 @@ class DateTime
   def self.json_create(object)
     args = object.values_at('y', 'm', 'd', 'H', 'M', 'S')
     of_a, of_b = object['of'].split('/')
-    args << Rational(of_a.to_i, of_b.to_i)
+    if of_b and of_b != '0'
+      args << Rational(of_a.to_i, of_b.to_i)
+    else
+      args << of_a
+    end
     args << object['sg']
     civil(*args)
   end
 
+  alias start sg unless method_defined?(:start)
+
   def to_json(*args)
     {
       'json_class' => self.class.name,
@@ -56,7 +71,7 @@ class DateTime
       'M' => min,
       'S' => sec,
       'of' => offset.to_s,
-      'sg' => sg,
+      'sg' => start,
     }.to_json(*args)
   end
 end

data/lib/json/common.rb

@@ -2,7 +2,7 @@ require 'json/version'
 
 module JSON
   class << self
-    # If _object_ is string like parse the string and return the parsed result
+    # If _object_ is string-like parse the string and return the parsed result
     # as a Ruby data structure. Otherwise generate a JSON text from the Ruby
     # data structure object and return it.
     #
@@ -184,7 +184,8 @@ module JSON
   end
 
   # :stopdoc:
-  # I want to deprecate these later, so I'll first be silent about them, and later delete them.
+  # I want to deprecate these later, so I'll first be silent about them, and
+  # later delete them.
   alias unparse generate
   module_function :unparse
   # :startdoc:
@@ -238,7 +239,7 @@ module JSON
   # :startdoc:
 
   # Load a ruby data structure from a JSON _source_ and return it. A source can
-  # either be a string like object, an IO like object, or an object responding
+  # either be a string-like object, an IO like object, or an object responding
   # to the read method. If _proc_ was given, it will be called with any nested
   # Ruby object as an argument recursively in depth first order.
   #
@@ -327,7 +328,7 @@ module ::Kernel
     nil
   end
 
-  # If _object_ is string like parse the string and return the parsed result as
+  # If _object_ is string-like parse the string and return the parsed result as
   # a Ruby data structure. Otherwise generate a JSON text from the Ruby data
   # structure object and return it.
   #
@@ -351,4 +352,3 @@ class ::Class
     respond_to?(:json_create)
   end
 end
-  # vim: set et sw=2 ts=2:

data/lib/json/editor.rb

@@ -1360,4 +1360,3 @@ module JSON
     end
   end
 end
-  # vim: set et sw=2 ts=2:

data/lib/json/pure/generator.rb

@@ -40,7 +40,7 @@ module JSON
   # Convert a UTF8 encoded Ruby string _string_ to a JSON string, encoded with
   # UTF16 big endian characters as \u????, and return it.
   def utf8_to_json(string) # :nodoc:
-    string = string.gsub(/["\\\/\x0-\x1f]/) { |c| MAP[c] }
+    string = string.gsub(/["\\\/\x0-\x1f]/) { MAP[$&] }
     string.gsub!(/(
                     (?:
                       [\xc2-\xdf][\x80-\xbf]    |

data/lib/json/pure/parser.rb

@@ -123,7 +123,7 @@ module JSON
         if scan(STRING)
           return '' if self[1].empty?
           self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n) do |c|
-            if u = UNESCAPE_MAP[c[1]]
+            if u = UNESCAPE_MAP[$&[1]]
               u
             else # \uXXXX
               bytes = ''

data/lib/json/version.rb

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

data/tests/runner.rb

@@ -23,4 +23,3 @@ class TS_AllTests
   end
 end
 Test::Unit::UI::Console::TestRunner.run(TS_AllTests)
-  # vim: set et sw=2 ts=2:

data/tests/test_json.rb

@@ -291,4 +291,3 @@ EOT
     assert_equal too_deep, output.string
   end
 end
-  # vim: set et sw=2 ts=2:

data/tests/test_json_addition.rb

@@ -31,6 +31,10 @@ class TC_JSONAddition < Test::Unit::TestCase
   end
 
   class B
+    def self.json_creatable?
+      false
+    end
+
     def to_json(*args)
       {
         'json_class'  => self.class.name,
@@ -78,14 +82,14 @@ class TC_JSONAddition < Test::Unit::TestCase
     )
   end
 
-  def test_extended_json_fail
+  def test_extended_json_fail1
     b = B.new
     assert !B.json_creatable?
     json = generate(b)
-    assert_equal({ 'json_class' => B.name }, JSON.parse(json))
+    assert_equal({ "json_class"=>"TC_JSONAddition::B" }, JSON.parse(json))
   end
 
-  def test_extended_json_fail
+  def test_extended_json_fail2
     c = C.new
     assert !C.json_creatable?
     json = generate(c)
@@ -112,6 +116,8 @@ EOT
     assert_equal raw, raw_again
   end
 
+  MyJsonStruct = Struct.new 'MyJsonStruct', :foo, :bar
+
   def test_core
     t = Time.now
     assert_equal t, JSON(JSON(t))
@@ -123,8 +129,7 @@ EOT
     assert_equal 1...10, JSON(JSON(1...10))
     assert_equal "a".."c", JSON(JSON("a".."c"))
     assert_equal "a"..."c", JSON(JSON("a"..."c"))
-    struct = Struct.new 'MyStruct', :foo, :bar
-    s = struct.new 4711, 'foot'
+    s = MyJsonStruct.new 4711, 'foot'
     assert_equal s, JSON(JSON(s))
     struct = Struct.new :foo, :bar
     s = struct.new 4711, 'foot'
@@ -138,7 +143,19 @@ EOT
       assert_equal e.message, e_again.message
       assert_equal e.backtrace, e_again.backtrace
     end
-    assert_equal /foo/, JSON(JSON(/foo/))
-    assert_equal /foo/i, JSON(JSON(/foo/i))
+    assert_equal(/foo/, JSON(JSON(/foo/)))
+    assert_equal(/foo/i, JSON(JSON(/foo/i)))
+  end
+
+  def test_utc_datetime
+    now = Time.now
+    d = DateTime.parse(now.to_s)                    # usual case
+    assert d, JSON.parse(d.to_json)
+    d = DateTime.parse(now.utc.to_s)                # of = 0
+    assert d, JSON.parse(d.to_json)
+    d = DateTime.civil(2008, 6, 17, 11, 48, 32, 1)  # of = 1 / 12 => 1/12
+    assert d, JSON.parse(d.to_json)
+    d = DateTime.civil(2008, 6, 17, 11, 48, 32, 12) # of = 12 / 12 => 12
+    assert d, JSON.parse(d.to_json)
   end
 end

data/tests/test_json_rails.rb

@@ -31,6 +31,10 @@ class TC_JSONRails < Test::Unit::TestCase
   end
 
   class B
+    def self.json_creatable?
+      false
+    end
+
     def to_json(*args)
       {
         'json_class'  => self.class.name,
@@ -74,14 +78,14 @@ class TC_JSONRails < Test::Unit::TestCase
     )
   end
 
-  def test_extended_json_fail
+  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_fail
+  def test_extended_json_fail2
     c = C.new # with rails addition all objects are theoretically creatable
     assert C.json_creatable?
     json = generate(c)

data/tools/fuzz.rb

@@ -1,6 +1,14 @@
 $KCODE='UTF8'
 require 'json'
 
+require 'iconv'
+ISO_8859_1_TO_UTF8 = Iconv.new('utf-8', 'iso-8859-15')
+class ::String
+  def to_utf8
+    ISO_8859_1_TO_UTF8.iconv self
+  end
+end
+
 class Fuzzer
   def initialize(n, freqs = {})
     sum = freqs.inject(0.0) { |s, x| s + x.last }
@@ -12,13 +20,13 @@ class Fuzzer
     end
     @freqs = freqs
     @n = n
-    @alpha = (0..0x7f).to_a
+    @alpha = (0..0xff).to_a
   end
 
   def random_string
     s = ''
     30.times { s << @alpha[rand(@alpha.size)] }
-    s
+    s.to_utf8
   end
 
   def pick

metadata

@@ -1,33 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: json_pure
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
-date: 2007-11-27 00:00:00 +01:00
-summary: A JSON implementation in Ruby
-require_paths: 
-- lib
-email: flori@ping.de
-homepage: http://json.rubyforge.org
-rubyforge_project: json
-description: ""
-autorequire: 
-default_executable: edit_json.rb
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.1.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Florian Frank
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-07-11 00:00:00 +02:00
+default_executable: edit_json.rb
+dependencies: []
+
+description: ""
+email: flori@ping.de
+executables: 
+- edit_json.rb
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - install.rb
 - lib
@@ -130,21 +123,35 @@ files:
 - tools
 - tools/fuzz.rb
 - tools/server.rb
-test_files: 
-- tests/runner.rb
+has_rdoc: true
+homepage: http://json.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - --title
 - JSON -- A JSON implemention
 - --main
 - JSON
 - --line-numbers
-extra_rdoc_files: []
-
-executables: 
-- edit_json.rb
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: json
+rubygems_version: 1.1.1
+signing_key: 
+specification_version: 2
+summary: A JSON implementation in Ruby
+test_files: 
+- tests/runner.rb