mirrors/EWF
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

now use prefix EWSGI_ instead of GW_ for ewsgi specification

Browse Source
This commit is contained in:
Jocelyn Fiat
2011-07-27 15:40:51 +02:00
parent 302ae8d030
commit e5fb3f8328
14 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
library/server/ewsgi/specification/gw_application.e → library/server/ewsgi/specification/ewsgi_application.e
View File

@@ -1,16 +1,16 @@
note
description: "Summary description for {GW_APPLICATION}."
description: "Summary description for {EWSGI_APPLICATION}."
legal: "See notice at end of class."
status: "See notice at end of class."
date: "$Date$"
revision: "$Revision$"
deferred class
GW_APPLICATION
EWSGI_APPLICATION
feature -- Process request
process (env: GW_ENVIRONMENT; a_input: GW_INPUT_STREAM; a_output: GW_OUTPUT_STREAM)
process (env: EWSGI_ENVIRONMENT; a_input: EWSGI_INPUT_STREAM; a_output: EWSGI_OUTPUT_STREAM)
-- Process request with environment `env', and i/o streams `a_input' and `a_output'
local
rescued: BOOLEAN
@@ -33,7 +33,7 @@ feature -- Process request
feature {NONE} -- Execution
execute (req: GW_REQUEST; res: GW_RESPONSE)
execute (req: EWSGI_REQUEST; res: EWSGI_RESPONSE)
-- Execute the request
-- See `req.input' for input stream
-- `req.environment' for the Gateway environment
@@ -41,19 +41,19 @@ feature {NONE} -- Execution
deferred
end
pre_execute (env: GW_ENVIRONMENT)
pre_execute (env: EWSGI_ENVIRONMENT)
-- Operation processed before `execute'
require
env_attached: env /= Void
do
end
post_execute (req: detachable GW_REQUEST; res: detachable GW_RESPONSE)
post_execute (req: detachable EWSGI_REQUEST; res: detachable EWSGI_RESPONSE)
-- Operation processed after `execute', or after `rescue_execute'
do
end
rescue_execute (req: detachable GW_REQUEST; res: detachable GW_RESPONSE; a_exception: detachable EXCEPTION)
rescue_execute (req: detachable EWSGI_REQUEST; res: detachable EWSGI_RESPONSE; a_exception: detachable EXCEPTION)
-- Operation processed on rescue of `execute'
do
post_execute (req, res)
@@ -61,7 +61,7 @@ feature {NONE} -- Execution
feature -- Factory
new_request (env: GW_ENVIRONMENT; a_input: GW_INPUT_STREAM): GW_REQUEST
new_request (env: EWSGI_ENVIRONMENT; a_input: EWSGI_INPUT_STREAM): EWSGI_REQUEST
-- New Request context based on `env' and `a_input'
--| note: you can redefine this function to create your own
--| descendant of GW_REQUEST_CONTEXT , or even to reuse/recycle existing
@@ -69,7 +69,7 @@ feature -- Factory
deferred
end
new_response (req: GW_REQUEST; a_output: GW_OUTPUT_STREAM): GW_RESPONSE
new_response (req: EWSGI_REQUEST; a_output: EWSGI_OUTPUT_STREAM): EWSGI_RESPONSE
-- New Response based on `req' and `a_output'
--| note: you can redefine this function to create your own
--| descendant of GW_RESPONSE , or even to reuse/recycle existing

6
library/server/ewsgi/specification/gw_connector.e → library/server/ewsgi/specification/ewsgi_connector.e
View File

@@ -1,11 +1,11 @@
note
description: "Summary description for {GW_CONNECTOR}."
description: "Summary description for {EWSGI_CONNECTOR}."
author: ""
date: "$Date$"
revision: "$Revision$"
deferred class
GW_CONNECTOR
EWSGI_CONNECTOR
feature {NONE} -- Initialization
@@ -22,7 +22,7 @@ feature {NONE} -- Initialization
feature {NONE} -- Access
application: GW_APPLICATION
application: EWSGI_APPLICATION
-- Gateway Application
feature -- Server

