oj 2.9.8 → 2.9.9

data/test/test_object.rb

@@ -379,6 +379,16 @@ class ObjectJuice < Minitest::Test
     assert(false, "*** expected an exception")
   end
 
+  def test_json_object_not_hat_hash
+    json = %{{"^#x":[1,2]}}
+    h = Oj.object_load(json)
+    assert_equal({1 => 2}, h);
+
+    json = %{{"~#x":[1,2]}}
+    h = Oj.object_load(json)
+    assert_equal({'~#x' => [1,2]}, h);
+  end
+
   def test_json_struct
     unless 'jruby' == RUBY_DESCRIPTION.split(' ')[0]
       obj = Stuck.new(false, 7)

data/test/test_scp.rb

@@ -244,4 +244,26 @@ class ScpTest < Minitest::Test
     end
   end
 
+  def test_pipe
+    handler = AllHandler.new()
+    json = %{{"one":true,"two":false}}
+    IO.pipe do |read_io, write_io|
+      if fork
+        write_io.close
+        Oj.sc_parse(handler, read_io) {|v| p v}
+        read_io.close
+        assert_equal([[:hash_start],
+                      [:hash_set, 'one', true],
+                      [:hash_set, 'two', false],
+                      [:hash_end],
+                      [:add_value, {}]], handler.calls)
+      else
+        read_io.close
+        write_io.write json
+        write_io.close
+        Process.exit(0)
+      end
+    end
+  end
+
 end

data/test/test_various.rb

@@ -897,7 +897,7 @@ class Juice < Minitest::Test
 
   def test_infinity
     n = Oj.load('Infinity', :mode => :object)
-    assert_equal(Float::INFINITY, n);
+    assert_equal(BigDecimal.new('Infinity').to_f, n);
     begin
       Oj.load('Infinity', :mode => :strict)
       fail()

metadata

@@ -1,111 +1,117 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: oj
-version: !ruby/object:Gem::Version
-  version: 2.9.8
+version: !ruby/object:Gem::Version 
+  hash: 57
+  prerelease: 
+  segments: 
+  - 2
+  - 9
+  - 9
+  version: 2.9.9
 platform: ruby
-authors:
+authors: 
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2014-07-07 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 9
+        version: "0.9"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: minitest
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 9
+        segments: 
+        - 5
+        version: "5"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rails
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-description: 'The fastest JSON parser and object serializer. '
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 3
+        version: "3"
+  type: :development
+  version_requirements: *id003
+description: "The fastest JSON parser and object serializer. "
 email: peter@ohler.com
 executables: []
-extensions:
+
+extensions: 
 - ext/oj/extconf.rb
-extra_rdoc_files:
-- README.md
-files:
-- LICENSE
+extra_rdoc_files: 
 - README.md
+files: 
+- lib/oj/bag.rb
+- lib/oj/error.rb
+- lib/oj/mimic.rb
+- lib/oj/saj.rb
+- lib/oj/schandler.rb
+- lib/oj/version.rb
+- lib/oj.rb
+- ext/oj/extconf.rb
 - ext/oj/buf.h
-- ext/oj/cache8.c
 - ext/oj/cache8.h
-- ext/oj/circarray.c
 - ext/oj/circarray.h
+- ext/oj/encode.h
+- ext/oj/err.h
+- ext/oj/hash.h
+- ext/oj/odd.h
+- ext/oj/oj.h
+- ext/oj/parse.h
+- ext/oj/reader.h
+- ext/oj/resolve.h
+- ext/oj/val_stack.h
+- ext/oj/cache8.c
+- ext/oj/circarray.c
 - ext/oj/compat.c
 - ext/oj/dump.c
-- ext/oj/encode.h
 - ext/oj/err.c
-- ext/oj/err.h
-- ext/oj/extconf.rb
 - ext/oj/fast.c
 - ext/oj/hash.c
-- ext/oj/hash.h
 - ext/oj/hash_test.c
 - ext/oj/object.c
 - ext/oj/odd.c
-- ext/oj/odd.h
 - ext/oj/oj.c
-- ext/oj/oj.h
 - ext/oj/parse.c
-- ext/oj/parse.h
 - ext/oj/reader.c
-- ext/oj/reader.h
 - ext/oj/resolve.c
-- ext/oj/resolve.h
 - ext/oj/saj.c
 - ext/oj/scp.c
 - ext/oj/sparse.c
 - ext/oj/strict.c
 - ext/oj/val_stack.c
-- ext/oj/val_stack.h
-- lib/oj.rb
-- lib/oj/bag.rb
-- lib/oj/error.rb
-- lib/oj/mimic.rb
-- lib/oj/saj.rb
-- lib/oj/schandler.rb
-- lib/oj/version.rb
 - test/_test_mimic_rails.rb
 - test/bug.rb
 - test/files.rb
 - test/helper.rb
-- test/io.rb
 - test/isolated/shared.rb
 - test/isolated/test_mimic_after.rb
 - test/isolated/test_mimic_alone.rb
