oj 2.9.4 → 2.9.5

data/test/isolated/test_mimic_after.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), '..')
+
+require 'helper'
+require 'isolated/shared'
+
+require 'json'
+Oj.mimic_JSON
+
+class MimicAfter < SharedMimicTest
+end # MimicAfter

data/test/isolated/test_mimic_alone.rb

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), '..')
+
+require 'helper'
+require 'isolated/shared'
+
+Oj.mimic_JSON
+
+class MimicAlone < SharedMimicTest
+end # MimicAlone

data/test/isolated/test_mimic_before.rb

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), '..')
+
+require 'helper'
+require 'isolated/shared'
+
+Oj.mimic_JSON
+require 'json'
+
+class MimicBefore < SharedMimicTest
+end # MimicBefore

data/test/isolated/test_mimic_define.rb

@@ -0,0 +1,28 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), '..')
+
+require 'helper'
+
+class MimicDefine < Minitest::Test
+  def test_mimic_define
+    assert(defined?(JSON).nil?)
+    Oj.mimic_JSON
+
+    # Test constants
+    assert(!defined?(JSON).nil?)
+    assert(!defined?(JSON::ParserError).nil?)
+    assert(Object.respond_to?(:to_json))
+
+    # Test loaded features
+    assert(!require('json'))
+
+    begin
+      require('json_spec')
+      assert(false, '** should raise LoadError')
+    rescue LoadError
+      assert(true)
+    end
+  end
+end # MimicSingle

data/test/isolated/test_mimic_rails_after.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), '..')
+
+require 'helper'
+
+begin
+  require 'rails/all'
+rescue Exception
+  Process.exit!(true)
+end
+
+Oj.mimic_JSON
+
+require 'isolated/shared'
+
+class MimicRailsAfter < SharedMimicRailsTest
+end # MimicRailsAfter

data/test/isolated/test_mimic_rails_before.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+# encoding: UTF-8
+
+$: << File.join(File.dirname(__FILE__), '..')
+
+require 'helper'
+
+Oj.mimic_JSON
+begin
+  require 'rails/all'
+rescue Exception
+  Process.exit!(true)
+end
+
+require 'isolated/shared'
+
+class MimicRailsBefore < SharedMimicRailsTest
+end # MimicRailsBefore
+

data/test/test_compat.rb

@@ -1,84 +1,70 @@
 #!/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
+$: << File.dirname(__FILE__)
 
-$VERBOSE = true
+require 'helper'
 
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
+class CompatJuice < Minitest::Test
 
-require 'test/unit'
-require 'stringio'
-require 'date'
-require 'bigdecimal'
-require 'oj'
+  class Jeez
+    attr_accessor :x, :y
 
-$ruby = RUBY_DESCRIPTION.split(' ')[0]
-$ruby = 'ree' if 'ruby' == $ruby && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
-
-class Jeez
-  attr_accessor :x, :y
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
 
-  def initialize(x, y)
-    @x = x
-    @y = y
-  end
+    def eql?(o)
+      self.class == o.class && @x == o.x && @y == o.y
+    end
+    alias == eql?
 
-  def eql?(o)
-    self.class == o.class && @x == o.x && @y == o.y
-  end
-  alias == eql?
-  
-  def as_json()
-    {"json_class" => self.class.to_s,"x" => @x,"y" => @y}
-  end
+    def as_json()
+      {"json_class" => self.class.to_s,"x" => @x,"y" => @y}
+    end
 
-  def self.json_create(h)
-    self.new(h['x'], h['y'])
-  end
-end # Jeez
+    def self.json_create(h)
+      self.new(h['x'], h['y'])
+    end
+  end # Jeez
 
-module One
-  module Two
-    module Three
-      class Deep
+  module One
+    module Two
+      module Three
+        class Deep
 
-        def initialize()
-        end
+          def initialize()
+          end
 
-        def eql?(o)
-          self.class == o.class
-        end
-        alias == eql?
+          def eql?(o)
+            self.class == o.class
+          end
+          alias == eql?
 
-        def to_hash()
-          {'json_class' => "#{self.class.name}"}
-        end
+          def to_hash()
+            {'json_class' => "#{self.class.name}"}
+          end
 
-        def to_json(*a)
-          %{{"json_class":"#{self.class.name}"}}
-        end
+          def to_json(*a)
+            %{{"json_class":"#{self.class.name}"}}
+          end
 