2
library/server/ewsgi/specification/gw_cookie.e → library/server/ewsgi/specification/ewsgi_cookie.e
View File

@@ -8,7 +8,7 @@ note
revision: "$Revision$"
class
GW_COOKIE
EWSGI_COOKIE
create
make

14
library/server/ewsgi/specification/gw_environment.e → library/server/ewsgi/specification/ewsgi_environment.e
View File

@@ -91,10 +91,10 @@ note
deferred
class
GW_ENVIRONMENT
EWSGI_ENVIRONMENT
inherit
GW_VARIABLES [STRING_8]
EWSGI_VARIABLES [STRING_8]
ITERABLE [STRING_8]
@@ -581,7 +581,7 @@ feature -- Extra
deferred
end
feature {GW_REQUEST} -- Element change
feature {EWSGI_REQUEST} -- Element change
set_orig_path_info (s: STRING)
-- Set ORIG_PATH_INFO to `s'
@@ -589,21 +589,21 @@ feature {GW_REQUEST} -- Element change
s_attached: s /= Void
deferred
ensure
same_orig_path_info: orig_path_info ~ variable ({GW_ENVIRONMENT_NAMES}.orig_path_info)
same_orig_path_info: orig_path_info ~ variable ({EWSGI_ENVIRONMENT_NAMES}.orig_path_info)
end
unset_orig_path_info
-- Unset ORIG_PATH_INFO
deferred
ensure
unset: not has_variable ({GW_ENVIRONMENT_NAMES}.orig_path_info)
unset: not has_variable ({EWSGI_ENVIRONMENT_NAMES}.orig_path_info)
end
update_path_info (a_path_info: like path_info)
-- Updated PATH_INFO
deferred
ensure
same_path_info: path_info ~ variable ({GW_ENVIRONMENT_NAMES}.path_info)
same_path_info: path_info ~ variable ({EWSGI_ENVIRONMENT_NAMES}.path_info)
end
invariant
@@ -614,7 +614,7 @@ invariant
query_string_attached: query_string /= Void
remote_addr_attached: remote_addr /= Void
path_info_identical: path_info ~ variable ({GW_ENVIRONMENT_NAMES}.path_info)
path_info_identical: path_info ~ variable ({EWSGI_ENVIRONMENT_NAMES}.path_info)
;note
copyright: "2011-2011, Eiffel Software and others"

4
library/server/ewsgi/specification/gw_environment_names.e → library/server/ewsgi/specification/ewsgi_environment_names.e
View File

@@ -1,12 +1,12 @@
note
description: "Summary description for {GW_ENVIRONMENT_NAMES}."
description: "Summary description for {EWSGI_ENVIRONMENT_NAMES}."
legal: "See notice at end of class."
status: "See notice at end of class."
date: "$Date$"
revision: "$Revision$"
class
GW_ENVIRONMENT_NAMES
EWSGI_ENVIRONMENT_NAMES
feature -- Access

68
library/server/ewsgi/specification/gw_environment_variables.e → library/server/ewsgi/specification/ewsgi_environment_variables.e
View File

@@ -1,15 +1,15 @@
note
description: "Summary description for {GW_ENVIRONMENT_VARIABLES}."
description: "Summary description for {EWSGI_ENVIRONMENT_VARIABLES}."
legal: "See notice at end of class."
status: "See notice at end of class."
date: "$Date$"
revision: "$Revision$"
class
GW_ENVIRONMENT_VARIABLES
EWSGI_ENVIRONMENT_VARIABLES
inherit
GW_ENVIRONMENT
EWSGI_ENVIRONMENT
redefine
update_path_info
end
@@ -37,13 +37,13 @@ feature {NONE} -- Initialization
end
--| QUERY_STRING
query_string := variable_or_default ({GW_ENVIRONMENT_NAMES}.query_string, empty_string, False)
query_string := variable_or_default ({EWSGI_ENVIRONMENT_NAMES}.query_string, empty_string, False)
--| REQUEST_METHOD
request_method := variable_or_default ({GW_ENVIRONMENT_NAMES}.request_method, empty_string, False)
request_method := variable_or_default ({EWSGI_ENVIRONMENT_NAMES}.request_method, empty_string, False)
--| CONTENT_TYPE
s := variable ({GW_ENVIRONMENT_NAMES}.content_type)
s := variable ({EWSGI_ENVIRONMENT_NAMES}.content_type)
if s /= Void and then not s.is_empty then
content_type := s
else
@@ -51,7 +51,7 @@ feature {NONE} -- Initialization
end
--| CONTENT_LENGTH
s := variable ({GW_ENVIRONMENT_NAMES}.content_length)
s := variable ({EWSGI_ENVIRONMENT_NAMES}.content_length)
content_length := s
if s /= Void and then s.is_integer then
content_length_value := s.to_integer
@@ -60,13 +60,13 @@ feature {NONE} -- Initialization
end
--| PATH_INFO
path_info := variable_or_default ({GW_ENVIRONMENT_NAMES}.path_info, empty_string, False)
path_info := variable_or_default ({EWSGI_ENVIRONMENT_NAMES}.path_info, empty_string, False)
--| SERVER_NAME
server_name := variable_or_default ({GW_ENVIRONMENT_NAMES}.server_name, empty_string, False)
server_name := variable_or_default ({EWSGI_ENVIRONMENT_NAMES}.server_name, empty_string, False)
--| SERVER_PORT
s := variable ({GW_ENVIRONMENT_NAMES}.server_port)
s := variable ({EWSGI_ENVIRONMENT_NAMES}.server_port)
if s /= Void and then s.is_integer then
server_port := s.to_integer
else
@@ -74,16 +74,16 @@ feature {NONE} -- Initialization
end
--| SCRIPT_NAME
script_name := variable_or_default ({GW_ENVIRONMENT_NAMES}.script_name, empty_string, False)
script_name := variable_or_default ({EWSGI_ENVIRONMENT_NAMES}.script_name, empty_string, False)
--| REMOTE_ADDR
remote_addr := variable_or_default ({GW_ENVIRONMENT_NAMES}.remote_addr, empty_string, False)
remote_addr := variable_or_default ({EWSGI_ENVIRONMENT_NAMES}.remote_addr, empty_string, False)
--| REMOTE_HOST
remote_host := variable_or_default ({GW_ENVIRONMENT_NAMES}.remote_host, empty_string, False)
remote_host := variable_or_default ({EWSGI_ENVIRONMENT_NAMES}.remote_host, empty_string, False)
--| REQUEST_URI
request_uri := variable_or_default ({GW_ENVIRONMENT_NAMES}.request_uri, empty_string, False)
request_uri := variable_or_default ({EWSGI_ENVIRONMENT_NAMES}.request_uri, empty_string, False)
end
feature -- Access
@@ -102,7 +102,7 @@ feature -- Access
Result := table.has_key (a_name)
end
feature {GW_REQUEST, GW_APPLICATION, GW_CONNECTOR} -- Element change
feature {EWSGI_REQUEST, EWSGI_APPLICATION, EWSGI_CONNECTOR} -- Element change
set_variable (a_name: STRING; a_value: STRING)
do
@@ -126,7 +126,7 @@ feature -- Common Gateway Interface - 1.1 8 January 1996
gateway_interface: STRING
do
Result := variable_or_default ({GW_ENVIRONMENT_NAMES}.gateway_interface, "", False)
Result := variable_or_default ({EWSGI_ENVIRONMENT_NAMES}.gateway_interface, "", False)
end
path_info: STRING
@@ -139,7 +139,7 @@ feature -- Common Gateway Interface - 1.1 8 January 1996
path_translated: detachable STRING
do
Result := variable ({GW_ENVIRONMENT_NAMES}.path_translated)
Result := variable ({EWSGI_ENVIRONMENT_NAMES}.path_translated)
end
query_string: STRING
@@ -150,12 +150,12 @@ feature -- Common Gateway Interface - 1.1 8 January 1996
remote_ident: detachable STRING
do
Result := variable ({GW_ENVIRONMENT_NAMES}.remote_ident)
Result := variable ({EWSGI_ENVIRONMENT_NAMES}.remote_ident)
end
remote_user: detachable STRING
do
Result := variable ({GW_ENVIRONMENT_NAMES}.remote_user)
Result := variable ({EWSGI_ENVIRONMENT_NAMES}.remote_user)
end
request_method: STRING
@@ -168,12 +168,12 @@ feature -- Common Gateway Interface - 1.1 8 January 1996
server_protocol: STRING
do
Result := variable_or_default ({GW_ENVIRONMENT_NAMES}.server_protocol, "HTTP/1.0", True)
Result := variable_or_default ({EWSGI_ENVIRONMENT_NAMES}.server_protocol, "HTTP/1.0", True)
end
server_software: STRING
do
Result := variable_or_default ({GW_ENVIRONMENT_NAMES}.server_software, "Unknown Server", True)
Result := variable_or_default ({EWSGI_ENVIRONMENT_NAMES}.server_software, "Unknown Server", True)
end
feature -- HTTP_*
@@ -181,41 +181,41 @@ feature -- HTTP_*
http_accept: detachable STRING
-- Contents of the Accept: header from the current request, if there is one.
do
Result := table.item ({GW_ENVIRONMENT_NAMES}.http_accept)
Result := table.item ({EWSGI_ENVIRONMENT_NAMES}.http_accept)
end
http_accept_charset: detachable STRING
-- Contents of the Accept-Charset: header from the current request, if there is one.
-- Example: 'iso-8859-1,*,utf-8'.
do
Result := table.item ({GW_ENVIRONMENT_NAMES}.http_accept_charset)
Result := table.item ({EWSGI_ENVIRONMENT_NAMES}.http_accept_charset)
end
http_accept_encoding: detachable STRING
-- Contents of the Accept-Encoding: header from the current request, if there is one.
-- Example: 'gzip'.
do
Result := table.item ({GW_ENVIRONMENT_NAMES}.http_accept_encoding)
Result := table.item ({EWSGI_ENVIRONMENT_NAMES}.http_accept_encoding)
end
http_accept_language: detachable STRING
-- Contents of the Accept-Language: header from the current request, if there is one.
-- Example: 'en'.
do
Result := table.item ({GW_ENVIRONMENT_NAMES}.http_accept_language)
Result := table.item ({EWSGI_ENVIRONMENT_NAMES}.http_accept_language)
end
http_connection: detachable STRING
-- Contents of the Connection: header from the current request, if there is one.
-- Example: 'Keep-Alive'.
do
Result := table.item ({GW_ENVIRONMENT_NAMES}.http_connection)
Result := table.item ({EWSGI_ENVIRONMENT_NAMES}.http_connection)
end
http_host: detachable STRING
-- Contents of the Host: header from the current request, if there is one.
do
Result := table.item ({GW_ENVIRONMENT_NAMES}.http_host)
Result := table.item ({EWSGI_ENVIRONMENT_NAMES}.http_host)
end
http_referer: detachable STRING
@@ -224,7 +224,7 @@ feature -- HTTP_*
-- Not all user agents will set this, and some provide the ability to modify HTTP_REFERER as a feature.
-- In short, it cannot really be trusted.
do
Result := table.item ({GW_ENVIRONMENT_NAMES}.http_referer)
Result := table.item ({EWSGI_ENVIRONMENT_NAMES}.http_referer)
end
http_user_agent: detachable STRING
@@ -234,13 +234,13 @@ feature -- HTTP_*
-- Among other things, you can use this value to tailor your page's
-- output to the capabilities of the user agent.
do
Result := table.item ({GW_ENVIRONMENT_NAMES}.http_user_agent)
Result := table.item ({EWSGI_ENVIRONMENT_NAMES}.http_user_agent)
end
http_authorization: detachable STRING
-- Contents of the Authorization: header from the current request, if there is one.
do
Result := table.item ({GW_ENVIRONMENT_NAMES}.http_authorization)
Result := table.item ({EWSGI_ENVIRONMENT_NAMES}.http_authorization)
end
feature -- Extra
@@ -251,24 +251,24 @@ feature -- Extra
orig_path_info: detachable STRING
-- Original version of `path_info' before processed by Current environment
feature {GW_REQUEST} -- Update
feature {EWSGI_REQUEST} -- Update
set_orig_path_info (s: STRING)
do
orig_path_info := s
set_variable ({GW_ENVIRONMENT_NAMES}.orig_path_info, s)
set_variable ({EWSGI_ENVIRONMENT_NAMES}.orig_path_info, s)
end
unset_orig_path_info
do
orig_path_info := Void
unset_variable ({GW_ENVIRONMENT_NAMES}.orig_path_info)
unset_variable ({EWSGI_ENVIRONMENT_NAMES}.orig_path_info)
end
update_path_info (a_path_info: like path_info)
do
path_info := a_path_info
set_variable ({GW_ENVIRONMENT_NAMES}.path_info, a_path_info)
set_variable ({EWSGI_ENVIRONMENT_NAMES}.path_info, a_path_info)
end
feature {NONE} -- Implementation

