lib/gon.rb in gon-5.1.0 vs lib/gon.rb in gon-5.1.1
- old
+ new
@@ -1,8 +1,9 @@
require 'request_store'
require 'action_view'
require 'action_controller'
+require 'multi_json'
require 'gon/base'
require 'gon/global'
require 'gon/watch'
require 'gon/request'
@@ -10,20 +11,15 @@
require 'gon/escaper'
require 'gon/rabl'
require 'gon/jbuilder'
require 'gon/json_dumper'
-# NOTE : JRuby greater than 1.7 doesn't support C-extensions
-if RUBY_PLATFORM =~ /java/
- require 'gon/json_dumper/active_support'
-else
- require 'gon/json_dumper/oj'
-end
-
# NOTE : ActionDispatch::Request#uuid appears only in Rails 3.2.1
unless ActionDispatch::Request.public_instance_methods.include?(:uuid)
require 'gon/compatibility/old_rails'
end
+
+require 'gon/spec_helpers'
class Gon
class << self
def global