-        def self.json_create(h)
-          self.new()
-        end
-      end # Deep
-    end # Three
-  end # Two
-end # One
+          def self.json_create(h)
+            self.new()
+          end
+        end # Deep
+      end # Three
+    end # Two
+  end # One
 
-def hash_eql(h1, h2)
-  return false if h1.size != h2.size
-  h1.keys.each do |k|
-    return false unless h1[k] == h2[k]
+  def setup
+    @default_options = Oj.default_options
   end
-  true
-end
 
-class CompatJuice < ::Test::Unit::TestCase
+  def teardown
+    Oj.default_options = @default_options
+  end
 
   def test_nil
     dump_and_load(nil, false)
@@ -218,7 +204,7 @@ class CompatJuice < ::Test::Unit::TestCase
   end
 
   def test_io_file
-    filename = 'open_file_test.json'
+    filename = File.join(File.dirname(__FILE__), 'open_file_test.json')
     File.open(filename, 'w') { |f| f.write(%{{
   "x":true,
   "y":58,
@@ -297,7 +283,7 @@ class CompatJuice < ::Test::Unit::TestCase
   end
 
   def test_json_object_bad
-    json = %{{"json_class":"Junk","x":true}}
+    json = %{{"json_class":"CompatJuice::Junk","x":true}}
     begin
       Oj.compat_load(json)
     rescue Exception => e

data/test/test_debian.rb

@@ -0,0 +1,53 @@
+# encoding: UTF-8
+
+require 'helper'
+
+class DebJuice < Minitest::Test
+  class Jam
+    attr_accessor :x, :y
+
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
+
+    def eql?(o)
+      self.class == o.class && @x == o.x && @y == o.y
+    end
+    alias == eql?
+
+  end# Jam
+
+  # contributed by sauliusg to fix as_json
+  class Orange < Jam
+    def initialize(x, y)
+      super
+    end
+
+    def as_json()
+      { :json_class => self.class,
+        :x => @x,
+        :y => @y }
+    end
+
+    def self.json_create(h)
+      self.new(h['x'], h['y'])
+    end
+  end
+
+  def test_as_json_object_compat_hash_cached
+    Oj.default_options = { :mode => :compat, :class_cache => true }
+    obj = Orange.new(true, 58)
+    json = Oj.dump(obj, :indent => 2)
+    assert(!json.nil?)
+    dump_and_load(obj, true)
+  end
+
+  def dump_and_load(obj, trace=false)
+    json = Oj.dump(obj, :indent => 2)
+    loaded = Oj.load(json);
+    assert_equal(obj, loaded)
+    loaded
+  end
+
+end

data/test/test_fast.rb

@@ -1,17 +1,9 @@
 #!/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
+$: << File.dirname(__FILE__)
 
-$VERBOSE = true
-
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
-
-require 'test/unit'
-require 'oj'
+require 'helper'
 
 $json1 = %{{
   "array": [
@@ -28,7 +20,15 @@ $json1 = %{{
   "boolean" : true
 }}
 
-class DocTest < ::Test::Unit::TestCase
+class DocTest < Minitest::Test
+  def setup
+    @default_options = Oj.default_options
+  end
+
+  def teardown
+    Oj.default_options = @default_options
+  end
+
   def test_nil
     json = %{null}
     Oj::Doc.open(json) do |doc|
@@ -310,7 +310,7 @@ class DocTest < ::Test::Unit::TestCase
   end
 
   def test_open_file
-    filename = 'open_file_test.json'
+    filename = File.join(File.dirname(__FILE__), 'open_file_test.json')
     File.open(filename, 'w') { |f| f.write('{"a":[1,2,3]}') }
     Oj::Doc.open_file(filename) do |doc|
       assert_equal(5, doc.size)
@@ -336,7 +336,7 @@ class DocTest < ::Test::Unit::TestCase
   end
 
   def test_file_open_close
-    filename = 'open_file_test.json'
+    filename = File.join(File.dirname(__FILE__), 'open_file_test.json')
     File.open(filename, 'w') { |f| f.write('{"a":[1,2,3]}') }
     doc = Oj::Doc.open_file(filename)
     assert_equal(Oj::Doc, doc.class)

data/test/test_file.rb

@@ -1,75 +1,63 @@
 #!/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
+$: << File.dirname(__FILE__)
 
-$VERBOSE = true
+require 'helper'
 
-$: << File.join(File.dirname(__FILE__), "../lib")
-$: << File.join(File.dirname(__FILE__), "../ext")
+class FileJuice < Minitest::Test
+  class Jam
+    attr_accessor :x, :y
 
-require 'test/unit'
-require 'date'
-require 'bigdecimal'
-require 'oj'
-
-$ruby = RUBY_DESCRIPTION.split(' ')[0]
-$ruby = 'ree' if 'ruby' == $ruby && RUBY_DESCRIPTION.include?('Ruby Enterprise Edition')
-
-class Jam
-  attr_accessor :x, :y
+    def initialize(x, y)
+      @x = x
+      @y = y
+    end
 
-  def initialize(x, y)
-    @x = x
-    @y = y
-  end
+    def eql?(o)
+      self.class == o.class && @x == o.x && @y == o.y
+    end
+    alias == eql?
 
-  def eql?(o)
-    self.class == o.class && @x == o.x && @y == o.y
-  end
-  alias == eql?
+  end# Jam
 
-end# Jam
+  class Jeez < Jam
+    def initialize(x, y)
+      super
+    end
 
-class Jeez < Jam
-  def initialize(x, y)
-    super
-  end
+    def to_json()
+      %{{"json_class":"#{self.class}","x":#{@x},"y":#{@y}}}
+    end
 
-  def to_json()
-    %{{"json_class":"#{self.class}","x":#{@x},"y":#{@y}}}
-  end
+    def self.json_create(h)
+      self.new(h['x'], h['y'])
+    end
+  end# Jeez
 
-  def self.json_create(h)
-    self.new(h['x'], h['y'])
-  end
-end# Jeez
+  class Orange < Jam
+    def initialize(x, y)
+      super
+    end
 
-class Orange < Jam
-  def initialize(x, y)
-    super
-  end
+    def as_json()
+      { :json_class => self.class,
+        :x => @x,
+        :y => @y }
+    end
 
-  def as_json()
-    { :json_class => self.class,
-      :x => @x,
-      :y => @y }
+    def self.json_create(h)
+      self.new(h['x'], h['y'])
+    end
   end
 
-  def self.json_create(h)
-    self.new(h['x'], h['y'])
+  def setup
+    @default_options = Oj.default_options
   end
-end
 
-class Range
-  def to_hash()
-    { 'begin' => self.begin, 'end' => self.end, 'exclude_end' => self.exclude_end? }
+  def teardown
+    Oj.default_options = @default_options
   end
-end # Range
-
-class FileJuice < ::Test::Unit::TestCase
 
   def test_nil
     dump_and_load(nil, false)
@@ -100,7 +88,7 @@ class FileJuice < ::Test::Unit::TestCase
     dump_and_load(-2.48e100 * 1.0e10, false)
     dump_and_load(1/0.0, false)
   end
-  
+
   def test_string
     dump_and_load('', false)
     dump_and_load('abc', false)
@@ -155,9 +143,9 @@ class FileJuice < ::Test::Unit::TestCase
     Oj.default_options = { :mode => :compat, :use_to_json => true }
     obj = Jeez.new(true, 58)
     json = Oj.dump(obj, :indent => 2)
-    assert(%{{"json_class":"Jeez","x":true,"y":58}
+    assert(%{{"json_class":"FileJuice::Jeez","x":true,"y":58}
 } == json ||
-           %{{"json_class":"Jeez","y":58,"x":true}
+           %{{"json_class":"FileJuice::Jeez","y":58,"x":true}
 } == json)
     dump_and_load(obj, false)
     Oj.default_options = { :mode => :compat, :use_to_json => false }
@@ -211,7 +199,6 @@ class FileJuice < ::Test::Unit::TestCase
   end
 
   def test_bigdecimal_object
-    mode = Oj.default_options[:mode]
     Oj.default_options = {:mode => :object}
     dump_and_load(BigDecimal.new('3.14159265358979323846'), false)
   end
@@ -229,7 +216,7 @@ class FileJuice < ::Test::Unit::TestCase
   end
 
   def dump_and_load(obj, trace=false)
-    filename = 'file_test.json'
+    filename = File.join(File.dirname(__FILE__), 'file_test.json')
     File.open(filename, "w") { |f|
       Oj.to_stream(f, obj, :indent => 2)
     }