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

Improvement

Browse Source 
and revert back to support draft 04
(but using custom variable, allow the user to follow draft 05 spec)
This commit is contained in:
Jocelyn Fiat
2011-07-22 16:57:50 +02:00
parent e1ef4c390e
commit 0ef88eadf5
10 changed files with 1128 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
library/protocol/uri_template/src/draft_05/uri_template_constants.e Normal file
View File

@@ -0,0 +1,52 @@
note
description: "[
Summary description for {URI_TEMPLATE_CONSTANTS}.
see http://tools.ietf.org/html/draft-gregorio-uritemplate-05
]"
author: ""
date: "$Date$"
revision: "$Revision$"
class
URI_TEMPLATE_CONSTANTS
feature -- Operator
Reserved_operator: CHARACTER = '+'
Form_style_query_operator: CHARACTER = '?'
Path_style_parameters_operator: CHARACTER = ';'
Path_segment_operator: CHARACTER = '/'
Label_operator: CHARACTER = '.'
feature -- Separator
Default_delimiter: CHARACTER = '|' --| Draft 05
feature -- Explode
Explode_plus: CHARACTER = '+'
Explode_star: CHARACTER = '*'
feature -- Modified
Modifier_substring: CHARACTER = ':'
Modifier_remainder: CHARACTER = '^'
note
copyright: "2011-2011, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software
5949 Hollister Ave., Goleta, CA 93117 USA
Telephone 805-685-1006, Fax 805-685-6869
Website http://www.eiffel.com
Customer support http://support.eiffel.com
]"
end

118
library/protocol/uri_template/src/uri_template.e
View File

