oj 2.18.5 → 3.0.0

data/test/tests.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+$oj_dir = File.dirname(File.expand_path(File.dirname(__FILE__)))
+%w(lib ext).each do |dir|
+  $: << File.join($oj_dir, dir)
+end
+
+require 'test_strict'
+require 'test_null'
+require 'test_compat'
+require 'test_object'
+require 'test_custom'

data/test/tests_mimic.rb

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+$: << File.join(File.dirname(__FILE__), 'json_gem')
+
+require 'json_common_interface_test'
+require 'json_encoding_test'
+require 'json_ext_parser_test'
+require 'json_fixtures_test'
+require 'json_generator_test'
+require 'json_generic_object_test'
+require 'json_parser_test'
+require 'json_string_matching_test'

data/test/tests_mimic_addition.rb

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.dirname(__FILE__)
+$: << File.join(File.dirname(__FILE__), 'json_gem')
+
+require 'json_addition_test'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oj
 version: !ruby/object:Gem::Version
-  version: 2.18.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Peter Ohler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-21 00:00:00.000000000 Z
+date: 2017-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -42,14 +42,14 @@ dependencies:
   name: wwtd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: 'The fastest JSON parser and object serializer. '
@@ -59,6 +59,15 @@ extensions:
 - ext/oj/extconf.rb
 extra_rdoc_files:
 - README.md
+- pages/Advanced.md
+- pages/Compatibility.md
+- pages/Custom.md
+- pages/Encoding.md
+- pages/JsonGem.md
+- pages/Modes.md
+- pages/Options.md
+- pages/Rails.md
+- pages/Security.md
 files:
 - LICENSE
 - README.md
@@ -67,8 +76,17 @@ files:
 - ext/oj/cache8.h
 - ext/oj/circarray.c
 - ext/oj/circarray.h
+- ext/oj/code.c
+- ext/oj/code.h
 - ext/oj/compat.c
+- ext/oj/custom.c
 - ext/oj/dump.c
+- ext/oj/dump.h
+- ext/oj/dump_compat.c
+- ext/oj/dump_leaf.c
+- ext/oj/dump_object.c
+- ext/oj/dump_rails.c
+- ext/oj/dump_strict.c
 - ext/oj/encode.h
 - ext/oj/err.c
 - ext/oj/err.h
@@ -77,6 +95,9 @@ files:
 - ext/oj/hash.c
 - ext/oj/hash.h
 - ext/oj/hash_test.c
+- ext/oj/mimic_json.c
+- ext/oj/mimic_rails.c
+- ext/oj/mimic_rails.h
 - ext/oj/object.c
 - ext/oj/odd.c
 - ext/oj/odd.h
@@ -88,10 +109,14 @@ files:
 - ext/oj/reader.h
 - ext/oj/resolve.c
 - ext/oj/resolve.h
+- ext/oj/rxclass.c
+- ext/oj/rxclass.h
 - ext/oj/saj.c
 - ext/oj/scp.c
 - ext/oj/sparse.c
+- ext/oj/stream_writer.c
 - ext/oj/strict.c
+- ext/oj/string_writer.c
 - ext/oj/val_stack.c
 - ext/oj/val_stack.h
 - lib/oj.rb
@@ -99,29 +124,34 @@ files:
 - lib/oj/bag.rb
 - lib/oj/easy_hash.rb
 - lib/oj/error.rb
+- lib/oj/json.rb
 - lib/oj/mimic.rb
 - lib/oj/saj.rb
 - lib/oj/schandler.rb
+- lib/oj/state.rb
 - lib/oj/version.rb
+- pages/Advanced.md
+- pages/Compatibility.md
+- pages/Custom.md
+- pages/Encoding.md
+- pages/JsonGem.md
+- pages/Modes.md
+- pages/Options.md
+- pages/Rails.md
+- pages/Security.md
 - test/_test_active.rb
 - test/_test_active_mimic.rb
 - test/_test_mimic_rails.rb