8
library/server/ewsgi/specification/gw_execution_variables.e → library/server/ewsgi/specification/ewsgi_execution_variables.e
View File

@@ -1,15 +1,15 @@
note
description: "Summary description for {HTTPD_EXECUTION_VARIABLES}."
description: "Summary description for {EWSGI_EXECUTION_VARIABLES}."
legal: "See notice at end of class."
status: "See notice at end of class."
date: "$Date$"
revision: "$Revision$"
class
GW_EXECUTION_VARIABLES
EWSGI_EXECUTION_VARIABLES
inherit
GW_VARIABLES [STRING_32]
EWSGI_VARIABLES [STRING_32]
undefine
copy, is_equal
end
@@ -31,7 +31,7 @@ feature -- Status report
Result := has (a_name)
end
feature {GW_REQUEST, GW_APPLICATION, GW_CONNECTOR} -- Element change
feature {EWSGI_REQUEST, EWSGI_APPLICATION, EWSGI_CONNECTOR} -- Element change
set_variable (a_name: STRING; a_value: STRING_32)
do

16
library/server/ewsgi/specification/gw_request.e → library/server/ewsgi/specification/ewsgi_request.e
View File

@@ -13,11 +13,11 @@ note
revision: "$Revision$"
deferred class
GW_REQUEST
EWSGI_REQUEST
feature -- Access: Input
input: GW_INPUT_STREAM
input: EWSGI_INPUT_STREAM
-- Server input channel
deferred
end
@@ -31,7 +31,7 @@ feature -- Access: extra values
feature -- Access: environment variables
environment: GW_ENVIRONMENT
environment: EWSGI_ENVIRONMENT
-- Environment variables
deferred
end
@@ -45,7 +45,7 @@ feature -- Access: environment variables
feature -- Access: execution variables
execution_variables: GW_EXECUTION_VARIABLES
execution_variables: EWSGI_EXECUTION_VARIABLES
-- Execution variables set by the application
deferred
end
@@ -59,7 +59,7 @@ feature -- Access: execution variables
feature -- URL Parameters
parameters: GW_REQUEST_VARIABLES
parameters: EWSGI_REQUEST_VARIABLES
-- Variables extracted from QUERY_STRING
deferred
end
@@ -73,7 +73,7 @@ feature -- URL Parameters
feature -- Form fields and related
form_fields: GW_REQUEST_VARIABLES
form_fields: EWSGI_REQUEST_VARIABLES
-- Variables sent by POST request
deferred
end
@@ -85,7 +85,7 @@ feature -- Form fields and related
deferred
end
uploaded_files: HASH_TABLE [GW_UPLOADED_FILE_DATA, STRING]
uploaded_files: HASH_TABLE [EWSGI_UPLOADED_FILE_DATA, STRING]
-- Table of uploaded files information
--| name: original path from the user
--| type: content type
@@ -110,7 +110,7 @@ feature -- Cookies
deferred
end
cookies: HASH_TABLE [GW_COOKIE, STRING]
cookies: HASH_TABLE [EWSGI_COOKIE, STRING]
-- Cookies Information
deferred
end

