mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
[Action Pack] require => require_relative
This basically revertse9fca7668b
,d08da958b9
,d1fe1dcf8a
, and68eaf7b4d5
This commit is contained in:
parent
d5ea33b9a0
commit
b0d0c9f40d
37 changed files with 70 additions and 70 deletions
|
@ -1,6 +1,6 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "error"
|
require "abstract_controller/error"
|
||||||
require "active_support/configurable"
|
require "active_support/configurable"
|
||||||
require "active_support/descendants_tracker"
|
require "active_support/descendants_tracker"
|
||||||
require "active_support/core_ext/module/anonymous"
|
require "active_support/core_ext/module/anonymous"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "error"
|
require "abstract_controller/error"
|
||||||
require "action_view"
|
require "action_view"
|
||||||
require "action_view/view_paths"
|
require "action_view/view_paths"
|
||||||
require "set"
|
require "set"
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
require "active_support/rails"
|
require "active_support/rails"
|
||||||
require "abstract_controller"
|
require "abstract_controller"
|
||||||
require "action_dispatch"
|
require "action_dispatch"
|
||||||
require_relative "action_controller/metal/live"
|
require "action_controller/metal/live"
|
||||||
require_relative "action_controller/metal/strong_parameters"
|
require "action_controller/metal/strong_parameters"
|
||||||
|
|
||||||
module ActionController
|
module ActionController
|
||||||
extend ActiveSupport::Autoload
|
extend ActiveSupport::Autoload
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
require "action_view"
|
require "action_view"
|
||||||
require "action_controller"
|
require "action_controller"
|
||||||
require_relative "log_subscriber"
|
require "action_controller/log_subscriber"
|
||||||
|
|
||||||
module ActionController
|
module ActionController
|
||||||
# API Controller is a lightweight version of <tt>ActionController::Base</tt>,
|
# API Controller is a lightweight version of <tt>ActionController::Base</tt>,
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require "action_view"
|
require "action_view"
|
||||||
require_relative "log_subscriber"
|
require "action_controller/log_subscriber"
|
||||||
require_relative "metal/params_wrapper"
|
require "action_controller/metal/params_wrapper"
|
||||||
|
|
||||||
module ActionController
|
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
|
# Action Controllers are the core of a web request in \Rails. They are made up of one or more actions that are executed
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "exceptions"
|
require "action_controller/metal/exceptions"
|
||||||
|
|
||||||
module ActionController #:nodoc:
|
module ActionController #:nodoc:
|
||||||
# Methods for sending arbitrary data and for streaming files to the browser,
|
# Methods for sending arbitrary data and for streaming files to the browser,
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require "rack/session/abstract/id"
|
require "rack/session/abstract/id"
|
||||||
require_relative "exceptions"
|
require "action_controller/metal/exceptions"
|
||||||
require "active_support/security_utils"
|
require "active_support/security_utils"
|
||||||
|
|
||||||
module ActionController #:nodoc:
|
module ActionController #:nodoc:
|
||||||
|
|
|
@ -4,7 +4,7 @@ require "rails"
|
||||||
require "action_controller"
|
require "action_controller"
|
||||||
require "action_dispatch/railtie"
|
require "action_dispatch/railtie"
|
||||||
require "abstract_controller/railties/routes_helpers"
|
require "abstract_controller/railties/routes_helpers"
|
||||||
require_relative "railties/helpers"
|
require "action_controller/railties/helpers"
|
||||||
require "action_view/railtie"
|
require "action_view/railtie"
|
||||||
|
|
||||||
module ActionController
|
module ActionController
|
||||||
|
|
|
@ -7,7 +7,7 @@ require "active_support/core_ext/module/anonymous"
|
||||||
require "active_support/core_ext/module/redefine_method"
|
require "active_support/core_ext/module/redefine_method"
|
||||||
require "active_support/core_ext/hash/keys"
|
require "active_support/core_ext/hash/keys"
|
||||||
require "active_support/testing/constant_lookup"
|
require "active_support/testing/constant_lookup"
|
||||||
require_relative "template_assertions"
|
require "action_controller/template_assertions"
|
||||||
require "rails-dom-testing"
|
require "rails-dom-testing"
|
||||||
|
|
||||||
module ActionController
|
module ActionController
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "parameter_filter"
|
require "action_dispatch/http/parameter_filter"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
module Http
|
module Http
|
||||||
|
|
|
@ -339,4 +339,4 @@ module Mime
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
require_relative "mime_types"
|
require "action_dispatch/http/mime_types"
|
||||||
|
|
|
@ -3,15 +3,15 @@
|
||||||
require "stringio"
|
require "stringio"
|
||||||
|
|
||||||
require "active_support/inflector"
|
require "active_support/inflector"
|
||||||
require_relative "headers"
|
require "action_dispatch/http/headers"
|
||||||
require "action_controller/metal/exceptions"
|
require "action_controller/metal/exceptions"
|
||||||
require "rack/request"
|
require "rack/request"
|
||||||
require_relative "cache"
|
require "action_dispatch/http/cache"
|
||||||
require_relative "mime_negotiation"
|
require "action_dispatch/http/mime_negotiation"
|
||||||
require_relative "parameters"
|
require "action_dispatch/http/parameters"
|
||||||
require_relative "filter_parameters"
|
require "action_dispatch/http/filter_parameters"
|
||||||
require_relative "upload"
|
require "action_dispatch/http/upload"
|
||||||
require_relative "url"
|
require "action_dispatch/http/url"
|
||||||
require "active_support/core_ext/array/conversions"
|
require "active_support/core_ext/array/conversions"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require "active_support/core_ext/module/attribute_accessors"
|
require "active_support/core_ext/module/attribute_accessors"
|
||||||
require_relative "filter_redirect"
|
require "action_dispatch/http/filter_redirect"
|
||||||
require_relative "cache"
|
require "action_dispatch/http/cache"
|
||||||
require "monitor"
|
require "monitor"
|
||||||
|
|
||||||
module ActionDispatch # :nodoc:
|
module ActionDispatch # :nodoc:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "journey/router"
|
require "action_dispatch/journey/router"
|
||||||
require_relative "journey/gtg/builder"
|
require "action_dispatch/journey/gtg/builder"
|
||||||
require_relative "journey/gtg/simulator"
|
require "action_dispatch/journey/gtg/simulator"
|
||||||
require_relative "journey/nfa/builder"
|
require "action_dispatch/journey/nfa/builder"
|
||||||
require_relative "journey/nfa/simulator"
|
require "action_dispatch/journey/nfa/simulator"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "transition_table"
|
require "action_dispatch/journey/gtg/transition_table"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
module Journey # :nodoc:
|
module Journey # :nodoc:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "../nfa/dot"
|
require "action_dispatch/journey/nfa/dot"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
module Journey # :nodoc:
|
module Journey # :nodoc:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "transition_table"
|
require "action_dispatch/journey/nfa/transition_table"
|
||||||
require_relative "../gtg/transition_table"
|
require "action_dispatch/journey/gtg/transition_table"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
module Journey # :nodoc:
|
module Journey # :nodoc:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "dot"
|
require "action_dispatch/journey/nfa/dot"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
module Journey # :nodoc:
|
module Journey # :nodoc:
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "../visitors"
|
require "action_dispatch/journey/visitors"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
module Journey # :nodoc:
|
module Journey # :nodoc:
|
||||||
|
|
|
@ -8,7 +8,7 @@ require 'racc/parser.rb'
|
||||||
|
|
||||||
# :stopdoc:
|
# :stopdoc:
|
||||||
|
|
||||||
require_relative "parser_extras"
|
require "action_dispatch/journey/parser_extras"
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
module Journey
|
module Journey
|
||||||
class Parser < Racc::Parser
|
class Parser < Racc::Parser
|
||||||
|
|
|
@ -47,4 +47,4 @@ end
|
||||||
---- header
|
---- header
|
||||||
# :stopdoc:
|
# :stopdoc:
|
||||||
|
|
||||||
require_relative "parser_extras"
|
require "action_dispatch/journey/parser_extras"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "scanner"
|
require "action_dispatch/journey/scanner"
|
||||||
require_relative "nodes/node"
|
require "action_dispatch/journey/nodes/node"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
# :stopdoc:
|
# :stopdoc:
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "router/utils"
|
require "action_dispatch/journey/router/utils"
|
||||||
require_relative "routes"
|
require "action_dispatch/journey/routes"
|
||||||
require_relative "formatter"
|
require "action_dispatch/journey/formatter"
|
||||||
|
|
||||||
before = $-w
|
before = $-w
|
||||||
$-w = false
|
$-w = false
|
||||||
require_relative "parser"
|
require "action_dispatch/journey/parser"
|
||||||
$-w = before
|
$-w = before
|
||||||
|
|
||||||
require_relative "route"
|
require "action_dispatch/journey/route"
|
||||||
require_relative "path/pattern"
|
require "action_dispatch/journey/path/pattern"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
module Journey # :nodoc:
|
module Journey # :nodoc:
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "../http/request"
|
require "action_dispatch/http/request"
|
||||||
require_relative "exception_wrapper"
|
require "action_dispatch/middleware/exception_wrapper"
|
||||||
require_relative "../routing/inspector"
|
require "action_dispatch/routing/inspector"
|
||||||
require "action_view"
|
require "action_view"
|
||||||
require "action_view/base"
|
require "action_view/base"
|
||||||
|
|
||||||
|
|
|
@ -3,8 +3,8 @@
|
||||||
require "rack/utils"
|
require "rack/utils"
|
||||||
require "rack/request"
|
require "rack/request"
|
||||||
require "rack/session/abstract/id"
|
require "rack/session/abstract/id"
|
||||||
require_relative "../cookies"
|
require "action_dispatch/middleware/cookies"
|
||||||
require_relative "../../request/session"
|
require "action_dispatch/request/session"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
module Session
|
module Session
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "abstract_store"
|
require "action_dispatch/middleware/session/abstract_store"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
module Session
|
module Session
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require "active_support/core_ext/hash/keys"
|
require "active_support/core_ext/hash/keys"
|
||||||
require_relative "abstract_store"
|
require "action_dispatch/middleware/session/abstract_store"
|
||||||
require "rack/session/cookie"
|
require "rack/session/cookie"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "abstract_store"
|
require "action_dispatch/middleware/session/abstract_store"
|
||||||
begin
|
begin
|
||||||
require "rack/session/dalli"
|
require "rack/session/dalli"
|
||||||
rescue LoadError => e
|
rescue LoadError => e
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "../http/request"
|
require "action_dispatch/http/request"
|
||||||
require_relative "exception_wrapper"
|
require "action_dispatch/middleware/exception_wrapper"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
# This middleware rescues any exception returned by the application
|
# This middleware rescues any exception returned by the application
|
||||||
|
|
|
@ -4,8 +4,8 @@ require "active_support/core_ext/hash/slice"
|
||||||
require "active_support/core_ext/enumerable"
|
require "active_support/core_ext/enumerable"
|
||||||
require "active_support/core_ext/array/extract_options"
|
require "active_support/core_ext/array/extract_options"
|
||||||
require "active_support/core_ext/regexp"
|
require "active_support/core_ext/regexp"
|
||||||
require_relative "redirection"
|
require "action_dispatch/routing/redirection"
|
||||||
require_relative "endpoint"
|
require "action_dispatch/routing/endpoint"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
module Routing
|
module Routing
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "../http/request"
|
require "action_dispatch/http/request"
|
||||||
require "active_support/core_ext/uri"
|
require "active_support/core_ext/uri"
|
||||||
require "active_support/core_ext/array/extract_options"
|
require "active_support/core_ext/array/extract_options"
|
||||||
require "rack/utils"
|
require "rack/utils"
|
||||||
require "action_controller/metal/exceptions"
|
require "action_controller/metal/exceptions"
|
||||||
require_relative "endpoint"
|
require "action_dispatch/routing/endpoint"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
module Routing
|
module Routing
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "../journey"
|
require "action_dispatch/journey"
|
||||||
require "active_support/core_ext/object/to_query"
|
require "active_support/core_ext/object/to_query"
|
||||||
require "active_support/core_ext/hash/slice"
|
require "active_support/core_ext/hash/slice"
|
||||||
require "active_support/core_ext/module/redefine_method"
|
require "active_support/core_ext/module/redefine_method"
|
||||||
require "active_support/core_ext/module/remove_method"
|
require "active_support/core_ext/module/remove_method"
|
||||||
require "active_support/core_ext/array/extract_options"
|
require "active_support/core_ext/array/extract_options"
|
||||||
require "action_controller/metal/exceptions"
|
require "action_controller/metal/exceptions"
|
||||||
require_relative "../http/request"
|
require "action_dispatch/http/request"
|
||||||
require_relative "endpoint"
|
require "action_dispatch/routing/endpoint"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
module Routing
|
module Routing
|
||||||
|
|
|
@ -3,11 +3,11 @@
|
||||||
require "capybara/dsl"
|
require "capybara/dsl"
|
||||||
require "capybara/minitest"
|
require "capybara/minitest"
|
||||||
require "action_controller"
|
require "action_controller"
|
||||||
require_relative "system_testing/driver"
|
require "action_dispatch/system_testing/driver"
|
||||||
require_relative "system_testing/server"
|
require "action_dispatch/system_testing/server"
|
||||||
require_relative "system_testing/test_helpers/screenshot_helper"
|
require "action_dispatch/system_testing/test_helpers/screenshot_helper"
|
||||||
require_relative "system_testing/test_helpers/setup_and_teardown"
|
require "action_dispatch/system_testing/test_helpers/setup_and_teardown"
|
||||||
require_relative "system_testing/test_helpers/undef_methods"
|
require "action_dispatch/system_testing/test_helpers/undef_methods"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
# = System Testing
|
# = System Testing
|
||||||
|
|
|
@ -7,7 +7,7 @@ require "active_support/core_ext/object/try"
|
||||||
require "rack/test"
|
require "rack/test"
|
||||||
require "minitest"
|
require "minitest"
|
||||||
|
|
||||||
require_relative "request_encoder"
|
require "action_dispatch/testing/request_encoder"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
module Integration #:nodoc:
|
module Integration #:nodoc:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "../middleware/cookies"
|
require "action_dispatch/middleware/cookies"
|
||||||
require_relative "../middleware/flash"
|
require "action_dispatch/middleware/flash"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
module TestProcess
|
module TestProcess
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
require_relative "request_encoder"
|
require "action_dispatch/testing/request_encoder"
|
||||||
|
|
||||||
module ActionDispatch
|
module ActionDispatch
|
||||||
# Integration test methods such as ActionDispatch::Integration::Session#get
|
# Integration test methods such as ActionDispatch::Integration::Session#get
|
||||||
|
|
|
@ -23,4 +23,4 @@
|
||||||
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||||
#++
|
#++
|
||||||
|
|
||||||
require_relative "action_pack/version"
|
require "action_pack/version"
|
||||||
|
|
Loading…
Reference in a new issue