ruby-json 1.1.1 → 1.1.2

data/README

@@ -13,4 +13,6 @@ library.
 
 Thanks to Adam Kramer for some serious changes for the better.
 
-$Id: README,v 1.2 2005/01/28 02:46:22 didosevilla Exp $
+2006/02/08 Incorporates changes by Tim Myrtle 
+
+$Id: README,v 1.3 2006/02/08 20:02:22 tmyrtle Exp $

data/{lib/json → json}/lexer.rb

@@ -22,12 +22,15 @@
 # Some bugs fixed by Adam Kramer (mailto:adam@the-kramers.net)
 # Copyright:: Copyright (c) 2003,2005 Rafael R. Sevilla
 # License:: GNU Lesser General Public License
-# $Id: lexer.rb,v 1.7 2005/01/28 02:42:10 didosevilla Exp $
+# $Id: lexer.rb,v 1.8 2006/02/09 18:14:20 tmyrtle Exp $
 #
 require 'json/objects'
 require 'cgi'
 
 module JSON
+
+  VERSION = '1.1.2'
+  
   class Lexer
     # This method will initialize the lexer to contain a string.
     # =====Parameters

data/{lib/json → json}/objects.rb

@@ -22,7 +22,7 @@
 # Heavily modified by Adam Kramer (mailto:adam@the-kramers.net)
 # Copyright:: Copyright (c) 2003,2005 Rafael R. Sevilla
 # License:: GNU Lesser General Public License
-# $Id: objects.rb,v 1.1 2005/01/28 02:08:45 didosevilla Exp $
+# $Id: objects.rb,v 1.2 2006/02/08 20:02:23 tmyrtle Exp $
 #
 
 
@@ -70,7 +70,7 @@ class String
 	|b|
 	c = b.chr
 	case c
-	when /\\|\">/
+	when /\\|\"|\//
 	  newstr << "\\" + c
 	when "\b"
 	  newstr << "\\b"
@@ -122,7 +122,7 @@ class Array
     # +lexer+:: Lexer object to use
     def from_json(lexer)
       raise "A JSON Array must begin with '['" if (lexer.nextclean != "[")
