json-jruby 1.1.2-universal-java-1.5 → 1.1.3-universal-java-1.5

data/lib/json/add/core.rb

@@ -33,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
@@ -48,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,
@@ -63,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/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 'MyJsonStruct', :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)

metadata

@@ -1,11 +1,13 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 extensions: []
+
 homepage: http://rubyforge.org/projects/json-jruby/
 executables: []
-version: !ruby/object:Gem::Version
-  version: 1.1.2
+
+version: !ruby/object:Gem::Version 
+  version: 1.1.3
 post_install_message: 
-date: 2008-04-06 03:00:00 +00:00
+date: 2009-01-04 02:00:00 +00:00
 files: 
 - lib/json.rb
 - lib/json
@@ -61,39 +63,44 @@ files:
 - tests/fixtures/fail28.json
 - tests/fixtures/pass2.json
 - tests/fixtures/pass16.json
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1
 rdoc_options: []
+
 signing_key: 
 cert_chain: []
+
 name: json-jruby
 has_rdoc: false
 platform: universal-java-1.5
 summary: A JSON implementation as a JRuby extension
 default_executable: 
 bindir: bin
-required_rubygems_version: !ruby/object:Gem::Requirement
+required_rubygems_version: !ruby/object:Gem::Requirement 
   version: 
   requirements: 
   - - '>='
-    - !ruby/object:Gem::Version
-      version: !str 0
-required_ruby_version: !ruby/object:Gem::Requirement
+    - !ruby/object:Gem::Version 
+      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement 
   version: 
   requirements: 
   - - '>='
-    - !ruby/object:Gem::Version
-      version: !str 0
+    - !ruby/object:Gem::Version 
+      version: "0"
 require_paths: 
 - lib
 specification_version: 2
 test_files: 
 - tests/runner.rb
 dependencies: []
+
 description: 
-email: mernen@gmail.com
+email: mernen+rubyforge@gmail.com
 authors: 
 - Daniel Luz
 extra_rdoc_files: []
+
 requirements: []
+
 rubyforge_project: json-jruby
 autorequire: