[Action Pack] require => require_relative

This basically reverts e9fca7668b, d08da958b9,
d1fe1dcf8a, and 68eaf7b4d5
This commit is contained in:
Akira Matsuda 2017-10-21 22:18:17 +09:00
parent d5ea33b9a0
commit b0d0c9f40d
37 changed files with 70 additions and 70 deletions

View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
require_relative "error"
require "abstract_controller/error"
require "active_support/configurable"
require "active_support/descendants_tracker"
require "active_support/core_ext/module/anonymous"

View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
require_relative "error"
require "abstract_controller/error"
require "action_view"
require "action_view/view_paths"
require "set"

View File

@ -3,8 +3,8 @@
require "active_support/rails"
require "abstract_controller"
require "action_dispatch"
require_relative "action_controller/metal/live"
require_relative "action_controller/metal/strong_parameters"
require "action_controller/metal/live"
require "action_controller/metal/strong_parameters"
module ActionController
extend ActiveSupport::Autoload

View File

@ -2,7 +2,7 @@
require "action_view"
require "action_controller"
require_relative "log_subscriber"
require "action_controller/log_subscriber"
module ActionController
# API Controller is a lightweight version of <tt>ActionController::Base</tt>,

View File

@ -1,8 +1,8 @@
# frozen_string_literal: true
require "action_view"
require_relative "log_subscriber"
require_relative "metal/params_wrapper"
require "action_controller/log_subscriber"
require "action_controller/metal/params_wrapper"
module ActionController
# Action Controllers are the core of a web request in \Rails. They are made up of one or more actions that are executed

View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
require_relative "exceptions"
require "action_controller/metal/exceptions"
module ActionController #:nodoc:
# Methods for sending arbitrary data and for streaming files to the browser,

View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
require "rack/session/abstract/id"
require_relative "exceptions"
require "action_controller/metal/exceptions"
require "active_support/security_utils"
module ActionController #:nodoc:

View File

@ -4,7 +4,7 @@ require "rails"
require "action_controller"
require "action_dispatch/railtie"
require "abstract_controller/railties/routes_helpers"
require_relative "railties/helpers"
require "action_controller/railties/helpers"
require "action_view/railtie"
module ActionController

View File

@ -7,7 +7,7 @@ require "active_support/core_ext/module/anonymous"
require "active_support/core_ext/module/redefine_method"
require "active_support/core_ext/hash/keys"
require "active_support/testing/constant_lookup"
require_relative "template_assertions"
require "action_controller/template_assertions"
require "rails-dom-testing"
module ActionController

View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
require_relative "parameter_filter"
require "action_dispatch/http/parameter_filter"
module ActionDispatch
module Http

View File

@ -339,4 +339,4 @@ module Mime
end
end
require_relative "mime_types"
require "action_dispatch/http/mime_types"

View File

@ -3,15 +3,15 @@
require "stringio"
require "active_support/inflector"
require_relative "headers"
require "action_dispatch/http/headers"
require "action_controller/metal/exceptions"
require "rack/request"
require_relative "cache"
require_relative "mime_negotiation"
require_relative "parameters"
require_relative "filter_parameters"
require_relative "upload"
require_relative "url"
require "action_dispatch/http/cache"
require "action_dispatch/http/mime_negotiation"
require "action_dispatch/http/parameters"
require "action_dispatch/http/filter_parameters"
require "action_dispatch/http/upload"
require "action_dispatch/http/url"
require "active_support/core_ext/array/conversions"
module ActionDispatch

View File

@ -1,8 +1,8 @@
# frozen_string_literal: true
require "active_support/core_ext/module/attribute_accessors"
require_relative "filter_redirect"
require_relative "cache"
require "action_dispatch/http/filter_redirect"
require "action_dispatch/http/cache"
require "monitor"
module ActionDispatch # :nodoc:

View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
require_relative "journey/router"
require_relative "journey/gtg/builder"
require_relative "journey/gtg/simulator"
require_relative "journey/nfa/builder"
require_relative "journey/nfa/simulator"
require "action_dispatch/journey/router"
require "action_dispatch/journey/gtg/builder"
require "action_dispatch/journey/gtg/simulator"
require "action_dispatch/journey/nfa/builder"
require "action_dispatch/journey/nfa/simulator"

View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
require_relative "transition_table"
require "action_dispatch/journey/gtg/transition_table"
module ActionDispatch
module Journey # :nodoc:

View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
require_relative "../nfa/dot"
require "action_dispatch/journey/nfa/dot"
module ActionDispatch
module Journey # :nodoc:

View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
require_relative "transition_table"
require_relative "../gtg/transition_table"
require "action_dispatch/journey/nfa/transition_table"
require "action_dispatch/journey/gtg/transition_table"
module ActionDispatch
module Journey # :nodoc:

View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
require_relative "dot"
require "action_dispatch/journey/nfa/dot"
module ActionDispatch
module Journey # :nodoc:

View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
require_relative "../visitors"
require "action_dispatch/journey/visitors"
module ActionDispatch
module Journey # :nodoc:

View File

@ -8,7 +8,7 @@ require 'racc/parser.rb'
# :stopdoc:
require_relative "parser_extras"
require "action_dispatch/journey/parser_extras"
module ActionDispatch
module Journey
class Parser < Racc::Parser