10
library/server/ewsgi/specification/gw_request_variables.e → library/server/ewsgi/specification/ewsgi_request_variables.e
View File

@@ -8,10 +8,10 @@ note
revision: "$Revision$"
class
GW_REQUEST_VARIABLES
EWSGI_REQUEST_VARIABLES
inherit
GW_VARIABLES [STRING_32]
EWSGI_VARIABLES [STRING_32]
ITERABLE [STRING_32]
@@ -51,7 +51,7 @@ feature -- Status report
Result := table.has (a_name)
end
feature {GW_REQUEST, GW_APPLICATION, GW_CONNECTOR} -- Element change
feature {EWSGI_REQUEST, EWSGI_APPLICATION, EWSGI_CONNECTOR} -- Element change
set_variable (a_name: STRING; a_value: STRING_32)
do
@@ -111,7 +111,7 @@ feature -- Access: table
create Result.make (table)
end
feature {GW_REQUEST} -- Element change
feature {EWSGI_REQUEST} -- Element change
add_variable (v: STRING_32; k: STRING_32)
-- Added `k,v' to variables table
@@ -124,7 +124,7 @@ feature {GW_REQUEST} -- Element change
table.force (v, k)
end
feature {GW_REQUEST} -- Element change
feature {EWSGI_REQUEST} -- Element change
table: HASH_TABLE [STRING_32, STRING_32]
-- Variables table

8
library/server/ewsgi/specification/gw_response.e → library/server/ewsgi/specification/ewsgi_response.e
View File

@@ -1,15 +1,15 @@
note
description: "Summary description for {GW_RESPONSE}."
description: "Summary description for {EWSGI_RESPONSE}."
author: ""
date: "$Date$"
revision: "$Revision$"
deferred class
GW_RESPONSE
EWSGI_RESPONSE
feature {GW_APPLICATION} -- Commit
feature {EWSGI_APPLICATION} -- Commit
commit (a_output_stream: GW_OUTPUT_STREAM)
commit (a_output_stream: EWSGI_OUTPUT_STREAM)
-- Commit the current response
deferred
ensure

2
library/server/ewsgi/specification/gw_uploaded_file_data.e → library/server/ewsgi/specification/ewsgi_uploaded_file_data.e
View File

@@ -5,7 +5,7 @@ note
revision: "$Revision$"
class
GW_UPLOADED_FILE_DATA
EWSGI_UPLOADED_FILE_DATA
create
make

4
library/server/ewsgi/specification/gw_variables.e → library/server/ewsgi/specification/ewsgi_variables.e
View File

@@ -8,7 +8,7 @@ note
revision: "$Revision$"
deferred class
GW_VARIABLES [G -> STRING_GENERAL]
EWSGI_VARIABLES [G -> STRING_GENERAL]
feature -- Status report
@@ -46,7 +46,7 @@ feature -- Access
end
end
feature {GW_REQUEST, GW_APPLICATION, GW_CONNECTOR} -- Element change
feature {EWSGI_REQUEST, EWSGI_APPLICATION, EWSGI_CONNECTOR} -- Element change
set_variable (a_name: STRING; a_value: G)
require

2
library/server/ewsgi/specification/stream/gw_input_stream.e → library/server/ewsgi/specification/stream/ewsgi_input_stream.e
View File

@@ -8,7 +8,7 @@ note
revision: "$Revision$"
deferred class
GW_INPUT_STREAM
EWSGI_INPUT_STREAM
feature -- Access

2
library/server/ewsgi/specification/stream/gw_output_stream.e → library/server/ewsgi/specification/stream/ewsgi_output_stream.e
View File

@@ -8,7 +8,7 @@ note
revision: "$Revision$"
deferred class
GW_OUTPUT_STREAM
EWSGI_OUTPUT_STREAM
inherit
ANY