@@ -114,15 +120,17 @@ files:
 - test/isolated/test_mimic_rails_after.rb
 - test/isolated/test_mimic_rails_before.rb
 - test/perf.rb
+- test/perf1.rb
+- test/perf2.rb
 - test/perf_compat.rb
 - test/perf_fast.rb
 - test/perf_file.rb
+- test/perf_obj_old.rb
 - test/perf_object.rb
 - test/perf_saj.rb
 - test/perf_scp.rb
 - test/perf_simple.rb
 - test/perf_strict.rb
-- test/sample.rb
 - test/sample/change.rb
 - test/sample/dir.rb
 - test/sample/doc.rb
@@ -135,8 +143,8 @@ files:
 - test/sample/rect.rb
 - test/sample/shape.rb
 - test/sample/text.rb
+- test/sample.rb
 - test/sample_json.rb
-- test/struct.rb
 - test/test_compat.rb
 - test/test_debian.rb
 - test/test_fast.rb
@@ -148,34 +156,43 @@ files:
 - test/test_strict.rb
 - test/test_various.rb
 - test/test_writer.rb
-- test/zip.rb
+- LICENSE
+- README.md
 homepage: http://www.ohler.com/oj
-licenses:
+licenses: 
 - MIT
 - GPL-3.0
-metadata: {}
 post_install_message: 
-rdoc_options:
-- "--main"
+rdoc_options: 
+- --main
 - README.md
-require_paths:
+require_paths: 
 - lib
 - ext
-required_ruby_version: !ruby/object:Gem::Requirement
-  requirements:
+required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
-  requirements:
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
+  requirements: 
   - - ">="
-    - !ruby/object:Gem::Version
-      version: '0'
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: oj
-rubygems_version: 2.2.2
+rubygems_version: 1.8.15
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A fast JSON parser and serializer.
 test_files: []
-has_rdoc: true
+

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 080ee5fb844d326ce444282c5df529a135cf125b
-  data.tar.gz: 6461af3c663d8974e0eea8c8b4e3e811500a7397
-SHA512:
-  metadata.gz: 5e241a43f3b733fad07606b48f36ec364fce3a516d59596e9684fd7d87bcbc45ea07321ed37719d95f6803d53877f76443813559a42b6c0c86b0f07d19bd0ee6
-  data.tar.gz: a01b9b8f1f84de6297b5d240c96680dd212851a95d55d6ffced9b1cd79c98553c29e4a9b7358e4c8f2bcc0b080a855cab85dc17cf30bdf9f4f562bf91f5d459c

data/test/io.rb

@@ -1,48 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$: << File.dirname(__FILE__)
-
-require 'helper'
-
-class Handler
-  def initialize
-    @state = []
-  end
-
-  def hash_start
-    @state << {}
-    @state.last
-  end
-
-  def hash_end
-    @state.pop
-  end
-
-  def hash_set(h,k,v)
-    h.store(k,v)
-  end
-
-  def array_start
-    @state << []
-    @state.last
-  end
-
-
-  def array_end
-    @state.pop
-  end
-
-  def array_append(a,v)
-    a << v
-  end
-
-  def error(message, line, column); p "ERROR: #{message}" end
-end
-
-handler = Handler.new
-def handler.add_value(v)
-  p v
-end
-
-Oj.sc_parse(handler, StringIO.new('{"a":"b","c":[1,2,{"d":"e"}]}[4,5,6]'))

data/test/struct.rb

@@ -1,29 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-# Ubuntu does not accept arguments to ruby when called using env. To get warnings to show up the -w options is
-# required. That can be set in the RUBYOPT environment variable.
-# export RUBYOPT=-w
-
-$VERBOSE = true
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-require 'oj'
-
-A = Struct.new(:a,:b,:c,:d)
-B = Struct.new(:e,:f)
-
-obj = [A.new(55, B.new(1, 'X'), B.new(2, 'Y'), 3)]
-
-s = Oj.dump(obj, :mode => :object)
-
-100000.times do
-  Oj.load(s, :mode => :object)
-  # ds = Oj.dump(o, :mode => :object)
-  # if ds != s
-  #   puts ds
-  #   raise "holy crap"
-  # end
-end

data/test/zip.rb

@@ -1,34 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$: << File.dirname(__FILE__)
-
-require 'helper'
-
-require 'zlib'
-
-File.open('test.json.gz', 'r') do |file|
-  Zlib::GzipReader.wrap(file) do |f2|
-    puts "*** f2: #{f2}"
-    Oj.load(f2) do |val|
-      puts val
-    end
-  end
-end
-
-=begin
-And a json file with the following contents (then gzipped):
-
-{"a":2}
-{"b":2}
-The output is:
-
-{"a"=>2}
-{"b"=>2}
-bin/test:8:in `load': undefined method `new' for #<EOFError: end of file reached> (NoMethodError)
-    from bin/test:8:in `block (2 levels) in <main>'
-    from bin/test:7:in `wrap'
-    from bin/test:7:in `block in <main>'
-    from bin/test:6:in `open'
-    from bin/test:6:in `<main>'
-=end