-      return if lexer.nextclean == ']'
+      return (self) if lexer.nextclean == ']'
       lexer.back
       loop {
 	self << lexer.nextvalue
@@ -177,7 +177,7 @@ class Hash
 	when '\0'
 	  raise "A JSON Object must end with '}'"
 	when '}'
-	  return;
+	  return (self);
 	else
 	  lexer.back
 	  key = lexer.nextvalue().to_s()

data/rakefile

@@ -0,0 +1,61 @@
+require 'rubygems'
+require 'rake'
+require 'rake/testtask'
+require 'rake/rdoctask'
+require 'rake/packagetask'
+require 'rake/gempackagetask'
+
+require 'json/lexer'
+
+PKG_NAME      = 'ruby-json'
+PKG_VERSION   = JSON::VERSION
+PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
+
+desc "Default Task"
+task :default => [ :clean, :test ]
+
+desc "Clean up directory"
+task :clean do
+  rm_rf 'pkg'
+  rm_rf 'doc'
+end
+
+# Run the unit tests
+Rake::TestTask.new { |t|
+  t.libs << "test"
+  t.pattern = 'test/*test.rb'
+  t.verbose = true
+}
+
+# Genereate the RDoc documentation
+Rake::RDocTask.new { |rdoc|
+  rdoc.rdoc_dir = 'doc'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('json/*.rb')
+}
+
+# Create compressed packages
+spec = Gem::Specification.new do |s|
+  s.platform = Gem::Platform::RUBY
+  
+  s.name = PKG_NAME
+  s.summary = "ruby-json is a library for using JavaScript Object Notation (JSON) under Ruby."
+  s.description = "ruby-json is a library able to serialize and deserialize Ruby objects to and from their JSON representation."
+  s.version = PKG_VERSION
+
+  s.author   = "Rafael R. Sevilla"
+  s.email    = "dido@imperium.ph"
+  s.homepage = "http://sourceforge.net/projects/json"
+
+  s.has_rdoc = true
+  s.require_path = '.'
+  s.autorequire = 'json/lexer'
+
+  s.files = Dir.glob("**/*").delete_if { |item| item.include?("CVS") }
+end
+
+Rake::GemPackageTask.new(spec) do |p|
+  p.gem_spec = spec
+  p.need_tar = true
+end
+

data/test/objtest.rb

@@ -21,7 +21,7 @@
 # Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
 # Copyright:: Copyright (c) 2003 Rafael R. Sevilla
 # License:: GNU Lesser General Public License
-# $Id: objtest.rb,v 1.2 2005/01/28 02:59:30 didosevilla Exp $
+# $Id: objtest.rb,v 1.3 2006/02/08 20:02:22 tmyrtle Exp $
 #
 
 require 'test/unit'
@@ -42,4 +42,165 @@ class ObjectTest < Test::Unit::TestCase
     assert(sobj['xyz'] == 1, "error in serialization of a FixNum to JSON")
     assert(sobj['euler'] == 0.577215665, "error in serialization of a float to JSON")
   end
+
+
+  def test_to_json_string
+    obj = { "key"=>"value" }
+    str = obj.to_json
+    assert(str == '{"key":"value"}', "basic serialization")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization")
+
+    obj = { "key"=>'"' }
+    str = obj.to_json
+    assert(str == '{"key":"\""}', "basic serialization-quote")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-quote")
+
+    obj = { "key"=>'/' }
+    str = obj.to_json
+    assert(str == '{"key":"\/"}', "basic serialization-solidus")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-solidus")
+
+    obj = { "key"=>'\\' }
+    str = obj.to_json
+    assert(str == '{"key":"\\\\"}', "basic serialization-reverse solidus")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-reverse solidus")
+
+    obj = { "key"=>"\b" }
+    str = obj.to_json
+    assert(str == '{"key":"\b"}', "basic serialization-backspace")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic serialization-backspace")
+
+    obj = { "key"=>"\f" }
+    str = obj.to_json
+    assert(str == '{"key":"\f"}', "basic serialization-formfeed")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-formfeed")
+
+    obj = { "key"=>"\n" }
+    str = obj.to_json
+    assert(str == '{"key":"\n"}', "basic serialization-newline")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-newline")
+
+    obj = { "key"=>"\r" }
+    str = obj.to_json
+    assert(str == '{"key":"\r"}', "basic serialization-carriage return")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-carriage return")
+
+    obj = { "key"=>"\t" }
+    str = obj.to_json
+    assert(str == '{"key":"\t"}', "basic serialization-horizontal tab")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-horizontal tab")
+  end
+
+
+  def test_to_json_number
+    obj = { "key"=>125 }
+    str = obj.to_json
+    assert(str == '{"key":125}', "basic serialization-integer")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-integer")
+
+    obj = { "key"=>-125 }
+    str = obj.to_json
+    assert(str == '{"key":-125}', "basic serialization-negative integer")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-negative integer")
+
+    obj = { "key"=>125.27 }
+    str = obj.to_json
+    assert(str == '{"key":125.27}', "basic serialization-float")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-float")
+
+    obj = { "key"=>-125.27 }
+    str = obj.to_json
+    assert(str == '{"key":-125.27}', "basic serialization-negative float")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-negative float")
+  end
+
+
+  def test_to_json_bool
+    obj = { "key"=>true }
+    str = obj.to_json
+    assert(str == '{"key":true}', "basic serialization-true")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-true")
+
+    obj = { "key"=>false }
+    str = obj.to_json
+    assert(str == '{"key":false}', "basic serialization-false")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-false")
+  end
+
+
+  def test_to_json_null
+    obj = { "key"=>nil }
+    str = obj.to_json
+    assert(str == '{"key":null}', "basic serialization-null")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-null")
+  end
+
+
+  def test_to_json_empty
+    obj = { "key"=>[] }
+    str = obj.to_json
+    assert(str == '{"key":[]}', "basic serialization-empty array")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"].class==Array, "basic deserialization-empty array1")
+    assert(sobj["key"].length==0, "basic deserialization-empty array2")
+
+    obj = { "key"=>{} }
+    str = obj.to_json
+    assert(str == '{"key":{}}', "basic serialization-empty hash")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"].class==Hash, "basic deserialization-empty hash1")
+    assert(sobj["key"].length==0, "basic deserialization-empty hash2")
+
+    obj = { "key"=>"" }
+    str = obj.to_json
+    assert(str == '{"key":""}', "basic serialization-empty string")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-empty string")
+  end
+
+
+  def test_to_json_subobject
+    obj = { "key"=>{ "key"=>"value" } }
+    str = obj.to_json
+    assert(str == '{"key":{"key":"value"}}', "basic serialization-subobject hash")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-subobject hash")
+
+    obj = { "key"=>[1,2,3] }
+    str = obj.to_json
+    assert(str == '{"key":[1,2,3]}', "basic serialization-subobject array")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-subobject array")
+
+    obj = { "key"=>[1,2,[4,5]] }
+    str = obj.to_json
+    assert(str == '{"key":[1,2,[4,5]]}', "basic serialization-subobject array")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-subobject array")
+
+    obj = { "key"=>[1,2,{"key"=>"value"}] }
+    str = obj.to_json
+    assert(str == '{"key":[1,2,{"key":"value"}]}', "basic serialization-subobject array/hash")
+    sobj = JSON::Lexer.new(str).nextvalue
+    assert(sobj["key"] == obj["key"], "basic deserialization-subobject array/hash")
+
+
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.5
+rubygems_version: 0.8.11
 specification_version: 1
 name: ruby-json
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
-date: 2005-01-28
-summary: ruby-json is a library for using the JavaScript Object Notation (JSON) under Ruby.
+  version: 1.1.2
+date: 2006-02-09 00:00:00 -08:00
+summary: ruby-json is a library for using JavaScript Object Notation (JSON) under Ruby.
 require_paths: 
-  - lib
+- .
 email: dido@imperium.ph
 homepage: http://sourceforge.net/projects/json
 rubyforge_project: 
@@ -18,109 +18,38 @@ bindir: bin
 has_rdoc: true
 required_ruby_version: !ruby/object:Gem::Version::Requirement 
   requirements: 
-    - 
-      - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
   version: 
 platform: ruby
-authors: []
+signing_key: 
+cert_chain: 
+authors: 
+- Rafael R. Sevilla
 files: 
-  - doc
-  - lib/json
-  - test
-  - README
-  - ruby-json.gemspec
-  - install.rb
-  - COPYING
-  - doc/files
-  - doc/index.html
-  - doc/rdoc-style.css
-  - doc/fr_method_index.html
-  - doc/fr_class_index.html
-  - doc/fr_file_index.html
-  - doc/created.rid
-  - doc/classes
-  - doc/files/json
-  - doc/files/test
-  - doc/files/install_rb.html
-  - doc/files/install_rb.src
-  - doc/files/json/lexer_rb.html
-  - doc/files/json/objects_rb.html
-  - doc/files/test/lexertest_rb.html
-  - doc/files/test/objtest_rb.html
-  - doc/files/test/arraytest_rb.html
-  - doc/files/install_rb.src/M000001.html
-  - doc/classes/JSON
-  - doc/classes/Hash.html
-  - doc/classes/ObjectTest.html
-  - doc/classes/JSON.html
-  - doc/classes/String.html
-  - doc/classes/Array.src
-  - doc/classes/Numeric.src
-  - doc/classes/Hash.src
-  - doc/classes/NilClass.html
-  - doc/classes/LexerTest.src
-  - doc/classes/String.src
-  - doc/classes/Object.src
-  - doc/classes/Object.html
-  - doc/classes/FalseClass.src
-  - doc/classes/Array.html
-  - doc/classes/ObjectTest.src
-  - doc/classes/TrueClass.src
-  - doc/classes/TrueClass.html
-  - doc/classes/FalseClass.html
-  - doc/classes/LexerTest.html
-  - doc/classes/NilClass.src
-  - doc/classes/ArrayTest.html
-  - doc/classes/Numeric.html
-  - doc/classes/ArrayTest.src
-  - doc/classes/JSON/Lexer.src
-  - doc/classes/JSON/Lexer.html
-  - doc/classes/JSON/Lexer.src/M000022.html
-  - doc/classes/JSON/Lexer.src/M000023.html
-  - doc/classes/JSON/Lexer.src/M000024.html
-  - doc/classes/JSON/Lexer.src/M000025.html
-  - doc/classes/JSON/Lexer.src/M000026.html
-  - doc/classes/JSON/Lexer.src/M000027.html
-  - doc/classes/JSON/Lexer.src/M000028.html
-  - doc/classes/JSON/Lexer.src/M000029.html
-  - doc/classes/JSON/Lexer.src/M000030.html
-  - doc/classes/JSON/Lexer.src/M000031.html
-  - doc/classes/JSON/Lexer.src/M000032.html
-  - doc/classes/JSON/Lexer.src/M000033.html
-  - doc/classes/JSON/Lexer.src/M000034.html
-  - doc/classes/JSON/Lexer.src/M000035.html
-  - doc/classes/JSON/Lexer.src/M000036.html
-  - doc/classes/Array.src/M000011.html
-  - doc/classes/Array.src/M000012.html
-  - doc/classes/Numeric.src/M000016.html
-  - doc/classes/Hash.src/M000009.html
-  - doc/classes/Hash.src/M000010.html
-  - doc/classes/LexerTest.src/M000008.html
-  - doc/classes/LexerTest.src/M000002.html
-  - doc/classes/LexerTest.src/M000003.html
-  - doc/classes/LexerTest.src/M000004.html
-  - doc/classes/LexerTest.src/M000005.html
-  - doc/classes/LexerTest.src/M000006.html
-  - doc/classes/LexerTest.src/M000007.html
-  - doc/classes/String.src/M000019.html
-  - doc/classes/String.src/M000020.html
-  - doc/classes/Object.src/M000018.html
-  - doc/classes/FalseClass.src/M000013.html
-  - doc/classes/ObjectTest.src/M000015.html
-  - doc/classes/TrueClass.src/M000021.html
-  - doc/classes/NilClass.src/M000017.html
-  - doc/classes/ArrayTest.src/M000014.html
-  - lib/json/objects.rb
-  - lib/json/lexer.rb
-  - test/lexertest.rb
-  - test/objtest.rb
-  - test/arraytest.rb
+- COPYING
+- README
+- install.rb
+- json
+- test
+- rakefile
+- json/lexer.rb
+- json/objects.rb
+- test/arraytest.rb
+- test/lexertest.rb
+- test/objtest.rb
 test_files: []
+
 rdoc_options: []
+
 extra_rdoc_files: []
+
 executables: []
+
 extensions: []
+
 requirements: []
-dependencies: []
+
+dependencies: []
+