@@ -2,7 +2,9 @@ note
description: "[
Summary description for {URI_TEMPLATE}.
See http://tools.ietf.org/html/draft-gregorio-uritemplate-05
See http://tools.ietf.org/html/draft-gregorio-uritemplate-04
note for draft 05, check {URI_TEMPLATE_CONSTANTS}.Default_delimiter
]"
legal: "See notice at end of class."
@@ -52,17 +54,18 @@ feature -- Access
feature -- Structures
variable_names: LIST [STRING]
-- All variable names
do
analyze (Void)
if attached expansion_parts as l_x_parts then
create {ARRAYED_LIST [STRING]} Result.make (l_x_parts.count)
analyze
if attached expressions as l_expressions then
create {ARRAYED_LIST [STRING]} Result.make (l_expressions.count)
from
l_x_parts.start
l_expressions.start
until
l_x_parts.after
l_expressions.after
loop
Result.append (l_x_parts.item.variable_names)
l_x_parts.forth
Result.append (l_expressions.item.variable_names)
l_expressions.forth
end
else
create {ARRAYED_LIST [STRING]} Result.make (0)
@@ -70,19 +73,20 @@ feature -- Structures
end
path_variable_names: LIST [STRING]
-- All variable names part of the path
do
analyze (Void)
if attached expansion_parts as l_x_parts then
create {ARRAYED_LIST [STRING]} Result.make (l_x_parts.count)
analyze
if attached expressions as l_expressions then
create {ARRAYED_LIST [STRING]} Result.make (l_expressions.count)
from
l_x_parts.start
l_expressions.start
until
l_x_parts.after
l_expressions.after
loop
if not l_x_parts.item.is_query then
Result.append (l_x_parts.item.variable_names)
if not l_expressions.item.is_query then
Result.append (l_expressions.item.variable_names)
end
l_x_parts.forth
l_expressions.forth
end
else
create {ARRAYED_LIST [STRING]} Result.make (0)
@@ -90,19 +94,20 @@ feature -- Structures
end
query_variable_names: LIST [STRING]
-- All variable names part of the query (i.e after '?')
do
analyze (Void)
if attached expansion_parts as l_x_parts then
create {ARRAYED_LIST [STRING]} Result.make (l_x_parts.count)
analyze
if attached expressions as l_expressions then
create {ARRAYED_LIST [STRING]} Result.make (l_expressions.count)
from
l_x_parts.start
l_expressions.start
until
l_x_parts.after
l_expressions.after
loop
if l_x_parts.item.is_query then
Result.append (l_x_parts.item.variable_names)
if l_expressions.item.is_query then
Result.append (l_expressions.item.variable_names)
end
l_x_parts.forth
l_expressions.forth
end
else
create {ARRAYED_LIST [STRING]} Result.make (0)
@@ -111,33 +116,33 @@ feature -- Structures
feature -- Builder
string (a_ht: HASH_TABLE [detachable ANY, STRING]): STRING
expanded_string (a_ht: HASH_TABLE [detachable ANY, STRING]): STRING
-- Expanded template using variable from `a_ht'
local
tpl: like template
exp: URI_TEMPLATE_EXPRESSION
p,q: INTEGER
do
analyze (Void)
analyze
tpl := template
if attached expansion_parts as l_x_parts then
if attached expressions as l_expressions then
create Result.make (tpl.count)
from
l_x_parts.start
l_expressions.start
p := 1
until
l_x_parts.after
l_expressions.after
loop
q := l_x_parts.item.position
q := l_expressions.item.position
--| Added inter variable text
Result.append (tpl.substring (p, q - 1))
--| Expand variables ...
exp := l_x_parts.item
exp.append_to_string (a_ht, Result)
exp := l_expressions.item
exp.append_expanded_to_string (a_ht, Result)
p := q + l_x_parts.item.expression.count + 2
p := q + l_expressions.item.expression.count + 2
l_x_parts.forth
l_expressions.forth
end
Result.append (tpl.substring (p, tpl.count))
else
@@ -160,33 +165,37 @@ feature -- Match
l_uri_count: INTEGER
do
--| Extract expansion parts "\\{([^\\}]*)\\}"
analyze (Void)
if attached expansion_parts as l_x_parts then
create l_path_vars.make (l_x_parts.count)
create l_query_vars.make (l_x_parts.count)
analyze
if attached expressions as l_expressions then
create l_path_vars.make (l_expressions.count)
create l_query_vars.make (l_expressions.count)
l_vars := l_path_vars
b := True
l_uri_count := a_uri.count
tpl := template
if l_x_parts.is_empty then
if l_expressions.is_empty then
b := a_uri.substring (1, tpl.count).same_string (tpl)
else
from
l_x_parts.start
l_expressions.start
p := 1
l_offset := 0
until
l_x_parts.after or not b
l_expressions.after or not b
loop
exp := l_x_parts.item
exp := l_expressions.item
vn := exp.expression
q := exp.position
--| Check text between vars
--| FIXME jfiat [2011/07/22] : check this ...
--| There should be at least one literal between two expression
--| {var}{foobar} is ambigous for matching ...
b := False
if q > p then
t := tpl.substring (p, q - 1)
s := a_uri.substring (p + l_offset, q + l_offset - 1)
b := s.same_string (t)
p := q + vn.count + 2
p := exp.end_position
end
--| Check related variable
if b and then not vn.is_empty then
@@ -210,7 +219,7 @@ feature -- Match
b := exp.is_query --| query are optional
end
end
l_x_parts.forth
l_expressions.forth
end
end
if b then
@@ -221,14 +230,14 @@ feature -- Match
feature {NONE} -- Internal Access
expansion_parts: detachable LIST [URI_TEMPLATE_EXPRESSION]
expressions: detachable LIST [URI_TEMPLATE_EXPRESSION]
-- Expansion parts
feature {NONE} -- Implementation
analyze (a_handler: detachable URI_TEMPLATE_HANDLER)
analyze
local
l_x_parts: like expansion_parts
l_expressions: like expressions
c: CHARACTER
i,p,n: INTEGER
tpl: like template
@@ -237,12 +246,12 @@ feature {NONE} -- Implementation
x: STRING
exp: URI_TEMPLATE_EXPRESSION
do
l_x_parts := expansion_parts
if l_x_parts = Void then
l_expressions := expressions
if l_expressions = Void then
tpl := template
--| Extract expansion parts "\\{([^\\}]*)\\}"
create {ARRAYED_LIST [like expansion_parts.item]} l_x_parts.make (tpl.occurrences ('{'))
create {ARRAYED_LIST [like expressions.item]} l_expressions.make (tpl.occurrences ('{'))
from
i := 1
n := tpl.count
@@ -254,7 +263,7 @@ feature {NONE} -- Implementation
if in_x then
if c = '}' then
create exp.make (p, x.twin, in_query)
l_x_parts.force (exp)
l_expressions.force (exp)
x.wipe_out
in_x := False
else
@@ -276,7 +285,7 @@ feature {NONE} -- Implementation
end
i := i + 1
end
expansion_parts := l_x_parts
expressions := l_expressions
end
end
@@ -355,11 +364,6 @@ feature {NONE} -- Implementation
Result := a_uri.substring (a_index, p)
end
url_encoder: URL_ENCODER
once
create Result
end
note
copyright: "2011-2011, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"

52
library/protocol/uri_template/src/uri_template_constants.e Normal file
View File

@@ -0,0 +1,52 @@
note
description: "[
Summary description for {URI_TEMPLATE_CONSTANTS}.
see http://tools.ietf.org/html/draft-gregorio-uritemplate-04
]"
author: ""
date: "$Date$"
revision: "$Revision$"
class
URI_TEMPLATE_CONSTANTS
feature -- Operator
Reserved_operator: CHARACTER = '+'
Form_style_query_operator: CHARACTER = '?'
Path_style_parameters_operator: CHARACTER = ';'
Path_segment_operator: CHARACTER = '/'
Label_operator: CHARACTER = '.'
feature -- Separator
Default_delimiter: CHARACTER = '=' --| Draft 0.4 , change to '|' for Draft 0.5
feature -- Explode
Explode_plus: CHARACTER = '+'
Explode_star: CHARACTER = '*'
feature -- Modified
Modifier_substring: CHARACTER = ':'
Modifier_remainder: CHARACTER = '^'
note
copyright: "2011-2011, Eiffel Software and others"
license: "Eiffel Forum License v2 (see http://www.eiffel.com/licensing/forum.txt)"
source: "[
Eiffel Software
5949 Hollister Ave., Goleta, CA 93117 USA
Telephone 805-685-1006, Fax 805-685-6869
Website http://www.eiffel.com
Customer support http://support.eiffel.com
]"
end

93
library/protocol/uri_template/src/uri_template_expression.e
View File

@@ -8,8 +8,13 @@ class
URI_TEMPLATE_EXPRESSION
inherit
ANY
DEBUG_OUTPUT
URI_TEMPLATE_CONSTANTS
export {NONE} all end
create
make
@@ -42,22 +47,27 @@ feature -- Processing
op_prefix := '%U'
op_delimiter := ','
inspect exp[1]
when '+' then
when Reserved_operator then
--| '+'
reserved := True
operator := '+'
when '.' then
when Label_operator then
--| '.'
operator := '.'
op_prefix := '.'
op_delimiter := '.'
when '/' then
when Path_segment_operator then
--| '/'
operator := '/'
op_prefix := '/'
op_delimiter := '/'
when ';' then
when Path_style_parameters_operator then
--| ';'
operator := ';'
op_prefix := ';'
op_delimiter := ';'
when '?' then
when Form_style_query_operator then
--| '?'
operator := '?'
op_prefix := '?'
op_delimiter := '&'
@@ -81,7 +91,7 @@ feature -- Processing
loop
s := lst.item
vmodifier := Void
p := s.index_of ('|', 1)
p := s.index_of (Default_delimiter, 1)
if p > 0 then
vn := s.substring (1, p - 1)
s := s.substring (p + 1, s.count)
@@ -97,7 +107,7 @@ feature -- Processing
i > n
loop
inspect vn[i]
when '*', '+', ':', '^' then
when Explode_plus, Explode_star, Modifier_substring, Modifier_remainder then
vmodifier := vn.substring (i, n)
vn := vn.substring (1, i - 1)
i := n + 1 --| exit
@@ -105,7 +115,7 @@ feature -- Processing
i := i + 1
end
end
vars.force (create {URI_TEMPLATE_EXPRESSION_VARIABLE}.make (operator, vn, s, vmodifier))
vars.force (create {URI_TEMPLATE_EXPRESSION_VARIABLE}.make (Current, vn, s, vmodifier))
lst.forth
end
variables := vars
@@ -117,32 +127,39 @@ feature -- Processing
feature -- Access
position: INTEGER
-- Character position on Current in the template
end_position: INTEGER
do
Result := position + expression.count + 2 --| '{' + `expression' + '}'
end
expression: STRING
-- Operator? + VariableName + modifier
is_query: BOOLEAN
-- Is in the query part (i.e: after '?' ?)
feature -- Status
operator: CHARACTER
has_operator: BOOLEAN
do
Result := operator /= '%U'
end
-- First character of `expression' if among
reserved: BOOLEAN
has_op_prefix: BOOLEAN
do
Result := op_prefix /= '%U'
end
-- Is reserved
-- i.e: do not url-encode the reserved character
op_prefix: CHARACTER
-- When expanding list of table, first character to use
--| ex: '?' for {?var}
op_delimiter: CHARACTER
-- When expanding list of table, delimiter character to use
--| ex: ',' for {?var}
variables: detachable LIST [URI_TEMPLATE_EXPRESSION_VARIABLE]
-- List of variables declared in `expression'
--| ex: "foo", "bar" for {?foo,bar}
variable_names: LIST [STRING]
do
@@ -168,46 +185,16 @@ feature -- Status report
feature -- Report
append_to_string (a_ht: HASH_TABLE [detachable ANY, STRING]; a_buffer: STRING)
append_expanded_to_string (a_ht: HASH_TABLE [detachable ANY, STRING]; a_buffer: STRING)
do
analyze
if attached variables as vars then
append_custom_variables_to_string (a_ht, vars, op_prefix, op_delimiter, True, a_buffer)
-- inspect operator
-- when '?' then
-- append_custom_variables_to_string (a_ht, vars, '?', '&', True, a_buffer)
-- when ';' then
-- append_custom_variables_to_string (a_ht, vars, ';', ';', False, a_buffer)
-- when '.' then
-- append_custom_variables_to_string (a_ht, vars, '.', ',', True, a_buffer)
-- when '/' then
-- append_custom_variables_to_string (a_ht, vars, '/', '/', True, a_buffer)
-- else
-- append_custom_variables_to_string (a_ht, vars, '%U', ',', False, a_buffer)
-- end
end
end
feature {NONE} -- Implementation
url_encoded_string (s: READABLE_STRING_GENERAL; a_encoded: BOOLEAN): STRING
do
if a_encoded then
Result := url_encoder.encoded_string (s.as_string_32)
else
Result := url_encoder.partial_encoded_string (s.as_string_32, <<
':', ',',
'+', '.', '/', ';', '?',
'|', '!', '@'
>>)
end
end
url_encoder: URL_ENCODER
once
create Result
end
append_custom_variables_to_string (a_ht: HASH_TABLE [detachable ANY, STRING]; vars: like variables; prefix_char, delimiter_char: CHARACTER; a_include_name: BOOLEAN; a_buffer: STRING)
-- If `first_char' is '%U' do not print any first character
local
@@ -228,8 +215,8 @@ feature {NONE} -- Implementation
vdata := a_ht.item (vi.name)
vstr := Void
if vdata /= Void then
vstr := vi.string (vdata)
if vstr = Void and vi.has_explode_modifier then
vstr := vi.expanded_string (vdata)
if vstr = Void and vi.has_explode then
--| Missing or list empty
vstr := vi.default_value
l_use_default := True
@@ -250,9 +237,9 @@ feature {NONE} -- Implementation
else
a_buffer.append_character (delimiter_char)
end
if l_use_default and (operator = '?') and not vi.has_explode_modifier_star then
if l_use_default and (operator = Form_style_query_operator) and not vi.has_explode_star then
a_buffer.append (vi.name)
if vi.has_explode_modifier_plus then
if vi.has_explode_plus then
a_buffer.append_character ('.')
else
a_buffer.append_character ('=')

228
library/protocol/uri_template/src/uri_template_expression_variable.e
View File

@@ -7,133 +7,172 @@ note
class
URI_TEMPLATE_EXPRESSION_VARIABLE
inherit
ANY
URI_TEMPLATE_CONSTANTS
export {NONE} all end
create
make
feature {NONE} -- Initialization
make (op: like operator; n: like name; d: like default_value; m: like modifier)
make (exp: like expression; n: like name; d: like default_value; em: detachable STRING)
-- Create based on expression `exp', variable name `n', default value `d' if any
-- and explode or modifier string `em'
do
operator := op
expression := exp
operator := exp.operator
name := n
default_value := d
modifier := m
if em /= Void and then em.count > 0 then
inspect em[1]
when Explode_star, Explode_plus then
explode := em[1]
when Modifier_substring, Modifier_remainder then
modifier := em
else
end
end
op_prefix := '%U'
op_separator := ','
inspect op
when '+' then
inspect operator
when Reserved_operator then --| '+'
reserved := True
when '?' then
when Form_style_query_operator then --| '?'
op_prefix := '?'
op_separator := '&'
when ';' then
when Path_style_parameters_operator then --| ';'
op_prefix := ';'
op_separator := ';'
when '/' then
when Path_segment_operator then --| '/'
op_prefix := '/'
op_separator := '/'
when '.' then
when Label_operator then --| '.'
op_prefix := '.'
op_separator := '.'
else
end
end
feature -- Access
expression: URI_TEMPLATE_EXPRESSION
-- Parent expression
operator: CHARACTER
-- First character of related `expression'
name: STRING
-- variable name
default_value: detachable STRING
-- default value if any
reserved: BOOLEAN
-- Is reserved?
-- i.e: do not url-encode the reserved character
op_prefix: CHARACTER
-- When expanding list of table, first character to use
--| ex: '?' for {?var}
op_separator: CHARACTER
-- When expanding list of table, delimiter character to use
--| ex: ',' for {?var}
explode: CHARACTER
-- Explode character , '*' or '+'
modifier: detachable STRING
-- Modifier expression, starting by ':' or '^'
--| ":3" , "-3", "^4", ...
has_modifier: BOOLEAN
do
Result := modifier /= Void
end
modified (s: READABLE_STRING_GENERAL): READABLE_STRING_GENERAL
modified_string (s: READABLE_STRING_GENERAL): READABLE_STRING_GENERAL
local
t: STRING
i,n: INTEGER
do
Result := s
if attached modifier as m and then m.count > 1 and then m[1] = ':' then
if attached modifier as m and then m.count > 1 then
n := s.count
t := m.substring (2, m.count)
if t.is_integer then
i := t.to_integer
if i > 0 then
if i < n then
Result := s.substring (1, i)
inspect m[1]
when Modifier_substring then
if i > 0 then
if i < n then
Result := s.substring (1, i)
end
elseif i < 0 then
Result := s.substring (n - i, n)
end
elseif i < 0 then
Result := s.substring (n - i, n)
when Modifier_remainder then
if i > 0 then
if i < n then
Result := s.substring (i + 1, n)
end
elseif i < 0 then
Result := s.substring (1, n + i) --| n + i = n - (-i)
end
else
check Known_modified: False end
-- Unchanged
end
end
end
end
has_explode_modifier: BOOLEAN
has_explode: BOOLEAN
do
Result := attached modifier as m and then m.count = 1 and then (
m[1] = '+' or m[1] = '*'
)
Result := explode = Explode_plus or explode = Explode_star
end
has_explode_modifier_plus: BOOLEAN
has_explode_plus: BOOLEAN
do
Result := attached modifier as m and then m.count = 1 and then
m[1] = '+'
Result := explode = Explode_plus
end
has_explode_modifier_star: BOOLEAN
has_explode_star: BOOLEAN
do
Result := attached modifier as m and then m.count = 1 and then
m[1] = '*'
Result := explode = Explode_star
end
feature -- Report
string (d: detachable ANY): detachable STRING
expanded_string (d: detachable ANY): detachable STRING
local
l_delimiter: CHARACTER
v_enc: detachable STRING
k_enc: STRING
l_obj: detachable ANY
i,n: INTEGER
modifier_is_plus: BOOLEAN
modifier_is_star: BOOLEAN
modifier_has_explode: BOOLEAN
explode_is_plus: BOOLEAN
explode_is_star: BOOLEAN
l_has_explode: BOOLEAN
dft: detachable ANY
has_list_op: BOOLEAN
op: like operator
do
modifier_has_explode := has_explode_modifier
if modifier_has_explode then
modifier_is_plus := has_explode_modifier_plus
modifier_is_star := has_explode_modifier_star
l_has_explode := has_explode
if l_has_explode then
explode_is_plus := has_explode_plus
explode_is_star := has_explode_star
end
has_list_op := operator /= '%U' and operator /= '+'
op := operator
has_list_op := op /= '%U' and op /= Reserved_operator
dft := default_value
create Result.make (20)
if attached {READABLE_STRING_GENERAL} d as l_string then
v_enc := url_encoded_string (modified (l_string), not reserved)
if operator = '?' then
v_enc := url_encoded_string (modified_string (l_string), not reserved)
if op = Form_style_query_operator then
Result.append (name)
Result.append_character ('=')
elseif operator = ';' then
elseif op = Path_style_parameters_operator then
Result.append (name)
if not v_enc.is_empty then
Result.append_character ('=')
@@ -143,29 +182,29 @@ feature -- Report
elseif attached {ARRAY [detachable ANY]} d as l_array then
if l_array.is_empty then
if dft /= Void then
inspect operator
when '?',';' then
if not modifier_has_explode then
inspect op
when Form_style_query_operator, Path_style_parameters_operator then
if not l_has_explode then
Result.append (name)
Result.append_character ('=')
Result.append (dft.out)
else
if modifier_is_plus then
if explode_is_plus then
Result.append (name)
Result.append_character ('.')
end
Result.append (dft.out)
end
when '/' then
if modifier_is_plus then
when Path_segment_operator then
if explode_is_plus then
Result.append (name)
Result.append_character ('.')
end
Result.append (dft.out)
when '.' then
when Label_operator then
else
if modifier_has_explode then
if modifier_is_plus then
if l_has_explode then
if explode_is_plus then
Result.append (name)
Result.append_character ('.')
end
@@ -176,17 +215,14 @@ feature -- Report
-- nothing ...
end
else
if modifier_has_explode then
if l_has_explode then
l_delimiter := op_separator
else
l_delimiter := ','
inspect operator
when '?' then
inspect op
when Form_style_query_operator then
Result.append (name)
Result.append_character ('=')
when ';' then
when '/' then
-- Result.append_character ('/')
else
end
end
@@ -203,10 +239,10 @@ feature -- Report
else
v_enc := ""
end
if modifier_is_plus then
if explode_is_plus then
if
(operator = '?' and modifier_is_plus) or
(operator = ';' and modifier_has_explode)
(op = Form_style_query_operator and explode_is_plus) or
(op = Path_style_parameters_operator and l_has_explode)
then
Result.append (name)
Result.append_character ('=')
@@ -214,7 +250,7 @@ feature -- Report
Result.append (name)
Result.append_character ('.')
end
elseif modifier_is_star and operator = '?' then
elseif explode_is_star and op = Form_style_query_operator then
Result.append (name)
Result.append_character ('=')
end
@@ -230,47 +266,31 @@ feature -- Report
Result := Void
end
elseif attached {HASH_TABLE [detachable ANY, STRING]} d as l_table then
-- if operator = '?' and not modifier_has_explode and l_table.is_empty and dft = Void then
-- elseif operator = '?' and not modifier_has_explode then
-- Result.append (name)
-- Result.append_character ('=')
-- if l_table.is_empty and dft /= Void then
-- Result.append (dft.out)
-- end
-- elseif l_table.is_empty and dft /= Void then
-- if modifier_has_explode then
-- if modifier_is_plus then
-- Result.append (name)
-- Result.append_character ('.')
-- end
-- Result.append (dft.out)
-- end
-- end
if l_table.is_empty then
if dft /= Void then
inspect operator
when '?',';' then
if not modifier_has_explode then
inspect op
when Form_style_query_operator, Path_style_parameters_operator then
if not l_has_explode then
Result.append (name)
Result.append_character ('=')
Result.append (dft.out)
else
if modifier_is_plus then
if explode_is_plus then
Result.append (name)
Result.append_character ('.')
end
Result.append (dft.out)
end
when '/' then
if modifier_is_plus then
when Path_segment_operator then
if explode_is_plus then
Result.append (name)
Result.append_character ('.')
end
Result.append (dft.out)
when '.' then
when Label_operator then
else
if modifier_has_explode then
if modifier_is_plus then
if l_has_explode then
if explode_is_plus then
Result.append (name)
Result.append_character ('.')
end
@@ -281,16 +301,14 @@ feature -- Report
-- nothing ...
end
else
if modifier_has_explode then
if l_has_explode then
l_delimiter := op_separator
else
l_delimiter := ','
inspect operator
when '?' then
inspect op
when Form_style_query_operator then
Result.append (name)
Result.append_character ('=')
when ';' then
when '/' then
else
end
end
@@ -308,20 +326,12 @@ feature -- Report
v_enc := ""
end
if modifier_is_plus then
if explode_is_plus then
Result.append (name)
Result.append_character ('.')
end
if
modifier_has_explode and
(
operator = '%U' or
operator = '+' or
operator = '?' or
operator = '.' or
operator = ';' or
operator = '/'
)
l_has_explode
then
Result.append (k_enc)
Result.append_character ('=')
@@ -348,12 +358,12 @@ feature -- Report
else
v_enc := default_value
end
if operator = '?' then
if op = Form_style_query_operator then
Result.append (name)
if v_enc /= Void then
Result.append_character ('=')
end
elseif operator = ';' then
elseif op = Path_style_parameters_operator then
Result.append (name)
if v_enc /= Void and then not v_enc.is_empty then
Result.append_character ('=')
@@ -374,7 +384,11 @@ feature {NONE} -- Implementation
else
Result := url_encoder.partial_encoded_string (s.as_string_32, <<
':', ',',
'+', '.', '/', ';', '?',
Reserved_operator,
Label_operator,
Path_segment_operator,
Path_style_parameters_operator,
Form_style_query_operator,
'|', '!', '@'
>>)
end