-- test/activesupport_datetime_test.rb
-- test/bug.rb
-- test/bug2.rb
-- test/bug3.rb
-- test/bug_fast.rb
-- test/bug_load.rb
-- test/crash.rb
-- test/curl/curl_oj.rb
-- test/curl/get_oj.rb
-- test/curl/just_curl.rb
-- test/curl/just_oj.rb
-- test/example.rb
+- test/activesupport4/decoding_test.rb
+- test/activesupport4/encoding_test.rb
+- test/activesupport4/test_helper.rb
+- test/activesupport5/decoding_test.rb
+- test/activesupport5/encoding_test.rb
+- test/activesupport5/encoding_test_cases.rb
+- test/activesupport5/test_helper.rb
+- test/activesupport5/time_zone_test_helpers.rb
 - test/files.rb
-- test/foo.rb
 - test/helper.rb
-- test/io.rb
 - test/isolated/shared.rb
 - test/isolated/test_mimic_after.rb
 - test/isolated/test_mimic_alone.rb
@@ -130,9 +160,17 @@ files:
 - test/isolated/test_mimic_define.rb
 - test/isolated/test_mimic_rails_after.rb
 - test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_rails_datetime.rb
 - test/isolated/test_mimic_redefine.rb
-- test/mod.rb
+- test/json_gem/json_addition_test.rb
+- test/json_gem/json_common_interface_test.rb
+- test/json_gem/json_encoding_test.rb
+- test/json_gem/json_ext_parser_test.rb
+- test/json_gem/json_fixtures_test.rb
+- test/json_gem/json_generator_test.rb
+- test/json_gem/json_generic_object_test.rb
+- test/json_gem/json_parser_test.rb
+- test/json_gem/json_string_matching_test.rb
+- test/json_gem/test_helper.rb
 - test/perf.rb
 - test/perf_compat.rb
 - test/perf_fast.rb
@@ -142,8 +180,6 @@ files:
 - test/perf_scp.rb
 - test/perf_simple.rb
 - test/perf_strict.rb
-- test/rails.rb
-- test/russian.rb
 - test/sample.rb
 - test/sample/change.rb
 - test/sample/dir.rb
@@ -158,27 +194,31 @@ files:
 - test/sample/shape.rb
 - test/sample/text.rb
 - test/sample_json.rb
-- test/struct.rb
 - test/test_compat.rb
+- test/test_custom.rb
 - test/test_debian.rb
 - test/test_fast.rb
 - test/test_file.rb
 - test/test_gc.rb
 - test/test_hash.rb
+- test/test_null.rb
 - test/test_object.rb
 - test/test_saj.rb
 - test/test_scp.rb
-- test/test_serializer.rb
 - test/test_strict.rb
 - test/test_various.rb
 - test/test_writer.rb
-- test/write_timebars.rb
+- test/tests.rb
+- test/tests_mimic.rb
+- test/tests_mimic_addition.rb
 homepage: http://www.ohler.com/oj
 licenses:
 - MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
+- "--title"
+- Oj
 - "--main"
 - README.md
 require_paths:
@@ -195,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: oj
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: A fast JSON parser and serializer.
@@ -203,22 +243,16 @@ test_files:
 - test/_test_active.rb
 - test/_test_active_mimic.rb
 - test/_test_mimic_rails.rb
-- test/activesupport_datetime_test.rb
-- test/bug.rb
-- test/bug2.rb
-- test/bug3.rb
-- test/bug_fast.rb
-- test/bug_load.rb
-- test/crash.rb
-- test/curl/curl_oj.rb
-- test/curl/get_oj.rb
-- test/curl/just_curl.rb
-- test/curl/just_oj.rb
-- test/example.rb
+- test/activesupport4/decoding_test.rb
+- test/activesupport4/encoding_test.rb
+- test/activesupport4/test_helper.rb
+- test/activesupport5/decoding_test.rb
+- test/activesupport5/encoding_test.rb
+- test/activesupport5/encoding_test_cases.rb
+- test/activesupport5/test_helper.rb
+- test/activesupport5/time_zone_test_helpers.rb
 - test/files.rb
-- test/foo.rb
 - test/helper.rb
-- test/io.rb
 - test/isolated/shared.rb
 - test/isolated/test_mimic_after.rb
 - test/isolated/test_mimic_alone.rb