View File

@ -47,4 +47,4 @@ end
---- header
# :stopdoc:
require_relative "parser_extras"
require "action_dispatch/journey/parser_extras"

View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
require_relative "scanner"
require_relative "nodes/node"
require "action_dispatch/journey/scanner"
require "action_dispatch/journey/nodes/node"
module ActionDispatch
# :stopdoc:

View File

@ -1,16 +1,16 @@
# frozen_string_literal: true
require_relative "router/utils"
require_relative "routes"
require_relative "formatter"
require "action_dispatch/journey/router/utils"
require "action_dispatch/journey/routes"
require "action_dispatch/journey/formatter"
before = $-w
$-w = false
require_relative "parser"
require "action_dispatch/journey/parser"
$-w = before
require_relative "route"
require_relative "path/pattern"
require "action_dispatch/journey/route"
require "action_dispatch/journey/path/pattern"
module ActionDispatch
module Journey # :nodoc:

View File

@ -1,8 +1,8 @@
# frozen_string_literal: true
require_relative "../http/request"
require_relative "exception_wrapper"
require_relative "../routing/inspector"
require "action_dispatch/http/request"
require "action_dispatch/middleware/exception_wrapper"
require "action_dispatch/routing/inspector"
require "action_view"
require "action_view/base"

View File

@ -3,8 +3,8 @@
require "rack/utils"
require "rack/request"
require "rack/session/abstract/id"
require_relative "../cookies"
require_relative "../../request/session"
require "action_dispatch/middleware/cookies"
require "action_dispatch/request/session"
module ActionDispatch
module Session

View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
require_relative "abstract_store"
require "action_dispatch/middleware/session/abstract_store"
module ActionDispatch
module Session

View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
require "active_support/core_ext/hash/keys"
require_relative "abstract_store"
require "action_dispatch/middleware/session/abstract_store"
require "rack/session/cookie"
module ActionDispatch

View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
require_relative "abstract_store"
require "action_dispatch/middleware/session/abstract_store"
begin
require "rack/session/dalli"
rescue LoadError => e

View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
require_relative "../http/request"
require_relative "exception_wrapper"
require "action_dispatch/http/request"
require "action_dispatch/middleware/exception_wrapper"
module ActionDispatch
# This middleware rescues any exception returned by the application

View File

@ -4,8 +4,8 @@ require "active_support/core_ext/hash/slice"
require "active_support/core_ext/enumerable"
require "active_support/core_ext/array/extract_options"
require "active_support/core_ext/regexp"
require_relative "redirection"
require_relative "endpoint"
require "action_dispatch/routing/redirection"
require "action_dispatch/routing/endpoint"
module ActionDispatch
module Routing

View File

@ -1,11 +1,11 @@
# frozen_string_literal: true
require_relative "../http/request"
require "action_dispatch/http/request"
require "active_support/core_ext/uri"
require "active_support/core_ext/array/extract_options"
require "rack/utils"
require "action_controller/metal/exceptions"
require_relative "endpoint"
require "action_dispatch/routing/endpoint"
module ActionDispatch
module Routing

View File

@ -1,14 +1,14 @@
# frozen_string_literal: true
require_relative "../journey"
require "action_dispatch/journey"
require "active_support/core_ext/object/to_query"
require "active_support/core_ext/hash/slice"
require "active_support/core_ext/module/redefine_method"
require "active_support/core_ext/module/remove_method"
require "active_support/core_ext/array/extract_options"
require "action_controller/metal/exceptions"
require_relative "../http/request"
require_relative "endpoint"
require "action_dispatch/http/request"
require "action_dispatch/routing/endpoint"
module ActionDispatch
module Routing

View File

@ -3,11 +3,11 @@
require "capybara/dsl"
require "capybara/minitest"
require "action_controller"
require_relative "system_testing/driver"
require_relative "system_testing/server"
require_relative "system_testing/test_helpers/screenshot_helper"
require_relative "system_testing/test_helpers/setup_and_teardown"
require_relative "system_testing/test_helpers/undef_methods"
require "action_dispatch/system_testing/driver"
require "action_dispatch/system_testing/server"
require "action_dispatch/system_testing/test_helpers/screenshot_helper"
require "action_dispatch/system_testing/test_helpers/setup_and_teardown"
require "action_dispatch/system_testing/test_helpers/undef_methods"
module ActionDispatch
# = System Testing

View File

@ -7,7 +7,7 @@ require "active_support/core_ext/object/try"
require "rack/test"
require "minitest"
require_relative "request_encoder"
require "action_dispatch/testing/request_encoder"
module ActionDispatch
module Integration #:nodoc:

View File

@ -1,7 +1,7 @@
# frozen_string_literal: true
require_relative "../middleware/cookies"
require_relative "../middleware/flash"
require "action_dispatch/middleware/cookies"
require "action_dispatch/middleware/flash"
module ActionDispatch
module TestProcess

View File

@ -1,6 +1,6 @@
# frozen_string_literal: true
require_relative "request_encoder"
require "action_dispatch/testing/request_encoder"
module ActionDispatch
# Integration test methods such as ActionDispatch::Integration::Session#get

View File

@ -23,4 +23,4 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#++
require_relative "action_pack/version"
require "action_pack/version"