grape.rb in grape-0.14.0

- old
+ new

@@ -7,23 +7,25 @@
 require 'rack/auth/digest/md5'
 require 'hashie'
 require 'set'
 require 'active_support/version'
 require 'active_support/core_ext/hash/indifferent_access'
-require 'active_support/ordered_hash'
-require 'active_support/core_ext/object/conversions'
+require 'active_support/core_ext/object/blank'
 require 'active_support/core_ext/array/extract_options'
+require 'active_support/core_ext/array/wrap'
 require 'active_support/core_ext/hash/deep_merge'
+require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/hash/except'
 require 'active_support/dependencies/autoload'
 require 'active_support/notifications'
 require 'multi_json'
 require 'multi_xml'
-require 'virtus'
 require 'i18n'
 require 'thread'
 
+require 'virtus'
+
 I18n.load_path << File.expand_path('../grape/locale/en.yml', __FILE__)
 
 module Grape
   extend ActiveSupport::Autoload
 
@@ -36,11 +38,12 @@
 
     autoload :Path
 
     autoload :Cookies
     autoload :Validations
-    autoload :Request, 'grape/http/request'
+    autoload :Request
+    autoload :Env, 'grape/util/env'
   end
 
   module Http
     extend ActiveSupport::Autoload
     eager_autoload do
@@ -65,10 +68,11 @@
     autoload :IncompatibleOptionValues
     autoload :MissingGroupTypeError,          'grape/exceptions/missing_group_type'
     autoload :UnsupportedGroupTypeError,      'grape/exceptions/unsupported_group_type'
     autoload :InvalidMessageBody
     autoload :InvalidAcceptHeader
+    autoload :InvalidVersionHeader
   end
 
   module ErrorFormatter
     extend ActiveSupport::Autoload
     autoload :Base
@@ -154,11 +158,10 @@
     autoload :Presenter
   end
 end
 
 require 'grape/util/content_types'
-require 'grape/util/parameter_types'
 
 require 'grape/validations/validators/base'
 require 'grape/validations/attributes_iterator'
 require 'grape/validations/validators/allow_blank'
 require 'grape/validations/validators/at_least_one_of'
@@ -169,7 +172,8 @@
 require 'grape/validations/validators/presence'
 require 'grape/validations/validators/regexp'
 require 'grape/validations/validators/values'
 require 'grape/validations/params_scope'
 require 'grape/validations/validators/all_or_none'
+require 'grape/validations/types'
 
 require 'grape/version'