@@ -227,9 +261,17 @@ test_files:
 - test/isolated/test_mimic_define.rb
 - test/isolated/test_mimic_rails_after.rb
 - test/isolated/test_mimic_rails_before.rb
-- test/isolated/test_mimic_rails_datetime.rb
 - test/isolated/test_mimic_redefine.rb
-- test/mod.rb
+- test/json_gem/json_addition_test.rb
+- test/json_gem/json_common_interface_test.rb
+- test/json_gem/json_encoding_test.rb
+- test/json_gem/json_ext_parser_test.rb
+- test/json_gem/json_fixtures_test.rb
+- test/json_gem/json_generator_test.rb
+- test/json_gem/json_generic_object_test.rb
+- test/json_gem/json_parser_test.rb
+- test/json_gem/json_string_matching_test.rb
+- test/json_gem/test_helper.rb
 - test/perf.rb
 - test/perf_compat.rb
 - test/perf_fast.rb
@@ -239,8 +281,6 @@ test_files:
 - test/perf_scp.rb
 - test/perf_simple.rb
 - test/perf_strict.rb
-- test/rails.rb
-- test/russian.rb
 - test/sample/change.rb
 - test/sample/dir.rb
 - test/sample/doc.rb
@@ -255,18 +295,20 @@ test_files:
 - test/sample/text.rb
 - test/sample.rb
 - test/sample_json.rb
-- test/struct.rb
 - test/test_compat.rb
+- test/test_custom.rb
 - test/test_debian.rb
 - test/test_fast.rb
 - test/test_file.rb
 - test/test_gc.rb
 - test/test_hash.rb
+- test/test_null.rb
 - test/test_object.rb
 - test/test_saj.rb
 - test/test_scp.rb
-- test/test_serializer.rb
 - test/test_strict.rb
 - test/test_various.rb
 - test/test_writer.rb
-- test/write_timebars.rb
+- test/tests.rb
+- test/tests_mimic.rb
+- test/tests_mimic_addition.rb

data/test/activesupport_datetime_test.rb

@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$: << File.dirname(__FILE__)
-
-require 'helper'
-
-require "active_support" # v5.0.0
-require "oj" #v2.17.1
-
-puts "ActiveSupport + OJ.dump(DateTime.now)"
-puts
-puts Oj.dump(DateTime.now)
-puts
-
-require "oj/active_support_helper"
-#require 'active_support/time'
-
-puts "ActiveSupport + OJ + active_support_helper dump(DateTime.now)"
-puts
-puts Oj.dump(DateTime.now)
-puts
-

data/test/bug.rb

@@ -1,51 +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 add_value(v)
-    p v
-  end
-
-  def error(message, line, column); p "ERROR: #{message}" end
-end
-
-$handler = Handler.new
-
-IO.popen("cat tst") { |p| puts Oj.sc_parse($handler, p) }
-
-#File.open('tst', 'r') { |file|  Oj.sc_parse($handler, file) }

data/test/bug2.rb

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$: << File.dirname(__FILE__)
-
-require 'helper'
-
-

data/test/bug3.rb

@@ -1,46 +0,0 @@
-#!/usr/bin/env ruby
-
-#!/usr/bin/env ruby
-# encoding: UTF-8
-
-$: << File.dirname(__FILE__)
-%w(lib ext test).each do |dir|
-  $LOAD_PATH.unshift File.expand_path("../../#{dir}", __FILE__)
-end
-
-require 'oj'
-require 'stringio'
-
-class Parser < Oj::Saj
-
-  def parse(json)
-    Oj.saj_parse(self, StringIO.new(json))
-  end
-
-  def hash_start(key)
-    puts "START: #{key}"
-  end
-
-  def error(message, line, column)
-    puts "Error callback: #{message}"
-  end
-
-end
-
-parser = Parser.new
-
-begin
-  # truncated JSON, Oj.saj_parse raises, #error not called
-  parser.parse('{"foo{"bar":')
-rescue Exception => e
-  puts "*** #{e.class}: #{e.message}"
-end
-
-puts "\n\n"
-
-begin
-  # invalid JSON, doesn't raise an error
-  parser.parse('{"foo":{"bar":}')
-rescue Exception => e
-  puts "*** #{e.class}: #{e.message}"
-end